Changeset 761affc9


Ignore:
Timestamp:
Jun 26, 2018 6:39:39 PM (2 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
3c53dfe
Parents:
f0f62527
Message:

Console: Move servlet to new package (ticket #2265)

Location:
apps/routerconsole
Files:
1 added
2 edited
1 moved

Legend:

Unmodified
Added
Removed
  • apps/routerconsole/java/build.xml

    rf0f62527 r761affc9  
    124124        <!-- set if unset -->
    125125        <property name="workspace.changes.j.tr" value="" />
    126         <jar destfile="./build/routerconsole.jar" basedir="./build/obj" excludes="net/i2p/router/web/helpers/*">
     126        <jar destfile="./build/routerconsole.jar" basedir="./build/obj" excludes="net/i2p/router/web/helpers/* net/i2p/router/web/servlets/*">
    127127            <manifest>
    128128                <!-- DTG added in 0.8.4, not in the classpath for very old installs, before we changed wrapper.config to specify * -->
     
    328328                <attribute name="X-Compile-Target-JDK" value="${javac.version}" />
    329329            </manifest>
    330             <classes dir="./build/obj" includes="net/i2p/router/web/helpers/*" />
     330            <classes dir="./build/obj" includes="net/i2p/router/web/helpers/* net/i2p/router/web/servlets/*" />
    331331        </war>
    332332    </target>
     
    335335        <uptodate property="war.uptodate" targetfile="build/routerconsole.war" >
    336336            <srcfiles dir= "../jsp" excludes="web.xml, web-fragment.xml, *.css, **/*.java, *.jsp, *.jsi" />
    337             <srcfiles dir= "build/obj" includes="net/i2p/router/web/helpers/*.class" />
     337            <srcfiles dir= "build/obj" includes="net/i2p/router/web/helpers/*.class net/i2p/router/web/servlets/*.class" />
    338338        </uptodate>
    339339        <condition property="shouldListChanges" >
  • apps/routerconsole/java/src/net/i2p/router/web/servlets/CodedIconRendererServlet.java

    rf0f62527 r761affc9  
    1 package net.i2p.router.web.helpers;
     1package net.i2p.router.web.servlets;
    22
    33import java.io.File;
  • apps/routerconsole/jsp/web.xml

    rf0f62527 r761affc9  
    1717
    1818    <servlet>
    19       <servlet-name>net.i2p.router.web.helpers.CodedIconRendererServlet</servlet-name>
    20       <servlet-class>net.i2p.router.web.helpers.CodedIconRendererServlet</servlet-class>
     19      <servlet-name>net.i2p.router.web.servlets.CodedIconRendererServlet</servlet-name>
     20      <servlet-class>net.i2p.router.web.servlets.CodedIconRendererServlet</servlet-class>
    2121    </servlet>
    2222
    2323    <servlet-mapping>
    24       <servlet-name>net.i2p.router.web.helpers.CodedIconRendererServlet</servlet-name>
     24      <servlet-name>net.i2p.router.web.servlets.CodedIconRendererServlet</servlet-name>
    2525      <url-pattern>/Plugins/*</url-pattern>
    2626    </servlet-mapping>
Note: See TracChangeset for help on using the changeset viewer.