geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject svn commit: r381214 [2/2] - in /geronimo/branches/configid: assemblies/j2ee-installer/ assemblies/j2ee-installer/src/izpack/ assemblies/j2ee-installer/src/var/config/ assemblies/j2ee-jetty-server/ assemblies/j2ee-jetty-server/src/var/config/ assemblies...
Date Mon, 27 Feb 2006 01:13:01 GMT
Modified: geronimo/branches/configid/modules/transaction/src/test/org/apache/geronimo/transaction/context/TransactionContextManagerTest.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/modules/transaction/src/test/org/apache/geronimo/transaction/context/TransactionContextManagerTest.java?rev=381214&r1=381213&r2=381214&view=diff
==============================================================================
--- geronimo/branches/configid/modules/transaction/src/test/org/apache/geronimo/transaction/context/TransactionContextManagerTest.java
(original)
+++ geronimo/branches/configid/modules/transaction/src/test/org/apache/geronimo/transaction/context/TransactionContextManagerTest.java
Sun Feb 26 17:12:56 2006
@@ -38,7 +38,8 @@
     private XidFactory xidFactory = new XidFactoryImpl("geronimo.test.tm".getBytes());
 
     protected void setUp() throws Exception {
-        TransactionManagerImpl tm = new TransactionManagerImpl(1000, null, null);
+        TransactionManagerImpl tm = new TransactionManagerImpl(1000, 
+                new XidFactoryImpl("WHAT DO WE CALL IT?".getBytes()), null, null);
         transactionContextManager = new TransactionContextManager(tm, tm);
     }
 

Modified: geronimo/branches/configid/modules/transaction/src/test/org/apache/geronimo/transaction/log/HOWLLogTest.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/modules/transaction/src/test/org/apache/geronimo/transaction/log/HOWLLogTest.java?rev=381214&r1=381213&r2=381214&view=diff
==============================================================================
--- geronimo/branches/configid/modules/transaction/src/test/org/apache/geronimo/transaction/log/HOWLLogTest.java
(original)
+++ geronimo/branches/configid/modules/transaction/src/test/org/apache/geronimo/transaction/log/HOWLLogTest.java
Sun Feb 26 17:12:56 2006
@@ -62,7 +62,8 @@
                 2, //                "maxLogFiles",
                 2, //                "minBuffers",
                 10,//                "threadsWaitingForceThreshold"});
-                xidFactory, new BasicServerInfo(new File(basedir, "target").getAbsolutePath())
+                xidFactory,
+                new BasicServerInfo(new File(basedir, "target").getAbsolutePath())
         );
         howlLog.doStart();
         return howlLog;

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

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

Modified: geronimo/branches/configid/modules/transaction/src/test/org/apache/geronimo/transaction/manager/TransactionManagerImplTest.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/modules/transaction/src/test/org/apache/geronimo/transaction/manager/TransactionManagerImplTest.java?rev=381214&r1=381213&r2=381214&view=diff
==============================================================================
--- geronimo/branches/configid/modules/transaction/src/test/org/apache/geronimo/transaction/manager/TransactionManagerImplTest.java
(original)
+++ geronimo/branches/configid/modules/transaction/src/test/org/apache/geronimo/transaction/manager/TransactionManagerImplTest.java
Sun Feb 26 17:12:56 2006
@@ -49,7 +49,8 @@
     TransactionManagerImpl tm;
 
     protected void setUp() throws Exception {
-        tm = new TransactionManagerImplGBean(10, transactionLog, resourceManagers);
+        tm = new TransactionManagerImplGBean(10,
+                new XidFactoryImpl("WHAT DO WE CALL IT?".getBytes()), transactionLog, resourceManagers);
     }
 
     protected void tearDown() throws Exception {

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

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

Modified: geronimo/branches/configid/plugins/geronimo-assembly-plugin/plugin.jelly
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/plugins/geronimo-assembly-plugin/plugin.jelly?rev=381214&r1=381213&r2=381214&view=diff
==============================================================================
--- geronimo/branches/configid/plugins/geronimo-assembly-plugin/plugin.jelly (original)
+++ geronimo/branches/configid/plugins/geronimo-assembly-plugin/plugin.jelly Sun Feb 26 17:12:56
2006
@@ -119,6 +119,7 @@
 
     <goal name="assemble:assemble-unpack">
         <ant:mkdir dir="${geronimo.assembly.dest}"/>
+        <j:set var="excludeManifest" value="false"/>
         <ant:unjar dest="${geronimo.assembly.dest}">
             <ant:fileset dir="${maven.repo.local}">
                 <j:set var="hasUnpack" value="false"/>
@@ -128,13 +129,26 @@
                         <ant:include
                                 name="${dependency.getArtifactDirectory()}/${dependency.getType()}s/${dependency.getArtifact()}"/>
                         <j:set var="hasUnpack" value="true"/>
+                        <j:if test="${dependency.getProperty('geronimo.assemble.unpack.exclude.manifest')
== 'true'}">
+                            <j:set var="excludeManifest" value="true"/>
+                        </j:if>
                     </j:if>
                 </j:forEach>
                 <j:if test="${hasUnpack == 'false'}">
                     <ant:exclude name="**/*"/>
                 </j:if>
             </ant:fileset>
