moving eclipseurl classes to separate src folder

8 files changed, 50 insertions, 18 deletions

diff --git a/org.eclipse.help.webapp/.classpath b/org.eclipse.help.webapp/.classpath
index d181ec1a0..d726aa510 100644
--- a/org.eclipse.help.webapp/.classpath
+++ b/org.eclipse.help.webapp/.classpath
@@ -1,11 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-    <classpathentry kind="src" path="src"/>
-    <classpathentry kind="src" path="/org.eclipse.core.runtime"/>
-    <classpathentry kind="src" path="/org.apache.xerces"/>
-    <classpathentry kind="src" path="/org.eclipse.help"/>
-    <classpathentry kind="src" path="/org.eclipse.core.boot"/>
-    <classpathentry kind="var" path="JRE_LIB" rootpath="JRE_SRCROOT" sourcepath="JRE_SRC"/>
-    <classpathentry kind="src" path="/org.eclipse.tomcat"/>
-    <classpathentry kind="output" path="WEB-INF/classes"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>

+<classpath>

+    <classpathentry kind="src" path="src"/>

+    <classpathentry kind="src" path="srcurl"/>

+    <classpathentry kind="src" path="/org.eclipse.core.runtime"/>

+    <classpathentry kind="src" path="/org.apache.xerces"/>

+    <classpathentry kind="src" path="/org.eclipse.help"/>

+    <classpathentry kind="src" path="/org.eclipse.core.boot"/>

+    <classpathentry kind="var" path="JRE_LIB" rootpath="JRE_SRCROOT" sourcepath="JRE_SRC"/>

+    <classpathentry kind="src" path="/org.eclipse.tomcat"/>

+    <classpathentry kind="output" path="WEB-INF\classes"/>

+</classpath>

diff --git a/org.eclipse.help.webapp/.cvsignore b/org.eclipse.help.webapp/.cvsignore
index 9b9450bbf..c0ac766bd 100644
--- a/org.eclipse.help.webapp/.cvsignore
+++ b/org.eclipse.help.webapp/.cvsignore
@@ -4,3 +4,4 @@ webapp.jar.bin.log
 eclipseurl.jar
 eclipseinfocenter.war
 temp.folder
+eclipseurlsrc.zip
diff --git a/org.eclipse.help.webapp/build.properties b/org.eclipse.help.webapp/build.properties
index 4174abe2c..061181c65 100644
--- a/org.eclipse.help.webapp/build.properties
+++ b/org.eclipse.help.webapp/build.properties
@@ -2,9 +2,11 @@ custom=true
 

 #properties for building a plugin

 #source.WEB-INF/lib/webapp.jar=src/

+#source.eclipseurl.jar=srcurl/

 #src.includes=about.html

 #bin.includes=images/,ns4/,WEB-INF/,*.css,*.html,*.js,*.jsp,plugin.properties,plugin.xml,webapp.properties

 #bin.excludes=cpl-v10.html,notice.html,WEB-INF/classes/

+#jars.compile.order=WEB-INF/lib/webapp.jar,eclipseurl.jar

 #jars.extra.classpath=../org.eclipse.tomcat/servlet.jar

 

 #properties for building an infocenter web app

diff --git a/org.eclipse.help.webapp/build.xml b/org.eclipse.help.webapp/build.xml
index fadd210da..13c3f2924 100644
--- a/org.eclipse.help.webapp/build.xml
+++ b/org.eclipse.help.webapp/build.xml
@@ -32,6 +32,7 @@
 

 	<target name="gather.bin.parts" depends="init" if="destination.temp.folder">

 		<mkdir dir="${destination.temp.folder}/${full.name}"/>

+		<copy file="${build.result.folder}/eclipseurl.jar" todir="${destination.temp.folder}/${full.name}"/>

 		<mkdir dir="${destination.temp.folder}/${full.name}/WEB-INF/lib"/>

 		<copy file="${build.result.folder}/WEB-INF/lib/webapp.jar" todir="${destination.temp.folder}/${full.name}/WEB-INF/lib"/>

 		<copy todir="${destination.temp.folder}/${full.name}">

