commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ozeigerm...@apache.org
Subject svn commit: r565874 - in /commons/proper/transaction/branches/TRANSACTION_2: ./ src/java/org/apache/commons/transaction/ src/java/org/apache/commons/transaction/file/ src/java/org/apache/commons/transaction/locking/ src/java/org/apache/commons/transact...
Date Tue, 14 Aug 2007 19:40:49 GMT
Author: ozeigermann
Date: Tue Aug 14 12:40:47 2007
New Revision: 565874

URL: http://svn.apache.org/viewvc?view=rev&rev=565874
Log:
Initial effort to bring the documentation up to date. Applies to both the new TLP and the 2.0 version.

Added:
    commons/proper/transaction/branches/TRANSACTION_2/pom.xml
    commons/proper/transaction/branches/TRANSACTION_2/src/java/org/apache/commons/transaction/DefaultTransaction.java
      - copied, changed from r560723, commons/proper/transaction/branches/TRANSACTION_2/src/java/org/apache/commons/transaction/TransactionImpl.java
    commons/proper/transaction/branches/TRANSACTION_2/src/java/org/apache/commons/transaction/file/FileSequence.java
      - copied, changed from r560723, commons/proper/transaction/branches/TRANSACTION_2/src/java/org/apache/commons/transaction/util/FileSequence.java
    commons/proper/transaction/branches/TRANSACTION_2/src/java/org/apache/commons/transaction/file/package.html
    commons/proper/transaction/branches/TRANSACTION_2/src/java/org/apache/commons/transaction/locking/deadlock1.png   (with props)
    commons/proper/transaction/branches/TRANSACTION_2/src/java/org/apache/commons/transaction/locking/deadlock2.png   (with props)
    commons/proper/transaction/branches/TRANSACTION_2/src/java/org/apache/commons/transaction/locking/deadlock3.png   (with props)
    commons/proper/transaction/branches/TRANSACTION_2/src/java/org/apache/commons/transaction/locking/package.html
    commons/proper/transaction/branches/TRANSACTION_2/src/java/org/apache/commons/transaction/memory/package.html
    commons/proper/transaction/branches/TRANSACTION_2/src/java/org/apache/commons/transaction/package.html
Removed:
    commons/proper/transaction/branches/TRANSACTION_2/TODO.txt
    commons/proper/transaction/branches/TRANSACTION_2/src/java/org/apache/commons/transaction/TransactionImpl.java
    commons/proper/transaction/branches/TRANSACTION_2/src/java/org/apache/commons/transaction/util/ComboInputStreamMulticaster.java
    commons/proper/transaction/branches/TRANSACTION_2/src/java/org/apache/commons/transaction/util/FileSequence.java
    commons/proper/transaction/branches/TRANSACTION_2/src/java/org/apache/commons/transaction/util/InputStreamMulticaster.java
    commons/proper/transaction/branches/TRANSACTION_2/xdocs/file/
    commons/proper/transaction/branches/TRANSACTION_2/xdocs/locks/
    commons/proper/transaction/branches/TRANSACTION_2/xdocs/maps/
Modified:
    commons/proper/transaction/branches/TRANSACTION_2/NOTICE.txt
    commons/proper/transaction/branches/TRANSACTION_2/README.txt
    commons/proper/transaction/branches/TRANSACTION_2/RELEASE-NOTES.txt
    commons/proper/transaction/branches/TRANSACTION_2/doap_transaction.rdf
    commons/proper/transaction/branches/TRANSACTION_2/maven.xml
    commons/proper/transaction/branches/TRANSACTION_2/project.properties
    commons/proper/transaction/branches/TRANSACTION_2/project.xml
    commons/proper/transaction/branches/TRANSACTION_2/src/java/org/apache/commons/transaction/Transaction.java
    commons/proper/transaction/branches/TRANSACTION_2/src/test/org/apache/commons/transaction/TransactionImplTest.java
    commons/proper/transaction/branches/TRANSACTION_2/xdocs/cvs-usage.xml
    commons/proper/transaction/branches/TRANSACTION_2/xdocs/index.xml
    commons/proper/transaction/branches/TRANSACTION_2/xdocs/issue-tracking.xml
    commons/proper/transaction/branches/TRANSACTION_2/xdocs/navigation.xml
    commons/proper/transaction/branches/TRANSACTION_2/xdocs/releases.xml
    commons/proper/transaction/branches/TRANSACTION_2/xdocs/style/project.css

Modified: commons/proper/transaction/branches/TRANSACTION_2/NOTICE.txt
URL: http://svn.apache.org/viewvc/commons/proper/transaction/branches/TRANSACTION_2/NOTICE.txt?view=diff&rev=565874&r1=565873&r2=565874
==============================================================================
--- commons/proper/transaction/branches/TRANSACTION_2/NOTICE.txt (original)
+++ commons/proper/transaction/branches/TRANSACTION_2/NOTICE.txt Tue Aug 14 12:40:47 2007
@@ -1,4 +1,4 @@
-Apache Jakarta Commons Transaction
+Apache Commons Transaction
 Copyright 1999-2007 The Apache Software Foundation
 
 This product includes software developed by

Modified: commons/proper/transaction/branches/TRANSACTION_2/README.txt
URL: http://svn.apache.org/viewvc/commons/proper/transaction/branches/TRANSACTION_2/README.txt?view=diff&rev=565874&r1=565873&r2=565874
==============================================================================
--- commons/proper/transaction/branches/TRANSACTION_2/README.txt (original)
+++ commons/proper/transaction/branches/TRANSACTION_2/README.txt Tue Aug 14 12:40:47 2007
@@ -1,7 +1,7 @@
-Jakarta Commons Transaction
-===========================
+Commons Transaction
+===================
 
-Welcome to the Transaction component of the Jakarta Commons project.
+Welcome to the Transaction component of the Apache Commons project.
 This component contains implementations of utility classes commonly used in
 transactional Java programming. Initially there are implementations for
 multi level locks, transactional collections and transactional file access.
@@ -32,7 +32,7 @@
 
 Maven
 -----
-The component can also be built using Maven. (Ant is the primary build tool.)
+The component can also be built using Maven 1.x. (Ant is the primary build tool.)
 It can be found here :
 
   http://maven.apache.org/

Modified: commons/proper/transaction/branches/TRANSACTION_2/RELEASE-NOTES.txt
URL: http://svn.apache.org/viewvc/commons/proper/transaction/branches/TRANSACTION_2/RELEASE-NOTES.txt?view=diff&rev=565874&r1=565873&r2=565874
==============================================================================
--- commons/proper/transaction/branches/TRANSACTION_2/RELEASE-NOTES.txt (original)
+++ commons/proper/transaction/branches/TRANSACTION_2/RELEASE-NOTES.txt Tue Aug 14 12:40:47 2007
@@ -1,4 +1,4 @@
-Jakarta Commons Transaction Release 2.0
+Commons Transaction Release 2.0
 ---------------------------------------
 
 RELEASE NUMBER: 2.0

Modified: commons/proper/transaction/branches/TRANSACTION_2/doap_transaction.rdf
URL: http://svn.apache.org/viewvc/commons/proper/transaction/branches/TRANSACTION_2/doap_transaction.rdf?view=diff&rev=565874&r1=565873&r2=565874
==============================================================================
--- commons/proper/transaction/branches/TRANSACTION_2/doap_transaction.rdf (original)
+++ commons/proper/transaction/branches/TRANSACTION_2/doap_transaction.rdf Tue Aug 14 12:40:47 2007
@@ -16,21 +16,21 @@
   limitations under the License.
 -->
 <rdf:RDF xmlns="http://usefulinc.com/ns/doap#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:asfext="http://projects.apache.org/ns/asfext#" xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#" xmlns:doap="http://usefulinc.com/ns/doap#" xml:lang="en">
-  <Project rdf:about="http://jakarta.apache.org/commons/transaction/">
-    <name>Apache Jakarta Commons Transaction</name>
-    <homepage rdf:resource="http://jakarta.apache.org/commons/transaction/"/>
+  <Project rdf:about="http://commons.apache.org/transaction/">
+    <name>Apache Commons Transaction</name>
+    <homepage rdf:resource="http://commons.apache.org/transaction/"/>
     <programming-language>Java</programming-language>
     <category rdf:resource="http://projects.apache.org/category/library"/>
     <license rdf:resource="http://usefulinc.com/doap/licenses/asl20"/>
+    <asfext:pmc rdf:resource="http://commons.apache.org/"/>
     <bug-database rdf:resource="http://issues.apache.org/jira/browse/TRANSACTION"/>
