Author: mrdon
Date: Sat Dec 17 12:08:15 2005
New Revision: 357379
URL: http://svn.apache.org/viewcvs?rev=357379&view=rev
Log:
Fixing binary distribution to include Mailreader example, updating source guide
to remove Ant references
Modified:
struts/scripting/trunk/maven.xml
struts/scripting/trunk/xdocs/source-guide.xml
Modified: struts/scripting/trunk/maven.xml
URL:
http://svn.apache.org/viewcvs/struts/scripting/trunk/maven.xml?rev=357379&r1=357378&r2=357379&view=diff
==============================================================================
--- struts/scripting/trunk/maven.xml (original)
+++ struts/scripting/trunk/maven.xml Sat Dec 17 12:08:15 2005
@@ -28,7 +28,7 @@
</ant:fileset>
</ant:copy>
- <ant:copy file="${basedir}/dist/struts-example.war"
+ <ant:copy file="${maven.war.build.dir}/${maven.war.final.name}"
todir="${maven.dist.bin.assembly.dir}" />
</postGoal>
Modified: struts/scripting/trunk/xdocs/source-guide.xml
URL:
http://svn.apache.org/viewcvs/struts/scripting/trunk/xdocs/source-guide.xml?rev=357379&r1=357378&r2=357379&view=diff
==============================================================================
--- struts/scripting/trunk/xdocs/source-guide.xml (original)
+++ struts/scripting/trunk/xdocs/source-guide.xml Sat Dec 17 12:08:15 2005
@@ -50,29 +50,23 @@
</ul>
<ul>
<li><code>/xdocs</code> - The XML source code for all documentation,
including this guide.</li>
- <li><code>/lib</code> - This directory is only created if you build
the project using the Ant script.</li>
<li><code>/target</code> - Maven puts all compiled files into this
temporary directory.</li>
- <li><code>/build</code> - Likewise, Apache Ant stores all compiled
files in this temporary folder.</li>
- <li><code>/dist</code> - The final results of the files Ant creates
will be placed here.</li>
</ul>
<p>Next, we'll look at how to build both Struts Scripting library and
the included example application.</p>
</subsection>
<subsection name="Build Instructions">
<a name="build"/>
- <p>Currently, Struts Scripting uses a hybrid build system composed of
both Maven and Ant build scripts. The Maven scripts handle building the
distribution files and provide a consistent build environment to users of other
Struts subprojects. To follow these build instructions, you will need to have
<a href="http://ant.apache.org";>Apache Ant</a> and/or <a
href="http://maven.apache.org";>Apache Maven</a> installed and their executables
available in your command path.
- </p>
- <p>
- The Apache Ant build script is primarily in charge of building the
Struts Mailreader example application. In fact, when the Maven script creates
a Struts Scripting distribution, it calls the Ant build script to create the
example application.
+ <p>Struts Scripting uses <a href="http://maven.apache.org";>Apache
Maven</a> 1.0 to build its jar, example application, documentation, and
distribution files. Maven 1.0 is used throughout Struts for building
subprojects, providing a consistent build environment to Struts users. To
follow these build instructions, you will need to have <a
href="http://maven.apache.org";>Apache Maven</a> 1.0 installed and its
<code>maven</code> executable available in your command path.
</p>
<p>
Since there are a bunch of build targets, we will break the build
down into tasks that you might want to accomplish and show the best way to
complete them.
</p>
<ul>
<li><strong>Build the Struts Scripting jar</strong> - Run
'<code>maven jar:jar</code>' which will create the jar as
<code>/target/struts-scripting-VERSION.jar</code>.</li>
- <li><strong>Build the Mailreader example</strong> - Run '<code>ant
example</code>' to create <code>/dist/struts-example.war</code>.</li>
+ <li><strong>Build the Mailreader example</strong> - Run '<code>maven
war:war</code>' to create <code>/target/struts-example.war</code>.</li>
<li><strong>Build the documentation</strong> - Run '<code>maven
site:generate</code>' to create the Struts Scripting website at
<code>/target/docs</code>.</li>
</ul>
- <p>While this list only covers a few build targets, there are many
other you can discover by typing '<code>ant -p</code>' or '<code>maven
-g</code>' from the Struts Scripting directory.</p>
+ <p>While this list only covers a few build targets, there are many
other you can discover by typing '<code>maven -g</code>' from the Struts
Scripting directory.</p>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
