Removing last vestiges of @deployDir from app creator.
git-svn-id: https://google-web-toolkit.googlecode.com/svn/releases/1.6@4355 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/user/src/com/google/gwt/user/tools/AppHtml.htmlsrc b/user/src/com/google/gwt/user/tools/AppHtml.htmlsrc
index 9f9c72f..2090fe7 100644
--- a/user/src/com/google/gwt/user/tools/AppHtml.htmlsrc
+++ b/user/src/com/google/gwt/user/tools/AppHtml.htmlsrc
@@ -23,7 +23,7 @@
<!-- If you add any GWT meta tags, they must -->
<!-- be added before this line. -->
<!-- -->
- <script type="text/javascript" language="javascript" src="@deployDir/@newModuleName.nocache.js"></script>
+ <script type="text/javascript" language="javascript" src="@newModuleName/@newModuleName.nocache.js"></script>
</head>
<!-- -->
diff --git a/user/src/com/google/gwt/user/tools/project.ant.xmlsrc b/user/src/com/google/gwt/user/tools/project.ant.xmlsrc
index 0946b3d..a9d8e3a 100644
--- a/user/src/com/google/gwt/user/tools/project.ant.xmlsrc
+++ b/user/src/com/google/gwt/user/tools/project.ant.xmlsrc
@@ -5,7 +5,6 @@
if you want to distribute it. This isn't needed for normal operation.
</description>
<property name="outdir" location="war" />
- <property name="extradir" location="extra" />
<!-- set classpath -->
<path id="project.class.path">
@@ -20,9 +19,9 @@
2. For a 1.4 server, split this so that the server side code is compiled
with a target=1.4 build rule -->
<target name="javac" description="Compile project to WEB-INF/classes">
- <mkdir dir="${outdir}/WEB-INF/classes"/>
+ <mkdir dir="war/WEB-INF/classes"/>
<javac srcdir="src:test"
- destdir="${outdir}/WEB-INF/classes"
+ destdir="war/WEB-INF/classes"
includes="**"
debug="true"
debuglevel="lines,vars,source"
@@ -35,8 +34,8 @@
</target>
<target name="deploy" depends="gwtc" description="Copy output to the war folder">
- <mkdir dir="${outdir}/WEB-INF/lib" />
- <copy todir="${outdir}/WEB-INF/lib" file="@gwtServletPath" />
+ <mkdir dir="war/WEB-INF/lib" />
+ <copy todir="war/WEB-INF/lib" file="@gwtServletPath" />
</target>
<!-- can add additional arguments like -logLevel INFO or -style PRETTY -->
@@ -45,18 +44,13 @@
classname="@compileClass">
<classpath>
<pathelement location="src"/>
+ <pathelement location="war/WEB-INF/classes"/>
+ <pathelement path="${project.class.path}/"/>
<pathelement location="@gwtDevPath"/>
- <pathelement location="${outdir}/WEB-INF/classes"/>
- <pathelement path="${java.class.path}/"/>
- <pathelement path="@gwtUserPath"/>
</classpath>
<!-- add jvmarg -Xss16M or similar if you see a StackOverflowError -->
<jvmarg value="-Xmx256M"/>
@antVmargs
- <arg value="-out"/>
- <arg file="${outdir}"/>
- <arg value="-extra"/>
- <arg file="${extradir}"/>
<arg value="@moduleName"/>
</java>
</target>
@@ -73,8 +67,6 @@
</classpath>
<jvmarg value="-Xmx256M"/>
@antVmargs
- <arg value="-out"/>
- <arg file="${outdir}"/>
<arg value="-startupUrl"/>
<arg value="@startupUrl"/>
<arg value="@moduleName"/>
@@ -86,9 +78,8 @@
<target name="clean" description="Cleans this project's intermediate and
output files">
<!-- uncomment if the WEB-INF/classes dir only contains GWT output -->
- <!-- <delete dir="${outdir}/WEB-INF/classes" failonerror="false" /> -->
- <delete dir="${outdir}/@deployDir" failonerror="false" />
- <delete dir="${extradir}" failonerror="false" />
+ <!-- <delete dir="war/WEB-INF/classes" failonerror="false" /> -->
+ <delete dir="war/@newModuleName" failonerror="false" />
</target>
</project>
diff --git a/user/src/com/google/gwt/user/tools/web.xmlsrc b/user/src/com/google/gwt/user/tools/web.xmlsrc
index 1d33d1e..60ade4d 100644
--- a/user/src/com/google/gwt/user/tools/web.xmlsrc
+++ b/user/src/com/google/gwt/user/tools/web.xmlsrc
@@ -8,7 +8,7 @@
<servlet-mapping>
<servlet-name>echoServlet</servlet-name>
- <url-pattern>/@deployDir/echo</url-pattern>
+ <url-pattern>/@newModuleName/echo</url-pattern>
</servlet-mapping>
</web-app>