-    <download-page rdf:resource="http://jakarta.apache.org/site/downloads/downloads_commons-transaction.cgi"/>
-    <asfext:pmc rdf:resource="http://jakarta.apache.org/"/>
+    <download-page rdf:resource="http://commons.apache.org/downloads/download_transaction.cgi"/>
     <shortdesc xml:lang="en">Commons Transaction</shortdesc>
     <description xml:lang="en">Commons Transaction</description>
     <repository>
       <SVNRepository>
-        <browse rdf:resource="http://svn.apache.org/repos/asf/jakarta/commons/proper/transaction/trunk"/>
-        <location rdf:resource="http://svn.apache.org/repos/asf/jakarta/commons/proper/transaction"/>
+        <browse rdf:resource="http://svn.apache.org/repos/asf/commons/proper/transaction/trunk"/>
+        <location rdf:resource="http://svn.apache.org/repos/asf/commons/proper/transaction"/>
       </SVNRepository>
     </repository>
     <release>
@@ -40,6 +40,6 @@
         <version>1.1</version>
       </revision>
     </release>
-    <mailing-list rdf:resource="http://jakarta.apache.org/site/mail2.html#Commons"/>
+    <mailing-list rdf:resource="http://commons.apache.org/mail-lists.html"/>
   </Project>
 </rdf:RDF>

Modified: commons/proper/transaction/branches/TRANSACTION_2/maven.xml
URL: http://svn.apache.org/viewvc/commons/proper/transaction/branches/TRANSACTION_2/maven.xml?view=diff&rev=565874&r1=565873&r2=565874
==============================================================================
--- commons/proper/transaction/branches/TRANSACTION_2/maven.xml (original)
+++ commons/proper/transaction/branches/TRANSACTION_2/maven.xml Tue Aug 14 12:40:47 2007
@@ -14,7 +14,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<project default="java:jar"
+<project 
   xmlns:ant="jelly:ant"
   xmlns:j="jelly:core">
 

Added: commons/proper/transaction/branches/TRANSACTION_2/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/transaction/branches/TRANSACTION_2/pom.xml?view=auto&rev=565874
==============================================================================
--- commons/proper/transaction/branches/TRANSACTION_2/pom.xml (added)
+++ commons/proper/transaction/branches/TRANSACTION_2/pom.xml Tue Aug 14 12:40:47 2007
@@ -0,0 +1,158 @@
+<?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 collectionsuage governing permissions and
+   limitations under the License.
+-->
+<project
+    xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <parent>
+    <groupId>org.apache.commons</groupId>
+    <artifactId>commons-parent</artifactId>
+    <version>3</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>commons-transaction</groupId>
+  <artifactId>commons-transaction</artifactId>
+  <version>2.0-SNAPSHOT</version>
+  <name>Transaction</name>
+
+  <inceptionYear>2004</inceptionYear>
+  <description>Classes that aid concurrent programming in transactional style.</description>
+
+  <url>http://commons.apache.org/transaction/</url>
+
+  <issueManagement>
+    <system>jira</system>
+    <url>http://issues.apache.org/jira/browse/TRANSACTION</url>
+  </issueManagement>
+
+  <scm>
+    <connection>scm:svn:https://svn.apache.org/repos/asf/commons/proper/transaction/trunk</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/commons/proper/transaction/trunk</developerConnection>
+    <url>http://svn.apache.org/viewvc/commons/proper/transaction/trunk</url>
+  </scm>
+
+  <developers>
+    <developer>
+      <name>Oliver Zeigermann</name>
+      <id>ozeigermann</id>
+      <email>ozeigermann@apache.org</email>
+      <organization></organization>
+      <timezone>+1</timezone>
+      <roles>
+         <role>Java Developer</role>
+      </roles>
+    </developer>
+    <developer>
+      <name>Stefan Lützkendorf</name>
+      <id>luetzkendorf</id>
+      <email>luetzkendorf@apache.org</email>
+      <organization></organization>
+      <timezone>+1</timezone>
+      <roles>
+         <role>Java Developer</role>
+      </roles>
+    </developer>
+    <developer>
+      <name>James Mason</name>
+      <id>masonjm</id>
+      <email>masonjm@apache.org</email>
+      <organization></organization>
+      <timezone>-8</timezone>
+      <roles>
+         <role>Java Developer</role>
+      </roles>
+    </developer>
+    <developer>
+      <name>Daniel Florey</name>
+      <id>dflorey</id>
+      <email>dflorey@apache.org</email>
+      <organization></organization>
+      <timezone>+1</timezone>
+      <roles>
+         <role>Java Developer</role>
+      </roles>
+    </developer>
+    <developer>
+      <name>Jörg Heinicke</name>
+      <id>joerg</id>
+      <email>joerg@apache.org</email>
+      <organization></organization>
+      <timezone>+1</timezone>
+      <roles>
+         <role>Java Developer</role>
+      </roles>
+    </developer>
+  </developers>
+  
+  <contributors>
+    <contributor>
+      <name>Antranig Basman</name>
+    </contributor>
+    <contributor>
+      <name>Armin Waibel</name>
+      <email>arminw@apache.org</email>
+      <timezone>+1</timezone>
+    </contributor>
+    <contributor>
+      <name>John Rousseau</name>
+      <email>JRRousseau@gmail.com</email>
+    </contributor>
+    <contributor>
+      <name>Peter Fassev</name>
+      <email>fassev at gmx dot de</email>
+    </contributor>
+    <contributor>
+      <name>Dennis Thrysøe</name>
+      <email>dth at conscius dot com</email>
+    </contributor>
+    <contributor>
+      <name>Holger Hoffstätte</name>
+      <email>holger dot hoffstaette at googlemail dot com</email>
+    </contributor>
+  </contributors>
+
+  <dependencies>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>1.1</version>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>junit-4.3.1</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <sourceDirectory>src/java</sourceDirectory>
+    <testSourceDirectory>src/test</testSourceDirectory>
+    <resources>
+      <resource>
+        <directory>.</directory>
+        <targetPath>META-INF</targetPath>
+          <includes>
+            <include>NOTICE.txt</include>
+            <include>LICENSE.txt</include>
+          </includes>
+        </resource>
+      </resources>
+    </build>
+
+</project>

Modified: commons/proper/transaction/branches/TRANSACTION_2/project.properties
URL: http://svn.apache.org/viewvc/commons/proper/transaction/branches/TRANSACTION_2/project.properties?view=diff&rev=565874&r1=565873&r2=565874
==============================================================================
--- commons/proper/transaction/branches/TRANSACTION_2/project.properties (original)
+++ commons/proper/transaction/branches/TRANSACTION_2/project.properties Tue Aug 14 12:40:47 2007
@@ -20,12 +20,12 @@
 maven.changelog.factory=org.apache.maven.svnlib.SvnChangeLogFactory
 
 maven.javadoc.author=false
-maven.javadoc.links=http://java.sun.com/products/jdk/1.4/docs/api
+maven.javadoc.links=http://java.sun.com/javase/6/docs/api/
 
 maven.xdoc.date=left
 maven.xdoc.poweredby.image=maven-feather.png
 maven.xdoc.version=${pom.currentVersion}
-maven.xdoc.developmentProcessUrl=http://jakarta.apache.org/commons/charter.html
+maven.xdoc.developmentProcessUrl=http://commons.apache.org/charter.html
 
 maven.compile.debug=on
 maven.compile.deprecation=off

Modified: commons/proper/transaction/branches/TRANSACTION_2/project.xml
URL: http://svn.apache.org/viewvc/commons/proper/transaction/branches/TRANSACTION_2/project.xml?view=diff&rev=565874&r1=565873&r2=565874
==============================================================================
--- commons/proper/transaction/branches/TRANSACTION_2/project.xml (original)
+++ commons/proper/transaction/branches/TRANSACTION_2/project.xml Tue Aug 14 12:40:47 2007
@@ -1,75 +1,97 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
+<?xml version="1.0" encoding="ISO-8859-15"?>
+ <!--
+   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
+       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.
--->
+   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>
   <pomVersion>3</pomVersion>
-  <name>Transaction</name>
   <groupId>commons-transaction</groupId>
   <artifactId>commons-transaction</artifactId>
-  <logo>/images/transaction-logo-white.png</logo>
+  <currentVersion>2.0-SNAPSHOT</currentVersion>
   <inceptionYear>2004</inceptionYear>
