Author: rr
Date: Sat Mar 6 21:53:22 2010
New Revision: 919858
URL: http://svn.apache.org/viewvc?rev=919858&view=rev
Log:
ODE-729: Deps update
Modified:
ode/branches/APACHE_ODE_1.X/axis2-war/src/main/assembly/bin.xml
ode/branches/APACHE_ODE_1.X/axis2/pom.xml
ode/branches/APACHE_ODE_1.X/axis2/src/main/java/org/apache/ode/axis2/util/GeronimoFactory.java
ode/branches/APACHE_ODE_1.X/bpel-compiler/pom.xml
ode/branches/APACHE_ODE_1.X/bpel-store/pom.xml
ode/branches/APACHE_ODE_1.X/dao-hibernate/pom.xml
ode/branches/APACHE_ODE_1.X/dependencies.rb
ode/branches/APACHE_ODE_1.X/distro/src/main/assembly/jbi.xml
ode/branches/APACHE_ODE_1.X/distro/src/main/assembly/war.xml
ode/branches/APACHE_ODE_1.X/jbi/src/main/assembly/bin.xml
ode/branches/APACHE_ODE_1.X/pom.xml
Modified: ode/branches/APACHE_ODE_1.X/axis2-war/src/main/assembly/bin.xml
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/main/assembly/bin.xml?rev=919858&r1=919857&r2=919858&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/axis2-war/src/main/assembly/bin.xml (original)
+++ ode/branches/APACHE_ODE_1.X/axis2-war/src/main/assembly/bin.xml Sat Mar 6
21:53:22 2010
@@ -156,7 +156,7 @@
<include>net.sf.saxon:saxon-xqj</include>
<include>wsdl4j:wsdl4j</include>
<include>tranql:tranql-connector</include>
- <include>org.apache.ode:xalan</include>
+ <include>xalan:xalan</include>
<include>org.apache.xmlbeans:xmlbeans</include>
<include>org.apache.httpcomponents:httpcore</include>
<include>org.apache.httpcomponents:httpcore-nio</include>
Modified: ode/branches/APACHE_ODE_1.X/axis2/pom.xml
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2/pom.xml?rev=919858&r1=919857&r2=919858&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/axis2/pom.xml (original)
+++ ode/branches/APACHE_ODE_1.X/axis2/pom.xml Sat Mar 6 21:53:22 2010
@@ -100,6 +100,11 @@
<version>${rampart.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.geronimo.components</groupId>
+ <artifactId>geronimo-transaction</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
Modified:
ode/branches/APACHE_ODE_1.X/axis2/src/main/java/org/apache/ode/axis2/util/GeronimoFactory.java
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2/src/main/java/org/apache/ode/axis2/util/GeronimoFactory.java?rev=919858&r1=919857&r2=919858&view=diff
==============================================================================
---
ode/branches/APACHE_ODE_1.X/axis2/src/main/java/org/apache/ode/axis2/util/GeronimoFactory.java
(original)
+++
ode/branches/APACHE_ODE_1.X/axis2/src/main/java/org/apache/ode/axis2/util/GeronimoFactory.java
Sat Mar 6 21:53:22 2010
@@ -19,23 +19,7 @@
package org.apache.ode.axis2.util;
-import org.apache.geronimo.gbean.AbstractName;
-import org.apache.geronimo.gbean.AbstractNameQuery;
-import org.apache.geronimo.kernel.GBeanNotFoundException;
-import org.apache.geronimo.kernel.Kernel;
-import org.apache.geronimo.kernel.KernelRegistry;
-import org.apache.geronimo.kernel.config.MultiParentClassLoader;
-import org.apache.geronimo.kernel.repository.Artifact;
-import org.apache.geronimo.kernel.repository.Repository;
-import org.apache.geronimo.transaction.context.GeronimoTransactionManager;
-import org.apache.geronimo.transaction.context.TransactionContextManager;
-
import javax.transaction.TransactionManager;
-import java.io.File;
-import java.net.MalformedURLException;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.Set;
public class GeronimoFactory {
@@ -44,36 +28,11 @@
}
public TransactionManager getTransactionManager() {
- Kernel kernel = KernelRegistry.getSingleKernel();
- TransactionContextManager ctxManager = null;
-
try {
- ctxManager = (TransactionContextManager)
kernel.getGBean(TransactionContextManager.class);
- } catch (GBeanNotFoundException except) {
- throw new RuntimeException( "Can't lookup GBean: " +
TransactionContextManager.class, except);
- }
-
- MultiParentClassLoader loader = (MultiParentClassLoader)
ctxManager.getClass().getClassLoader();
-
- // Add Jencks to Geronimo's root classloader to avoid
InvalidAccessError
- AbstractNameQuery abstractNameQuery = new AbstractNameQuery(null,
Collections.EMPTY_MAP, Repository.class.getName());
- Set set = kernel.listGBeans(abstractNameQuery);
- for (Iterator iterator = set.iterator(); iterator.hasNext();) {
- AbstractName abstractName = (AbstractName) iterator.next();
- File f = null;
- try {
- Repository repo = (Repository) kernel.getGBean(abstractName);
- f = repo.getLocation(new Artifact("org.jencks", "jencks",
"1.3", "jar"));
- loader.addURL(f.toURL());
- } catch (GBeanNotFoundException except) {
- throw new RuntimeException("Can't lookup GBean: " +
abstractName, except);
- } catch (MalformedURLException except) {
- throw new RuntimeException("Invalid URL for jencks: " + f,
except);
- }
+ return new
org.apache.geronimo.transaction.manager.GeronimoTransactionManager();
+ } catch (Exception e) {
+ throw new RuntimeException("Can't instantiate
GeronimoTransactionManager", e);
}
-
- // Use Jenck to wrap TransactionContextManager back to
TransactionManager
- return new GeronimoTransactionManager(ctxManager);
}
}
Modified: ode/branches/APACHE_ODE_1.X/bpel-compiler/pom.xml
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-compiler/pom.xml?rev=919858&r1=919857&r2=919858&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/bpel-compiler/pom.xml (original)
+++ ode/branches/APACHE_ODE_1.X/bpel-compiler/pom.xml Sat Mar 6 21:53:22 2010
@@ -99,7 +99,7 @@
<artifactId>xercesImpl</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.ode</groupId>
+ <groupId>xalan</groupId>
<artifactId>xalan</artifactId>
</dependency>
<dependency>
Modified: ode/branches/APACHE_ODE_1.X/bpel-store/pom.xml
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-store/pom.xml?rev=919858&r1=919857&r2=919858&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/bpel-store/pom.xml (original)
+++ ode/branches/APACHE_ODE_1.X/bpel-store/pom.xml Sat Mar 6 21:53:22 2010
@@ -133,7 +133,7 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.ode</groupId>
+ <groupId>xalan</groupId>
<artifactId>xalan</artifactId>
<scope>test</scope>
</dependency>
Modified: ode/branches/APACHE_ODE_1.X/dao-hibernate/pom.xml
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/dao-hibernate/pom.xml?rev=919858&r1=919857&r2=919858&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/dao-hibernate/pom.xml (original)
+++ ode/branches/APACHE_ODE_1.X/dao-hibernate/pom.xml Sat Mar 6 21:53:22 2010
@@ -46,6 +46,11 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.hibernate</groupId>
Modified: ode/branches/APACHE_ODE_1.X/dependencies.rb
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/dependencies.rb?rev=919858&r1=919857&r2=919858&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/dependencies.rb (original)
+++ ode/branches/APACHE_ODE_1.X/dependencies.rb Sat Mar 6 21:53:22 2010
@@ -119,7 +119,7 @@
TRANQL = [ "tranql:tranql-connector:jar:1.1", COMMONS.primitives ]
WOODSTOX = "woodstox:wstx-asl:jar:3.2.1"
WSDL4J = "wsdl4j:wsdl4j:jar:1.6.1"
-XALAN = "org.apache.ode:xalan:jar:2.7.0-2"
+XALAN = "xalan:xalan:jar:2.7.1"
XERCES = "xerces:xercesImpl:jar:2.9.0"
WS_COMMONS = struct(
:axiom =>AXIOM,
@@ -132,4 +132,4 @@
"org.apache.xbean:xbean-spring:jar:3.4.3",
"org.apache.xbean:xbean-classloader:jar:3.4.3"
]
-XMLBEANS = "org.apache.xmlbeans:xmlbeans:jar:2.3.0"
\ No newline at end of file
+XMLBEANS = "org.apache.xmlbeans:xmlbeans:jar:2.3.0"
Modified: ode/branches/APACHE_ODE_1.X/distro/src/main/assembly/jbi.xml
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/distro/src/main/assembly/jbi.xml?rev=919858&r1=919857&r2=919858&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/distro/src/main/assembly/jbi.xml (original)
+++ ode/branches/APACHE_ODE_1.X/distro/src/main/assembly/jbi.xml Sat Mar 6
21:53:22 2010
@@ -141,7 +141,7 @@
<include>jaxen:jaxen</include>
<include>log4j:log4j</include>
<include>wsdl4j:wsdl4j</include>
- <include>org.apache.ode:xalan</include>
+ <include>xalan:xalan</include>
<include>xerces:xercesImpl</include>
</includes>
</dependencySet>
Modified: ode/branches/APACHE_ODE_1.X/distro/src/main/assembly/war.xml
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/distro/src/main/assembly/war.xml?rev=919858&r1=919857&r2=919858&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/distro/src/main/assembly/war.xml (original)
+++ ode/branches/APACHE_ODE_1.X/distro/src/main/assembly/war.xml Sat Mar 6
21:53:22 2010
@@ -142,7 +142,7 @@
<include>jaxen:jaxen</include>
<include>log4j:log4j</include>
<include>wsdl4j:wsdl4j</include>
- <include>org.apache.ode:xalan</include>
+ <include>xalan:xalan</include>
<include>xerces:xercesImpl</include>
</includes>
</dependencySet>
Modified: ode/branches/APACHE_ODE_1.X/jbi/src/main/assembly/bin.xml
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/jbi/src/main/assembly/bin.xml?rev=919858&r1=919857&r2=919858&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/jbi/src/main/assembly/bin.xml (original)
+++ ode/branches/APACHE_ODE_1.X/jbi/src/main/assembly/bin.xml Sat Mar 6
21:53:22 2010
@@ -111,7 +111,7 @@
<include>net.sf.saxon:saxon-xqj</include>
<include>wsdl4j:wsdl4j</include>
<include>tranql:tranql-connector</include>
- <include>org.apache.ode:xalan</include>
+ <include>xalan:xalan</include>
<include>org.apache.xmlbeans:xmlbeans</include>
<include>com.thoughtworks.xstream:xstream</include>
<include>axion:axion</include>
Modified: ode/branches/APACHE_ODE_1.X/pom.xml
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/pom.xml?rev=919858&r1=919857&r2=919858&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/pom.xml (original)
+++ ode/branches/APACHE_ODE_1.X/pom.xml Sat Mar 6 21:53:22 2010
@@ -75,7 +75,7 @@
<geronimo.specs.jta.version>1.1</geronimo.specs.jta.version>
<geronimo.specs.ejb.version>1.1</geronimo.specs.ejb.version>
<jetty.version>6.1.12rc1</jetty.version>
- <jencks.version>1.3</jencks.version>
+ <jencks.version>2.1</jencks.version>
<jasper.version>4.2.20RC0</jasper.version>
<log4j.version>1.2.13</log4j.version>
<saxon.version>9.1.0.8</saxon.version>
