Author: niallp
Date: Thu Jul 19 21:51:08 2007
New Revision: 557864
URL: http://svn.apache.org/viewvc?view=rev&rev=557864
Log:
Build and site improvements
Removed:
jakarta/commons/proper/beanutils/trunk/xdocs/downloads.xml
Modified:
jakarta/commons/proper/beanutils/trunk/NOTICE.txt
jakarta/commons/proper/beanutils/trunk/maven.xml
jakarta/commons/proper/beanutils/trunk/src/main/assembly/src.xml
jakarta/commons/proper/beanutils/trunk/xdocs/building.xml
jakarta/commons/proper/beanutils/trunk/xdocs/navigation.xml
Modified: jakarta/commons/proper/beanutils/trunk/NOTICE.txt
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/beanutils/trunk/NOTICE.txt?view=diff&rev=557864&r1=557863&r2=557864
==============================================================================
--- jakarta/commons/proper/beanutils/trunk/NOTICE.txt (original)
+++ jakarta/commons/proper/beanutils/trunk/NOTICE.txt Thu Jul 19 21:51:08 2007
@@ -1,5 +1,5 @@
Apache Commons BeanUtils
-Copyright 2001-2006 The Apache Software Foundation
+Copyright 2001-2007 The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
Modified: jakarta/commons/proper/beanutils/trunk/maven.xml
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/beanutils/trunk/maven.xml?view=diff&rev=557864&r1=557863&r2=557864
==============================================================================
--- jakarta/commons/proper/beanutils/trunk/maven.xml (original)
+++ jakarta/commons/proper/beanutils/trunk/maven.xml Thu Jul 19 21:51:08 2007
@@ -40,6 +40,20 @@
<!-- ================================================================== -->
<postGoal name="dist:prepare-bin-filesystem">
+ <!-- Create a jar file containing the sources -->
+ <jar
destfile="${maven.dist.bin.assembly.dir}/${maven.final.name}-sources.jar">
+ <zipfileset prefix="META-INF" dir="${basedir}"
+ includes="LICENSE*, NOTICE*"/>
+ <fileset dir="${basedir}/src/java" includes="**/*.java"/>
+ </jar>
+
+ <!-- Create a jar file containing the Javadocs -->
+ <jar
destfile="${maven.dist.bin.assembly.dir}/${maven.final.name}-javadoc.jar">
+ <zipfileset prefix="META-INF" dir="${basedir}"
+ includes="LICENSE*, NOTICE*"/>
+ <fileset dir="${basedir}/target/docs/apidocs"/>
+ </jar>
+
<!-- Copy the NOTICE -->
<copy todir="${maven.dist.bin.assembly.dir}">
<fileset file="${basedir}/NOTICE.txt"/>
@@ -57,6 +71,10 @@
<!-- Copy the NOTICE -->
<copy todir="${maven.dist.src.assembly.dir}">
+ <fileset file="${basedir}/build-other-jars.xml"/>
+ <fileset file="${basedir}/checkstyle.xml"/>
+ <fileset file="${basedir}/license-header.txt"/>
+ <fileset file="${basedir}/pom.xml"/>
<fileset file="${basedir}/NOTICE.txt"/>
<fileset file="${basedir}/RELEASE-NOTES.txt"/>
<fileset file="${basedir}/build.properties.sample"/>
@@ -74,10 +92,44 @@
<!-- ================================================================== -->
<postGoal name="dist">
+ <!-- Create a versioned pom -->
+ <copy file="${basedir}/project.xml"
tofile="${maven.dist.dir}/${maven.final.name}.pom"/>
+
+ <!-- create checksum for pom -->
+ <ant:checksum file="${maven.dist.dir}/${maven.final.name}.pom"
property="pom.md5"/>
+ <ant:echo message="${pom.md5} *${maven.final.name}.pom"
+ file="${maven.dist.dir}/${maven.final.name}.pom.md5" />
+
+ <copy todir="${maven.dist.dir}">
+ <fileset
file="${maven.dist.bin.assembly.dir}/commons-beanutils*.jar"/>
+ </copy>
+
<!-- create checksum for jar -->
- <ant:checksum file="${maven.build.dir}/${maven.final.name}.jar"
property="jar.md5"/>
+ <ant:checksum file="${maven.dist.dir}/${maven.final.name}.jar"
property="jar.md5"/>
<ant:echo message="${jar.md5} *${maven.final.name}.jar"
- file="${maven.build.dir}/${maven.final.name}.jar.md5" />
+ file="${maven.dist.dir}/${maven.final.name}.jar.md5" />
+
+ <!-- create checksum for core jar -->
+ <ant:checksum
file="${maven.dist.dir}/commons-beanutils-core-${pom.currentVersion}.jar"
+ property="core.jar.md5"/>
+ <ant:echo message="${core.jar.md5}
*commons-beanutils-core-${pom.currentVersion}.jar"
+
file="${maven.dist.dir}/commons-beanutils-core-${pom.currentVersion}.jar.md5" />
+
+ <!-- create checksum for bean-collections jar -->
+ <ant:checksum
file="${maven.dist.dir}/commons-beanutils-bean-collections-${pom.currentVersion}.jar"
+ property="bean.collections.jar.md5"/>
+ <ant:echo message="${bean.collections.jar.md5}
*commons-beanutils-bean-collections-${pom.currentVersion}.jar"
+
file="${maven.dist.dir}/commons-beanutils-bean-collections-${pom.currentVersion}.jar.md5"
/>
+
+ <!-- create checksum for sources jar -->
+ <ant:checksum
file="${maven.dist.dir}/${maven.final.name}-sources.jar"
property="sources.jar.md5"/>
+ <ant:echo message="${sources.jar.md5}
*${maven.final.name}-sources.jar"
+
file="${maven.dist.dir}/${maven.final.name}-sources.jar.md5" />
+
+ <!-- create checksum for javadoc jar -->
+ <ant:checksum
file="${maven.dist.dir}/${maven.final.name}-javadoc.jar"
property="javadoc.jar.md5"/>
+ <ant:echo message="${javadoc.jar.md5}
*${maven.final.name}-javadoc.jar"
+
file="${maven.dist.dir}/${maven.final.name}-javadoc.jar.md5" />
<!-- create checksum for binary zip -->
<ant:checksum file="${maven.dist.dir}/${maven.final.name}.zip"
property="zip.md5"/>
Modified: jakarta/commons/proper/beanutils/trunk/src/main/assembly/src.xml
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/beanutils/trunk/src/main/assembly/src.xml?view=diff&rev=557864&r1=557863&r2=557864
==============================================================================
--- jakarta/commons/proper/beanutils/trunk/src/main/assembly/src.xml (original)
+++ jakarta/commons/proper/beanutils/trunk/src/main/assembly/src.xml Thu Jul 19
21:51:08 2007
@@ -28,8 +28,11 @@
<includes>
<include>build.properties.sample</include>
<include>build.xml</include>
+ <include>build-other-jars.xml</include>
+ <include>checkstyle.xml</include>
<include>doap_beanutils.rdf</include>
<include>LICENSE.txt</include>
+ <include>license-header.txt</include>
<include>maven.xml</include>
<include>NOTICE.txt</include>
<include>pom.xml</include>
@@ -37,7 +40,6 @@
<include>project.xml</include>
<include>README.txt</include>
<include>RELEASE-NOTES.txt</include>
-
</includes>
</fileSet>
<fileSet>
Modified: jakarta/commons/proper/beanutils/trunk/xdocs/building.xml
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/beanutils/trunk/xdocs/building.xml?view=diff&rev=557864&r1=557863&r2=557864
==============================================================================
--- jakarta/commons/proper/beanutils/trunk/xdocs/building.xml (original)
+++ jakarta/commons/proper/beanutils/trunk/xdocs/building.xml Thu Jul 19
21:51:08 2007
@@ -24,12 +24,18 @@
<!-- ================================================== -->
<section name="Overview">
<p>
- Commons BeanUtils uses <a href="http://maven.apache.org";>Maven</a> or
- <a href="http://ant.apache.org";>Ant</a> as a build system.
+ Commons BeanUtils can be built using
+ <a href="http://maven.apache.org/maven-1.x/";>Maven 1</a>,
+ <a href="http://maven.apache.org";>Maven 2</a> or
+ <a href="http://ant.apache.org";>Ant</a> as the build system.
</p>
+ <p>
+ Further details can be found in the
+ <a href="http://jakarta.apache.org/commons/building.html";>commons build
instructions</a>.
+ </p>
</section>
<!-- ================================================== -->
-<section name="Maven Goals">
+<section name="Maven 1 Goals">
<p>
To build a jar file, change into BeanUtils's root directory and run
<strong><code>maven jar</code></strong>.
@@ -37,26 +43,45 @@
</p>
<p>
To build the Javadocs, run <strong><code>maven javadoc</code></strong>.
- The result will be in "target/docs/apidocs".
+ The result will be in "target/docs/apidocs" subdirectory.
</p>
<p>
To build the full website, run <strong><code>maven site</code></strong>.
-
- The result will be in "target/docs".
+ The result will be in "target/docs" subdirectory.
</p>
+</section>
+<!-- ================================================== -->
+<section name="Maven 2 Goals">
<p>
- Further details can be found in the
- <a href="http://jakarta.apache.org/commons/building.html";>commons build
instructions</a>.
+ To build a jar file, change into BeanUtils's root directory and run
+ <strong><code>mvn package</code></strong>.
+ The result will be in the "target" subdirectory.
+ </p>
+ <p>
+ To build the full website, run <strong><code>mvn site</code></strong>.
+ The result will be in "target/site" subdirectory.
+ </p>
+ <p>
+ To build the full distribution, run <strong><code>mvn site
assembly:assembly</code></strong>.
+ The result will be in "target" subdirectory.
</p>
</section>
<!-- ================================================== -->
<section name="Ant Goals">
<p>
- To build a jar file and the javadocs, change into Validator's root
directory
+ To build a jar file and the javadocs, change into BeanUtils's root
directory
and run <strong><code>ant dist</code></strong>.
The result will be in the "dist" subdirectory.
</p>
</section>
<!-- ================================================== -->
+<section name="Nightly Builds">
+ <p>
+ <a
href="http://people.apache.org/builds/jakarta-commons/nightly/commons-beanutils/";>Nightly
Builds</a>
+ are built once a day from the current SVN HEAD. These are provided
purely for test purposes and are <b>NOT
+ official releases</b> of the Apache Software Foundation - Released
versions of Commons BeanUtils are
+ available <a
href="http://jakarta.apache.org/site/downloads/downloads_commons-beanutils.cgi";>here</a>.
+ </p>
+</section>
</body>
</document>
Modified: jakarta/commons/proper/beanutils/trunk/xdocs/navigation.xml
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/beanutils/trunk/xdocs/navigation.xml?view=diff&rev=557864&r1=557863&r2=557864
==============================================================================
--- jakarta/commons/proper/beanutils/trunk/xdocs/navigation.xml (original)
+++ jakarta/commons/proper/beanutils/trunk/xdocs/navigation.xml Thu Jul 19
21:51:08 2007
@@ -32,9 +32,25 @@
<menu name="BeanUtils">
<item name="Overview" href="/index.html"/>
- <item name="Download" href="/downloads.html"/>
- <item name="User Guide (SVN latest)"
href="apidocs/org/apache/commons/beanutils/package-summary.html#package_description"/>
- <item name="Bean-Collections" href="/bean-collections.html"/>
+ <item name="Download"
href="http://jakarta.apache.org/site/downloads/downloads_commons-beanutils.cgi"/>
+ <item name="Release Notes" href="/changes-report.html"/>
+ <item name="Dependencies" href="/dependencies.html"/>
+ <item name="Mailing Lists" href="/mail-lists.html"/>
+ <item name="Issue Tracking" href="/issue-tracking.html"/>
+ <item name="Source Repository" href="/cvs-usage.html"/>
+ <item name="License" href="/license.html"/>
+ </menu>
+
+ <menu name="Documentation">
+ <item name="Building" href="/building.html"/>
+ <item name="Wiki"
href="http://wiki.apache.org/jakarta-commons/BeanUtils"/>
+
+ <item name="Latest">
+ <item name="User Guide"
href="/apidocs/org/apache/commons/beanutils/package-summary.html#package_description"/>
+ <item name="API" href="/apidocs/index.html"/>
+ <item name="Bean Collections" href="/bean-collections.html"/>
+ </item>
+
<item name='1.7.0 Release'>
<item name='User Guide'
href='http://jakarta.apache.org/commons/beanutils/commons-beanutils-1.7.0/docs/api/org/apache/commons/beanutils/package-summary.html#package_description'/>
@@ -53,17 +69,6 @@
<item name='Release Notes'
href='http://jakarta.apache.org/commons/beanutils/commons-beanutils-1.6.1/RELEASE-NOTES.txt'/>
</item>
- <item name="Wiki"
href="http://wiki.apache.org/jakarta-commons/BeanUtils"/>
- </menu>
-
- <menu name="Development">
- <item name="History" href="/changes-report.html"/>
- <item name="Building" href="/building.html"/>
- <item name="Mailing Lists" href="/mail-lists.html"/>
- <item name="Issue Tracking" href="/issue-tracking.html"/>
- <item name="Team" href="/team-list.html"/>
- <item name="Source Repository" href="/cvs-usage.html"/>
- <item name="Javadoc (latest)"
href="http://jakarta.apache.org/commons/beanutils/apidocs/"/>
</menu>
&commons;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
