You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by as...@apache.org on 2006/10/11 00:54:36 UTC
svn commit: r462628 - in /incubator/ode/trunk: axis2-war/pom.xml
axis2/pom.xml
axis2/src/main/java/org/apache/ode/axis2/util/GeronimoFactory.java
Author: assaf
Date: Tue Oct 10 15:54:35 2006
New Revision: 462628
URL: http://svn.apache.org/viewvc?view=rev&rev=462628
Log:
Testing to prove why Jencks doesn't work
Modified:
incubator/ode/trunk/axis2-war/pom.xml
incubator/ode/trunk/axis2/pom.xml
incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/util/GeronimoFactory.java
Modified: incubator/ode/trunk/axis2-war/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/axis2-war/pom.xml?view=diff&rev=462628&r1=462627&r2=462628
==============================================================================
--- incubator/ode/trunk/axis2-war/pom.xml (original)
+++ incubator/ode/trunk/axis2-war/pom.xml Tue Oct 10 15:54:35 2006
@@ -335,6 +335,31 @@
<scope>runtime</scope>
</dependency>
<dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-kernel</artifactId>
+ <version>${geronimoVersion}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-transaction</artifactId>
+ <version>${geronimoVersion}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jencks</groupId>
+ <artifactId>jencks</artifactId>
+ <version>${jencksVersion}</version>
+ <classifier>all</classifier>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>jibx</groupId>
+ <artifactId>jibx-run</artifactId>
+ <version>1.1-beta3</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
<groupId>jibx</groupId>
<artifactId>jibx-run</artifactId>
<version>1.1-beta3</version>
Modified: incubator/ode/trunk/axis2/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/axis2/pom.xml?view=diff&rev=462628&r1=462627&r2=462628
==============================================================================
--- incubator/ode/trunk/axis2/pom.xml (original)
+++ incubator/ode/trunk/axis2/pom.xml Tue Oct 10 15:54:35 2006
@@ -106,17 +106,17 @@
<artifactId>activation</artifactId>
</dependency>
<dependency>
- <groupId>org.jencks</groupId>
- <artifactId>jencks</artifactId>
- <classifier>all</classifier>
- </dependency>
- <dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-kernel</artifactId>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-transaction</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jencks</groupId>
+ <artifactId>jencks</artifactId>
+ <classifier>all</classifier>
</dependency>
<dependency>
Modified: incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/util/GeronimoFactory.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/util/GeronimoFactory.java?view=diff&rev=462628&r1=462627&r2=462628
==============================================================================
--- incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/util/GeronimoFactory.java (original)
+++ incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/util/GeronimoFactory.java Tue Oct 10 15:54:35 2006
@@ -38,10 +38,18 @@
public TransactionManager getTransactionManager() {
Kernel kernel = KernelRegistry.getSingleKernel();
try {
+ // Using Jencks.
TransactionContextManager ctxManager = (TransactionContextManager)kernel.getProxyManager().createProxy(
- new AbstractName(new URI("geronimo/transaction/1.1/car?name=TransactionContextManager")),
+ new AbstractName(new URI("geronimo/j2ee-server/1.1/car?ServiceModule=geronimo/j2ee-server/1.1/car,j2eeType=TransactionContextManager,name=TransactionContextManager")),
TransactionContextManager.class);
return new GeronimoTransactionManager(ctxManager);
+/*
+ // Passing TransactionManager directly.
+ TransactionManager txManager = (TransactionManager)kernel.getProxyManager().createProxy(
+ new AbstractName(new URI("geronimo/j2ee-server/1.1/car?ServiceModule=geronimo/j2ee-server/1.1/car,j2eeType=TransactionManager,name=TransactionManager")),
+ TransactionManager.class);
+ return txManager;
+*/
} catch (URISyntaxException except) {
throw new RuntimeException(except);
}