You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@struts.apache.org by mr...@apache.org on 2005/03/25 07:53:59 UTC
svn commit: r158994 - in struts/flow/trunk: ./ src/examples/WEB-INF/guess/
src/examples/WEB-INF/remote/ src/examples/WEB-INF/wizard/
src/examples/remote/ src/guess-example/ src/remote-example/
src/wizard-example/
Author: mrdon
Date: Thu Mar 24 22:53:58 2005
New Revision: 158994
URL: http://svn.apache.org/viewcvs?view=rev&rev=158994
Log:
Finished restructing of examples into one
Added:
struts/flow/trunk/src/examples/remote/clientFlow.js
- copied unchanged from r158992, struts/flow/trunk/src/examples/WEB-INF/remote/clientFlow.js
Removed:
struts/flow/trunk/src/examples/WEB-INF/remote/clientFlow.js
struts/flow/trunk/src/guess-example/
struts/flow/trunk/src/remote-example/
struts/flow/trunk/src/wizard-example/
Modified:
struts/flow/trunk/build.xml
struts/flow/trunk/src/examples/WEB-INF/guess/guess.jsp
struts/flow/trunk/src/examples/WEB-INF/guess/success.jsp
struts/flow/trunk/src/examples/WEB-INF/remote/guess.jsp
struts/flow/trunk/src/examples/WEB-INF/remote/success.jsp
struts/flow/trunk/src/examples/WEB-INF/wizard/hobbies-form.jsp
struts/flow/trunk/src/examples/WEB-INF/wizard/name-form.jsp
struts/flow/trunk/src/examples/WEB-INF/wizard/summary-form.jsp
Modified: struts/flow/trunk/build.xml
URL: http://svn.apache.org/viewcvs/struts/flow/trunk/build.xml?view=diff&r1=158993&r2=158994
==============================================================================
--- struts/flow/trunk/build.xml (original)
+++ struts/flow/trunk/build.xml Thu Mar 24 22:53:58 2005
@@ -32,15 +32,11 @@
<property name="src.java" value="${src.dir}/java" />
<property name="src.test" value="${src.dir}/test" />
<property name="src.doc" value="${src.dir}/doc" />
- <property name="src.guess.example" value="${src.dir}/guess-example" />
- <property name="src.remote.example" value="${src.dir}/remote-example" />
- <property name="src.wizard.example" value="${src.dir}/wizard-example" />
+ <property name="src.examples" value="${src.dir}/examples" />
<property name="build.dir" value="ant-build" />
- <property name="build.guess.example" value="${build.dir}/guess-example" />
- <property name="build.remote.example" value="${build.dir}/remote-example" />
- <property name="build.wizard.example" value="${build.dir}/wizard-example" />
+ <property name="build.examples" value="${build.dir}/examples" />
<property name="build.target" value="${build.dir}/target" />
<property name="build.test" value="${build.dir}/test" />
<property name="build.doc" value="${build.dir}/doc" />
@@ -166,7 +162,7 @@
<mkdir dir="${dist.dir}" />
</target>
- <target name="release" depends="clean, jar, guess-example, wizard-example,javadoc"
+ <target name="release" depends="clean, jar, examples,javadoc"
description="Creates a release">
<echo message="Creating ${app.version} release" />
@@ -262,60 +258,22 @@
excludes="**/example/*.*"/>
</target>
- <target name="guess-example" depends="jar"
- description="Create guess example">
- <echo message="Creating guess example"/>
- <mkdir dir="${build.guess.example}" />
- <mkdir dir="${build.guess.example}/WEB-INF/lib" />
- <copy todir="${build.guess.example}">
- <fileset dir="${src.guess.example}" excludes="WEB-INF/web.xml" />
+ <target name="examples" depends="jar"
+ description="Create examples">
+ <echo message="Creating examples"/>
+ <mkdir dir="${build.examples}" />
+ <mkdir dir="${build.examples}/WEB-INF/lib" />
+ <copy todir="${build.examples}">
+ <fileset dir="${src.examples}" excludes="WEB-INF/web.xml" />
</copy>
- <copy todir="${build.guess.example}/WEB-INF/lib">
+ <copy todir="${build.examples}/WEB-INF/lib">
<fileset dir="${lib.core}" />
</copy>
- <copy todir="${build.guess.example}/WEB-INF/lib" file="${dist.dir}/${app.jar}" />
+ <copy todir="${build.examples}/WEB-INF/lib" file="${dist.dir}/${app.jar}" />
- <war destfile="${dist.dir}/guess-example.war"
- basedir="${build.guess.example}"
- webxml="${src.guess.example}/WEB-INF/web.xml"/>
+ <war destfile="${dist.dir}/examples.war"
+ basedir="${build.examples}"
+ webxml="${src.examples}/WEB-INF/web.xml"/>
</target>
-
- <target name="remote-example" depends="jar"
- description="Create remote example">
- <echo message="Creating remote example"/>
- <mkdir dir="${build.remote.example}" />
- <mkdir dir="${build.remote.example}/WEB-INF/lib" />
- <copy todir="${build.remote.example}">
- <fileset dir="${src.remote.example}" excludes="WEB-INF/web.xml" />
- </copy>
- <copy todir="${build.remote.example}/WEB-INF/lib">
- <fileset dir="${lib.core}" />
- </copy>
- <copy todir="${build.remote.example}/WEB-INF/lib" file="${dist.dir}/${app.jar}" />
-
- <war destfile="${dist.dir}/remote-example.war"
- basedir="${build.remote.example}"
- webxml="${src.remote.example}/WEB-INF/web.xml"/>
- </target>
-
- <target name="wizard-example" depends="jar"
- description="Create wizard example">
- <echo message="Creating wizard example"/>
- <mkdir dir="${build.wizard.example}" />
- <mkdir dir="${build.wizard.example}/WEB-INF/lib" />
- <copy todir="${build.wizard.example}">
- <fileset dir="${src.wizard.example}" excludes="WEB-INF/web.xml" />
- </copy>
- <copy todir="${build.wizard.example}/WEB-INF/lib">
- <fileset dir="${lib.core}" />
- </copy>
- <copy todir="${build.wizard.example}/WEB-INF/lib" file="${dist.dir}/${app.jar}" />
-
- <war destfile="${dist.dir}/wizard-example.war"
- basedir="${build.wizard.example}"
- webxml="${src.wizard.example}/WEB-INF/web.xml"/>
- </target>
-
-
</project>
Modified: struts/flow/trunk/src/examples/WEB-INF/guess/guess.jsp
URL: http://svn.apache.org/viewcvs/struts/flow/trunk/src/examples/WEB-INF/guess/guess.jsp?view=diff&r1=158993&r2=158994
==============================================================================
--- struts/flow/trunk/src/examples/WEB-INF/guess/guess.jsp (original)
+++ struts/flow/trunk/src/examples/WEB-INF/guess/guess.jsp Thu Mar 24 22:53:58 2005
@@ -16,6 +16,6 @@
<input type="text" name="guess"/>
<input type="submit"/>
</form>
-
+ <a href="../index.html">Return to index</a>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: struts/flow/trunk/src/examples/WEB-INF/guess/success.jsp
URL: http://svn.apache.org/viewcvs/struts/flow/trunk/src/examples/WEB-INF/guess/success.jsp?view=diff&r1=158993&r2=158994
==============================================================================
--- struts/flow/trunk/src/examples/WEB-INF/guess/success.jsp (original)
+++ struts/flow/trunk/src/examples/WEB-INF/guess/success.jsp Thu Mar 24 22:53:58 2005
@@ -13,5 +13,6 @@
<p><a href="guess.do">Play again</a></p>
+ <a href="../index.html">Return to index</a>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: struts/flow/trunk/src/examples/WEB-INF/remote/guess.jsp
URL: http://svn.apache.org/viewcvs/struts/flow/trunk/src/examples/WEB-INF/remote/guess.jsp?view=diff&r1=158993&r2=158994
==============================================================================
--- struts/flow/trunk/src/examples/WEB-INF/remote/guess.jsp (original)
+++ struts/flow/trunk/src/examples/WEB-INF/remote/guess.jsp Thu Mar 24 22:53:58 2005
@@ -32,5 +32,6 @@
<input type="button" onclick="cheat()" value="Cheat" />
</form>
+ <a href="../index.html">Return to index</a>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: struts/flow/trunk/src/examples/WEB-INF/remote/success.jsp
URL: http://svn.apache.org/viewcvs/struts/flow/trunk/src/examples/WEB-INF/remote/success.jsp?view=diff&r1=158993&r2=158994
==============================================================================
--- struts/flow/trunk/src/examples/WEB-INF/remote/success.jsp (original)
+++ struts/flow/trunk/src/examples/WEB-INF/remote/success.jsp Thu Mar 24 22:53:58 2005
@@ -13,5 +13,6 @@
<p><a href="guess.do">Play again</a></p>
+ <a href="../index.html">Return to index</a>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: struts/flow/trunk/src/examples/WEB-INF/wizard/hobbies-form.jsp
URL: http://svn.apache.org/viewcvs/struts/flow/trunk/src/examples/WEB-INF/wizard/hobbies-form.jsp?view=diff&r1=158993&r2=158994
==============================================================================
--- struts/flow/trunk/src/examples/WEB-INF/wizard/hobbies-form.jsp (original)
+++ struts/flow/trunk/src/examples/WEB-INF/wizard/hobbies-form.jsp Thu Mar 24 22:53:58 2005
@@ -32,5 +32,6 @@
<input type="submit" name="next" value="Next" />
</form>
+ <a href="../index.html">Return to index</a>
</body>
</html>
Modified: struts/flow/trunk/src/examples/WEB-INF/wizard/name-form.jsp
URL: http://svn.apache.org/viewcvs/struts/flow/trunk/src/examples/WEB-INF/wizard/name-form.jsp?view=diff&r1=158993&r2=158994
==============================================================================
--- struts/flow/trunk/src/examples/WEB-INF/wizard/name-form.jsp (original)
+++ struts/flow/trunk/src/examples/WEB-INF/wizard/name-form.jsp Thu Mar 24 22:53:58 2005
@@ -35,5 +35,6 @@
<input type="submit" name="next" value="Next" />
</form>
+ <a href="../index.html">Return to index</a>
</body>
</html>
Modified: struts/flow/trunk/src/examples/WEB-INF/wizard/summary-form.jsp
URL: http://svn.apache.org/viewcvs/struts/flow/trunk/src/examples/WEB-INF/wizard/summary-form.jsp?view=diff&r1=158993&r2=158994
==============================================================================
--- struts/flow/trunk/src/examples/WEB-INF/wizard/summary-form.jsp (original)
+++ struts/flow/trunk/src/examples/WEB-INF/wizard/summary-form.jsp Thu Mar 24 22:53:58 2005
@@ -43,5 +43,6 @@
<input type="submit" name="prev" value="Previous" />
</form>
+ <a href="../index.html">Return to index</a>
</body>
</html>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org