@@ -40,7 +41,6 @@
 		<!-- custom addition begin -->

 		<copy file="${basedir}/web.xml" todir="${destination.temp.folder}/${full.name}/WEB-INF" overwrite="true"/>

 		<copy file="${basedir}/jsp.jar" todir="${destination.temp.folder}/${full.name}/WEB-INF/lib"/>

-		<copy file="${build.result.folder}/eclipseurl.jar" todir="${destination.temp.folder}/${full.name}"/>

 		<!-- custom end -->

 	</target>

 

@@ -57,13 +57,7 @@
 			<fileset dir="src/" excludes="**/*.java"/>

 		</copy>

 		<mkdir dir="${build.result.folder}/WEB-INF/lib"/>

-		<!-- custom change begin -->

-		<!--

 		<jar jarfile="${build.result.folder}/WEB-INF/lib/webapp.jar" basedir="${temp.folder}/WEB-INF/lib/webapp.jar.bin"/>

-		-->

-		<jar jarfile="${build.result.folder}/WEB-INF/lib/webapp.jar" basedir="${temp.folder}/WEB-INF/lib/webapp.jar.bin" excludes="org/eclipse/help/internal/proxy/**"/>

-		<jar jarfile="${build.result.folder}/eclipseurl.jar" basedir="${temp.folder}/WEB-INF/lib/webapp.jar.bin" includes="org/eclipse/help/internal/proxy/**"/>

-		<!-- custom end -->

 		<delete dir="${temp.folder}/WEB-INF/lib/webapp.jar.bin"/>

 	</target>

 

@@ -74,20 +68,50 @@
 		</zip>

 	</target>

 

+	<target name="eclipseurl.jar" depends="init" unless="eclipseurl.jar">

+		<property name="destdir" value="${temp.folder}/eclipseurl.jar.bin"/>

+		<delete dir="${temp.folder}/eclipseurl.jar.bin"/>

+		<mkdir dir="${temp.folder}/eclipseurl.jar.bin"/>

+		<!-- compile the source code -->

+		<javac destdir="${temp.folder}/eclipseurl.jar.bin" failonerror="false" verbose="true" debug="on" includeAntRuntime="no" bootclasspath="${bootclasspath}" classpath="../org.eclipse.core.runtime/runtime.jar;../org.eclipse.help/help.jar;../org.apache.xerces/xercesImpl.jar;../org.eclipse.help/bin;../org.apache.xerces/bin;../org.eclipse.core.runtime/bin;../org.eclipse.core.boot/boot.jar;WEB-INF/lib/webapp.jar;../org.eclipse.tomcat/servlet.jar;../org.apache.xerces/xmlParserAPIs.jar;../org.eclipse.core.boot/bin">

+			<src path="srcurl/"/>

+		</javac>

+		<!-- copy necessary resources -->

+		<copy todir="${temp.folder}/eclipseurl.jar.bin">

+			<fileset dir="srcurl/" excludes="**/*.java"/>

+		</copy>

+		<mkdir dir="${build.result.folder}"/>

+		<jar jarfile="${build.result.folder}/eclipseurl.jar" basedir="${temp.folder}/eclipseurl.jar.bin"/>

+		<delete dir="${temp.folder}/eclipseurl.jar.bin"/>

+	</target>

+

+	<target name="eclipseurlsrc.zip" depends="init" unless="eclipseurlsrc.zip">

+		<mkdir dir="${build.result.folder}"/>

+		<zip zipfile="${build.result.folder}/eclipseurlsrc.zip" filesonly="false">

+			<fileset dir="srcurl/" includes="**/*.java"/>

+		</zip>

+	</target>

+

 	<target name="build.jars" depends="init">

 		<available property="WEB-INF/lib/webapp.jar" file="${build.result.folder}/WEB-INF/lib/webapp.jar"/>

 		<antcall target="WEB-INF/lib/webapp.jar"/>

+		<available property="eclipseurl.jar" file="${build.result.folder}/eclipseurl.jar"/>

+		<antcall target="eclipseurl.jar"/>

 	</target>

 

 	<target name="build.sources" depends="init">

 		<available property="WEB-INF/lib/webappsrc.zip" file="${build.result.folder}/WEB-INF/lib/webappsrc.zip"/>

 		<antcall target="WEB-INF/lib/webappsrc.zip"/>

