packaging fixes, hosted mode for linux should work too

svn changeset:3154/svn branch:trunk

2 files changed, 19 insertions, 15 deletions

diff --git a/build/build.xml b/build/build.xml
index 590a2e16e2..b162c25abc 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -41,7 +41,7 @@
 	<target name="package-linux" depends="clean-all, init, build, docs, internal-package-linux" description="Create public tar.bz2 package for Linux.">
 	</target>
 
-	<target name="package-jar-war" depends="clean-all, init, build" description="Create itmill-toolkit-x.y.z.jar and war file.">
+	<target name="package-jar" depends="clean-all, init, build" description="Create itmill-toolkit-x.y.z.jar file.">
 	</target>
 
 	<!-- internal tests for packaging -->
@@ -115,7 +115,6 @@
 
 		<!-- Destination files -->
 		<property name="lib-jar-name" value="${product-file}-${version}.jar" />
-		<property name="demo-war-name" value="${product-file}-demo-${version}.war" />
 
 		<echo message="Prepared to build ${product-file} version ${version} packages" />
 
@@ -131,6 +130,7 @@
 		<mkdir dir="${output-dir}/WebContent/doc/api" />
 		<mkdir dir="${output-dir}/WebContent/doc/example-source" />
 		<mkdir dir="${output-dir}/WebContent/WEB-INF" />
+		<mkdir dir="${output-dir}/WebContent/WEB-INF/lib" />
 		<mkdir dir="${output-dir}/WebContent/WEB-INF/classes" />
 
 		<!-- Construct classpath used by java and javadoc compilation -->
@@ -330,7 +330,7 @@
 				<exclude name="**/.svn" />
 				<include name="release-notes.html" />
 				<include name="*.html" />
-				<include name="license/*.html" />
+				<include name="license/licensing-guidelines.html" />
 			</fileset>
 		</copy>
 		<delete includeemptydirs="true" defaultexcludes="false">
@@ -530,15 +530,11 @@
 		<copy todir="${output-dir}/WebContent">
 			<fileset dir="WebContent">
 				<exclude name="**/.svn" />
-				<exclude name="openajax/**" />
-				<exclude name="WEB-INF/web.xml" />
-				<exclude name="ITMILL/widgetsets/**" />
-				<exclude name="WEB-INF/lib/commons-fileupload-custom.jar" />
-				<exclude name="ITMILL/themes/test*/**" />
-				<exclude name="WEB-INF/classes/**" />
+				<include name="demo/**/*" />
+				<include name="META-INF/**/*" />
 			</fileset>
 		</copy>
-
+		
 		<!-- Add package specific WebContent files from build/package/WebContent -->
 		<copy todir="${output-dir}/WebContent">
 			<fileset dir="build/package/WebContent">
@@ -642,10 +638,11 @@
 				</patternset>
 			</fileset>
 		</jar>
+		<copy file="${output-dir}/WebContent/WEB-INF/lib/${lib-jar-name}" tofile="${output-dir}/WebContent/${lib-jar-name}" />
 	</target>
 
 	<!-- Demo  - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-	<target name="demo" depends="libs, javadoc">
+	<target name="demo" depends="libs, docs">
 		<echo>Building demo</echo>
 		<echo>Adding demo class files.</echo>
 		<copy todir="${output-dir}/WebContent/WEB-INF/classes">
@@ -664,9 +661,10 @@
 				<include name="${toolkit-package}/launcher/**" />
 			</fileset>
 		</copy>
-
+		
+		<!--
 		<echo>Building WAR</echo>
-		<war warfile="${output-dir}/WebContent/demo/${product-file}.war">
+		<war warfile="${output-dir}/${product-file}.war">
 			<fileset dir="${output-dir}/WebContent">
 				<include name="**/*" />
 			</fileset>
@@ -674,6 +672,7 @@
 				<include name="${lib-jar-name}" />
 			</lib>
 		</war>
+		-->
 	</target>
 
 	<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
diff --git a/build/package/eclipse-IT Mill Toolkit Hosted Mode-launch b/build/package/eclipse-IT Mill Toolkit Hosted Mode-launch
index 90346b43f8..637ab7b1aa 100644
--- a/build/package/eclipse-IT Mill Toolkit Hosted Mode-launch
+++ b/build/package/eclipse-IT Mill Toolkit Hosted Mode-launch
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
-<stringAttribute key="bad_container_name" value="/<eclipse-workspace-name></eclipse-workspace-name>/IT_Mill_Toolkit_Hosted_Mode.launch"/>
-<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
+<stringAttribute key="bad_container_name" value="/<eclipse-workspace-name></eclipse-workspace-name>/IT Mill Toolkit Hosted Mode.launch"/>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
 <listEntry value="/<eclipse-workspace-name></eclipse-workspace-name>/gwt/gwt-dev-<platform></platform>.jar"/>
 </listAttribute>
@@ -15,6 +14,12 @@
 <listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
 <listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
 </listAttribute>
+<listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry containerPath=&quot;org.eclipse.jdt.launching.JRE_CONTAINER&quot; javaProject=&quot;<eclipse-workspace-name></eclipse-workspace-name>&quot; path=&quot;1&quot; type=&quot;4&quot;/&gt;&#10;"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/<eclipse-workspace-name></eclipse-workspace-name>/WebContent/WEB-INF/src&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry id=&quot;org.eclipse.jdt.launching.classpathentry.defaultClasspath&quot;&gt;&#10;&lt;memento exportedEntriesOnly=&quot;false&quot; project=&quot;<eclipse-workspace-name></eclipse-workspace-name>&quot;/&gt;&#10;&lt;/runtimeClasspathEntry&gt;&#10;"/>
+</listAttribute>
+<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.google.gwt.dev.GWTShell"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-noserver -whitelist &quot;127.0.0.1  ^http[:][/][/]127[.]0[.]0[.]1[:]8888&quot; -out WebContent/ITMILL/widgetsets http://127.0.0.1:8888/"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="<eclipse-workspace-name></eclipse-workspace-name>"/>