+            <j:if test="${excludeManifest == 'true'}">
+                <ant:patternset>
+                    <!-- this exclude leaves an empty META-INF directory 
+                         that we delete below -->
+                    <ant:exclude name="META-INF/MANIFEST.MF"/>
+                </ant:patternset>        
+            </j:if>
         </ant:unjar>
+        <j:if test="${excludeManifest == 'true'}">
+           <ant:delete dir="${geronimo.assembly.dest}/META-INF"/>
+        </j:if>
         <ant:chmod dir="${geronimo.assembly.dest}/bin" perm="ugo+x" includes="*.sh"/>
     </goal>
 

Modified: geronimo/branches/configid/plugins/geronimo-assembly-plugin/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/plugins/geronimo-assembly-plugin/project.xml?rev=381214&r1=381213&r2=381214&view=diff
==============================================================================
--- geronimo/branches/configid/plugins/geronimo-assembly-plugin/project.xml (original)
+++ geronimo/branches/configid/plugins/geronimo-assembly-plugin/project.xml Sun Feb 26 17:12:56
2006
@@ -23,7 +23,7 @@
     <id>geronimo-assembly-plugin</id>
     <name>Geronimo :: Maven Assembly Plugin</name>
     <description>A plugin used to assemble a distribution of Geronimo</description>
-    <currentVersion>1.0.7</currentVersion>
+    <currentVersion>1.1.0-8</currentVersion>
 
     <dependencies>
         <dependency>

Modified: geronimo/branches/configid/plugins/geronimo-dependency-plugin/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/plugins/geronimo-dependency-plugin/project.xml?rev=381214&r1=381213&r2=381214&view=diff
==============================================================================
--- geronimo/branches/configid/plugins/geronimo-dependency-plugin/project.xml (original)
+++ geronimo/branches/configid/plugins/geronimo-dependency-plugin/project.xml Sun Feb 26 17:12:56
2006
@@ -23,7 +23,7 @@
     <id>geronimo-dependency-plugin</id>
     <name>Geronimo :: Maven Dependency Plugin</name>
     <description>A plugin used to construct a geronimo-service.xml dependency list
for a Geronimo module</description>
-    <currentVersion>1.0.1</currentVersion>
+    <currentVersion>1.1.0-1</currentVersion>
 
     <dependencies>
         <dependency>

Modified: geronimo/branches/configid/plugins/geronimo-deployment-plugin/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/plugins/geronimo-deployment-plugin/project.xml?rev=381214&r1=381213&r2=381214&view=diff
==============================================================================
--- geronimo/branches/configid/plugins/geronimo-deployment-plugin/project.xml (original)
+++ geronimo/branches/configid/plugins/geronimo-deployment-plugin/project.xml Sun Feb 26 17:12:56
2006
@@ -32,7 +32,7 @@
     <package>org.apache.geronimo</package>
     <logo></logo>
 
-    <currentVersion>1.0.1</currentVersion>
+    <currentVersion>1.1.0-1</currentVersion>
 
     <dependencies>
         <dependency>

Modified: geronimo/branches/configid/plugins/geronimo-packaging-plugin/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/plugins/geronimo-packaging-plugin/project.xml?rev=381214&r1=381213&r2=381214&view=diff
==============================================================================
--- geronimo/branches/configid/plugins/geronimo-packaging-plugin/project.xml (original)
+++ geronimo/branches/configid/plugins/geronimo-packaging-plugin/project.xml Sun Feb 26 17:12:56
2006
@@ -22,7 +22,7 @@
     <groupId>geronimo</groupId>
     <id>geronimo-packaging-plugin</id>
     <name>Geronimo :: Maven Packaging Plugin</name>
-    <currentVersion>1.0.2</currentVersion>
+    <currentVersion>1.1.0-2</currentVersion>
 
     <dependencies>
         <dependency>



Mime
View raw message