-  <shortDescription>Commons Transaction</shortDescription>
-  <description>Commons Transaction</description>
-
-  <currentVersion>2.0pre</currentVersion>
-
-  <url>http://jakarta.apache.org/commons/${pom.artifactId.substring(8)}/</url>
-  <package>org.apache.commons.${pom.artifactId.substring(8)}</package>
+  <name>Transaction</name>
+  <shortDescription>Making concurrent programming transactional.</shortDescription>
+  <description>Classes that aid concurrent programming in transactional style.</description>
+  <logo>/images/logo.png</logo>
+   
+  <url>http://commons.apache.org/transaction/</url>
+  <package>org.apache.commons.transaction</package>
 
   <organization>
     <name>The Apache Software Foundation</name>
-    <url>http://jakarta.apache.org</url>
-    <logo>http://jakarta.apache.org/images/original-jakarta-logo.gif</logo>
+    <url>http://commons.apache.org/</url>
+    <logo>http://commons.apache.org/images/logo.png</logo>
   </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>
-  <issueTrackingUrl>http://issues.apache.org/jira/browse/${pom.artifactId.substring(8).toUpperCase()}</issueTrackingUrl>
-  <siteAddress>minotaur.apache.org</siteAddress>
-  <siteDirectory>/www/jakarta.apache.org/commons/${pom.artifactId.substring(8)}/</siteDirectory>
-  <distributionDirectory>/www/jakarta.apache.org/builds/jakarta-commons/${pom.artifactId.substring(8)}/</distributionDirectory>
+  <gumpRepositoryId>commons</gumpRepositoryId>
+  <issueTrackingUrl>http://issues.apache.org/jira/</issueTrackingUrl>
+  <siteAddress>people.apache.org</siteAddress>
+  <siteDirectory>/www/commons.apache.org/transacion/</siteDirectory>
+  <distributionDirectory>/www/people.apache.org/builds/commons/transacion/</distributionDirectory>
   
-  <repository>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/jakarta/commons/proper/${pom.artifactId.substring(8)}/trunk</connection>
-    <url>http://svn.apache.org/repos/asf/jakarta/commons/proper/${pom.artifactId.substring(8)}/trunk/</url>
-  </repository>
+    <repository>
+      <connection>scm:svn:http://svn.apache.org/repos/asf/commons/proper/transacion/trunk</connection>
+      <url>http://svn.apache.org/repos/asf/commons/proper/transacion/trunk</url>
+    </repository>
   
   <mailingLists>
     <mailingList>
       <name>Commons Dev List</name>
-      <subscribe>commons-dev-subscribe@jakarta.apache.org</subscribe>
-      <unsubscribe>commons-dev-unsubscribe@jakarta.apache.org</unsubscribe>
-      <archive>http://mail-archives.apache.org/mod_mbox/jakarta-commons-dev/</archive>
+      <subscribe>dev-subscribe@commons.apache.org</subscribe>
+      <unsubscribe>dev-unsubscribe@commons.apache.org</unsubscribe>
+      <archive>http://mail-archives.apache.org/mod_mbox/commons-dev/</archive>
     </mailingList>
     <mailingList>
       <name>Commons User List</name>
-      <subscribe>commons-user-subscribe@jakarta.apache.org</subscribe>
-      <unsubscribe>commons-user-unsubscribe@jakarta.apache.org</unsubscribe>
-      <archive>http://mail-archives.apache.org/mod_mbox/jakarta-commons-user/</archive>
+      <subscribe>user-subscribe@commons.apache.org</subscribe>
+      <unsubscribe>user-unsubscribe@commons.apache.org</unsubscribe>
+      <archive>http://mail-archives.apache.org/mod_mbox/commons-user/</archive>
     </mailingList>
   </mailingLists>
 
+  <versions>
+    <version>
+      <id>1.0</id>
+      <name>1.0</name>
+      <tag>TRANSACTION_1_0_RELEASE</tag>
+    </version>
+    <version>
+      <id>1.0.1</id>
+      <name>1.0.1</name>
+      <tag>TRANSACTION_1_0_1_RELEASE</tag>
+    </version>
+    <version>
+      <id>1.1</id>
+      <name>1.1</name>
+      <tag>TRANSACTION_1_1_FINAL_RELEASE</tag>
+    </version>
+    <version>
+      <id>1.2</id>
+      <name>1.2</name>
+      <tag>TRANSACTION_1_2_RELEASE</tag>
+    </version>
+  </versions>
+
   <developers>
     <developer>
       <name>Oliver Zeigermann</name>
@@ -150,7 +172,6 @@
     </contributor>
   </contributors>
 
-
   <dependencies>
     <dependency>
       <groupId>commons-logging</groupId>
@@ -160,67 +181,25 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>junit-4.3.1</version>
+      <version>4.3.1</version>
       <properties>
         <scope>test</scope>
       </properties>
     </dependency>
-    <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>
-
-    <!-- these two are required by maven -->
-    <dependency>
-      <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 -->
-
-    <dependency>
-      <groupId>maven</groupId>
-      <artifactId>maven-xdoc-plugin</artifactId>
-      <version>1.9.2</version>
-      <url>http://maven.apache.org/maven-1.x/reference/plugins/xdoc/</url>
-      <type>plugin</type>
-      <properties>
-          <comment>
-              &lt;strong&gt;Site Only&lt;/strong&gt; - v1.9.2 (minimum)
-          </comment>
-          <optional>true</optional>
-      </properties>
-    </dependency>
   </dependencies>
 
   <build>
-    <nagEmailAddress>commons-dev@jakarta.apache.org</nagEmailAddress>
+    <nagEmailAddress>dev@commons.apache.org</nagEmailAddress>
     <sourceDirectory>src/java</sourceDirectory>
-    <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
+    <!-- unitTestSourceDirectory>src/test</unitTestSourceDirectory-->
     <integrationUnitTestSourceDirectory/>
     <aspectSourceDirectory/>
-    <unitTest>
+    <!--  FIXME -->
+    <!--  unitTest>
       <includes>
-        <include>org/apache/commons/transaction/file/ComboInputStreamMulticasterTest.java</include>
+        <include>org/apache/commons/collections/TestAllPackages.java</include>
       </includes>
-    </unitTest>
+   	</unitTest-->
     <resources>
       <resource>
         <directory>.</directory>
@@ -233,15 +212,18 @@
   </build>
 
   <reports>
-    <report>maven-changelog-plugin</report>
-    <report>maven-developer-activity-plugin</report>
-    <report>maven-file-activity-plugin</report>
+    <!--report>maven-changelog-plugin</report-->
+    <!--report>maven-changes-plugin</report-->
+    <!--report>maven-developer-activity-plugin</report-->
+    <!--report>maven-file-activity-plugin</report-->
+    <!--report>maven-checkstyle-plugin</report-->
     <report>maven-javadoc-plugin</report>
     <report>maven-jdepend-plugin</report>
     <report>maven-junit-report-plugin</report>
     <report>maven-jxr-plugin</report>
     <report>maven-license-plugin</report>
-    <report>maven-tasklist-plugin</report>
+    <!--report>maven-cobertura-plugin</report>
+    <report>maven-jdiff-plugin</report-->
   </reports>
 
 </project>

Copied: commons/proper/transaction/branches/TRANSACTION_2/src/java/org/apache/commons/transaction/DefaultTransaction.java (from r560723, commons/proper/transaction/branches/TRANSACTION_2/src/java/org/apache/commons/transaction/TransactionImpl.java)
URL: http://svn.apache.org/viewvc/commons/proper/transaction/branches/TRANSACTION_2/src/java/org/apache/commons/transaction/DefaultTransaction.java?view=diff&rev=565874&p1=commons/proper/transaction/branches/TRANSACTION_2/src/java/org/apache/commons/transaction/TransactionImpl.java&r1=560723&p2=commons/proper/transaction/branches/TRANSACTION_2/src/java/org/apache/commons/transaction/DefaultTransaction.java&r2=565874
==============================================================================
--- commons/proper/transaction/branches/TRANSACTION_2/src/java/org/apache/commons/transaction/TransactionImpl.java (original)
+++ commons/proper/transaction/branches/TRANSACTION_2/src/java/org/apache/commons/transaction/DefaultTransaction.java Tue Aug 14 12:40:47 2007
@@ -31,13 +31,13 @@
  * 
  * 
  */
