geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject svn commit: r430508 [5/5] - in /geronimo/trunk: ./ applications/magicGball/magicGball-ear/src/plan/ applications/magicGball/src/plan/ configs/client-corba/src/plan/ configs/client-deployer/src/plan/ configs/client/src/plan/ configs/j2ee-corba/src/plan/...
Date Thu, 10 Aug 2006 19:56:58 GMT
Modified: geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/manager/TransactionManagerImpl.java
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/manager/TransactionManagerImpl.java?rev=430508&r1=430507&r2=430508&view=diff
==============================================================================
--- geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/manager/TransactionManagerImpl.java (original)
+++ geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/manager/TransactionManagerImpl.java Thu Aug 10 12:56:47 2006
@@ -17,43 +17,93 @@
 
 package org.apache.geronimo.transaction.manager;
 
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import javax.transaction.HeuristicMixedException;
+import javax.transaction.HeuristicRollbackException;
+import javax.transaction.InvalidTransactionException;
+import javax.transaction.NotSupportedException;
+import javax.transaction.RollbackException;
+import javax.transaction.Status;
+import javax.transaction.SystemException;
+import javax.transaction.Transaction;
+import javax.transaction.TransactionManager;
+import javax.transaction.UserTransaction;
+import javax.transaction.xa.XAException;
+import javax.transaction.xa.Xid;
+
+import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap;
+import edu.emory.mathcs.backport.java.util.concurrent.CopyOnWriteArrayList;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.geronimo.transaction.ExtendedTransactionManager;
 import org.apache.geronimo.transaction.log.UnrecoverableLog;
 
-import javax.transaction.*;
-import javax.transaction.xa.XAException;
-import javax.transaction.xa.Xid;
-import java.util.*;
-
 /**
  * Simple implementation of a transaction manager.
  *
  * @version $Rev$ $Date$
  */
