Author: niallp Date: Tue Feb 6 13:30:48 2007 New Revision: 504301 URL: http://svn.apache.org/viewvc?view=rev&rev=504301 Log: Update maven build for launcher - remove dependency on commons building - create md5 checksums - add missing files from src/binary distros (not antRun, antRun.bat or ant jar files though) - add improved building, issue tracking and source repository pages - correct mail archive links - remove unecessary dependencies (commons logging and collections) - specify "provided" scope for dependencies
Added: jakarta/commons/proper/launcher/trunk/xdocs/building.xml (with props) jakarta/commons/proper/launcher/trunk/xdocs/cvs-usage.xml (with props) jakarta/commons/proper/launcher/trunk/xdocs/issue-tracking.xml (with props) jakarta/commons/proper/launcher/trunk/xdocs/style/ jakarta/commons/proper/launcher/trunk/xdocs/style/project.css Removed: jakarta/commons/proper/launcher/trunk/xdocs/downloads.xml Modified: jakarta/commons/proper/launcher/trunk/maven.xml jakarta/commons/proper/launcher/trunk/project.properties jakarta/commons/proper/launcher/trunk/project.xml jakarta/commons/proper/launcher/trunk/xdocs/navigation.xml Modified: jakarta/commons/proper/launcher/trunk/maven.xml URL: http://svn.apache.org/viewvc/jakarta/commons/proper/launcher/trunk/maven.xml?view=diff&rev=504301&r1=504300&r2=504301 ============================================================================== --- jakarta/commons/proper/launcher/trunk/maven.xml (original) +++ jakarta/commons/proper/launcher/trunk/maven.xml Tue Feb 6 13:30:48 2007 @@ -15,23 +15,98 @@ limitations under the License. --> <project default="java:jar" + xmlns:ant="jelly:ant" xmlns:j="jelly:core"> <!-- ================================================================== --> - <!-- START : C O M M O N S - B U I L D --> + <!-- Copy into the binary distribution --> <!-- ================================================================== --> - <!-- Required: Look and Feel for documentation within distributions --> + <postGoal name="dist:prepare-bin-filesystem"> + + <!-- Copy the NOTICE --> + <copy todir="${maven.dist.bin.assembly.dir}"> + <fileset file="${basedir}/NOTICE.txt"/> + </copy> + + <!-- Copy bin files --> + <copy todir="${maven.dist.bin.assembly.dir}/bin"> + <fileset file="${basedir}/src/bin/launcher.properties"/> + <fileset file="${basedir}/src/bin/launcher.xml"/> + </copy> + + <!-- Copy bin files, fixing line endings --> + <ant:fixcrlf srcdir="${basedir}/src/bin" + includes="launch-ant.bat" + destdir="${maven.dist.bin.assembly.dir}/bin" + eol="crlf"/> + <ant:fixcrlf srcdir="${basedir}/src/bin" + includes="launch-ant.sh" + destdir="${maven.dist.bin.assembly.dir}/bin" + eol="lf"/> + + </postGoal> + + <!-- ================================================================== --> + <!-- Copy into the source distribution --> <!-- ================================================================== --> - <postGoal name="xdoc:copy-resources"> - <copy todir="${basedir}/target/docs/style/" failonerror="false"> - <fileset dir="${basedir}/../commons-build/xdocs/style"> - <include name='**/*'/> - <exclude name='**/CVS/**'/> - </fileset> + <postGoal name="dist:prepare-src-filesystem"> + + <!-- Copy the NOTICE --> + <copy todir="${maven.dist.src.assembly.dir}"> + <fileset file="${basedir}/NOTICE.txt"/> + <fileset file="${basedir}/build.properties.sample"/> </copy> + + <!-- Copy xdoc files --> + <copy todir="${maven.dist.src.assembly.dir}/xdocs"> + <fileset dir="./xdocs"/> + </copy> + + <!-- Copy example files --> + <copy todir="${maven.dist.src.assembly.dir}/example"> + <fileset dir="./example"/> + </copy> + </postGoal> + <!-- ================================================================== --> - <!-- END: C O M M O N S - B U I L D --> + <!-- Create MD5 Check Sums --> <!-- ================================================================== --> + <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" /> + + <!-- create checksum for jar --> + <ant:checksum file="${maven.build.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" /> + + <!-- create checksum for binary zip --> + <ant:checksum file="${maven.dist.dir}/${maven.final.name}.zip" property="zip.md5"/> + <ant:echo message="${zip.md5} *${maven.final.name}.zip" + file="${maven.dist.dir}/${maven.final.name}.zip.md5" /> + + <!-- create checksum for binary tar.gz --> + <ant:checksum file="${maven.dist.dir}/${maven.final.name}.tar.gz" property="tar.gz.md5"/> + <ant:echo message="${tar.gz.md5} *${maven.final.name}.tar.gz" + file="${maven.dist.dir}/${maven.final.name}.tar.gz.md5" /> + + <!-- create checksum for source zip --> + <ant:checksum file="${maven.dist.dir}/${maven.final.name}-src.zip" property="src.zip.md5"/> + <ant:echo message="${src.zip.md5} *${maven.final.name}-src.zip" + file="${maven.dist.dir}/${maven.final.name}-src.zip.md5" /> + + <!-- create checksum for source tar.gz --> + <ant:checksum file="${maven.dist.dir}/${maven.final.name}-src.tar.gz" property="src.tar.gz.md5"/> + <ant:echo message="${src.tar.gz.md5} *${maven.final.name}-src.tar.gz" + file="${maven.dist.dir}/${maven.final.name}-src.tar.gz.md5" /> + + </postGoal> </project> Modified: jakarta/commons/proper/launcher/trunk/project.properties URL: http://svn.apache.org/viewvc/jakarta/commons/proper/launcher/trunk/project.properties?view=diff&rev=504301&r1=504300&r2=504301 ============================================================================== --- jakarta/commons/proper/launcher/trunk/project.properties (original) +++ jakarta/commons/proper/launcher/trunk/project.properties Tue Feb 6 13:30:48 2007 @@ -24,13 +24,19 @@ maven.javadoc.author=false maven.javadoc.links=http://java.sun.com/j2se/1.4.2/docs/api +maven.compile.source=1.3 +maven.compile.target=1.3 + # Jar Manifest Additional Attributes maven.jar.manifest.attributes.list=Implementation-Vendor-Id,X-Compile-Source-JDK,X-Compile-Target-JDK maven.jar.manifest.attribute.Implementation-Vendor-Id=org.apache maven.jar.manifest.attribute.X-Compile-Source-JDK=${maven.compile.source} maven.jar.manifest.attribute.X-Compile-Target-JDK=${maven.compile.target} -maven.xdoc.jsl=../commons-build/commons-site.jsl +# Make the source distro unzip to a different directory +maven.dist.src.assembly.dir=${maven.dist.assembly.dir}/src/${maven.final.name}-src + +maven.xdoc.includeProjectDocumentation=no maven.xdoc.date=bottom maven.xdoc.version=${pom.currentVersion} maven.xdoc.developmentProcessUrl=http://jakarta.apache.org/commons/charter.html Modified: jakarta/commons/proper/launcher/trunk/project.xml URL: http://svn.apache.org/viewvc/jakarta/commons/proper/launcher/trunk/project.xml?view=diff&rev=504301&r1=504300&r2=504301 ============================================================================== --- jakarta/commons/proper/launcher/trunk/project.xml (original) +++ jakarta/commons/proper/launcher/trunk/project.xml Tue Feb 6 13:30:48 2007 @@ -65,13 +65,13 @@ <name>Commons Dev List</name> <subscribe>[EMAIL PROTECTED]</subscribe> <unsubscribe>[EMAIL PROTECTED]</unsubscribe> - <archive>http://mail-archives.apache.org/eyebrowse/[EMAIL PROTECTED]</archive> + <archive>http://mail-archives.apache.org/mod_mbox/jakarta-commons-dev/</archive> </mailingList> <mailingList> <name>Commons User List</name> <subscribe>[EMAIL PROTECTED]</subscribe> <unsubscribe>[EMAIL PROTECTED]</unsubscribe> - <archive>http://mail-archives.apache.org/eyebrowse/[EMAIL PROTECTED]</archive> + <archive>http://mail-archives.apache.org/mod_mbox/jakarta-commons-user/</archive> </mailingList> </mailingLists> @@ -126,21 +126,17 @@ <groupId>ant</groupId> <artifactId>ant</artifactId> <version>1.5.3-1</version> + <properties> + <scope>provided</scope> + </properties> </dependency> <dependency> <groupId>ant</groupId> <artifactId>ant-optional</artifactId> <version>1.5.3-1</version> - </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>1.0.4</version> - </dependency> - <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - <version>2.1</version> + <properties> + <scope>provided</scope> + </properties> </dependency> <dependency> <groupId>junit</groupId> @@ -155,11 +151,23 @@ <groupId>xml-apis</groupId> <artifactId>xml-apis</artifactId> <version>2.0.2</version> + <properties> + <comment> + required for <strong>JDK 1.3</strong> + </comment> + <scope>provided</scope> + </properties> </dependency> <dependency> <groupId>xerces</groupId> <artifactId>xerces</artifactId> <version>2.0.2</version> + <properties> + <comment> + required for <strong>JDK 1.3</strong> + </comment> + <scope>provided</scope> + </properties> </dependency> <!-- /these two are required by maven --> <dependency> @@ -171,7 +179,21 @@ <properties> <comment> <strong>Site Only</strong> - v1.9.2 (minimum) - required for building the BeanUtils Site documentation. + required for building the Site documentation. + </comment> + </properties> + </dependency> + + <dependency> + <groupId>maven</groupId> + <artifactId>maven-changelog-plugin</artifactId> + <version>1.8.2</version> + <url>http://maven.apache.org/reference/plugins/changelog/</url> + <type>plugin</type> + <properties> + <comment> + <strong>Site Only</strong> - v1.8.2 (minimum) + required for building the Site documentation. </comment> </properties> </dependency> @@ -193,9 +215,9 @@ <reports> <report>maven-changelog-plugin</report> - <report>maven-changes-plugin</report> - <report>maven-developer-activity-plugin</report> - <report>maven-file-activity-plugin</report> + <!-- report>maven-changes-plugin</report --> + <!-- report>maven-developer-activity-plugin</report --> + <!-- report>maven-file-activity-plugin</report --> <report>maven-javadoc-plugin</report> <report>maven-jdepend-plugin</report> <report>maven-junit-report-plugin</report> Added: jakarta/commons/proper/launcher/trunk/xdocs/building.xml URL: http://svn.apache.org/viewvc/jakarta/commons/proper/launcher/trunk/xdocs/building.xml?view=auto&rev=504301 ============================================================================== --- jakarta/commons/proper/launcher/trunk/xdocs/building.xml (added) +++ jakarta/commons/proper/launcher/trunk/xdocs/building.xml Tue Feb 6 13:30:48 2007 @@ -0,0 +1,73 @@ +<?xml version="1.0"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<document> + <properties> + <title>Building</title> + <author email="commons-dev@jakarta.apache.org">Commons Documentation Team</author> + </properties> +<body> +<!-- ================================================== --> +<section name="Overview"> +<p> + Commons Launcher uses <a href="http://maven.apache.org">Maven</a> or + <a href="http://ant.apache.org">Ant</a> as a build system. +</p> +</section> +<!-- ================================================== --> +<section name="Maven Goals"> + <p> + To build a jar file, change into Launcher's root directory and run + <strong><code>maven jar</code></strong>. + The result will be in the "target" subdirectory. + </p> + <p> + To build the Javadocs, run <strong><code>maven javadoc</code></strong>. + The result will be in "target/docs/apidocs". + </p> + <p> + To build the full website, run <strong><code>maven site</code></strong>. + + The result will be in "target/docs". + </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="Ant Goals"> + <p> + To build a jar file and the javadocs, change into Launcher'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-launcher/">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 Launcher are + available <a href="http://jakarta.apache.org/site/downloads/downloads_commons-launcher.cgi">here</a>. + </p> +</section> + +<!-- ================================================== --> +</body> +</document> Propchange: jakarta/commons/proper/launcher/trunk/xdocs/building.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: jakarta/commons/proper/launcher/trunk/xdocs/building.xml ------------------------------------------------------------------------------ svn:keywords = Date Author Id Revision HeadURL Added: jakarta/commons/proper/launcher/trunk/xdocs/cvs-usage.xml URL: http://svn.apache.org/viewvc/jakarta/commons/proper/launcher/trunk/xdocs/cvs-usage.xml?view=auto&rev=504301 ============================================================================== --- jakarta/commons/proper/launcher/trunk/xdocs/cvs-usage.xml (added) +++ jakarta/commons/proper/launcher/trunk/xdocs/cvs-usage.xml Tue Feb 6 13:30:48 2007 @@ -0,0 +1,50 @@ +<?xml version="1.0" encoding="ISO-8859-1" ?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<document> + <properties> + <title>Source repository</title> + <author email="commons-dev@jakarta.apache.org">Commons Documentation Team</author> + </properties> + <body> +<!-- ================================================== --> +<section name="Source repository"> +<p> + Jakarta Commons Launcher is hosted on the Apache + <a href="http://subversion.tigris.org/">subversion</a> repository. +</p> +<p> + The project URL is:<br /> + <code>http://svn.apache.org/repos/asf/jakarta/commons/proper/launcher/trunk</code> +</p> +<p> + The best way to view the repository is via the + <a href="http://svn.apache.org/viewvc/jakarta/commons/proper/launcher/trunk/">subversion viewer</a>. +</p> +<p> + The alternative is to use the + <a href="http://svn.apache.org/repos/asf/jakarta/commons/proper/launcher/trunk/">native subversion</a> display. +</p> +<p> + For more information on subversion and creating patches see the + <a href="http://www.apache.org/dev/contributors.html">Apache Contributors Guide</a>. +</p> +</section> +<!-- ================================================== --> +</body> +</document> \ No newline at end of file Propchange: jakarta/commons/proper/launcher/trunk/xdocs/cvs-usage.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: jakarta/commons/proper/launcher/trunk/xdocs/cvs-usage.xml ------------------------------------------------------------------------------ svn:keywords = Date Author Id Revision HeadURL Added: jakarta/commons/proper/launcher/trunk/xdocs/issue-tracking.xml URL: http://svn.apache.org/viewvc/jakarta/commons/proper/launcher/trunk/xdocs/issue-tracking.xml?view=auto&rev=504301 ============================================================================== --- jakarta/commons/proper/launcher/trunk/xdocs/issue-tracking.xml (added) +++ jakarta/commons/proper/launcher/trunk/xdocs/issue-tracking.xml Tue Feb 6 13:30:48 2007 @@ -0,0 +1,72 @@ +<?xml version="1.0"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<document> + <properties> + <title>Issue tracking</title> + <author email="commons-dev@jakarta.apache.org">Commons Documentation Team</author> + </properties> +<body> +<!-- ================================================== --> +<section name="Issue tracking"> +<p> + Commons Launcher uses <a href="http://issues.apache.org/jira/">ASF JIRA</a> for for tracking issues. + See the <a href="http://issues.apache.org/jira/browse/LAUNCHER">Launcher JIRA project page</a>. +</p> +<p> + To use JIRA you may need to <a href="http://issues.apache.org/jira/secure/Signup!default.jspa">create an account</a> + (if you have previously created/updated Commons issues using Bugzilla an account will have been automatically + created and you can use the <a href="http://issues.apache.org/jira/secure/ForgotPassword!default.jspa">Forgot Password</a> + page to get a new password). +</p> +<p> + If you would like to report a bug, or raise an enhancement request with + Commons Launcher please do the following: + <ol> + <li><a href="http://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&pid=12310483&sorter/field=issuekey&sorter/order=DESC&status=1&status=4">Search existing open bugs</a>. + If you find your issue listed then please add a comment with your details.</li> + <li><a href="http://mail-archives.apache.org/mod_mbox/jakarta-commons-dev/">Search the mailing list archive</a>. + You may find your issue or idea has already been discussed.</li> + <li>Decide if your issue is a bug or an enhancement.</li> + <li>Submit either a <a href="http://issues.apache.org/jira/secure/CreateIssueDetails!init.jspa?pid=12310483&issuetype=1&priority=4&assignee=-1">bug report</a> + or <a href="http://issues.apache.org/jira/secure/CreateIssueDetails!init.jspa?pid=12310483&issuetype=4&priority=4&assignee=-1">enhancement request</a>.</li> + </ol> +</p> +<p> + Please also remember these points: + <ul> + <li>the more information you provide, the better we can help you</li> + <li>test cases are vital, particularly for any proposed enhancements</li> + <li>the developers of Commons Launcher are all unpaid volunteers</li> + </ul> +</p> +<p> + For more information on subversion and creating patches see the + <a href="http://www.apache.org/dev/contributors.html">Apache Contributors Guide</a>. +</p> +<p> + You may also find these links useful: + <ul> + <li><a href="http://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&pid=12310483&sorter/field=issuekey&sorter/order=DESC&status=1&status=4">All Open Launcher bugs</a></li> + <li><a href="http://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&pid=12310483&sorter/field=issuekey&sorter/order=DESC&status=5&status=6">All Resolved Launcher bugs</a></li> + <li><a href="http://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&pid=12310483&sorter/field=issuekey&sorter/order=DESC">All Launcher bugs</a></li> + </ul> +</p> +</section> +<!-- ================================================== --> +</body> +</document> Propchange: jakarta/commons/proper/launcher/trunk/xdocs/issue-tracking.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: jakarta/commons/proper/launcher/trunk/xdocs/issue-tracking.xml ------------------------------------------------------------------------------ svn:keywords = Date Author Id Revision HeadURL Modified: jakarta/commons/proper/launcher/trunk/xdocs/navigation.xml URL: http://svn.apache.org/viewvc/jakarta/commons/proper/launcher/trunk/xdocs/navigation.xml?view=diff&rev=504301&r1=504300&r2=504301 ============================================================================== --- jakarta/commons/proper/launcher/trunk/xdocs/navigation.xml (original) +++ jakarta/commons/proper/launcher/trunk/xdocs/navigation.xml Tue Feb 6 13:30:48 2007 @@ -15,18 +15,37 @@ See the License for the specific language governing permissions and limitations under the License. --> -<!DOCTYPE org.apache.commons.menus SYSTEM '../../commons-build/menus/menus.dtd'> +<!DOCTYPE org.apache.commons.menus SYSTEM 'http://jakarta.apache.org/commons/build/maven-build.dtd'> <project name="Commons Launcher"> <title>Commons Launcher</title> <body> + <links> + <item name="Apache" href="http://www.apache.org"/> + <item name="Jakarta" href="http://jakarta.apache.org"/> + <item name="Commons" href="http://jakarta.apache.org/commons/"/> + </links> + <menu name="Commons Launcher"> <item name="Overview" href="/index.html" /> <item name="API Documentation" href="/apidocs/index.html"/> <item name="Example" href="/example.html"/> - <item name="Downloads" href="/downloads.html"/> + <item name="Download" href="http://jakarta.apache.org/site/downloads/downloads_commons-launcher.cgi"/> + <item name="Dependencies" href="/dependencies.html"/> + <item name="License" href="/license.html"/> <item name="Wiki" href="http://wiki.apache.org/jakarta-commons/Launcher"/> </menu> - &common-menus; + + <menu name="Development"> + <item name="Mailing Lists" href="/mail-lists.html"/> + <item name="Issue Tracking" href="/issue-tracking.html"/> + <item name="Latest JavaDoc" href="/apidocs/index.html"/> + <item name="Source Repository" href="/cvs-usage.html"/> + <item name="Building" href="/building.html"/> + <item name="Maven Reports" href="/maven-reports.html"/> + </menu> + + &commons; + </body> </project> Added: jakarta/commons/proper/launcher/trunk/xdocs/style/project.css URL: http://svn.apache.org/viewvc/jakarta/commons/proper/launcher/trunk/xdocs/style/project.css?view=auto&rev=504301 ============================================================================== --- jakarta/commons/proper/launcher/trunk/xdocs/style/project.css (added) +++ jakarta/commons/proper/launcher/trunk/xdocs/style/project.css Tue Feb 6 13:30:48 2007 @@ -0,0 +1 @@ [EMAIL PROTECTED] url("http://jakarta.apache.org/style/jakarta-maven.css"); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]