console: Move web resources to war

apps/desktopgui/build.xml

@@ -80,7 +80,7 @@
 		<!-- set if unset -->
 		<property name="workspace.changes.tr" value="" />
                 <!-- ideal for linux: 24x24, but transparency doesn't work -->
-                <copy tofile="${build}/desktopgui/resources/images/logo.png" file="../../installer/resources/themes/console/images/itoopie_xsm.png" />
+                <copy tofile="${build}/desktopgui/resources/images/logo.png" file="../../apps/routerconsole/jsp/themes/console/images/itoopie_xsm.png" />
                 <copy todir="${build}/desktopgui/resources/images" file="images/itoopie_black_24.png" />
                 <copy todir="${build}/desktopgui/resources/images" file="images/itoopie_white_24.png" />
 		<jar basedir="${build}" excludes="messages-src/**" destfile="${dist}/${jar}">

apps/i2psnark/java/build.xml

@@ -250,6 +250,9 @@
 
     <!-- add css, image, and js files for standalone snark to the war -->
     <target name="standalone_war" depends="war">
+<!--  FIXME
+//////////////////////////////////////////////////////////////////////////////////////////////////////////////
+-->
         <mkdir dir="build/standalone-resources/.resources/themes/snark" />
         <copy todir="build/standalone-resources/.resources/themes/snark" >
             <fileset dir="../../../installer/resources/themes/snark/" />

apps/routerconsole/java/build.xml

@@ -339,7 +339,7 @@
         <!-- set if unset -->
         <property name="workspace.changes.w.tr" value="" />
         <!-- Don't include the css in the war, the main build.xml will copy it to docs/themes/console/ -->
-        <copy file="../../../installer/resources/themes/console/images/favicon.ico" tofile="../jsp/favicon.ico" />
+        <copy file="../jsp/themes/console/images/favicon.ico" tofile="../jsp/favicon.ico" />
         <war destfile="build/routerconsole.war" webxml="../jsp/web-out.xml"
              basedir="../jsp/" excludes="web.xml, *.css, **/*.java, *.jsp, *.jsi, web-fragment.xml, web-out.xml">
             <manifest>

apps/routerconsole/jsp/web.xml

@@ -28,11 +28,6 @@
 
     
     <!-- yeah, i'm lazy, using a jsp instead of a servlet.. -->
-    <servlet-mapping> 
-      <servlet-name>net.i2p.router.web.jsp.viewtheme_jsp</servlet-name>
-      <url-pattern>/themes/*</url-pattern>
-    </servlet-mapping>
-    
     <servlet-mapping> 
       <servlet-name>net.i2p.router.web.jsp.viewtheme_jsp</servlet-name>
       <url-pattern>/javadoc/*</url-pattern>