AGentooCat/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
zzz
2018-06-26 18:39:39 +00:00
parent f0f62527d7
commit 761affc94d
4 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/routerconsole/java/build.xml
View File

@@ -123,7 +123,7 @@
<target name="jar1" depends="compile, bundle-news, bundle-countries, jarUpToDate, listChangedFiles" unless="jar.uptodate" >
<!-- set if unset -->
<property name="workspace.changes.j.tr" value="" />
<jar destfile="./build/routerconsole.jar" basedir="./build/obj" excludes="net/i2p/router/web/helpers/*">
<jar destfile="./build/routerconsole.jar" basedir="./build/obj" excludes="net/i2p/router/web/helpers/* net/i2p/router/web/servlets/*">
<manifest>
<!-- DTG added in 0.8.4, not in the classpath for very old installs, before we changed wrapper.config to specify * -->
<!-- very old installs don't have i2psnark,jstl,standard in the classpath... not added in WebAppConfiguration any more -->
@@ -327,14 +327,14 @@
<attribute name="X-Compile-Source-JDK" value="${javac.version}" />
<attribute name="X-Compile-Target-JDK" value="${javac.version}" />
</manifest>
<classes dir="./build/obj" includes="net/i2p/router/web/helpers/*" />
<classes dir="./build/obj" includes="net/i2p/router/web/helpers/* net/i2p/router/web/servlets/*" />
</war>
</target>
<target name="warUpToDate">
<uptodate property="war.uptodate" targetfile="build/routerconsole.war" >
<srcfiles dir= "../jsp" excludes="web.xml, web-fragment.xml, *.css, **/*.java, *.jsp, *.jsi" />
<srcfiles dir= "build/obj" includes="net/i2p/router/web/helpers/*.class" />
<srcfiles dir= "build/obj" includes="net/i2p/router/web/helpers/*.class net/i2p/router/web/servlets/*.class" />
</uptodate>
<condition property="shouldListChanges" >
<and>

2
apps/routerconsole/java/src/net/i2p/router/web/helpers/CodedIconRendererServlet.java → apps/routerconsole/java/src/net/i2p/router/web/servlets/CodedIconRendererServlet.java
View File

@@ -1,4 +1,4 @@
package net.i2p.router.web.helpers;
package net.i2p.router.web.servlets;
import java.io.File;
import java.io.IOException;

13
apps/routerconsole/java/src/net/i2p/router/web/servlets/package.html Normal file
View File

@@ -0,0 +1,13 @@
<html>
<body>
<p>
Full servlets, mostly for static content.
Each must be added to apps/routerconsole/jsp/web.xml.
</p><p>
This package was created in release 0.9.36.
No classes contained here are part of a public API.
Subject to change.
Not for public use.
</p>
</body>
</html>

6
apps/routerconsole/jsp/web.xml
View File

@@ -16,12 +16,12 @@
<!-- precompiled servlets -->
<servlet>
<servlet-name>net.i2p.router.web.helpers.CodedIconRendererServlet</servlet-name>
<servlet-class>net.i2p.router.web.helpers.CodedIconRendererServlet</servlet-class>
<servlet-name>net.i2p.router.web.servlets.CodedIconRendererServlet</servlet-name>
<servlet-class>net.i2p.router.web.servlets.CodedIconRendererServlet</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>net.i2p.router.web.helpers.CodedIconRendererServlet</servlet-name>
<servlet-name>net.i2p.router.web.servlets.CodedIconRendererServlet</servlet-name>
<url-pattern>/Plugins/*</url-pattern>
</servlet-mapping>