Author: niallp
Date: Fri Nov 16 08:19:01 2007
New Revision: 595718
URL: http://svn.apache.org/viewvc?rev=595718&view=rev
Log:
Add m2 build
Added:
commons/proper/transaction/trunk/pom.xml
- copied, changed from r595710,
commons/proper/transaction/branches/TRANSACTION_2/pom.xml
commons/proper/transaction/trunk/src/assembly/
- copied from r595710,
commons/proper/transaction/branches/TRANSACTION_2/src/assembly/
commons/proper/transaction/trunk/src/site/
- copied from r595710,
commons/proper/transaction/branches/TRANSACTION_2/src/site/
Modified:
commons/proper/transaction/trunk/src/assembly/bin.xml
commons/proper/transaction/trunk/src/assembly/src.xml
commons/proper/transaction/trunk/src/site/site.xml
Copied: commons/proper/transaction/trunk/pom.xml (from r595710,
commons/proper/transaction/branches/TRANSACTION_2/pom.xml)
URL:
http://svn.apache.org/viewvc/commons/proper/transaction/trunk/pom.xml?p2=commons/proper/transaction/trunk/pom.xml&p1=commons/proper/transaction/branches/TRANSACTION_2/pom.xml&r1=595710&r2=595718&rev=595718&view=diff
==============================================================================
--- commons/proper/transaction/branches/TRANSACTION_2/pom.xml (original)
+++ commons/proper/transaction/trunk/pom.xml Fri Nov 16 08:19:01 2007
@@ -27,8 +27,8 @@
<modelVersion>4.0.0</modelVersion>
<groupId>commons-transaction</groupId>
<artifactId>commons-transaction</artifactId>
- <version>2.0-SNAPSHOT</version>
- <name>Transaction</name>
+ <version>1.3-SNAPSHOT</version>
+ <name>Commons Transaction</name>
<inceptionYear>2004</inceptionYear>
<description>Classes that aid concurrent programming in a transactional
style.</description>
@@ -131,22 +131,42 @@
<dependencies>
<dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
+ <version>1.1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
+ <version>1.1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_2.4_spec</artifactId>
+ <version>1.1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>1.2</version>
+ </dependency>
+ <dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.1</version>
</dependency>
<dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.8</version>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.3.1</version>
<scope>test</scope>
</dependency>
</dependencies>
-
- <properties>
- <maven.compile.source>1.6</maven.compile.source>
- <maven.compile.target>1.6</maven.compile.target>
- </properties>
<build>
<sourceDirectory>src/java</sourceDirectory>
Modified: commons/proper/transaction/trunk/src/assembly/bin.xml
URL:
http://svn.apache.org/viewvc/commons/proper/transaction/trunk/src/assembly/bin.xml?rev=595718&r1=595710&r2=595718&view=diff
==============================================================================
--- commons/proper/transaction/trunk/src/assembly/bin.xml (original)
+++ commons/proper/transaction/trunk/src/assembly/bin.xml Fri Nov 16 08:19:01
2007
@@ -27,6 +27,7 @@
<include>LICENSE.txt</include>
<include>NOTICE.txt</include>
<include>RELEASE-NOTES.txt</include>
+ <include>README.txt</include>
</includes>
</fileSet>
<fileSet>
Modified: commons/proper/transaction/trunk/src/assembly/src.xml
URL:
http://svn.apache.org/viewvc/commons/proper/transaction/trunk/src/assembly/src.xml?rev=595718&r1=595710&r2=595718&view=diff
==============================================================================
--- commons/proper/transaction/trunk/src/assembly/src.xml (original)
+++ commons/proper/transaction/trunk/src/assembly/src.xml Fri Nov 16 08:19:01
2007
@@ -32,8 +32,12 @@
<include>pom.xml</include>
<include>project.properties</include>
<include>project.xml</include>
+ <include>README.txt</include>
<include>RELEASE-NOTES.txt</include>
</includes>
+ </fileSet>
+ <fileSet>
+ <directory>example</directory>
</fileSet>
<fileSet>
<directory>src</directory>
Modified: commons/proper/transaction/trunk/src/site/site.xml
URL:
http://svn.apache.org/viewvc/commons/proper/transaction/trunk/src/site/site.xml?rev=595718&r1=595710&r2=595718&view=diff
==============================================================================
--- commons/proper/transaction/trunk/src/site/site.xml (original)
+++ commons/proper/transaction/trunk/src/site/site.xml Fri Nov 16 08:19:01 2007
@@ -29,9 +29,21 @@
<item name="Releases" href="/releases.html"/>
<item name="Mailing Lists" href="/mail-lists.html"/>
<item name="Issue Tracking" href="/issue-tracking.html"/>
- <item name="Javadoc (2.x)" href="/apidocs/index.html"/>
+ <item name="Javadoc" href="/apidocs/index.html"/>
<item name="SVN Repository" href="/source-repository.html"/>
- <item name="SVN repository (2.x)"
href="http://svn.apache.org/viewvc/commons/proper/transaction/branches/TRANSACTION_2/"/>
+ </menu>
+
+ <menu name="Documentation">
+ <item name="Transactional Maps" href="/maps/index.html">
+ <item name="Map Wrapper comparision"
href="/maps/wrappers-comparision.html"/>
+ </item>
+ <item name="Locking" href="/locks/index.html">
+ <item name="Introduction"
href="/locks/tutorial.html"/>
+ <item name="Preference Locks"
href="/locks/preference.html"/>
+ <item name="Transaction Concepts"
href="/locks/concepts.html"/>
+ <item name="Deadlocks"
href="/locks/deadlock.html"/>
+ </item>
+ <item name="Transactional file access" href="/file/index.html"/>
</menu>
</body>
