Fixed packaging.

svn changeset:3092/svn branch:trunk

4 files changed, 12 insertions, 25 deletions

diff --git a/build/build.xml b/build/build.xml
index 02a9f06774..c36ee058c8 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -52,7 +52,6 @@
 	<target name="test-package" depends="init" description="used for testing build.xml">
 		<echo>Creating package for Mac platform.</echo>
 		<var name="package-platform" value="mac" />
-		<!-- TODO: on Mac Leopard, we should not use -XstartOnFirstThread -->
 		<var name="eclipse-launch-vmargs" value="-XstartOnFirstThread -Xms128M -Xmx512M" />
 		<antcall target="add-platform-specific-files" inheritAll="true" inheritRefs="true" />
 		<delete file="${result-path}/eclipse-test" followsymlinks="false" />
@@ -123,7 +122,7 @@
 
 		<!-- Create Output Directory Hierarchy -->
 		<mkdir dir="${output-dir}/WebContent" />
-		<mkdir dir="${output-dir}/WebContent/lib" />
+		<mkdir dir="${output-dir}/WebContent/demo" />
 		<mkdir dir="${output-dir}/WebContent/doc" />
 		<mkdir dir="${output-dir}/WebContent/doc/manual" />
 		<mkdir dir="${output-dir}/WebContent/doc/api" />
@@ -352,7 +351,6 @@
 				<copy todir="${output-dir}">
 					<fileset dir="build/package">
 						<include name="start-demo.bat" />
-						<include name="start-demo.txt" />
 					</fileset>
 				</copy>
 			</then>
@@ -363,7 +361,6 @@
 				<copy todir="${output-dir}">
 					<fileset dir="build/package">
 						<include name="start-demo.sh" />
-						<include name="start-demo.txt" />
 					</fileset>
 				</copy>
 				<chmod file="${output-dir}/start-demo.sh" perm="ugo+x" />
@@ -374,14 +371,12 @@
 			<then>
 				<copy todir="${output-dir}">
 					<fileset dir="build/package">
-						<include name="Start IT Mill Toolkit.app" />
+						<include name="Start IT Mill Toolkit.app/**/*" />
 						<include name="start-demo.sh" />
-						<include name="start-demo.txt" />
 						<include name=".VolumeIcon.icns" />
-						<include name=".DS_Store" />
+						<!-- TODO: <include name=".DS_Store" /> -->
 					</fileset>
 				</copy>
-				<!-- TODO: this does not work, why? -->
 				<chmod file="${output-dir}/start-demo.sh" perm="ugo+x" />
 			</then>
 		</if>
@@ -432,12 +427,12 @@
 		</copy>
 
 		<!-- copy 3rd part libraries used by demo -->
-		<copy todir="${output-dir}/WebContent/lib/demo">
+		<copy todir="${output-dir}/WebContent/demo/lib">
 			<fileset dir="lib">
 				<include name="reservr/**/*" />
 			</fileset>
 		</copy>
-		<copy todir="${output-dir}/WebContent/lib">
+		<copy todir="${output-dir}/WebContent/demo/lib">
 			<fileset dir="lib">
 				<include name="jetty/**/*" />
 			</fileset>
@@ -579,7 +574,7 @@
 				<pathelement location="${gwt-dir}/${platform}/${lib-gwt-dev}" />
 				<pathelement location="${result-path}/src" />
 				<!-- demo jars -->
-				<pathelement location="${output-dir}/WebContent/lib/demo/reservr/googlemaps_gwt.jar" />
+				<pathelement location="${output-dir}/WebContent/demo/lib/reservr/googlemaps_gwt.jar" />
 				<!-- demo widgetset sources -->
 				<pathelement path="${output-dir}/WebContent/WEB-INF/src" />
 			</classpath>
@@ -605,7 +600,7 @@
 	<target name="libs" depends="compile-java, compile-client-side">
 		<echo>Creating libs (server-side)</echo>
 		<!-- Create Toolkit JAR -->
