Author: sco...@google.com Date: Fri Feb 13 13:17:55 2009 New Revision: 4718
Modified: releases/1.6/samples/dynatable/war/WEB-INF/web.xml releases/1.6/user/src/com/google/gwt/user/tools/WebAppCreator.java releases/1.6/user/src/com/google/gwt/user/tools/project.ant.xmlsrc Log: Update WebAppCreator to make for friendlier build files. Tweak DynaTable's web.xml to have a nice welcome file. Review by: jlabanca (TBR) Modified: releases/1.6/samples/dynatable/war/WEB-INF/web.xml ============================================================================== --- releases/1.6/samples/dynatable/war/WEB-INF/web.xml (original) +++ releases/1.6/samples/dynatable/war/WEB-INF/web.xml Fri Feb 13 13:17:55 2009 @@ -1,15 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> <web-app> - <servlet> - <servlet-name>calendar</servlet-name> - <servlet-class> - com.google.gwt.sample.dynatable.server.SchoolCalendarServiceImpl - </servlet-class> - </servlet> - <servlet-mapping> - <servlet-name>calendar</servlet-name> - <url-pattern>/dynatable/calendar</url-pattern> - </servlet-mapping> + <!-- Default page to serve --> + <welcome-file-list> + <welcome-file>DynaTable.html</welcome-file> + </welcome-file-list> + + <!-- Servlets --> + <servlet> + <servlet-name>calendar</servlet-name> + <servlet-class>com.google.gwt.sample.dynatable.server.SchoolCalendarServiceImpl</servlet-class> + </servlet> + + <servlet-mapping> + <servlet-name>calendar</servlet-name> + <url-pattern>/dynatable/calendar</url-pattern> + </servlet-mapping> </web-app> Modified: releases/1.6/user/src/com/google/gwt/user/tools/WebAppCreator.java ============================================================================== --- releases/1.6/user/src/com/google/gwt/user/tools/WebAppCreator.java (original) +++ releases/1.6/user/src/com/google/gwt/user/tools/WebAppCreator.java Fri Feb 13 13:17:55 2009 @@ -251,9 +251,9 @@ replacements.put("@moduleName", moduleName); replacements.put("@clientPackage", modulePackageName + ".client"); replacements.put("@serverPackage", modulePackageName + ".server"); + replacements.put("@gwtSdk", installPath); replacements.put("@gwtUserPath", gwtUserPath); replacements.put("@gwtDevPath", gwtDevPath); - replacements.put("@gwtServletPath", gwtServletPath); replacements.put("@gwtVersion", About.GWT_VERSION_NUM); replacements.put("@gwtModuleDtd", gwtModuleDtd); replacements.put("@shellClass", HostedMode.class.getName()); Modified: releases/1.6/user/src/com/google/gwt/user/tools/project.ant.xmlsrc ============================================================================== --- releases/1.6/user/src/com/google/gwt/user/tools/project.ant.xmlsrc (original) +++ releases/1.6/user/src/com/google/gwt/user/tools/project.ant.xmlsrc Fri Feb 13 13:17:55 2009 @@ -1,19 +1,19 @@ <?xml version="1.0" encoding="utf-8" ?> <project name="@moduleShortName" default="build" basedir="."> + <!-- Configure path to GWT SDK --> + <property name="gwt.sdk" location="@gwtSdk" /> <path id="project.class.path"> <pathelement location="war/WEB-INF/classes"/> - <pathelement location="@gwtUserPath"/> - <pathelement location="@gwtDevPath"/> + <pathelement location="${gwt.sdk}/gwt-user.jar"/> + <fileset dir="${gwt.sdk}" includes="gwt-dev*.jar"/> <!-- Add any additional non-server libs (such as JUnit) --> - <fileset dir="war/WEB-INF/lib"> - <include name="**/*.jar"/> - </fileset> + <fileset dir="war/WEB-INF/lib" includes="**/*.jar"/> </path> <target name="libs" description="Copy libs to WEB-INF/lib"> <mkdir dir="war/WEB-INF/lib" /> - <copy todir="war/WEB-INF/lib" file="@gwtServletPath" /> + <copy todir="war/WEB-INF/lib" file="${gwt.sdk}/gwt-servlet.jar" /> <!-- Add any additional server libs that need to be copied --> </target> @@ -25,9 +25,11 @@ debug="true" debuglevel="lines,vars,source"> <classpath refid="project.class.path"/> </javac> + <copy todir="war/WEB-INF/classes"> + <fileset dir="src" excludes="**/*.java"/> + </copy> </target> - <!-- can add additional arguments like -logLevel INFO or -style PRETTY --> <target name="gwtc" depends="javac" description="GWT compile to JavaScript"> <java failonerror="true" fork="true" classname="@compileClass"> <classpath> @@ -36,6 +38,7 @@ </classpath> <!-- add jvmarg -Xss16M or similar if you see a StackOverflowError --> <jvmarg value="-Xmx256M"/>@antVmargs + <!-- Additional arguments like -style PRETTY or -logLevel DEBUG --> <arg value="@moduleName"/> </java> </target> @@ -49,12 +52,16 @@ <jvmarg value="-Xmx256M"/>@antVmargs <arg value="-startupUrl"/> <arg value="@startupUrl"/> - <arg value="@moduleName"/> <!-- Additional arguments like -style PRETTY or -logLevel DEBUG --> + <arg value="@moduleName"/> </java> </target>@antEclipseRule <target name="build" depends="gwtc" description="Build this project" /> + + <target name="war" depends="build" description="Create a war file"> + <zip destfile="@moduleShortName.war" basedir="war"/> + </target> <target name="clean" description="Cleans this project"> <delete dir="war/WEB-INF/classes" failonerror="false" /> --~--~---------~--~----~------------~-------~--~----~ http://groups.google.com/group/Google-Web-Toolkit-Contributors -~----------~----~----~----~------~----~------~--~---