Author: niallp
Date: Fri Jul 14 09:12:26 2006
New Revision: 421934
URL: http://svn.apache.org/viewvc?rev=421934&view=rev
Log:
Improve maven site/build:
1) Copy NOTICE.txt and RELEASE-NOTES.txt into binary distro
2) Copy NOTICE.txt, RELEASE-NOTES.txt and build.properties.sample into source
distro
3) Copy xdocs and example directories into source distro
4) Generate checksums for jar, source and binary files
5) Change the source distro to unpack to a different directory
6) Add custom "Source Repository" page
7) Add custom "Issue Tracking" page
8) De-tab project.xml
9) Include NOTICE.txt in jar file
10) Mark "optional/provided" dependencies for m2 pom
11) Set JDK version to 1.3 - ????? is this correct ?????
Added:
jakarta/commons/proper/transaction/trunk/maven.xml (with props)
jakarta/commons/proper/transaction/trunk/xdocs/cvs-usage.xml (with props)
jakarta/commons/proper/transaction/trunk/xdocs/issue-tracking.xml (with
props)
Modified:
jakarta/commons/proper/transaction/trunk/project.properties
jakarta/commons/proper/transaction/trunk/project.xml
Added: jakarta/commons/proper/transaction/trunk/maven.xml
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/transaction/trunk/maven.xml?rev=421934&view=auto
==============================================================================
--- jakarta/commons/proper/transaction/trunk/maven.xml (added)
+++ jakarta/commons/proper/transaction/trunk/maven.xml Fri Jul 14 09:12:26 2006
@@ -0,0 +1,88 @@
+<!--
+ Copyright 2006 The Apache Software Foundation
+
+ Licensed 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.
+-->
+<project default="java:jar"
+ xmlns:ant="jelly:ant"
+ xmlns:j="jelly:core">
+
+ <!-- ================================================================== -->
+ <!-- Copy into the binary distribution -->
+ <!-- ================================================================== -->
+ <postGoal name="dist:prepare-bin-filesystem">
+
+ <copy todir="${maven.dist.bin.assembly.dir}">
+ <fileset file='${basedir}/NOTICE.txt'/>
+ <fileset file="${basedir}/RELEASE-NOTES.txt"/>
+ </copy>
+
+ </postGoal>
+
+ <!-- ================================================================== -->
+ <!-- Copy into the source distribution -->
+ <!-- ================================================================== -->
+ <postGoal name="dist:prepare-src-filesystem">
+
+ <!-- Copy files -->
+ <copy todir="${maven.dist.src.assembly.dir}">
+ <fileset file='${basedir}/NOTICE.txt'/>
+ <fileset file="${basedir}/RELEASE-NOTES.txt"/>
+ <fileset file="${basedir}/build.properties.sample"/>
+ </copy>
+
+ <!-- Copy xdoc directory -->
+ <copy todir="${maven.dist.src.assembly.dir}/xdocs">
+ <fileset dir="xdocs"/>
+ </copy>
+
+ <!-- Copy example directory -->
+ <copy todir="${maven.dist.src.assembly.dir}/example">
+ <fileset dir="example"/>
+ </copy>
+
+ </postGoal>
+
+ <!-- ================================================================== -->
+ <!-- Create MD5 Check Sums -->
+ <!-- ================================================================== -->
+ <postGoal name="dist">
+
+ <!-- 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>
Propchange: jakarta/commons/proper/transaction/trunk/maven.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/commons/proper/transaction/trunk/maven.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: jakarta/commons/proper/transaction/trunk/project.properties
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/transaction/trunk/project.properties?rev=421934&r1=421933&r2=421934&view=diff
==============================================================================
--- jakarta/commons/proper/transaction/trunk/project.properties (original)
+++ jakarta/commons/proper/transaction/trunk/project.properties Fri Jul 14
09:12:26 2006
@@ -13,6 +13,8 @@
maven.compile.debug=on
maven.compile.deprecation=off
maven.compile.optimize=off
+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
@@ -25,3 +27,7 @@
maven.junit.fork=true
maven.junit.sysproperties=org.xml.sax.driver
org.xml.sax.driver=org.apache.xerces.parsers.SAXParser
+
+# Make the source distro unzip to a different directory
+maven.dist.src.assembly.dir=${maven.dist.assembly.dir}/src/${maven.final.name}-src
+
Modified: jakarta/commons/proper/transaction/trunk/project.xml
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/transaction/trunk/project.xml?rev=421934&r1=421933&r2=421934&view=diff
==============================================================================
--- jakarta/commons/proper/transaction/trunk/project.xml (original)
+++ jakarta/commons/proper/transaction/trunk/project.xml Fri Jul 14 09:12:26
2006
@@ -21,11 +21,11 @@
</organization>
<licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>/LICENSE.txt</url>
- <distribution>repo</distribution>
- </license>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>/LICENSE.txt</url>
+ <distribution>repo</distribution>
+ </license>
</licenses>
<gumpRepositoryId>jakarta</gumpRepositoryId>
@@ -128,6 +128,9 @@
<groupId>geronimo-spec</groupId>
<artifactId>geronimo-spec-j2ee</artifactId>
<version>1.0-M1</version>
+ <properties>
+ <scope>provided</scope>
+ </properties>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
@@ -143,6 +146,9 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
+ <properties>
+ <scope>test</scope>
+ </properties>
</dependency>
<!-- these two are required by maven -->
@@ -150,11 +156,17 @@
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
<version>2.0.2</version>
+ <properties>
+ <optional>true</optional>
+ </properties>
</dependency>
<dependency>
<groupId>xerces</groupId>
<artifactId>xerces</artifactId>
<version>2.0.2</version>
+ <properties>
+ <optional>true</optional>
+ </properties>
</dependency>
<!-- /these two are required by maven -->
@@ -174,11 +186,11 @@
</dependencies>
<build>
- <nagEmailAddress>[email protected]</nagEmailAddress>
- <sourceDirectory>src/java</sourceDirectory>
- <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
- <integrationUnitTestSourceDirectory/>
- <aspectSourceDirectory/>
+ <nagEmailAddress>[email protected]</nagEmailAddress>
+ <sourceDirectory>src/java</sourceDirectory>
+ <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
+ <integrationUnitTestSourceDirectory/>
+ <aspectSourceDirectory/>
<unitTest>
<includes>
<include>org/apache/commons/transaction/file/FileResourceManagerTest.java</include>
@@ -189,6 +201,15 @@
<include>org/apache/commons/transaction/locking/LockTestRepeatableReads.java</include>
</includes>
</unitTest>
+ <resources>
+ <resource>
+ <directory>.</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>NOTICE.txt</include>
+ </includes>
+ </resource>
+ </resources>
</build>
<reports>
Added: jakarta/commons/proper/transaction/trunk/xdocs/cvs-usage.xml
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/transaction/trunk/xdocs/cvs-usage.xml?rev=421934&view=auto
==============================================================================
--- jakarta/commons/proper/transaction/trunk/xdocs/cvs-usage.xml (added)
+++ jakarta/commons/proper/transaction/trunk/xdocs/cvs-usage.xml Fri Jul 14
09:12:26 2006
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!--
+/*
+ * Copyright 2006 The Apache Software Foundation.
+ *
+ * Licensed 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="[email protected]">Commons Documentation
Team</author>
+ </properties>
+ <body>
+<!-- ================================================== -->
+<section name="Source repository">
+<p>
+ Jakarta Commons Transaction 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/transaction/trunk</code>
+</p>
+<p>
+ The best way to view the repository is via the
+ <a
href="http://svn.apache.org/viewvc/jakarta/commons/proper/transaction/trunk/";>subversion
viewer</a>.
+</p>
+<p>
+ The alternative is to use the
+ <a
href="http://svn.apache.org/repos/asf/jakarta/commons/proper/transaction/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/transaction/trunk/xdocs/cvs-usage.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/commons/proper/transaction/trunk/xdocs/cvs-usage.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: jakarta/commons/proper/transaction/trunk/xdocs/issue-tracking.xml
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/transaction/trunk/xdocs/issue-tracking.xml?rev=421934&view=auto
==============================================================================
--- jakarta/commons/proper/transaction/trunk/xdocs/issue-tracking.xml (added)
+++ jakarta/commons/proper/transaction/trunk/xdocs/issue-tracking.xml Fri Jul
14 09:12:26 2006
@@ -0,0 +1,71 @@
+<?xml version="1.0"?>
+<!--
+Copyright 2006 The Apache Software Foundation.
+
+Licensed 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="[email protected]">Commons Documentation
Team</author>
+ </properties>
+<body>
+<!-- ================================================== -->
+<section name="Issue tracking">
+<p>
+ Commons Transaction 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/TRANSACTION";>Transaction's 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 Transaction please do the following:
+ <ol>
+ <li><a
href="http://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&pid=12310493&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=12310493&issuetype=1&priority=4&assignee=-1";>bug
report</a>
+ or <a
href="http://issues.apache.org/jira/secure/CreateIssueDetails!init.jspa?pid=12310493&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 Transaction 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=12310493&sorter/field=issuekey&sorter/order=DESC&status=1&status=4";>All
Open Transaction bugs</a></li>
+ <li><a
href="http://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&pid=12310493&sorter/field=issuekey&sorter/order=DESC&status=5&status=6";>All
Resolved Transaction bugs</a></li>
+ <li><a
href="http://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&pid=12310493&sorter/field=issuekey&sorter/order=DESC";>All
Transaction bugs</a></li>
+ </ul>
+</p>
+</section>
+<!-- ================================================== -->
+</body>
+</document>
Propchange: jakarta/commons/proper/transaction/trunk/xdocs/issue-tracking.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/commons/proper/transaction/trunk/xdocs/issue-tracking.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