-public class TransactionImpl implements Transaction {
+public class DefaultTransaction implements Transaction {
 
     protected LockManager lm;
 
     protected List<ManageableResourceManager> rms;
 
-    public TransactionImpl(LockManager lm) {
+    public DefaultTransaction(LockManager lm) {
         this.lm = lm;
         this.rms = new LinkedList<ManageableResourceManager>();
     }

Modified: commons/proper/transaction/branches/TRANSACTION_2/src/java/org/apache/commons/transaction/Transaction.java
URL: http://svn.apache.org/viewvc/commons/proper/transaction/branches/TRANSACTION_2/src/java/org/apache/commons/transaction/Transaction.java?view=diff&rev=565874&r1=565873&r2=565874
==============================================================================
--- commons/proper/transaction/branches/TRANSACTION_2/src/java/org/apache/commons/transaction/Transaction.java (original)
+++ commons/proper/transaction/branches/TRANSACTION_2/src/java/org/apache/commons/transaction/Transaction.java Tue Aug 14 12:40:47 2007
@@ -26,7 +26,6 @@
  *
  * 
  */
-// TODO: We need a manager for such a transaction (or at least an implementation)
 public interface Transaction {
     public void start(long timeout, TimeUnit unit);
 

Copied: commons/proper/transaction/branches/TRANSACTION_2/src/java/org/apache/commons/transaction/file/FileSequence.java (from r560723, commons/proper/transaction/branches/TRANSACTION_2/src/java/org/apache/commons/transaction/util/FileSequence.java)
URL: http://svn.apache.org/viewvc/commons/proper/transaction/branches/TRANSACTION_2/src/java/org/apache/commons/transaction/file/FileSequence.java?view=diff&rev=565874&p1=commons/proper/transaction/branches/TRANSACTION_2/src/java/org/apache/commons/transaction/util/FileSequence.java&r1=560723&p2=commons/proper/transaction/branches/TRANSACTION_2/src/java/org/apache/commons/transaction/file/FileSequence.java&r2=565874
==============================================================================
--- commons/proper/transaction/branches/TRANSACTION_2/src/java/org/apache/commons/transaction/util/FileSequence.java (original)
+++ commons/proper/transaction/branches/TRANSACTION_2/src/java/org/apache/commons/transaction/file/FileSequence.java Tue Aug 14 12:40:47 2007
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.transaction.util;
+package org.apache.commons.transaction.file;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;

Added: commons/proper/transaction/branches/TRANSACTION_2/src/java/org/apache/commons/transaction/file/package.html
URL: http://svn.apache.org/viewvc/commons/proper/transaction/branches/TRANSACTION_2/src/java/org/apache/commons/transaction/file/package.html?view=auto&rev=565874
==============================================================================
--- commons/proper/transaction/branches/TRANSACTION_2/src/java/org/apache/commons/transaction/file/package.html (added)
+++ commons/proper/transaction/branches/TRANSACTION_2/src/java/org/apache/commons/transaction/file/package.html Tue Aug 14 12:40:47 2007
@@ -0,0 +1,41 @@
+<html>
+<body>
+<h1>Transactional file access</h1>
+<p>.
+</p>
+ <p>Sometimes it may be desirable to save a single file or even a
+ number of related files to the file system atomically. This means if
+ you write something and an error occurs or for any reason you change
+ your mind and rather want to cancel what you did. Consider your
+ application fails in the middle of overwriting important data which
+ neither gives you the old state nor the new one, but rather a
+ corrupted one. Or only part of your data has been written leaving you
+ with an inconsistent state.</p> 
+
+<p>This package provides you with code that allows you to have atomic
+read and write operations on any file system. The <a
+href="TxFileResourceManager.html">file
+resource manager</a> offers you the possibility to isolate a number of
+operations on a set of files in a transaction. Using the <a
+href="../locking/package-summary.html">locking package</a> it is able to offer you
+full ACID transactions including serializability. Of course to make this
+work all access to the managed files must be done by this
+manager. Direct access to the file system can <em>not</em> be
+monitored by the manager.</p>
+
+<p>A fail safe <a
+href="FileSequence.html">file
+sequence</a> is the second main part of the file package. Just like
+sequences known from Oracle or other relational database systems it
+provides you with a unique ids. Each call to the <a
+href="FileSequence.html#nextSequenceValueBottom(java.lang.String,%20long)">next</a>
+method will return a new unique long number and persists the current
+value of the sequence to disk. This means when you shut down your
+system and restart it you will still get no double
+numbers, but the sequence will continue. Additionally, this sequence implementation is fail safe which
+means when an error occurs while saving the value of the sequence to
+disk you still are guaranteed not to get any double values. The file
+containing the value is guaranteed not to be corrupted as well. 
+</p>
+</body>
+</html>

Added: commons/proper/transaction/branches/TRANSACTION_2/src/java/org/apache/commons/transaction/locking/deadlock1.png
URL: http://svn.apache.org/viewvc/commons/proper/transaction/branches/TRANSACTION_2/src/java/org/apache/commons/transaction/locking/deadlock1.png?view=auto&rev=565874
==============================================================================
Binary file - no diff available.

Propchange: commons/proper/transaction/branches/TRANSACTION_2/src/java/org/apache/commons/transaction/locking/deadlock1.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: commons/proper/transaction/branches/TRANSACTION_2/src/java/org/apache/commons/transaction/locking/deadlock2.png
URL: http://svn.apache.org/viewvc/commons/proper/transaction/branches/TRANSACTION_2/src/java/org/apache/commons/transaction/locking/deadlock2.png?view=auto&rev=565874
==============================================================================
Binary file - no diff available.

Propchange: commons/proper/transaction/branches/TRANSACTION_2/src/java/org/apache/commons/transaction/locking/deadlock2.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: commons/proper/transaction/branches/TRANSACTION_2/src/java/org/apache/commons/transaction/locking/deadlock3.png
URL: http://svn.apache.org/viewvc/commons/proper/transaction/branches/TRANSACTION_2/src/java/org/apache/commons/transaction/locking/deadlock3.png?view=auto&rev=565874
==============================================================================
Binary file - no diff available.

Propchange: commons/proper/transaction/branches/TRANSACTION_2/src/java/org/apache/commons/transaction/locking/deadlock3.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: commons/proper/transaction/branches/TRANSACTION_2/src/java/org/apache/commons/transaction/locking/package.html
URL: http://svn.apache.org/viewvc/commons/proper/transaction/branches/TRANSACTION_2/src/java/org/apache/commons/transaction/locking/package.html?view=auto&rev=565874
==============================================================================
--- commons/proper/transaction/branches/TRANSACTION_2/src/java/org/apache/commons/transaction/locking/package.html (added)
+++ commons/proper/transaction/branches/TRANSACTION_2/src/java/org/apache/commons/transaction/locking/package.html Tue Aug 14 12:40:47 2007
@@ -0,0 +1,118 @@
+<html>
+<body>
+<h1>Locking</h1>
+
+<p>Beginning with version 1.1 the Commons Transaction package features
+extended transaction support mechanisms. They are grouped around the
+new <a
+href="../apidocs/org/apache/commons/transaction/locking/LockManager2.html">lock
+manager</a> and its <a
+href="../apidocs/org/apache/commons/transaction/locking/GenericLockManager.html">implementation</a>
+that should be used as the only interface to access locks
+associated to some sort of transaction. To do so it offers you locking
+methods like <a
+href="../apidocs/org/apache/commons/transaction/locking/LockManager2.html#lock(java.lang.Object,%20java.lang.Object,%20int,%20int,%20boolean,%20long)">lock</a>
+and <a
+href="../apidocs/org/apache/commons/transaction/locking/LockManager2.html#tryLock(java.lang.Object,%20java.lang.Object,%20int,%20boolean)">tryLock</a>.</p>  
+
+<p>It is important for this manager to be central and have
+knowledge of all locking operations to perform tasks like <a href="deadlock.html">deadlock
+detection</a>, incorporate <a
+href="../apidocs/org/apache/commons/transaction/locking/LockManager2.html#startGlobalTimeout(java.lang.Object,%20long)">global
+transaction timeouts</a> and add convenience methods to <a
+href="../apidocs/org/apache/commons/transaction/locking/LockManager2.html#releaseAll(java.lang.Object)">release
+all locks</a> of a transaction.</p>  
+
+<p>Additional to the <a href="preference.html">preference feature</a>
+in the new <a href="../apidocs/org/apache/commons/transaction/locking/MultiLevelLock2.html">lock</a>, its <a
+href="../apidocs/org/apache/commons/transaction/locking/GenericLock.html">implementation</a>
+has some internal means to record all requests that wait for
+(partially) acquiring a lock in the sequence they occur. This is
+used by the deadlock detection in the lock manager. Another possible
+use is in custom implementations of fair scheduling lock
+mechanisms. Even though the specific protected methods 
+<a
+href="../apidocs/org/apache/commons/transaction/locking/GenericLock.html#registerWaiter(org.apache.commons.transaction.locking.GenericLock.LockOwner)">registerWaiter</a>
+and
+<a
+href="../apidocs/org/apache/commons/transaction/locking/GenericLock.html#unregisterWaiter(org.apache.commons.transaction.locking.GenericLock.LockOwner)">unregisterWaiter</a>
+and field 
+<a
+href="../apidocs/org/apache/commons/transaction/locking/GenericLock.html#waitingOwners">waitingOwners</a> are not made available
+through interfaces subclasses can still use them and even make their means public.</p> 
+
+<h2>Deadlocks</h2>
+ <p>A deadlock describes the scenario where two or more threads are
+ mutually blocking each other. Each waits for the other to release its
+ lock which will never happen as no thread can perform any
+ action. Consider the following figure for illustration this. Thread #1 holds locks
+a, b and c and waits for lock d. Thread #2 holds locks d and e and
+waits for lock b. As lock d is owner by Thread #2, Thread #1 can not
+ continue before Thread #2 releases it. Now Thread #2 waits for lock b
+ which is turn is owner by Thread #1.</p>
+
+<center>
+<img src="deadlock1.png"/>
+</center>
+
+<p> Neither thread will ever be able
+ to release any locks as both executions are blocked: the whole scene is dead!
+</p>
+
+<h3>How does deadlock detection work?</h3>
+
+<p>Theoretically, deadlock detection is pretty simple. First you have threads
+that own locks, then you have threads that wait for locks to
+acquire. Now you can think of a directed graph where you have
+threads and locks being nodes and each lock ownership and lock wait is
+a vertex that connects those nodes. When you have a cycle in that
+graph, i.e. when you can traverse the (directed!) graph starting from a certain
+node and you can reach that node again, you have a deadlock. This
+means a thread waits for itself to release a lock to 
+finally acquire a desired lock. Obviously, this will never happen
+without taking additional actions from the outside. Such an action
+could be to release the block for one thread telling it that there was
+a deadlock and the thread shall resolve it now it is able to perform actions.</p>
+<p>This can be illustrated with the above figure. Traversing the graph starting from Thread #1 going
+over lock b, Thread #2, lock d and finally Thread #1 (again) reveals
+the cycle and thus the deadlock. Note that of course you could just as
+well have started with Thread #2 and would have revealed the same cycle.
+</p>
+
+<h3>How does deadlock detection work for Commons Transaction?</h3>
+
+<p>In case of commons transaction things are a bit more complicated
+as a lock can have multiple (compatible) threads or better to say
+owners - lock ownership is not directly tied to the thread accessing
+the lock, but to an Object called owner. It can well be possible
+that an owner can both (partially) own a lock and wait for it as
+well. This may sound confusing, but actually becomes pretty obvious
+when you look at this example. There is a read/write lock and both owner #1
+and #2 hold a read lock which of course is compatible. Now when owner
+#1 ties to acquire a write lock it will have to wait for owner #2 to
+release its read lock. In such a case owner #1 both (partially) holds
+the lock and waits for it as illustrated by the following figure.</p>
+
+<center>
+<img src="deadlock2.png"/>
+</center>
+
+<p>The above algorithm would detect a deadlock. This of course is not there
+as owner #1 is blocked, but owner #2 is not and may finally release the read
+lock. This means the scenario is not dead.</p>
+<p>Obviously, the wait set of the lock is the problem. The graph does not
+tell us why owner #1 is waiting. In fact it does not wait for owner #1, but
+only for owner #2. Lookig at the next figure we see this. Both owners
+only own part of the lock and owner #1 is waiting for that part of
+the lock that owner #2 owns. 
+</p>
+
+<center>
+<img src="deadlock3.png"/>
+</center>
+
+<p>Thus the algorithm has to be modified in such a way that only the
+  real conflicting parts of the locks are taken into consideration. </p>
+
+</body>
+</html>

Added: commons/proper/transaction/branches/TRANSACTION_2/src/java/org/apache/commons/transaction/memory/package.html
URL: http://svn.apache.org/viewvc/commons/proper/transaction/branches/TRANSACTION_2/src/java/org/apache/commons/transaction/memory/package.html?view=auto&rev=565874
==============================================================================
--- commons/proper/transaction/branches/TRANSACTION_2/src/java/org/apache/commons/transaction/memory/package.html (added)
+++ commons/proper/transaction/branches/TRANSACTION_2/src/java/org/apache/commons/transaction/memory/package.html Tue Aug 14 12:40:47 2007
@@ -0,0 +1,342 @@
+<html>
+<body>
+<h1>Transactional Maps</h1>
+<p>Working on maps as if they were databases.
+</p>
+
+ <p>One major part of the Transaction Component are a set of wrappers that allow to add transactional control
+to any kind of map implemening the <code>java.util.Map</code> interface. Transactional control refers 
+to the procedure that you start a transaction do a number of statements and finally decide to either
+commit the changes, i.e. make them permanent, or rather roll back the transaction by discarding all your changes.
+</p>
+
+<p>As an example imagine a client application where you do complex stuff (maybe 
+talking to one or more servers) and the user is allowed to cancel the 
+whole operation. Or it might be needed to be canceled because of errors that occur in the middle of the whole request. 
+Now image all the results have been stored in a transactional map and you 
+simply do a rollback on errors and a commit upon success.
+</p>
+
+<p>The whole thing gets a bit more complicated when more than one transaction is executed on a map at the same time. 
+	In this case these transactions are running <em>concurrently</em>. 
+	Problems that might occur with concurrent transaction are diverse and implementations differ in how much 
+	spurious phenomena can be observed. Which phenomenon can occur with which transactional map implementation can be found in the chart a little bit down this page. Finally, there is a
+	<a
+	href="http://www.cs.umb.edu/cs734/CritiqueANSI_Iso.pdf">great
+	more general article about different isolations</a>.  </p>
+<p>If none of
+the known phenomena is observable - which of course is the best you can get - a transaction is called <em>serializable</em>.
+ The origin of this term comes from a differet, but equivalent definition. This
+definition switches the perspective from local phenomena observed inside
+transactions to global one, more specific global corretctness. If a set of
+transactions are executed
+concurrently and there is a strictly sequential execution schedule of those transactions that leaves the
+map in the same state as the concurrent one those transactions are called <em>
+serializable</em>.
+</p>
+
+<h2>Comparision of transactional map implementations</h2>
+
+<table summary="" border="1" frame="HSIDES" rules="GROUPS" width="100%" cellpadding="3" cellspacing="0" dir="ltr" title="">
+
+<thead>
+<tr>
+<th align="left" valign="bottom" scope="col"></th>
+<th align="left" valign="bottom" scope="col"> <font face="Arial,
+Helvetica, sans-serif"><strong><a href="../apidocs/org/apache/commons/transaction/memory/TransactionalMapWrapper.html">TransactionalMapWrapper</a></strong></font></th>
+<th align="left" valign="bottom" scope="col"> <font face="Arial, Helvetica, sans-serif"><strong><a href="../apidocs/org/apache/commons/transaction/memory/OptimisticMapWrapper.html">OptimisticMapWrapper</a></strong></font></th>
+<th align="left" valign="bottom" scope="col"> <font face="Arial, Helvetica, sans-serif"><strong><a href="../apidocs/org/apache/commons/transaction/memory/PessimisticMapWrapper.html">PessimisticMapWrapper</a></strong></font></th>
+</tr>
+</thead>
+
+<tbody>
+<tr align="left" valign="top">
+<td> 
+
+<p>Lost update</p>
+
+</td>
+<td> 
+
+<p>Possible</p>
+</td>
+<td> 
+
+<p>Not possible</p>
+</td>
+<td> 
+
+<p>Not possible</p>
+</td>
+</tr>
+
+<tr align="left" valign="top">
+<td> 
+
+<p>Dirty write</p>
+
+</td>
+<td> 
+
+<p>Not possible</p>
+</td>
+<td> 
+
+<p>Not possible</p>
+</td>
+<td> 
+
+<p>Not possible</p>
+</td>
+</tr>
+
+<tr align="left" valign="top">
+<td> 
+
+<p>Dirty read</p>
+</td>
+<td> 
+
+
+<p>Not possible</p>
+</td>
+<td> 
+
+<p>Not possible</p>
+</td>
+<td> 
+
+<p>Not possible</p>
+</td>
+</tr>
+
+<tr align="left" valign="top">
+<td> 
+
+<p>Lost update</p>
+
+</td>
+<td> 
+
+<p>Possible</p>
+</td>
+<td> 
+
+<p>Not possible</p>
+</td>
+<td> 
+
+<p>Not possible</p>
+</td>
+</tr>
+
+<tr align="left" valign="top">
+<td> 
+
+<p>Nonrepeatable read</p>
+</td>
+<td> 
+
+<p>Possible</p>
+
+</td>
+<td> 
+
+<p>Not possible</p>
+</td>
+<td> 
+
+<p>Not possible</p>
+</td>
+</tr>
+
+<tr align="left" valign="top">
+<td> 
+
+<p>Phantoms</p>
+</td>
+<td> 
+
+<p>Possible</p>
+</td>
+<td> 
+
+
+<p>Not possible</p>
+</td>
+<td> 
+
+
+<p>Not possible</p>
+</td>
+</tr>
+
+<tr align="left" valign="top">
+<td> 
+
+<p>Read Skew</p>
+
+</td>
+<td> 
+
+<p>Possible</p>
+</td>
+<td> 
+
+<p>Not possible</p>
+</td>
+<td> 
+
+<p>Not possible</p>
+</td>
+</tr>
+
+<tr align="left" valign="top">
+<td> 
+
+<p>Write Skew</p>
+
+</td>
+<td> 
+
+<p>Possible</p>
+</td>
+<td> 
+
+<p>Possible</p>
+</td>
+<td> 
+
+<p>Not possible</p>
+</td>
+</tr>
+
+<tr align="left" valign="top">
+<td> 
+
+
+<p>Readers block writers</p>
+</td>
+<td> 
+
+<p>No</p>
+</td>
+<td> 
+
+<p>No</p>
+</td>
+<td> 
+
+<p>Yes</p>
+</td>
+</tr>
+
+<tr align="left" valign="top">
+<td> 
+
+<p>Writers block readers</p>
+
+</td>
+<td> 
+
+<p>No</p>
+</td>
+<td> 
+
+<p>No</p>
+</td>
+<td> 
+
+<p>Yes</p>
+</td>
+</tr>
+
+<tr align="left" valign="top">
+<td> 
+
+<p>Writers block writers</p>
+</td>
+<td> 
+
+<p>No</p>
+
+</td>
+<td> 
+
+<p>No</p>
+
+</td>
+<td> 
+
+<p>Yes</p>
+</td>
+</tr>
+
+<tr align="left" valign="top">
+<td> 
+
+<p>Might deadlock</p>
+</td>
+<td> 
+
+<p>No</p>
+
+</td>
+<td> 
+
+<p>No</p>
+
+</td>
+<td> 
+
+<p>Yes</p>
+</td>
+</tr>
+
+<tr align="left" valign="top">
+<td> 
+
+<p>Commit might fail</p>
+</td>
+<td> 
+
+<p>No</p>
+
+</td>
+<td> 
+
+<p>Yes</p>
+
+</td>
+<td> 
+
+<p>No</p>
+</td>
+</tr>
+
+<tr align="left" valign="top">
+<td> 
+
+<p>Isolation Level</p>
+
+</td>
+<td> 
+
+<p>Read Committed (with lost updates possible)</p>
+</td>
+<td> 
+
+<p>Snapshot (Oracle would call it Serializable)</p>
+</td>
+<td> 
+
+<p>Serializable</p>
+</td>
+</tr>
+
+</tbody>
+</table>
+
+
+</body>
+</html>
\ No newline at end of file

Added: commons/proper/transaction/branches/TRANSACTION_2/src/java/org/apache/commons/transaction/package.html
URL: http://svn.apache.org/viewvc/commons/proper/transaction/branches/TRANSACTION_2/src/java/org/apache/commons/transaction/package.html?view=auto&rev=565874
==============================================================================
--- commons/proper/transaction/branches/TRANSACTION_2/src/java/org/apache/commons/transaction/package.html (added)
+++ commons/proper/transaction/branches/TRANSACTION_2/src/java/org/apache/commons/transaction/package.html Tue Aug 14 12:40:47 2007
@@ -0,0 +1,31 @@
+<html>
+<body>
+<h1>Apache Commons Transaction</h1>
+<p>Making concurrent programming transactional.
+</p>
+<p>When you <a
+href="../apidocs/org/apache/commons/transaction/file/FileResourceManager.html#startTransaction(java.lang.Object)">start</a>
+a transaction you need to provide an indentifier to later refer to
+this newly started transaction. You can also let an identifier be <a
+href="../apidocs/org/apache/commons/transaction/file/FileResourceManager.html#generatedUniqueTxId()">generated</a>
+for you. Calls to e.g. <a
+href="../apidocs/org/apache/commons/transaction/file/FileResourceManager.html#readResource(java.lang.Object,%20java.lang.Object)">read</a>,
+<a
+href="../apidocs/org/apache/commons/transaction/file/FileResourceManager.html#createResource(java.lang.Object,%20java.lang.Object)">create</a>
+or <a
+href="../apidocs/org/apache/commons/transaction/file/FileResourceManager.html#writeResource(java.lang.Object,%20java.lang.Object)">write
+to</a> will need the identifier to know which transaction they belong to.</p> 
+
+<p>Finally when you want to
+commit the transaction call <a
+href="../apidocs/org/apache/commons/transaction/file/FileResourceManager.html#commitTransaction(java.lang.Object)">commit</a>
+or <a
+href="../apidocs/org/apache/commons/transaction/file/FileResourceManager.html#rollbackTransaction(java.lang.Object)">rollback</a>
+to undo all changes. The transactionality is achieved by first writing to
+temporary files and upon commit moving or copying them to the primary
+location. Locks and a delicate commit mechanism will assure that no
+data corruption occurs.
+</p>
+
+</body>
+</html>
\ No newline at end of file

Modified: commons/proper/transaction/branches/TRANSACTION_2/src/test/org/apache/commons/transaction/TransactionImplTest.java
URL: http://svn.apache.org/viewvc/commons/proper/transaction/branches/TRANSACTION_2/src/test/org/apache/commons/transaction/TransactionImplTest.java?view=diff&rev=565874&r1=565873&r2=565874
==============================================================================
--- commons/proper/transaction/branches/TRANSACTION_2/src/test/org/apache/commons/transaction/TransactionImplTest.java (original)
+++ commons/proper/transaction/branches/TRANSACTION_2/src/test/org/apache/commons/transaction/TransactionImplTest.java Tue Aug 14 12:40:47 2007
@@ -34,7 +34,7 @@
     @Test
     public void basic() {
         LockManager lm = new RWLockManager<String, String>();
-        Transaction t = new TransactionImpl(lm);
+        Transaction t = new DefaultTransaction(lm);
         TxMap<String, Object> txMap1 = new PessimisticTxMap<String, Object>("TxMap1");
         t.enlistResourceManager(txMap1);
         TxMap<String, Object> txMap2 = new PessimisticTxMap<String, Object>("TxMap2");

Modified: commons/proper/transaction/branches/TRANSACTION_2/xdocs/cvs-usage.xml
URL: http://svn.apache.org/viewvc/commons/proper/transaction/branches/TRANSACTION_2/xdocs/cvs-usage.xml?view=diff&rev=565874&r1=565873&r2=565874
==============================================================================
--- commons/proper/transaction/branches/TRANSACTION_2/xdocs/cvs-usage.xml (original)
+++ commons/proper/transaction/branches/TRANSACTION_2/xdocs/cvs-usage.xml Tue Aug 14 12:40:47 2007
@@ -18,26 +18,26 @@
 <document>
  <properties>
   <title>Source repository</title>
-  <author email="commons-dev@jakarta.apache.org">Commons Documentation Team</author>
+  <author email="dev@commons.apache.org">Commons Documentation Team</author>
  </properties>
  <body>
 <!-- ================================================== -->
 <section name="Source repository">
 <p>
-  Jakarta Commons Transaction is hosted on the Apache
+  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>
+  <code>http://svn.apache.org/repos/asf/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>.
+  <a href="http://svn.apache.org/viewvc/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.
+  <a href="http://svn.apache.org/repos/asf/commons/proper/transaction/trunk/">native subversion</a> display.
 </p>
 <p>
   For more information on subversion and creating patches see the

Modified: commons/proper/transaction/branches/TRANSACTION_2/xdocs/index.xml
URL: http://svn.apache.org/viewvc/commons/proper/transaction/branches/TRANSACTION_2/xdocs/index.xml?view=diff&rev=565874&r1=565873&r2=565874
==============================================================================
--- commons/proper/transaction/branches/TRANSACTION_2/xdocs/index.xml (original)
+++ commons/proper/transaction/branches/TRANSACTION_2/xdocs/index.xml Tue Aug 14 12:40:47 2007
@@ -1,89 +1,217 @@
 <?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.
+	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>Overview</title>
-  <author email="commons-dev@jakarta.apache.org">Commons Documentation Team</author>
- </properties>
-
- <body>
-
-<section name="The Transaction Component">
-<p>Commons Transaction aims at providing lightweight, standardized,
-well tested and 
-efficient implementations of utility classes commonly used in
-transactional Java programming. Initially there are implementations for
-multi level locks, 
-transactional collections and transactional file access. There may
-be additional implementations when the common need for them becomes
-obvious. However, the complete component shall remain compatible to
-JDK1.2 and should have minimal dependencies.</p>
-<p>The optimal - but maybe impudent - long term goal would be to create the transactional counterpart
-of <a
-href="http://gee.cs.oswego.edu/dl/classes/EDU/oswego/cs/dl/util/concurrent/intro.html">Doug
-Lea's fabulous concurrent package</a> which recently made it to Java 5.0.</p> 
-
-
-<p>These are the initial parts in detail:
-<ul>
-<li><b><a href="maps/index.html">memory</a> package:</b>
-Contains a wrapper to make any map implementing interface
-<code>java.util.Map</code> transactional. 
-
-Depending on the type of the map that is wrapped this can either work as a
-transactional cache or some sort of volatile memory store.
-</li>
-
-<li>
-<b><a href="locks/index.html">locking</a> package:</b>
-Interfaces and implementations for locks that can have more than one
-owner at different compatible levels.
-</li>
-
-<li>
-<b><a href="file/index.html">file</a> package:</b>
-Implementation of transaction file access. Using a pessimistic
-locking schema this implementation features
-<em>serializable</em> transactions. 
-</li>
-
-<li>
-<b><em>util</em> package:</b> 
-Contains a collection of utility classes used by the transaction
-package itself. Of more general interest could be a rendezvous barrier
-and a file utility class.
-</li>
-</ul>
-</p>
-</section>
-
-<section name="Releases">
-    <p>
-       See the <a href="releases.html">releases</a> page for information on obtaining releases.
-    </p>
-</section>
-
-<section name="Documentation">
-  <p>
-     The <a href="apidocs/index.html">JavaDoc API documents</a> are available online.
-  </p>
-</section>
+	<properties>
+		<title>Overview</title>
+		<author email="dev@commons.apache.org">
+			Commons Documentation Team
+		</author>
+	</properties>
+
+	<body>
+
+		<section name="Commons Transaction Mantra">
+			<p>
+				<b>Making concurrent programming transactional.</b>
+			</p>
+			<p>
+				Whenever you have concurrent access to resources and
+				want to protect them with locks,
+				<em>Commons Transaction</em>
+				can be right for you.
+			</p>
+		</section>
+		<section name="Commons Transaction 2.x">
+			<p>
+				Currently,
+				<em>Commons Transaction</em>
+				undergoes a radical change towards its 2.0 release. Main
+				objectives are
+				<ul>
+					<li>
+						migration to the
+						<code>java.util.concurrent</code>
+						package
+					</li>
+					<li>full support for Java 5 generics</li>
+					<li>
+						support for a component based approach (by
+						factoring out each interesting aspect into an
+						interface plus default implementation)
+					</li>
+					<li>usage of commons logging</li>
+					<li>
+						full file management features for the
+						transactional file system
+					</li>
+				</ul>
+			</p>
+			<p>
+				<em>Commons Transaction</em>
+				might be useful for you when you
+				<ul>
+					<li>
+						need transactional file access (i.e. ACID
+						transactions on a set of files)
+					</li>
+					<li>
+						have resources that need locking - lock managers
+						can do that for you:
+						<ul>
+							<li>
+								benefit from automatic deadlock recovery
+							</li>
+							<li>
+								be sure you never forget to release a
+								lock again
+							</li>
+							<li>
+								let your code have a timer for a whole
+								block of locks
+							</li>
+							<li>
+								have an out-of-the-box solution for
+								hierarchical locks
+							</li>
+						</ul>
+					</li>
+					<li>need transactional access to maps</li>
+				</ul>
+			</p>
+			<p>
+				These are the initial packages of
+				<em>Commons Transaction</em>
+				2.x:
+				<ul>
+					<li>
+						<b>
+							<a
+								href="apidocs/org/apache/commons/transaction/package-summary.html">
+								transaction
+							</a>
+							package:
+						</b>
+						This base package defines interfaces for
+						transactions and resources that take part in
+						transactions.
+					</li>
+
+					<li>
+						<b>
+							<a
+								href="apidocs/org/apache/commons/transaction/locking/package-summary.html">
+								locking
+							</a>
+							package:
+						</b>
+						Interfaces and implementations for lock
+						managers. Lock managers help you to keep control
+						over your locks. All current implementations
+						also perform deadlock detection.
+					</li>
+
+					<li>
+						<b>
+							<a
+								href="apidocs/org/apache/commons/transaction/resource/package-summary.html">
+								resource
+							</a>
+							and
+							<a
+								href="apidocs/org/apache/commons/transaction/file/package-summary.html">
+								file
+							</a>
+							package:
+						</b>
+						Interfaces for a general access to streamable
+						resources and default implementations for the
+						file system. One implementation features
+						<em>ACID</em>
+						transactions on the file system using a
+						pessimistic locking schema.
+					</li>
+
+
+					<li>
+						<b>
+							<a
+								href="apidocs/org/apache/commons/transaction/memory/package-summary.html">
+								memory
+							</a>
+							package:
+						</b>
+						Contains a number of transactional
+						<code>java.util.Map</code>
+						implementations.
+					</li>
+					<li>
+						<b>
+							<a
+								href="apidocs/org/apache/commons/transaction/util/package-summary.html">
+								util
+							</a>
+							package:
+						</b>
+						Contains a collection of utility classes used by
+						the transaction package itself. Of more general
+						interest could be a rendezvous barrier, and file
+						utilities.
+					</li>
+				</ul>
+			</p>
+
+		</section>
+
+		<section name="Commons Transaction 1.x">
+			<p>
+				Commons Transaction 1.x aimed at providing lightweight,
+				standardized, well tested and efficient implementations
+				of utility classes commonly used in transactional Java
+				programming. Initially there were implementations for
+				multi level locks, transactional collections and
+				transactional file access. The 1.x component is
+				compatible to JDK1.2.
+			</p>
+		</section>
+
+		<section name="Releases">
+			<p>
+				See the
+				<a href="releases.html">releases</a>
+				page for information on obtaining releases.
+			</p>
+		</section>
+
+		<section name="Documentation">
+			<p>
+				The
+				<a href="apidocs/index.html">
+					JavaDoc API documents of the upcoming
+					<b>2.0 version</b>
+				</a>
+				are available online. If you are interested in the
+				previous 1.x documentation go to the
+				<a href="releases.html">releases</a>
+				page and download them together with the version you are
+				interested in.
+			</p>
+		</section>
 
-</body>
+	</body>
 </document>

Modified: commons/proper/transaction/branches/TRANSACTION_2/xdocs/issue-tracking.xml
URL: http://svn.apache.org/viewvc/commons/proper/transaction/branches/TRANSACTION_2/xdocs/issue-tracking.xml?view=diff&rev=565874&r1=565873&r2=565874
==============================================================================
--- commons/proper/transaction/branches/TRANSACTION_2/xdocs/issue-tracking.xml (original)
+++ commons/proper/transaction/branches/TRANSACTION_2/xdocs/issue-tracking.xml Tue Aug 14 12:40:47 2007
@@ -1,31 +1,30 @@
 <?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
+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
+     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.
+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>
+  <author email="dev@commons.apache.org">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>.
+  Commons Transaction uses <a href="http://issues.apache.org/jira/browse/TRANSACTION">ASF JIRA</a> for tracking issues.
 </p>
 <p>
   To use JIRA you may need to <a href="http://issues.apache.org/jira/secure/Signup!default.jspa">create an account</a>
@@ -37,13 +36,13 @@
   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&amp;pid=12310493&amp;sorter/field=issuekey&amp;sorter/order=DESC&amp;status=1&amp;status=4">Search existing open bugs</a>.
+  <li><a href="http://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&amp;pid=12310465&amp;sorter/field=issuekey&amp;sorter/order=DESC&amp;status=1&amp;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>.
+  <li><a href="http://mail-archives.apache.org/mod_mbox/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&amp;issuetype=1&amp;priority=4&amp;assignee=-1">bug report</a>
-  or <a href="http://issues.apache.org/jira/secure/CreateIssueDetails!init.jspa?pid=12310493&amp;issuetype=4&amp;priority=4&amp;assignee=-1">enhancement request</a>.</li>
+  <li>Submit either a <a href="http://issues.apache.org/jira/secure/CreateIssueDetails!init.jspa?pid=12310465&amp;issuetype=1&amp;priority=4&amp;assignee=-1">bug report</a>
+  or <a href="http://issues.apache.org/jira/secure/CreateIssueDetails!init.jspa?pid=12310465&amp;issuetype=4&amp;priority=4&amp;assignee=-1">enhancement request</a>.</li>
   </ol>
 </p>
 <p>
@@ -55,15 +54,11 @@
   </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&amp;pid=12310493&amp;sorter/field=issuekey&amp;sorter/order=DESC&amp;status=1&amp;status=4">All Open Transaction bugs</a></li>
-  <li><a href="http://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&amp;pid=12310493&amp;sorter/field=issuekey&amp;sorter/order=DESC&amp;status=5&amp;status=6">All Resolved Transaction bugs</a></li>
-  <li><a href="http://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&amp;pid=12310493&amp;sorter/field=issuekey&amp;sorter/order=DESC">All Transaction bugs</a></li>
+  <li><a href="http://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&amp;pid=12310493&amp;status=1">All Open Transaction bugs</a></li>
+  <li><a href="http://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&amp;pid=12310493&amp;status=5">All Resolved Transaction bugs</a></li>
+  <li><a href="http://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&amp;mode=hide&amp;pid=12310493">All Transaction bugs</a></li>
   </ul>
 </p>
 </section>

Modified: commons/proper/transaction/branches/TRANSACTION_2/xdocs/navigation.xml
URL: http://svn.apache.org/viewvc/commons/proper/transaction/branches/TRANSACTION_2/xdocs/navigation.xml?view=diff&rev=565874&r1=565873&r2=565874
==============================================================================
--- commons/proper/transaction/branches/TRANSACTION_2/xdocs/navigation.xml (original)
+++ commons/proper/transaction/branches/TRANSACTION_2/xdocs/navigation.xml Tue Aug 14 12:40:47 2007
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE org.apache.commons.menus SYSTEM 'http://jakarta.apache.org/commons/build/maven-build.dtd'>
+<!DOCTYPE org.apache.commons.menus SYSTEM 'http://commons.apache.org/build/maven-build.dtd'>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -16,32 +16,23 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<project name="Commons&#xA0;Transaction">
-    <title>Commons&#xA0;Transaction</title>
+<project name="Commons Transaction">
+    <title>Commons Transaction</title>
     <body>
-        <links>
-          <item name="Jakarta Commons" href="http://jakarta.apache.org/commons/"/>
-        </links>
+	    <links>
+	      <item name="Apache Commons" href="http://commons.apache.org/"/>
+	    </links>
 
-        <menu name="Commons&#xA0;Transaction">
+        <menu name="Commons Transaction">
           <item name="Overview" href="/index.html" />
-          <item name="Download" href="http://jakarta.apache.org/site/downloads/downloads_commons-transaction.cgi"/>
-          <item name="Javadoc" href="/apidocs/index.html"/>
+	      <item name="Mailing lists" href="/mail-lists.html"/>
+	      <item name="Team" href="/team-list.html"/>
+          <item name="Download" href="http://commons.apache.org/downloads/download_transaction.cgi"/>
+          <item name="Javadoc (2.x)" href="/apidocs/index.html"/>
           <item name="Releases" href="releases.html"/>
+	      <item name="SVN repository" href="http://svn.apache.org/viewvc/commons/proper/transaction/trunk/"/>
         </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>
-
+        
         &commons;
     </body>
 </project>

Modified: commons/proper/transaction/branches/TRANSACTION_2/xdocs/releases.xml
URL: http://svn.apache.org/viewvc/commons/proper/transaction/branches/TRANSACTION_2/xdocs/releases.xml?view=diff&rev=565874&r1=565873&r2=565874
==============================================================================
--- commons/proper/transaction/branches/TRANSACTION_2/xdocs/releases.xml (original)
+++ commons/proper/transaction/branches/TRANSACTION_2/xdocs/releases.xml Tue Aug 14 12:40:47 2007
@@ -18,7 +18,7 @@
 <document>
    <properties>
       <title>Downloads</title>
-      <author email="commons-dev@jakarta.apache.org">Commons Documentation Team</author>
+      <author email="dev@commons.apache.org">Commons Documentation Team</author>
       <revision>$Id$</revision>
    </properties>
 
@@ -28,11 +28,11 @@
          <ul>
            <li><a href="http://archive.apache.org/dist/jakarta/commons/transaction/">Version 1.0 - 15 December 2004</a> / <a href="http://svn.apache.org/repos/asf/jakarta/commons/proper/transaction/tags/TRANSACTION_1_0_RELEASE/RELEASE-NOTES.txt">release notes</a></li>
            <li><a href="http://archive.apache.org/dist/jakarta/commons/transaction/">Version 1.0.1 - 13 January 2005</a> / <a href="http://svn.apache.org/repos/asf/jakarta/commons/proper/transaction/tags/TRANSACTION_1_0_1_RELEASE/RELEASE-NOTES.txt">release notes</a></li>
-           <li><a href="http://jakarta.apache.org/site/downloads/downloads_commons-transaction.cgi">Version 1.1 - 02 June 2005</a> / <a href="http://svn.apache.org/repos/asf/jakarta/commons/proper/transaction/tags/TRANSACTION_1_1_FINAL_RELEASE/RELEASE-NOTES.txt">release notes</a></li>
+           <li><a href="http://commons.apache.org/downloads/download_transaction.cgi">Version 1.1 - 02 June 2005</a> / <a href="http://svn.apache.org/repos/asf/jakarta/commons/proper/transaction/tags/TRANSACTION_1_1_FINAL_RELEASE/RELEASE-NOTES.txt">release notes</a></li>
          </ul>
          <p>
             The latest binary and source releases are always available on the
-            <a href="http://jakarta.apache.org/site/downloads/downloads_commons-transaction.cgi">
+            <a href="http://commons.apache.org/downloads/download_transaction.cgi">
             Commons Transaction Downloads page</a>.
          </p>
          <p>
@@ -42,12 +42,7 @@
             special archive area</a>.
          </p>
       </section>
-      <section name="Beta Releases / Release Candidates">
-         <p>The following beta releases / release candidates are available:</p>
-         <ul>
-           <li><a href="http://people.apache.org/dist/jakarta/commons/transaction/1.1b1/">Version 1.1 beta 1 - 13 January 2005</a> / <a href="http://svn.apache.org/repos/asf/jakarta/commons/proper/transaction/tags/TRANSACTION_1_1_B1_RELEASE/RELEASE-NOTES.txt">release notes</a></li>
-           <li><a href="http://people.apache.org/dist/jakarta/commons/transaction/1.1b2/">Version 1.1 beta 2 - 5 February 2005</a> / <a href="http://svn.apache.org/repos/asf/jakarta/commons/proper/transaction/tags/TRANSACTION_1_1_B2_RELEASE/RELEASE-NOTES.txt">release notes</a></li>
-         </ul>
+      <section name="Most recent non-official releases (Alphas / Betas / Release Candidates)">
       </section>
       <section name="Latest Sources">
          <p>

Modified: commons/proper/transaction/branches/TRANSACTION_2/xdocs/style/project.css
URL: http://svn.apache.org/viewvc/commons/proper/transaction/branches/TRANSACTION_2/xdocs/style/project.css?view=diff&rev=565874&r1=565873&r2=565874
==============================================================================
--- commons/proper/transaction/branches/TRANSACTION_2/xdocs/style/project.css (original)
+++ commons/proper/transaction/branches/TRANSACTION_2/xdocs/style/project.css Tue Aug 14 12:40:47 2007
@@ -1,17 +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.
-*/
-@import url("http://jakarta.apache.org/style/jakarta-maven.css");
\ No newline at end of file
+@import url("http://commons.apache.org/style/commons-maven.css");



Mime
View raw message