Updating build commands and launch configs in anticipation of bigger commit. git-svn-id: https://google-web-toolkit.googlecode.com/svn/releases/1.6@3779 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/eclipse/samples/DynaTable2/DynaTable2 compile.launch b/eclipse/samples/DynaTable2/DynaTable2 compile.launch index 4aa652d..9d1d153 100644 --- a/eclipse/samples/DynaTable2/DynaTable2 compile.launch +++ b/eclipse/samples/DynaTable2/DynaTable2 compile.launch
@@ -17,7 +17,7 @@ </listAttribute> <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/> <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.google.gwt.dev.GWTCompiler"/> -<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-out www -style PRETTY -logLevel INFO com.google.gwt.sample.dynatable.DynaTable"/> +<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-wardir war -style PRETTY -logLevel INFO com.google.gwt.sample.dynatable.DynaTable"/> <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="DynaTable2"/> <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-ea -Dgwt.devjar=C:\gwt\releases\1.6\build\staging\gwt-windows-0.0.0\gwt-dev-windows.jar"/> </launchConfiguration>
diff --git a/eclipse/samples/DynaTable2/DynaTable2 server.launch b/eclipse/samples/DynaTable2/DynaTable2 server.launch index eb932c9..4029b62 100644 --- a/eclipse/samples/DynaTable2/DynaTable2 server.launch +++ b/eclipse/samples/DynaTable2/DynaTable2 server.launch
@@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication"> <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"> -<listEntry value="/DynaTable2/jetty-6.1.11.jar"/> +<listEntry value="/DynaTable2"/> </listAttribute> <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES"> -<listEntry value="1"/> +<listEntry value="4"/> </listAttribute> <booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/> <listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
diff --git a/eclipse/samples/DynaTable2/DynaTable2 shell.launch b/eclipse/samples/DynaTable2/DynaTable2 shell.launch index 3be307b..cca8023 100644 --- a/eclipse/samples/DynaTable2/DynaTable2 shell.launch +++ b/eclipse/samples/DynaTable2/DynaTable2 shell.launch
@@ -17,7 +17,7 @@ </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="-out www -style PRETTY -logLevel INFO com.google.gwt.sample.dynatable.DynaTable/DynaTable.html"/> +<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-wardir war -style PRETTY -logLevel INFO DynaTable.html"/> <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="DynaTable2"/> <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-ea -Dgwt.devjar=C:\gwt\releases\1.6\build\staging\gwt-windows-0.0.0\gwt-dev-windows.jar"/> </launchConfiguration>
diff --git a/eclipse/samples/DynaTable2/build.xml b/eclipse/samples/DynaTable2/build.xml index c0b01e3..d810bd9 100644 --- a/eclipse/samples/DynaTable2/build.xml +++ b/eclipse/samples/DynaTable2/build.xml
@@ -20,22 +20,15 @@ </target> <target name="deploy" description="Copy output to the war folder"> - <copy todir="${wardir}"> - <fileset dir="www/com.google.gwt.sample.dynatable.DynaTable" /> - </copy> - <mkdir dir="${wardir}/WEB-INF/misc" /> + <mkdir dir="${wardir}/WEB-INF/lib" /> <copy todir="${wardir}/WEB-INF/lib" file="${gwt.install}/gwt-servlet.jar" /> - <mkdir dir="${wardir}/WEB-INF/misc" /> - <copy todir="${wardir}/WEB-INF/misc"> - <fileset dir="www/com.google.gwt.sample.dynatable.DynaTable-aux" /> - </copy> </target> <target name="gwtc" depends="javac" description="Compile to JavaScript"> <java classname="com.google.gwt.dev.GWTCompiler" fork="yes" failonerror="true"> <jvmarg value="-Xmx256M"/> - <arg value="-out" /> - <arg file="www" /> + <arg value="-wardir" /> + <arg file="war" /> <arg value="com.google.gwt.sample.dynatable.DynaTable" /> <classpath> <pathelement location="../../../samples/dynatable/src" /> @@ -53,7 +46,23 @@ <arg value="-webapp" /> <arg file="war" /> <classpath> - <pathelement location="jetty-6.1.11.jar" /> + <pathelement location="${gwt.install}/gwt-dev-windows.jar" /> + </classpath> + </java> + </target> + + <target name="shell" depends="javac" description="Run the deployed app in GWT hosted mode"> + <java classname="com.google.gwt.dev.GWTShell" fork="yes" failonerror="true"> + <jvmarg value="-Xmx256M"/> + <jvmarg value="-Dgwt.devjar=C:\gwt\releases\1.6\build\staging\gwt-windows-0.0.0\gwt-dev-windows.jar"/> + <arg value="-wardir" /> + <arg file="war" /> + <arg value="http://localhost:8888/DynaTable.html" /> + <classpath> + <pathelement location="../../../samples/dynatable/src" /> + <pathelement location="${wardir}/WEB-INF/classes" /> + <pathelement location="${gwt.install}/gwt-user.jar" /> + <pathelement location="${gwt.install}/gwt-dev-windows.jar" /> </classpath> </java> </target> @@ -62,10 +71,12 @@ <target name="clean" description="Cleans this project's intermediate and output files"> <delete includeemptydirs="true" failonerror="false"> - <fileset dir="${wardir}" excludes="WEB-INF/**"/> + <fileset dir="${wardir}" includes="*" excludes="DynaTable.html"/> </delete> <delete dir="${wardir}/WEB-INF/classes" failonerror="false" /> - <delete dir="${wardir}/WEB-INF/misc" failonerror="false" /> + <delete dir="${wardir}/WEB-INF/lib" failonerror="false" /> + <delete dir="${wardir}/WEB-INF/gwt-aux" failonerror="false" /> + <delete dir="${wardir}/WEB-INF/.gwt-tmp" failonerror="false" /> <delete dir="www" failonerror="false" /> </target> </project>
diff --git a/eclipse/samples/DynaTable2/jetty-6.1.11.jar b/eclipse/samples/DynaTable2/jetty-6.1.11.jar deleted file mode 100644 index a22d544..0000000 --- a/eclipse/samples/DynaTable2/jetty-6.1.11.jar +++ /dev/null Binary files differ