+		<available property="eclipseurlsrc.zip" file="${build.result.folder}/eclipseurlsrc.zip"/>

+		<antcall target="eclipseurlsrc.zip"/>

 	</target>

 

 	<target name="build.zips" depends="init">

 	</target>

 

 	<target name="gather.sources" depends="init" if="destination.temp.folder">

+		<mkdir dir="${destination.temp.folder}/${full.name}"/>

+		<copy file="${build.result.folder}/eclipseurlsrc.zip" todir="${destination.temp.folder}/${full.name}"/>

 		<mkdir dir="${destination.temp.folder}/${full.name}/WEB-INF/lib"/>

 		<copy file="${build.result.folder}/WEB-INF/lib/webappsrc.zip" todir="${destination.temp.folder}/${full.name}/WEB-INF/lib"/>

 		<copy todir="${destination.temp.folder}/${full.name}">

@@ -96,11 +120,15 @@
 	</target>

 

 	<target name="gather.logs" depends="init" if="destination.temp.folder">

+		<mkdir dir="${destination.temp.folder}/${full.name}"/>

+		<copy file="${temp.folder}/eclipseurl.jar.bin.log" todir="${destination.temp.folder}/${full.name}"/>

 		<mkdir dir="${destination.temp.folder}/${full.name}/WEB-INF/lib"/>

 		<copy file="${temp.folder}/WEB-INF/lib/webapp.jar.bin.log" todir="${destination.temp.folder}/${full.name}/WEB-INF/lib"/>

 	</target>

 

 	<target name="clean" depends="init">

+		<delete file="${build.result.folder}/eclipseurl.jar"/>

+		<delete file="${build.result.folder}/eclipseurlsrc.zip"/>

 		<delete file="${build.result.folder}/WEB-INF/lib/webapp.jar"/>

 		<delete file="${build.result.folder}/WEB-INF/lib/webappsrc.zip"/>

 		<delete file="${plugin.destination}/${full.name}.jar"/>

diff --git a/org.eclipse.help.webapp/src/org/eclipse/help/internal/proxy/protocol/ProxyHandler.java b/org.eclipse.help.webapp/srcurl/org/eclipse/help/internal/proxy/protocol/ProxyHandler.java
index c707948e1..c707948e1 100644
--- a/org.eclipse.help.webapp/src/org/eclipse/help/internal/proxy/protocol/ProxyHandler.java
+++ b/org.eclipse.help.webapp/srcurl/org/eclipse/help/internal/proxy/protocol/ProxyHandler.java
diff --git a/org.eclipse.help.webapp/src/org/eclipse/help/internal/proxy/protocol/help/Handler.java b/org.eclipse.help.webapp/srcurl/org/eclipse/help/internal/proxy/protocol/help/Handler.java
index aefa106a3..aefa106a3 100644
--- a/org.eclipse.help.webapp/src/org/eclipse/help/internal/proxy/protocol/help/Handler.java
+++ b/org.eclipse.help.webapp/srcurl/org/eclipse/help/internal/proxy/protocol/help/Handler.java
diff --git a/org.eclipse.help.webapp/src/org/eclipse/help/internal/proxy/protocol/platform/Handler.java b/org.eclipse.help.webapp/srcurl/org/eclipse/help/internal/proxy/protocol/platform/Handler.java
index f4e796b32..f4e796b32 100644
--- a/org.eclipse.help.webapp/src/org/eclipse/help/internal/proxy/protocol/platform/Handler.java
+++ b/org.eclipse.help.webapp/srcurl/org/eclipse/help/internal/proxy/protocol/platform/Handler.java
diff --git a/org.eclipse.help.webapp/src/org/eclipse/help/internal/proxy/protocol/search/Handler.java b/org.eclipse.help.webapp/srcurl/org/eclipse/help/internal/proxy/protocol/search/Handler.java
index f09ff8996..f09ff8996 100644
--- a/org.eclipse.help.webapp/src/org/eclipse/help/internal/proxy/protocol/search/Handler.java
+++ b/org.eclipse.help.webapp/srcurl/org/eclipse/help/internal/proxy/protocol/search/Handler.java