You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@river.apache.org by jc...@apache.org on 2009/09/29 21:37:44 UTC
svn commit: r820075 - in /incubator/river/jtsk/trunk: build.xml
doc/build.html examples/hello/build.xml examples/hello/index.html
qa/build.xml qa/jtreg/
Author: jcosters
Date: Tue Sep 29 19:37:44 2009
New Revision: 820075
URL: http://svn.apache.org/viewvc?rev=820075&view=rev
Log:
RIVER-301, RIVER-320:
-various improvements to build process
-integrated key generation machanism to replace prebuilt keys
Modified:
incubator/river/jtsk/trunk/build.xml
incubator/river/jtsk/trunk/doc/build.html
incubator/river/jtsk/trunk/examples/hello/build.xml
incubator/river/jtsk/trunk/examples/hello/index.html
incubator/river/jtsk/trunk/qa/build.xml
incubator/river/jtsk/trunk/qa/jtreg/ (props changed)
Modified: incubator/river/jtsk/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/build.xml?rev=820075&r1=820074&r2=820075&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/build.xml (original)
+++ incubator/river/jtsk/trunk/build.xml Tue Sep 29 19:37:44 2009
@@ -26,7 +26,7 @@
<!-- ## building the Apache River source distribution. -->
<!-- ## -->
<!-- ################################################################## -->
-<project name="river" basedir="." default="all">
+<project name="river" basedir="." default="all.build">
<description>Apache River is a project furthering the development
and advancement of Jini technology.</description>
@@ -58,7 +58,7 @@
</target>
<target name="release-bin" description="Create a binary release"
- depends="all">
+ depends="all.build">
<mkdir dir="${dist.dir}"/>
<delete file="${bin.zip.bundle}"/>
<zip destfile="${bin.zip.bundle}" roundup="yes">
@@ -87,6 +87,7 @@
<zipfileset dir="${basedir}/examples" prefix="${product.name}/examples">
<include name="**/${lib}/**"/>
<include name="**/config/**"/>
+ <exclude name="**/config/META-INF/"/>
<include name="**/prebuiltkeys/**"/>
<include name="**/scripts/**"/>
<include name="**/${doc}/**"/>
@@ -132,7 +133,7 @@
<tarfileset dir="${basedir}/examples" prefix="${product.name}/examples">
<include name="**/${lib}/**"/>
<include name="**/config/**"/>
- <include name="**/prebuiltkeys/**"/>
+ <exclude name="**/config/META-INF/"/>
<include name="**/scripts/**"/>
<include name="**/${doc}/**"/>
<include name="**/*.html"/>
@@ -182,27 +183,26 @@
<include name="**"/>
<exclude name="**/${lib}/"/>
<exclude name="**/${build}/"/>
- <exclude name="**/${doc.api}/"/>
+ <exclude name="**/prebuiltkeys/"/>
+ <exclude name="**/${doc}/"/>
</zipfileset>
<zipfileset dir="${basedir}/examples"
prefix="${product.name}/examples"
includes="**/*.sh"
filemode="755"/>
- <!-- TODO investigate the source under the jtreg directory -->
<zipfileset dir="${basedir}/qa" prefix="${product.name}/qa">
<include name="${src}/**"/>
<include name="harness/**"/>
<include name="jtreg/**"/>
<include name="${doc}/**"/>
- <exclude name="${doc}/api"/>
- <exclude name="${doc}/api/**"/>
+ <exclude name="${doc.api}/"/>
<include name="build.xml"/>
<include name="README.txt"/>
</zipfileset>
</zip>
<delete file="${src.tar.bundle}"/>
<tar destfile="${src.tar.bundle}" compression="gzip" longfile="gnu">
- <tarfileset dir="${basedir}" prefix="${install.dir}">
+ <tarfileset dir="${basedir}" prefix="${product.name}">
<include name="index.html"/>
<include name="build.xml"/>
<include name="common.xml"/>
@@ -228,7 +228,8 @@
<include name="**"/>
<exclude name="**/${lib}/"/>
<exclude name="**/${build}/"/>
- <exclude name="**/${doc.api}/"/>
+ <exclude name="**/prebuiltkeys/"/>
+ <exclude name="**/${doc}/"/>
</tarfileset>
<tarfileset dir="${basedir}/examples"
prefix="${product.name}/examples"
@@ -239,8 +240,7 @@
<include name="harness/**"/>
<include name="jtreg/**"/>
<include name="${doc}/**"/>
- <exclude name="${doc}/api"/>
- <exclude name="${doc}/api/**"/>
+ <exclude name="${doc.api}/"/>
<include name="build.xml"/>
<include name="README.txt"/>
</tarfileset>
@@ -2076,14 +2076,21 @@
</ant>
</target>
- <target name="all" depends="all.jars,configentry,all.doc"
- description="Build all, including subcomponents"/>
+ <target name="build" depends="configentry,jars,doc,spec-doc"/>
+
+ <target name="all.build" depends="build"
+ description="Build all, including subcomponents">
+ <!-- Call qa subcomponent build -->
+ <ant dir="qa" target="build" inheritall="false" />
+ <!-- Call examples/hello subcomponent build -->
+ <ant dir="examples/hello" target="build" inheritall="false" />
+ </target>
<target name="all.clean" depends="clean"
description="Clean all, including subcomponents">
<!-- Call qa subcomponent build -->
<ant dir="qa" target="clean" inheritall="false" />
- <!-- Call examples subcomponent build -->
+ <!-- Call examples/hello subcomponent build -->
<ant dir="examples/hello" target="clean" inheritall="false" />
</target>
@@ -2095,7 +2102,7 @@
<ant dir="examples/hello" target="compile" inheritall="false" />
</target>
- <target name="all.doc" depends="doc,spec-doc,jars"
+ <target name="all.doc" depends="jars,doc,spec-doc"
description="Generate javadoc for all, including subcomponents">
<!-- Call qa subcomponent build -->
<ant dir="qa" target="doc" inheritall="false" />
Modified: incubator/river/jtsk/trunk/doc/build.html
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/doc/build.html?rev=820075&r1=820074&r2=820075&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/doc/build.html (original)
+++ incubator/river/jtsk/trunk/doc/build.html Tue Sep 29 19:37:44 2009
@@ -102,7 +102,7 @@
<blockquote>
<dl>
<dt>
- <b>all</b><br>
+ <b>all.build</b><br>
This target is also the default target and can be invoked by simply running
<code>ant</code> without specifying any target. This target compiles the
class files for all of the distribution source code, generates Java Remote
Modified: incubator/river/jtsk/trunk/examples/hello/build.xml
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/examples/hello/build.xml?rev=820075&r1=820074&r2=820075&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/examples/hello/build.xml (original)
+++ incubator/river/jtsk/trunk/examples/hello/build.xml Tue Sep 29 19:37:44 2009
@@ -16,7 +16,7 @@
! limitations under the License.
!-->
-<project name="hello" basedir="." default="jars">
+<project name="hello" basedir="." default="build">
<description>This Ant scripts provides numerous tasks to build the
the Hello Example</description>
@@ -46,12 +46,14 @@
</path>
<property name="config.dir" location="config"/>
+ <property name="trust.dir" location="prebuiltkeys"/>
<target name="clean" depends=""
description="Removes all files and dirs created by the build">
<delete dir="${build.dir}"/>
<delete dir="${lib.dir}"/>
<delete dir="${doc.dir}"/>
+ <delete dir="${trust.dir}"/>
</target>
<target name="compile" depends="prep" description="Build classes">
@@ -65,6 +67,7 @@
<mkdir dir="${build.classes.dir}" />
<mkdir dir="${build.deps.dir}" />
<mkdir dir="${lib.dir}" />
+ <mkdir dir="${trust.dir}" />
</target>
<target name="doc" depends="compile"
@@ -208,5 +211,69 @@
</rmic>
</target>
+ <target name="trust" depends="prep,keystores,password,truststore"
+ description="Generate keys, passwords and certificates"/>
+
+ <target name="keystores" depends="client.keystore,
+ reggie.keystore,
+ phoenix.keystore,
+ server.keystore" />
+
+ <target name="client.keystore">
+ <delete file="${trust.dir}/client.keystore" quiet="true"/>
+ <keystore target="client" dir="${trust.dir}" dname="Client" />
+ </target>
+
+ <target name="reggie.keystore">
+ <delete file="${trust.dir}/reggie.keystore" quiet="true"/>
+ <keystore target="reggie" dir="${trust.dir}" dname="Reggie" />
+ </target>
+
+ <target name="phoenix.keystore">
+ <delete file="${trust.dir}/phoenix.keystore" quiet="true"/>
+ <keystore target="phoenix" dir="${trust.dir}" dname="Phoenix" />
+ </target>
+
+ <target name="server.keystore">
+ <delete file="${trust.dir}/server.keystore" quiet="true"/>
+ <keystore target="server" dir="${trust.dir}" dname="Server" />
+ </target>
+
+ <target name="password" depends="client.password,
+ reggie.password,
+ phoenix.password,
+ server.password" />
+
+ <target name="client.password">
+ <delete file="${trust.dir}/client.password" quiet="true"/>
+ <echo file="${trust.dir}/client.password" message="clientpw" />
+ </target>
+
+ <target name="reggie.password">
+ <delete file="${trust.dir}/reggie.password" quiet="true"/>
+ <echo file="${trust.dir}/reggie.password" message="reggiepw" />
+ </target>
+
+ <target name="phoenix.password">
+ <delete file="${trust.dir}/phoenix.password" quiet="true"/>
+ <echo file="${trust.dir}/phoenix.password" message="phoenixpw" />
+ </target>
+
+ <target name="server.password">
+ <delete file="${trust.dir}/server.password" quiet="true"/>
+ <echo file="${trust.dir}/server.password" message="serverpw" />
+ </target>
+
+ <target name="truststore">
+ <delete file="${trust.dir}/truststore" quiet="true" />
+ <truststore target="client" dir="${trust.dir}" />
+ <truststore target="reggie" dir="${trust.dir}" />
+ <truststore target="phoenix" dir="${trust.dir}" />
+ <truststore target="server" dir="${trust.dir}" />
+ </target>
+
+ <target name="build" depends="trust,jars,doc"
+ description="Build all"/>
+
</project>
Modified: incubator/river/jtsk/trunk/examples/hello/index.html
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/examples/hello/index.html?rev=820075&r1=820074&r2=820075&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/examples/hello/index.html (original)
+++ incubator/river/jtsk/trunk/examples/hello/index.html Tue Sep 29 19:37:44 2009
@@ -703,26 +703,36 @@
>> $ANT_HOME/bin/ant jars
</pre>
-<h4>Clean builds</h4>
+<h4>Generating Javadoc</h4>
-To remove all class files, recompile all source files, and then
-generate all of the JAR files of the example, type the following:
+To create Javadoc documentation for the example, type the following:
<pre>
- >> $ANT_HOME/bin/ant clean
- >> $ANT_HOME/bin/ant jars
+ >> $ANT_HOME/bin/ant doc
</pre>
-<h4>Generating Javadoc</h4>
+<hr>
-To create Javadoc documentation for the example, type the following:
+<h4>Generating prebuilt keys</h4>
+
+To generate keys and certificates for the example, type the following:
<pre>
- >> $ANT_HOME/bin/ant doc
+ >> $ANT_HOME/bin/ant trust
</pre>
<hr>
+<h4>Clean builds</h4>
+
+To remove all class files, recompile all source files, and then
+generate all of the JAR files of the example, type the following:
+
+<pre>
+ >> $ANT_HOME/bin/ant clean
+ >> $ANT_HOME/bin/ant
+</pre>
+
<a name="troubleshooting">
<h2>Troubleshooting</h2>
</a>
Modified: incubator/river/jtsk/trunk/qa/build.xml
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/build.xml?rev=820075&r1=820074&r2=820075&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/qa/build.xml (original)
+++ incubator/river/jtsk/trunk/qa/build.xml Tue Sep 29 19:37:44 2009
@@ -16,7 +16,7 @@
! See the License for the specific language governing permissions and
! limitations under the License.
!-->
-<project name="qa" default="jars" basedir=".">
+<project name="qa" basedir="." default="build" >
<description>This Ant scripts provides numerous tasks to build and run the
the River QA test harness and tests</description>
@@ -114,6 +114,8 @@
</javac-cmd>
</target>
+ <target name="build" depends="jars,doc" />
+
<target name="jtreg" depends="" description="Run jtreg tests">
<!-- TODO: refine classpath -->
<property name="jtreg.classpath" refid="river.jars" />
Propchange: incubator/river/jtsk/trunk/qa/jtreg/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Sep 29 19:37:44 2009
@@ -1,2 +1,3 @@
+test.props
JTreport
JTwork