-		<jar jarfile="${output-dir}/WebContent/lib/${lib-jar-name}" compress="true">
+		<jar jarfile="${output-dir}/WebContent/WEB-INF/lib/${lib-jar-name}" compress="true">
 			<fileset dir="${result-path}/classes">
 				<patternset>
 					<exclude name="${toolkit-package}/demo/**" />
@@ -645,14 +640,6 @@
 			</fileset>
 		</copy>
 
-		<!-- TODO remove WebContent/lib? -->
-		<echo>Adding (duplicating) Toolkit JAR to WebContent/WEB-INF/lib</echo>
-		<copy todir="${output-dir}/WebContent/WEB-INF/lib">
-			<fileset dir="${output-dir}/WebContent/lib">
-				<include name="${lib-jar-name}" />
-			</fileset>
-		</copy>
-
 		<echo>Adding source for demo</echo>
 		<copy todir="${output-dir}/WebContent/WEB-INF/src">
 			<fileset dir="${result-path}/src">
@@ -672,12 +659,12 @@
 		-->
 		
 		<echo>Building WAR</echo>
-		<war warfile="${output-dir}/lib/${product-file}.war" webxml="build/package/WebContent/WEB-INF/web.xml">
+		<war warfile="${output-dir}/${product-file}.war" webxml="build/package/WebContent/WEB-INF/web.xml">
 			<fileset dir="${output-dir}/WebContent">
 				<exclude name="WEB-INF/web.xml" />
 				<include name="**/*" />
 			</fileset>
-			<lib dir="${output-dir}/WebContent/lib">
+			<lib dir="${output-dir}/WebContent/WEB-INF/lib">
 				<include name="${lib-jar-name}" />
 			</lib>
 		</war>
diff --git a/build/package/WebContent/index.html b/build/package/WebContent/index.html
index e605412db6..90ee218729 100644
--- a/build/package/WebContent/index.html
+++ b/build/package/WebContent/index.html
@@ -207,7 +207,7 @@
 				<div class="library">
 					<h5>Library</h5>
 					<p>Contains all you need to start a new Toolkit project (binaries, sources, default 
-					themes and widgetsets). <a href="lib/itmill-toolkit-<version></version>.jar">Toolkit JAR</a></p>
+					themes and widgetsets). <a href="WEB-INF/lib/itmill-toolkit-<version></version>.jar">Toolkit JAR</a></p>
 				</div>
 				
 				<div class="documentation">
diff --git a/build/package/start-demo.bat b/build/package/start-demo.bat
index 8ac629e9c5..08bd809566 100644
--- a/build/package/start-demo.bat
+++ b/build/package/start-demo.bat
@@ -1 +1 @@
-@java -cp "lib\jetty\jetty-6.1.5.jar;lib\jetty\jetty-util-6.1.5.jar;lib\jetty\servlet-api-2.5-6.1.5.jar;WebContent\WEB-INF\classes" com.itmill.toolkit.launcher.ITMillToolkitDesktopMode

+@java -cp "WebContent\demo\lib\jetty\jetty-6.1.5.jar;WebContent\demo\lib\jetty\jetty-util-6.1.5.jar;WebContent\demo\lib\jetty\servlet-api-2.5-6.1.5.jar;WebContent\WEB-INF\classes" com.itmill.toolkit.launcher.ITMillToolkitDesktopMode

diff --git a/build/package/start-demo.sh b/build/package/start-demo.sh
index 1576528db7..36fbb95292 100644
--- a/build/package/start-demo.sh
+++ b/build/package/start-demo.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-java -cp lib/jetty/jetty-6.1.5.jar:lib/jetty/jetty-util-6.1.5.jar:lib/jetty/servlet-api-2.5-6.1.5.jar:WebContent/WEB-INF/classes com.itmill.toolkit.launcher.ITMillToolkitDesktopMode
+java -cp WebContent/demo/lib/jetty/jetty-6.1.5.jar:WebContent/demo/lib/jetty/jetty-util-6.1.5.jar:WebContent/demo/lib/jetty/servlet-api-2.5-6.1.5.jar:WebContent/WEB-INF/classes com.itmill.toolkit.launcher.ITMillToolkitDesktopMode