merge of 'be06d7987687efb0d6b027f04a2efbf702218677'

     and 'f6541fdc88966f2e0e510c2291b33cf716a3a62a'

apps/desktopgui/.classpath

@@ -3,7 +3,7 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/i2p_router"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/i2p_sdk"/>
-	<classpathentry kind="lib" path="/lib/wrapper/all/wrapper.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/installer"/>
 	<classpathentry kind="output" path="build"/>
 </classpath>

apps/routerconsole/java/.classpath → apps/routerconsole/.classpath

 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="java/src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/desktopgui"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/i2p_router"/>
@@ -8,6 +8,6 @@
 	<classpathentry combineaccessrules="false" kind="src" path="/jetty"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/jrobin"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/systray"/>
-	<classpathentry kind="lib" path="/lib/wrapper/all/wrapper.jar"/>
-	<classpathentry kind="output" path="build/obj"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/installer"/>
+	<classpathentry kind="output" path="java/build/obj"/>
 </classpath>

apps/susidns/src/.classpath

@@ -2,8 +2,8 @@
 <classpath>
 	<classpathentry kind="src" path="java/src"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/i2p_sdk"/>
-	<classpathentry kind="lib" path="WEB-INF/lib/jstl.jar"/>
-	<classpathentry kind="lib" path="WEB-INF/lib/standard.jar"/>
+	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/jstl.jar"/>
+	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/standard.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="output" path="WEB-INF/classes"/>
 </classpath>

installer/.classpath

+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="java/src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/i2p_sdk"/>
+	<classpathentry exported="true" kind="lib" path="lib/wrapper/all/wrapper.jar"/>
+	<classpathentry kind="output" path="java/build"/>
+</classpath>

installer/lib/.project → installer/.project

 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>lib</name>
+	<name>installer</name>
 	<comment></comment>
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
 </projectDescription>