-public class TransactionManagerImpl implements ExtendedTransactionManager, XidImporter {
+public class TransactionManagerImpl implements TransactionManager, UserTransaction, XidImporter, MonitorableTransactionManager {
+    private static final Log log = LogFactory.getLog(TransactionManagerImpl.class);
+    protected static final int DEFAULT_TIMEOUT = 600;
+    protected static final byte[] DEFAULT_TM_ID = new byte[] {71,84,77,73,68};
+
     final TransactionLog transactionLog;
     final XidFactory xidFactory;
     private final int defaultTransactionTimeoutMilliseconds;
     private final ThreadLocal transactionTimeoutMilliseconds = new ThreadLocal();
     private final ThreadLocal threadTx = new ThreadLocal();
+    private final ConcurrentHashMap associatedTransactions = new ConcurrentHashMap();
     private static final Log recoveryLog = LogFactory.getLog("RecoveryController");
     final Recovery recovery;
     final Collection resourceManagers;
+    private final CopyOnWriteArrayList transactionAssociationListeners = new CopyOnWriteArrayList();
     private List recoveryErrors = new ArrayList();
 
-    /**
-     * TODO NOTE!!! this should be called in an unspecified transaction context, but we cannot enforce this restriction!
-     */
+    public TransactionManagerImpl() throws XAException {
+        this(DEFAULT_TIMEOUT,
+                null,
+                null,
+                null);
+    }
+
+    public TransactionManagerImpl(int defaultTransactionTimeoutSeconds) throws XAException {
+        this(defaultTransactionTimeoutSeconds,
+                null,
+                null,
+                null);
+    }
+
+    public TransactionManagerImpl(int defaultTransactionTimeoutSeconds, TransactionLog transactionLog) throws XAException {
+        this(defaultTransactionTimeoutSeconds,
+                null,
+                transactionLog,
+                null);
+    }
+
     public TransactionManagerImpl(int defaultTransactionTimeoutSeconds, XidFactory xidFactory, TransactionLog transactionLog, Collection resourceManagers) throws XAException {
         if (defaultTransactionTimeoutSeconds <= 0) {
             throw new IllegalArgumentException("defaultTransactionTimeoutSeconds must be positive: attempted value: " + defaultTransactionTimeoutSeconds);
         }
 
         this.defaultTransactionTimeoutMilliseconds = defaultTransactionTimeoutSeconds * 1000;
-        this.transactionLog = transactionLog == null ? new UnrecoverableLog() : transactionLog;
-        this.xidFactory = xidFactory;
+
+        if (transactionLog == null) {
+            this.transactionLog = new UnrecoverableLog();
+        } else {
+            this.transactionLog = transactionLog;
+        }
+
+        if (xidFactory != null) {
+            this.xidFactory = xidFactory;
+        } else {
+            this.xidFactory = new XidFactoryImpl(DEFAULT_TM_ID);
+        }
+
         this.resourceManagers = resourceManagers;
         recovery = new RecoveryImpl(this.transactionLog, this.xidFactory);
 
@@ -71,11 +121,30 @@
         return new ArrayList(resourceManagers);
     }
 
-
     public Transaction getTransaction() throws SystemException {
         return (Transaction) threadTx.get();
     }
 
+    private void associate(TransactionImpl tx) throws InvalidTransactionException {
+        if (tx == null) throw new NullPointerException("tx is null");
+
+        Object existingAssociation = associatedTransactions.putIfAbsent(tx, Thread.currentThread());
+        if (existingAssociation != null) {
+            throw new InvalidTransactionException("Specified transaction is already associated with another thread");
+        }
+        threadTx.set(tx);
+        fireThreadAssociated(tx);
+    }
+
+    private void unassociate() throws SystemException {
+        Transaction tx = getTransaction();
+        if (tx != null) {
+            associatedTransactions.remove(tx);
+            threadTx.set(null);
+            fireThreadUnassociated(tx);
+        }
+    }
+
     public void setTransactionTimeout(int seconds) throws SystemException {
         if (seconds < 0) {
             throw new SystemException("transaction timeout must be positive or 0 to reset to default");
@@ -102,8 +171,13 @@
         }
         TransactionImpl tx = new TransactionImpl(xidFactory, transactionLog, getTransactionTimeoutMilliseconds(transactionTimeoutMilliseconds));
 //        timeoutTimer.schedule(tx, getTransactionTimeoutMilliseconds(transactionTimeoutMilliseconds));
-        threadTx.set(tx);
-                // Todo: Verify if this is correct thing to do. Use default timeout for next transaction.
+        try {
+            associate(tx);
+        } catch (InvalidTransactionException e) {
+            // should not be possible since we just created that transaction and no one has a reference yet
+            throw new SystemException("Internal error: associate threw an InvalidTransactionException for a newly created transaction");
+        }
+        // Todo: Verify if this is correct thing to do. Use default timeout for next transaction.
         this.transactionTimeoutMilliseconds.set(null);
         return tx;
     }
@@ -111,19 +185,19 @@
     public Transaction suspend() throws SystemException {
         Transaction tx = getTransaction();
         if (tx != null) {
+            unassociate();
         }
-        threadTx.set(null);
         return tx;
     }
 
     public void resume(Transaction tx) throws IllegalStateException, InvalidTransactionException, SystemException {
-        if (threadTx.get() != null) {
-            throw new IllegalStateException("Transaction already associated with current thread");
+        if (getTransaction() != null) {
+            throw new IllegalStateException("Thread already associated with another transaction");
         }
-        if (tx instanceof TransactionImpl == false) {
+        if (!(tx instanceof TransactionImpl)) {
             throw new InvalidTransactionException("Cannot resume foreign transaction: " + tx);
         }
-        threadTx.set(tx);
+        associate((TransactionImpl) tx);
     }
 
     public void setRollbackOnly() throws IllegalStateException, SystemException {
@@ -142,7 +216,7 @@
         try {
             tx.commit();
         } finally {
-            threadTx.set(null);
+            unassociate();
         }
     }
 
@@ -154,7 +228,7 @@
         try {
             tx.rollback();
         } finally {
-            threadTx.set(null);
+            unassociate();
         }
     }
 
@@ -252,4 +326,33 @@
         return new HashMap(recovery.getExternalXids());
     }
 
+    public void addTransactionAssociationListener(TransactionManagerMonitor listener) {
+        transactionAssociationListeners.addIfAbsent(listener);
+    }
+
+    public void removeTransactionAssociationListener(TransactionManagerMonitor listener) {
+        transactionAssociationListeners.remove(listener);
+    }
+
+    protected void fireThreadAssociated(Transaction tx) {
+        for (Iterator iterator = transactionAssociationListeners.iterator(); iterator.hasNext();) {
+            TransactionManagerMonitor listener = (TransactionManagerMonitor) iterator.next();
+            try {
+                listener.threadAssociated(tx);
+            } catch (Exception e) {
+                log.warn("Error calling transaction association listener", e);
+            }
+        }
+    }
+
+    protected void fireThreadUnassociated(Transaction tx) {
+        for (Iterator iterator = transactionAssociationListeners.iterator(); iterator.hasNext();) {
+            TransactionManagerMonitor listener = (TransactionManagerMonitor) iterator.next();
+            try {
+                listener.threadUnassociated(tx);
+            } catch (Exception e) {
+                log.warn("Error calling transaction association listener", e);
+            }
+        }
+    }
 }

Modified: geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/manager/TransactionManagerImplGBean.java
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/manager/TransactionManagerImplGBean.java?rev=430508&r1=430507&r2=430508&view=diff
==============================================================================
--- geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/manager/TransactionManagerImplGBean.java (original)
+++ geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/manager/TransactionManagerImplGBean.java Thu Aug 10 12:56:47 2006
@@ -17,14 +17,17 @@
 
 package org.apache.geronimo.transaction.manager;
 
-import org.apache.geronimo.gbean.*;
-import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
-import org.apache.geronimo.transaction.ExtendedTransactionManager;
-
-import javax.transaction.xa.XAException;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+import javax.transaction.xa.XAException;
+
+import org.apache.geronimo.gbean.GBeanInfo;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
+import org.apache.geronimo.gbean.ReferenceCollection;
+import org.apache.geronimo.gbean.ReferenceCollectionEvent;
+import org.apache.geronimo.gbean.ReferenceCollectionListener;
+import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 
 /**
  * Simple implementation of a transaction manager.
@@ -40,7 +43,7 @@
         super(defaultTransactionTimeoutSeconds, xidFactory, transactionLog, resourceManagers);
     }
 
-    
+
     /**
      * We can track as resources are added into the geronimo kernel.
      *
@@ -78,9 +81,6 @@
         infoBuilder.addReference("XidFactory", XidFactory.class, NameFactory.XID_FACTORY);
         infoBuilder.addReference("TransactionLog", TransactionLog.class, NameFactory.TRANSACTION_LOG);
         infoBuilder.addReference("ResourceManagers", ResourceManager.class);//two kinds of things, so specify the type in each pattern.
-
-        infoBuilder.addInterface(ExtendedTransactionManager.class);
-        infoBuilder.addInterface(XidImporter.class);
 
         infoBuilder.setConstructor(new String[]{
                 "defaultTransactionTimeoutSeconds",

Modified: geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/manager/XidImporter.java
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/manager/XidImporter.java?rev=430508&r1=430507&r2=430508&view=diff
==============================================================================
--- geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/manager/XidImporter.java (original)
+++ geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/manager/XidImporter.java Thu Aug 10 12:56:47 2006
@@ -38,4 +38,6 @@
     void forget(Transaction tx) throws XAException;
     int prepare(Transaction tx) throws XAException;
     void rollback(Transaction tx) throws XAException;
+
+    Map getExternalXids();
 }

Modified: geronimo/trunk/modules/transaction/src/test/org/apache/geronimo/transaction/log/HOWLLogTest.java
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/transaction/src/test/org/apache/geronimo/transaction/log/HOWLLogTest.java?rev=430508&r1=430507&r2=430508&view=diff
==============================================================================
--- geronimo/trunk/modules/transaction/src/test/org/apache/geronimo/transaction/log/HOWLLogTest.java (original)
+++ geronimo/trunk/modules/transaction/src/test/org/apache/geronimo/transaction/log/HOWLLogTest.java Thu Aug 10 12:56:47 2006
@@ -25,7 +25,6 @@
 import org.apache.geronimo.transaction.manager.TransactionLog;
 import org.apache.geronimo.transaction.manager.XidFactory;
 import org.apache.geronimo.transaction.manager.XidFactoryImpl;
-import org.apache.geronimo.system.serverinfo.BasicServerInfo;
 
 /**
  *
@@ -63,7 +62,7 @@
                 2, //                "minBuffers",
                 10,//                "threadsWaitingForceThreshold"});
                 xidFactory,
-                new BasicServerInfo(new File(basedir, "target").getAbsolutePath())
+                new File(basedir, "target")
         );
         howlLog.doStart();
         return howlLog;

Modified: geronimo/trunk/modules/transaction/src/test/org/apache/geronimo/transaction/manager/HOWLLogRecoveryTest.java
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/transaction/src/test/org/apache/geronimo/transaction/manager/HOWLLogRecoveryTest.java?rev=430508&r1=430507&r2=430508&view=diff
==============================================================================
--- geronimo/trunk/modules/transaction/src/test/org/apache/geronimo/transaction/manager/HOWLLogRecoveryTest.java (original)
+++ geronimo/trunk/modules/transaction/src/test/org/apache/geronimo/transaction/manager/HOWLLogRecoveryTest.java Thu Aug 10 12:56:47 2006
@@ -20,7 +20,6 @@
 import java.io.File;
 
 import org.apache.geronimo.transaction.log.HOWLLog;
-import org.apache.geronimo.system.serverinfo.BasicServerInfo;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import junit.extensions.TestSetup;
@@ -72,7 +71,7 @@
                 2, //                "minBuffers",
                 10,//                "threadsWaitingForceThreshold"});
                 xidFactory,
-                new BasicServerInfo(targetDir)
+                new File(targetDir)
         );
         howlLog.doStart();
         txLog = howlLog;

Modified: geronimo/trunk/modules/transaction/src/test/org/apache/geronimo/transaction/manager/ProtocolTest.java
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/transaction/src/test/org/apache/geronimo/transaction/manager/ProtocolTest.java?rev=430508&r1=430507&r2=430508&view=diff
==============================================================================
--- geronimo/trunk/modules/transaction/src/test/org/apache/geronimo/transaction/manager/ProtocolTest.java (original)
+++ geronimo/trunk/modules/transaction/src/test/org/apache/geronimo/transaction/manager/ProtocolTest.java Thu Aug 10 12:56:47 2006
@@ -31,8 +31,7 @@
     private MockResource mr11, mr12, mr21, mr22;
 
     protected void setUp() throws Exception {
-        tm = new TransactionManagerImpl(1000, 
-                new XidFactoryImpl("WHAT DO WE CALL IT?".getBytes()), null, null);
+        tm = new TransactionManagerImpl();
         mrm1 = new MockResourceManager(true);
         mrm2 = new MockResourceManager(true);
         mr11 = new MockResource(mrm1, "mr11");

Modified: geronimo/trunk/modules/transaction/src/test/org/apache/geronimo/transaction/manager/TestTransactionManager.java
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/transaction/src/test/org/apache/geronimo/transaction/manager/TestTransactionManager.java?rev=430508&r1=430507&r2=430508&view=diff
==============================================================================
--- geronimo/trunk/modules/transaction/src/test/org/apache/geronimo/transaction/manager/TestTransactionManager.java (original)
+++ geronimo/trunk/modules/transaction/src/test/org/apache/geronimo/transaction/manager/TestTransactionManager.java Thu Aug 10 12:56:47 2006
@@ -112,8 +112,7 @@
     }
 
     protected void setUp() throws Exception {
-        tm = new TransactionManagerImpl(10 * 1000,
-                new XidFactoryImpl("WHAT DO WE CALL IT?".getBytes()), null, null);
+        tm = new TransactionManagerImpl();
         rm1 = new MockResourceManager(true);
         rm2 = new MockResourceManager(true);
         rm3 = new MockResourceManager(false);

Modified: geronimo/trunk/modules/transaction/src/test/org/apache/geronimo/transaction/manager/XATransactionTester.java
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/transaction/src/test/org/apache/geronimo/transaction/manager/XATransactionTester.java?rev=430508&r1=430507&r2=430508&view=diff
==============================================================================
--- geronimo/trunk/modules/transaction/src/test/org/apache/geronimo/transaction/manager/XATransactionTester.java (original)
+++ geronimo/trunk/modules/transaction/src/test/org/apache/geronimo/transaction/manager/XATransactionTester.java Thu Aug 10 12:56:47 2006
@@ -47,9 +47,7 @@
         ds = getDataSource(args);
         XAConnection xaConn = ds.getXAConnection("test", "test");
         XAResource xaRes = xaConn.getXAResource();
-        manager = new TransactionManagerImpl(10,
-                new XidFactoryImpl("WHAT DO WE CALL IT?".getBytes()), 
-                new DummyLog(), null);
+        manager = new TransactionManagerImpl(10, new DummyLog());
         Connection c = xaConn.getConnection();
         Statement s = c.createStatement();
 

Modified: geronimo/trunk/modules/transaction/src/test/org/apache/geronimo/transaction/manager/XidImporterTest.java
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/transaction/src/test/org/apache/geronimo/transaction/manager/XidImporterTest.java?rev=430508&r1=430507&r2=430508&view=diff
==============================================================================
--- geronimo/trunk/modules/transaction/src/test/org/apache/geronimo/transaction/manager/XidImporterTest.java (original)
+++ geronimo/trunk/modules/transaction/src/test/org/apache/geronimo/transaction/manager/XidImporterTest.java Thu Aug 10 12:56:47 2006
@@ -44,8 +44,7 @@
     XidFactory xidFactory = new XidFactoryImpl();
 
     protected void setUp() throws Exception {
-        tm = new TransactionManagerImpl(10 * 1000, 
-                new XidFactoryImpl("WHAT DO WE CALL IT?".getBytes()), null, null);
+        tm = new TransactionManagerImpl();
     }
 
     public void testImportXid() throws Exception {

Modified: geronimo/trunk/modules/upgrade/src/java/org/apache/geronimo/upgrade/Upgrade1_0To1_1.java
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/upgrade/src/java/org/apache/geronimo/upgrade/Upgrade1_0To1_1.java?rev=430508&r1=430507&r2=430508&view=diff
==============================================================================
--- geronimo/trunk/modules/upgrade/src/java/org/apache/geronimo/upgrade/Upgrade1_0To1_1.java (original)
+++ geronimo/trunk/modules/upgrade/src/java/org/apache/geronimo/upgrade/Upgrade1_0To1_1.java Thu Aug 10 12:56:47 2006
@@ -40,7 +40,7 @@
 import org.apache.geronimo.deployment.service.EnvironmentBuilder;
 
 /**
- * @version $Rev:$ $Date:$
+ * @version $Rev$ $Date$
  */
 public class Upgrade1_0To1_1 {
 

Modified: geronimo/trunk/modules/upgrade/src/java/org/apache/geronimo/upgrade/UpgradeGBean.java
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/upgrade/src/java/org/apache/geronimo/upgrade/UpgradeGBean.java?rev=430508&r1=430507&r2=430508&view=diff
==============================================================================
--- geronimo/trunk/modules/upgrade/src/java/org/apache/geronimo/upgrade/UpgradeGBean.java (original)
+++ geronimo/trunk/modules/upgrade/src/java/org/apache/geronimo/upgrade/UpgradeGBean.java Thu Aug 10 12:56:47 2006
@@ -30,7 +30,7 @@
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
 
 /**
- * @version $Rev:$ $Date:$
+ * @version $Rev$ $Date$
  */
 public class UpgradeGBean {
 

Modified: geronimo/trunk/modules/upgrade/src/test-data/ejb_pkgen_1.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/upgrade/src/test-data/ejb_pkgen_1.xml?rev=430508&r1=430507&r2=430508&view=diff
==============================================================================
--- geronimo/trunk/modules/upgrade/src/test-data/ejb_pkgen_1.xml (original)
+++ geronimo/trunk/modules/upgrade/src/test-data/ejb_pkgen_1.xml Thu Aug 10 12:56:47 2006
@@ -29,8 +29,8 @@
       </enterprise-beans>
 
       <gbean gbeanName="geronimo.server:name=CMPPKGenerator" class="org.openejb.entity.cmp.pkgenerator.SequenceTablePrimaryKeyGeneratorWrapper">
-        <reference name="TransactionContextManager">
-            <gbean-name>*:name=TransactionContextManager,*</gbean-name>
+        <reference name="TransactionManager">
+            <gbean-name>*:name=TransactionManager,*</gbean-name>
         </reference>
         <reference name="ManagedConnectionFactoryWrapper"><gbean-name>geronimo.server:J2EEApplication=null,J2EEServer=geronimo,JCAResource=geronimo-cts/database/${pom.currentVersion}/car,j2eeType=JCAManagedConnectionFactory,name=jdbc/DB1</gbean-name></reference>
         <attribute name="tableName">CUSTOM_UNKNOWNPK_TABLE1</attribute>

Modified: geronimo/trunk/plugins/geronimo-assembly-plugin/src/java/org/apache/geronimo/plugin/assembly/RepoCopier.java
URL: http://svn.apache.org/viewvc/geronimo/trunk/plugins/geronimo-assembly-plugin/src/java/org/apache/geronimo/plugin/assembly/RepoCopier.java?rev=430508&r1=430507&r2=430508&view=diff
==============================================================================
--- geronimo/trunk/plugins/geronimo-assembly-plugin/src/java/org/apache/geronimo/plugin/assembly/RepoCopier.java (original)
+++ geronimo/trunk/plugins/geronimo-assembly-plugin/src/java/org/apache/geronimo/plugin/assembly/RepoCopier.java Thu Aug 10 12:56:47 2006
@@ -28,7 +28,7 @@
 import java.io.IOException;
 
 /**
- * @version $Rev:$ $Date:$
+ * @version $Rev$ $Date$
  */
 public class RepoCopier {
 

Modified: geronimo/trunk/plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/ConfigCopier.java
URL: http://svn.apache.org/viewvc/geronimo/trunk/plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/ConfigCopier.java?rev=430508&r1=430507&r2=430508&view=diff
==============================================================================
--- geronimo/trunk/plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/ConfigCopier.java (original)
+++ geronimo/trunk/plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/ConfigCopier.java Thu Aug 10 12:56:47 2006
@@ -34,7 +34,7 @@
 /**
  * Copies all the configurations out of source config store into target config store.
  *
- * @version $Rev:$ $Date:$
+ * @version $Rev$ $Date$
  */
 public class ConfigCopier {
 

Modified: geronimo/trunk/plugins/geronimo-packaging-plugin/src/test-resources/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/plugins/geronimo-packaging-plugin/src/test-resources/plan.xml?rev=430508&r1=430507&r2=430508&view=diff
==============================================================================
--- geronimo/trunk/plugins/geronimo-packaging-plugin/src/test-resources/plan.xml (original)
+++ geronimo/trunk/plugins/geronimo-packaging-plugin/src/test-resources/plan.xml Thu Aug 10 12:56:47 2006
@@ -97,8 +97,8 @@
   </gbean>
   <gbean name="TransactionalThreadPooledTimer" class="org.apache.geronimo.timer.jdbc.JDBCStoreThreadPooledTransactionalTimer">
     <attribute name="repeatCount">5</attribute>
-    <reference name="TransactionContextManager">
-      <name>TransactionContextManager</name>
+    <reference name="TransactionManager">
+      <name>TransactionManager</name>
     </reference>
     <reference name="ManagedConnectionFactoryWrapper">
       <name>SystemDatasource</name>
@@ -111,8 +111,8 @@
     </dependency>
   </gbean>
   <gbean name="NonTransactionalThreadPooledTimer" class="org.apache.geronimo.timer.jdbc.JDBCStoreThreadPooledNonTransactionalTimer">
-    <reference name="TransactionContextManager">
-      <name>TransactionContextManager</name>
+    <reference name="TransactionManager">
+      <name>TransactionManager</name>
     </reference>
     <reference name="ManagedConnectionFactoryWrapper">
       <name>SystemDatasource</name>

Modified: geronimo/trunk/plugins/geronimo-packaging-plugin/src/test-resources/result.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/plugins/geronimo-packaging-plugin/src/test-resources/result.xml?rev=430508&r1=430507&r2=430508&view=diff
==============================================================================
--- geronimo/trunk/plugins/geronimo-packaging-plugin/src/test-resources/result.xml (original)
+++ geronimo/trunk/plugins/geronimo-packaging-plugin/src/test-resources/result.xml Thu Aug 10 12:56:47 2006
@@ -96,8 +96,8 @@
   </gbean>
   <gbean name="TransactionalThreadPooledTimer" class="org.apache.geronimo.timer.jdbc.JDBCStoreThreadPooledTransactionalTimer">
     <attribute name="repeatCount">5</attribute>
-    <reference name="TransactionContextManager">
-      <name>TransactionContextManager</name>
+    <reference name="TransactionManager">
+      <name>TransactionManager</name>
     </reference>
     <reference name="ManagedConnectionFactoryWrapper">
       <name>SystemDatasource</name>
@@ -110,8 +110,8 @@
     </dependency>
   </gbean>
   <gbean name="NonTransactionalThreadPooledTimer" class="org.apache.geronimo.timer.jdbc.JDBCStoreThreadPooledNonTransactionalTimer">
-    <reference name="TransactionContextManager">
-      <name>TransactionContextManager</name>
+    <reference name="TransactionManager">
+      <name>TransactionManager</name>
     </reference>
     <reference name="ManagedConnectionFactoryWrapper">
       <name>SystemDatasource</name>

Modified: geronimo/trunk/plugins/geronimo-packaging-plugin/src/test/org/apache/geronimo/plugin/packaging/PlanProcessorTest.java
URL: http://svn.apache.org/viewvc/geronimo/trunk/plugins/geronimo-packaging-plugin/src/test/org/apache/geronimo/plugin/packaging/PlanProcessorTest.java?rev=430508&r1=430507&r2=430508&view=diff
==============================================================================
--- geronimo/trunk/plugins/geronimo-packaging-plugin/src/test/org/apache/geronimo/plugin/packaging/PlanProcessorTest.java (original)
+++ geronimo/trunk/plugins/geronimo-packaging-plugin/src/test/org/apache/geronimo/plugin/packaging/PlanProcessorTest.java Thu Aug 10 12:56:47 2006
@@ -30,7 +30,7 @@
 import org.apache.geronimo.kernel.repository.Artifact;
 
 /**
- * @version $Rev:$ $Date:$
+ * @version $Rev$ $Date$
  */
 public class PlanProcessorTest extends TestCase {
 

Modified: geronimo/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/pom.xml?rev=430508&r1=430507&r2=430508&view=diff
==============================================================================
--- geronimo/trunk/pom.xml (original)
+++ geronimo/trunk/pom.xml Thu Aug 10 12:56:47 2006
@@ -43,18 +43,19 @@
         <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/trunk</developerConnection>
         <url>http://svn.apache.org/viewvc/geronimo/trunk</url>
     </scm>
-    
+
     <properties>
         <genesis.version>1.0.0-SNAPSHOT</genesis.version>
-        
+
         <!--
         HACK: These properties are currently needed in child poms, so we need to keep them around.
               Usage of these properties should be removed whenever possible.
         -->
-        
+
         <asn1Version>0.3.2</asn1Version>
         <apachedsVersion>0.9.2</apachedsVersion>
         <activeMqVersion>3.2.4-SNAPSHOT</activeMqVersion>
+        <backportUtilVersion>2.0_01_pd</backportUtilVersion>
         <commonsCliVersion>1.0</commonsCliVersion>
         <commonsLoggingVersion>1.0.4</commonsLoggingVersion>
         <cglibVersion>2.1_3</cglibVersion>
@@ -85,123 +86,123 @@
         <concurrentVersion>1.3.4</concurrentVersion>
         <jlineVersion>0.9.9</jlineVersion>
     </properties>
-    
+
     <dependencyManagement>
         <dependencies>
-            
+
             <!-- Geronimo specification versions -->
-            
+
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-activation_1.0.2_spec</artifactId>
                 <version>1.1</version>
             </dependency>
-            
+
             <!-- FIXME: Need to use the correct gid/aid for this dependency -->
             <dependency>
                 <groupId>geronimo-spec</groupId>
                 <artifactId>geronimo-spec-corba</artifactId>
                 <version>1.0</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-ejb_2.1_spec</artifactId>
                 <version>1.0.1</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-j2ee_1.4_spec</artifactId>
                 <version>1.1</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
                 <version>1.0.1</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
                 <version>${geronimoSpecJ2eeDeploymentVersion}</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-j2ee-jacc_1.0_spec</artifactId>
                 <version>1.0.1</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-j2ee-management_1.0_spec</artifactId>
                 <version>1.0.1</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-javamail_1.3.1_spec</artifactId>
                 <version>1.2-SNAPSHOT</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>org.apache.geronimo.javamail</groupId>
                 <artifactId>geronimo-javamail_1.3.1_provider</artifactId>
                 <version>1.0-SNAPSHOT</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-jaxr_1.0_spec</artifactId>
                 <version>1.0.1</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-jaxrpc_1.1_spec</artifactId>
                 <version>1.0.1</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-jsp_2.0_spec</artifactId>
                 <version>1.0.1</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-jms_1.1_spec</artifactId>
                 <version>${geronimoSpecJmsVersion}</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
                 <version>1.0.1</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-qname_1.1_spec</artifactId>
                 <version>${geronimoSpecQnameVersion}</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-saaj_1.1_spec</artifactId>
                 <version>1.0.1</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-servlet_2.4_spec</artifactId>
                 <version>1.0.1</version>
             </dependency>
-            
+
             <!-- External dependency versions -->
-            
+
             <dependency>
                 <groupId>jline</groupId>
                 <artifactId>jline</artifactId>
@@ -214,49 +215,55 @@
                 <artifactId>axis</artifactId>
                 <version>1.4</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>activeio</groupId>
                 <artifactId>activeio</artifactId>
                 <version>2.0-r118</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>asm</groupId>
                 <artifactId>asm</artifactId>
                 <version>1.4.3</version>
             </dependency>
-            
+
+            <dependency>
+                <groupId>backport-util-concurrent</groupId>
+                <artifactId>backport-util-concurrent</artifactId>
+                <version>${backportUtilVersion}</version>
+            </dependency>
+
             <dependency>
                 <groupId>castor</groupId>
                 <artifactId>castor</artifactId>
                 <version>0.9.5.3</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>cglib</groupId>
                 <artifactId>cglib-nodep</artifactId>
                 <version>${cglibVersion}</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>commons-io</groupId>
                 <artifactId>commons-io</artifactId>
                 <version>1.1</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>commons-logging</groupId>
                 <artifactId>commons-logging</artifactId>
                 <version>${commonsLoggingVersion}</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>concurrent</groupId>
                 <artifactId>concurrent</artifactId>
                 <version>${concurrentVersion}</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>org.objectweb.howl</groupId>
                 <artifactId>howl</artifactId>
@@ -264,73 +271,73 @@
                 <type>jar</type>
                 <scope>compile</scope>
             </dependency>
-            
+
             <dependency>
                 <groupId>hsqldb</groupId>
                 <artifactId>hsqldb</artifactId>
                 <version>1.7.2.2</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>jdom</groupId>
                 <artifactId>jdom</artifactId>
                 <version>1.0</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>log4j</groupId>
                 <artifactId>log4j</artifactId>
                 <version>${log4jVersion}</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>mx4j</groupId>
                 <artifactId>mx4j</artifactId>
                 <version>${mx4jVersion}</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>mx4j</groupId>
                 <artifactId>mx4j-remote</artifactId>
                 <version>${mx4jVersion}</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>mockobjects</groupId>
                 <artifactId>mockobjects-jdk1.4-j2ee1.3</artifactId>
                 <version>0.09</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>mockobjects</groupId>
                 <artifactId>mockobjects-core</artifactId>
                 <version>0.09</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>org.apache.derby</groupId>
                 <artifactId>derby</artifactId>
                 <version>${derbyVersion}</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>org.apache.derby</groupId>
                 <artifactId>derbynet</artifactId>
                 <version>${derbyVersion}</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>regexp</groupId>
                 <artifactId>regexp</artifactId>
                 <version>1.3</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>scout</groupId>
                 <artifactId>scout</artifactId>
                 <version>0.5</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>stax</groupId>
                 <artifactId>stax-api</artifactId>
@@ -342,102 +349,102 @@
                     </exclusion>
                 </exclusions>
             </dependency>
-            
+
             <dependency>
                 <groupId>tranql</groupId>
                 <artifactId>tranql</artifactId>
                 <version>${tranqlVersion}</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>wsdl4j</groupId>
                 <artifactId>wsdl4j</artifactId>
                 <version>1.5.2</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>xerces</groupId>
                 <artifactId>xercesImpl</artifactId>
                 <version>${xercesVersion}</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>xerces</groupId>
                 <artifactId>xmlParserAPIs</artifactId>
                 <version>${xmlParserApisVersion}</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>xfire</groupId>
                 <artifactId>xfire</artifactId>
                 <version>20050202</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>xfire</groupId>
                 <artifactId>xfire-java</artifactId>
                 <version>20050202</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>xmlbeans</groupId>
                 <artifactId>xbean</artifactId>
                 <version>2.0.0</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>xml-resolver</groupId>
                 <artifactId>xml-resolver</artifactId>
                 <version>1.1</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>xpp3</groupId>
                 <artifactId>xpp3</artifactId>
                 <version>${xpp3Version}</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>xstream</groupId>
                 <artifactId>xstream</artifactId>
                 <version>${xstreamVersion}</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
                 <version>3.8.1</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>org.apache.pluto</groupId>
                 <artifactId>pluto</artifactId>
                 <version>${plutoVersion}</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>org.apache.pluto</groupId>
                 <artifactId>pluto-portal</artifactId>
                 <version>${plutoVersion}</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>org.apache.pluto</groupId>
                 <artifactId>pluto-descriptors</artifactId>
                 <version>${plutoVersion}</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>activemq</groupId>
                 <artifactId>activemq-core</artifactId>
                 <version>${activeMqVersion}</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>activemq</groupId>
                 <artifactId>activemq-ra</artifactId>
                 <version>${activeMqVersion}</version>
-                
+
                 <!-- Can't be found anywhere -->
                 <exclusions>
                     <exclusion>
@@ -446,61 +453,61 @@
                     </exclusion>
                 </exclusions>
             </dependency>
-            
+
             <dependency>
                 <groupId>activemq</groupId>
                 <artifactId>activemq-gbean-g1_1</artifactId>
                 <version>${activeMqVersion}</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>activemq</groupId>
                 <artifactId>activemq-gbean-management-g1_1</artifactId>
                 <version>${activeMqVersion}</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>jdbm</groupId>
                 <artifactId>jdbm</artifactId>
                 <version>0.20-dev</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>oro</groupId>
                 <artifactId>oro</artifactId>
                 <version>2.0.8</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>antlr</groupId>
                 <artifactId>antlr</artifactId>
                 <version>2.7.2</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>commons-discovery</groupId>
                 <artifactId>commons-discovery</artifactId>
                 <version>0.2</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>commons-collections</groupId>
                 <artifactId>commons-collections</artifactId>
                 <version>3.1</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>commons-primitives</groupId>
                 <artifactId>commons-primitives</artifactId>
                 <version>20041207.202534</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>commons-lang</groupId>
                 <artifactId>commons-lang</artifactId>
                 <version>2.0</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>commons-el</groupId>
                 <artifactId>commons-el</artifactId>
@@ -511,9 +518,9 @@
                     HACK: For some crazy reason, if we exclude this here, then
                           modules/jetty will fail to compile and there is no
                           way to convince m2 to put the jar back on the classpath
-                          so, until that is resolved we have to disable this 
+                          so, until that is resolved we have to disable this
                           exclusion
-                          
+
                     <exclusion>
                         <groupId>commons-logging</groupId>
                         <artifactId>commons-logging</artifactId>
@@ -521,117 +528,117 @@
                     -->
                 </exclusions>
             </dependency>
-            
+
             <dependency>
                 <groupId>commons-digester</groupId>
                 <artifactId>commons-digester</artifactId>
                 <version>1.6</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>commons-modeler</groupId>
                 <artifactId>commons-modeler</artifactId>
                 <version>20060524</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>commons-beanutils</groupId>
                 <artifactId>commons-beanutils</artifactId>
                 <version>1.6.1</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>commons-cli</groupId>
                 <artifactId>commons-cli</artifactId>
                 <version>1.0</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>commons-fileupload</groupId>
                 <artifactId>commons-fileupload</artifactId>
                 <version>1.1-dev</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>xml-apis</groupId>
                 <artifactId>xml-apis</artifactId>
                 <version>${xmlApisVersion}</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>portlet-api</groupId>
                 <artifactId>portlet-api</artifactId>
                 <version>1.0</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>taglibs</groupId>
                 <artifactId>standard</artifactId>
                 <version>1.1.1</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>javax.servlet</groupId>
                 <artifactId>jstl</artifactId>
                 <version>1.1.1</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>dwr</groupId>
                 <artifactId>dwr</artifactId>
                 <version>1.1.1</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>org.openejb</groupId>
                 <artifactId>openejb-core</artifactId>
                 <version>${openejbVersion}</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>org.openejb</groupId>
                 <artifactId>openejb-builder</artifactId>
                 <version>${openejbVersion}</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>org.openejb</groupId>
                 <artifactId>openejb-pkgen-builder</artifactId>
                 <version>${openejbVersion}</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>tranql</groupId>
                 <artifactId>tranql-connector-derby-embed-xa</artifactId>
                 <version>${tranqlVendorsVersion}</version>
                 <type>rar</type>
             </dependency>
-            
+
             <dependency>
                 <groupId>tranql</groupId>
                 <artifactId>tranql-connector-derby-embed-local</artifactId>
                 <version>${tranqlVendorsVersion}</version>
                 <type>rar</type>
             </dependency>
-            
+
             <dependency>
                 <groupId>juddi</groupId>
                 <artifactId>juddi</artifactId>
                 <version>0.9rc4</version>
             </dependency>
-            
+
         </dependencies>
     </dependencyManagement>
-    
+
     <build>
         <!--
-        
+
         FIXME: Need to reorganize modules to use the standard maven module layout
-        
+
         -->
         <sourceDirectory>src/java</sourceDirectory>
         <testSourceDirectory>src/test</testSourceDirectory>
-        
+
         <resources>
             <resource>
                 <directory>${pom.basedir}</directory>
@@ -641,29 +648,29 @@
                     <include>NOTICE.txt</include>
                 </includes>
             </resource>
-            
+
             <resource>
                 <directory>src/resources</directory>
             </resource>
         </resources>
-        
+
         <testResources>
             <testResource>
                 <directory>src/test-data</directory>
             </testResource>
-            
+
             <testResource>
                 <directory>src/test-resources</directory>
             </testResource>
         </testResources>
-        
+
         <pluginManagement>
             <plugins>
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>xmlbeans-maven-plugin</artifactId>
                     <version>2.0.1-SNAPSHOT</version>
-                    
+
                     <executions>
                         <execution>
                             <goals>
@@ -671,7 +678,7 @@
                             </goals>
                         </execution>
                     </executions>
-                    
+
                     <configuration>
                         <schemaDirectory>${pom.basedir}/src/schema</schemaDirectory>
                         <xmlConfigs>
@@ -681,12 +688,12 @@
                         <quiet>false</quiet>
                     </configuration>
                 </plugin>
-                
+
                 <!--
                 NOTE: WAR & JSPC are overridden here (from project-config) to specify non-standard paths.
                       Remove once modules have been reorganized to use the m2 standard layout.
                 -->
-                
+
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-war-plugin</artifactId>
@@ -701,7 +708,7 @@
                         </archive>
                     </configuration>
                 </plugin>
-                
+
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-ear-plugin</artifactId>
@@ -713,7 +720,7 @@
                         </archive>
                     </configuration>
                 </plugin>
-                
+
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>jspc-maven-plugin</artifactId>
@@ -733,7 +740,7 @@
                 </plugin>
             </plugins>
         </pluginManagement>
-        
+
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -743,7 +750,7 @@
                     <target>1.4</target>
                 </configuration>
              </plugin>
-             
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-idea-plugin</artifactId>
@@ -752,7 +759,7 @@
                     <linkModules>true</linkModules>
                 </configuration>
             </plugin>
-            
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-release-plugin</artifactId>
@@ -762,13 +769,13 @@
             </plugin>
          </plugins>
     </build>
-    
+
     <repositories>
         <!--
-        NOTE: The default repositories are picked up by Genesis, but need to 
+        NOTE: The default repositories are picked up by Genesis, but need to
               specify where Genesis lives to pick it up + any additional repositories.
         -->
-        
+
         <repository>
             <id>apache</id>
             <name>Apache Repository</name>
@@ -781,7 +788,7 @@
                 <enabled>true</enabled>
             </releases>
         </repository>
-        
+
         <repository>
             <id>apache-snapshots</id>
             <name>Apache Snapshots Repository</name>
@@ -796,7 +803,7 @@
                 <enabled>false</enabled>
             </releases>
         </repository>
-        
+
         <!--
         FIXME: Include the legacy Apache and Codehaus repositories... should eventually
                ween ourselves off of them...
@@ -815,7 +822,7 @@
                 <enabled>true</enabled>
             </releases>
         </repository>
-        
+
         <repository>
             <id>apache-snapshots-m1</id>
             <name>Apache Maven 1 Snapshots Repository</name>
@@ -830,7 +837,7 @@
                 <enabled>true</enabled>
             </releases>
         </repository>
-        
+
         <repository>
             <id>codehaus-m1</id>
             <name>Codehaus Maven 1 Repository</name>
@@ -845,28 +852,28 @@
                 <enabled>true</enabled>
             </releases>
         </repository>
-        
+
     </repositories>
-    
+
     <distributionManagement>
         <!--
         NOTE: The repository and snapshotRepository are picked up from Genesis.
         -->
-        
+
         <site>
             <id>geronimo-website</id>
             <url>scp://people.apache.org/www/geronimo.apache.org/maven</url>
         </site>
     </distributionManagement>
-    
+
     <profiles>
         <profile>
             <id>default</id>
-            
+
             <activation>
                 <activeByDefault>true</activeByDefault>
             </activation>
-            
+
             <modules>
                 <module>modules</module>
                 <module>m2-plugins</module>
@@ -875,24 +882,24 @@
                 <module>m2-assemblies</module>
             </modules>
         </profile>
-        
+
         <!--
         NOTE: The staged build is used to get around a problem with Maven
               and extention plugins.
-              
+
               See http://issues.apache.org/jira/browse/GERONIMO-2172 for more details.
         -->
-        
+
         <profile>
             <id>stage-bootstrap</id>
-            
+
             <activation>
                 <property>
                     <name>stage</name>
                     <value>bootstrap</value>
                 </property>
             </activation>
-            
+
             <modules>
                 <!--
                 NOTE: This should really only include the bare minimum set of modules
@@ -904,81 +911,81 @@
                 <module>m2-plugins</module>
             </modules>
         </profile>
-        
+
         <profile>
             <id>stage-assemble</id>
-            
+
             <activation>
                 <property>
                     <name>stage</name>
                     <value>assemble</value>
                 </property>
             </activation>
-            
+
             <modules>
                 <module>applications</module>
                 <module>configs</module>
                 <module>m2-assemblies</module>
             </modules>
         </profile>
-        
+
         <profile>
             <id>release-environment</id>
-            
+
             <activation>
                 <property>
                     <name>env</name>
                     <value>release</value>
                 </property>
             </activation>
-            
+
             <modules>
                 <module>modules</module>
                 <module>m2-plugins</module>
-                
+
                 <!--
                 NOTE: Probably do not want to publish these to the repo...  Or do we?
-                
+
                 <module>applications</module>
                 <module>configs</module>
                 <module>m2-assemblies</module>
                 -->
             </modules>
         </profile>
-        
+
         <profile>
             <id>site-environment</id>
-            
+
             <activation>
                 <property>
                     <name>env</name>
                     <value>site</value>
                 </property>
             </activation>
-            
+
             <modules>
                 <module>modules</module>
                 <module>m2-plugins</module>
                 <module>applications</module>
             </modules>
         </profile>
-        
+
         <profile>
             <id>site-stage-environment</id>
-            
+
             <activation>
                 <property>
                     <name>env</name>
                     <value>site-stage</value>
                 </property>
             </activation>
-            
+
             <modules>
                 <module>modules</module>
                 <module>m2-plugins</module>
                 <module>applications</module>
             </modules>
-            
+
             <distributionManagement>
                 <site>
                     <id>geronimo-website</id>
@@ -987,6 +994,6 @@
             </distributionManagement>
         </profile>
     </profiles>
-    
+
 </project>
 



Mime
View raw message