cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aadamc...@apache.org
Subject svn commit: r586789 - in /cayenne/main/trunk: itests/itest-common/pom.xml itests/itest-common/src/main/java/org/apache/cayenne/itest/OpenEJBContainer.java itests/jpa-chapter5/pom.xml pom.xml
Date Sat, 20 Oct 2007 19:38:07 GMT
Author: aadamchik
Date: Sat Oct 20 12:37:57 2007
New Revision: 586789

URL: http://svn.apache.org/viewvc?rev=586789&view=rev
Log:
fixing itest failures; upgrading geronimo/openejb itest deps

Modified:
    cayenne/main/trunk/itests/itest-common/pom.xml
    cayenne/main/trunk/itests/itest-common/src/main/java/org/apache/cayenne/itest/OpenEJBContainer.java
    cayenne/main/trunk/itests/jpa-chapter5/pom.xml
    cayenne/main/trunk/pom.xml

Modified: cayenne/main/trunk/itests/itest-common/pom.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/itests/itest-common/pom.xml?rev=586789&r1=586788&r2=586789&view=diff
==============================================================================
--- cayenne/main/trunk/itests/itest-common/pom.xml (original)
+++ cayenne/main/trunk/itests/itest-common/pom.xml Sat Oct 20 12:37:57 2007
@@ -60,13 +60,7 @@
 		</dependency>
 
 		<dependency>
-			<groupId>org.apache.geronimo.modules</groupId>
-			<artifactId>geronimo-transaction-jta11</artifactId>
-			<scope>compile</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>org.apache.geronimo.modules</groupId>
+			<groupId>org.apache.geronimo.components</groupId>
 			<artifactId>geronimo-transaction</artifactId>
 			<scope>compile</scope>
 		</dependency>

Modified: cayenne/main/trunk/itests/itest-common/src/main/java/org/apache/cayenne/itest/OpenEJBContainer.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/itests/itest-common/src/main/java/org/apache/cayenne/itest/OpenEJBContainer.java?rev=586789&r1=586788&r2=586789&view=diff
==============================================================================
--- cayenne/main/trunk/itests/itest-common/src/main/java/org/apache/cayenne/itest/OpenEJBContainer.java
(original)
+++ cayenne/main/trunk/itests/itest-common/src/main/java/org/apache/cayenne/itest/OpenEJBContainer.java
Sat Oct 20 12:37:57 2007
@@ -28,7 +28,7 @@
 
 import org.apache.cayenne.project.CayenneUserDir;
 import org.apache.cayenne.util.Util;
-import org.apache.geronimo.transaction.jta11.GeronimoTransactionManagerJTA11;
+import org.apache.geronimo.transaction.manager.GeronimoTransactionManager;
 import org.apache.openejb.client.LocalInitialContextFactory;
 
 /**
@@ -50,7 +50,7 @@
     }
 
     private File openEjbHome;
-    private GeronimoTransactionManagerJTA11 txManager;
+    private GeronimoTransactionManager txManager;
 
     private OpenEJBContainer() {
         setupOpenEJBHome();
@@ -113,7 +113,7 @@
         // different IC for binding the environment.
         new InitialContext();
 
-        this.txManager = new GeronimoTransactionManagerJTA11();
+        this.txManager = new GeronimoTransactionManager();
         new InitialContext().bind(
                 "java:comp/TransactionSynchronizationRegistry",
                 txManager);

Modified: cayenne/main/trunk/itests/jpa-chapter5/pom.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/itests/jpa-chapter5/pom.xml?rev=586789&r1=586788&r2=586789&view=diff
==============================================================================
--- cayenne/main/trunk/itests/jpa-chapter5/pom.xml (original)
+++ cayenne/main/trunk/itests/jpa-chapter5/pom.xml Sat Oct 20 12:37:57 2007
@@ -45,6 +45,14 @@
 			<artifactId>itest-common</artifactId>
 			<version>${version}</version>
 		</dependency>
+		
+		<!-- DBCP snapshot needed by OpenEJB container -->
+		<dependency>
+			<groupId>commons-dbcp</groupId>
+			<artifactId>commons-dbcp</artifactId>
+			<version>1.3-SNAPSHOT</version>
+			<scope>compile</scope>
+		</dependency>
 
 		<dependency>
 			<groupId>org.apache.geronimo.specs</groupId>

Modified: cayenne/main/trunk/pom.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/pom.xml?rev=586789&r1=586788&r2=586789&view=diff
==============================================================================
--- cayenne/main/trunk/pom.xml (original)
+++ cayenne/main/trunk/pom.xml Sat Oct 20 12:37:57 2007
@@ -382,23 +382,16 @@
 			</dependency>
 			
 			<dependency>
-				<groupId>org.apache.geronimo.modules</groupId>
-				<artifactId>geronimo-transaction-jta11</artifactId>
-				<version>2.0-SNAPSHOT</version>
-				<scope>test</scope>
-			</dependency>
-			
-			<dependency>
-				<groupId>org.apache.geronimo.modules</groupId>
+				<groupId>org.apache.geronimo.components</groupId>
 				<artifactId>geronimo-transaction</artifactId>
-				<version>2.0-SNAPSHOT</version>
+				<version>2.0.1</version>
 				<scope>test</scope>
 			</dependency>
 
 			<dependency>
 				<groupId>org.apache.openejb</groupId>
 				<artifactId>openejb-core</artifactId>
-				<version>3.0-incubating-SNAPSHOT</version>
+				<version>3.0-beta-1</version>
 				<scope>test</scope>
                                 <exclusions>
                                         <exclusion> 



Mime
View raw message