You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by gn...@apache.org on 2007/10/11 11:59:08 UTC
svn commit: r583763 - in /incubator/servicemix/trunk: ./
archetypes/servicemix-cxf-bc-service-unit/
archetypes/servicemix-cxf-se-service-unit/ build/src/main/resources/
core/servicemix-core/src/main/java/org/apache/servicemix/jbi/container/
core/servic...
Author: gnodet
Date: Thu Oct 11 02:59:07 2007
New Revision: 583763
URL: http://svn.apache.org/viewvc?rev=583763&view=rev
Log:
SM-909: upgrade to Geronimo 2.0
Modified:
incubator/servicemix/trunk/archetypes/servicemix-cxf-bc-service-unit/ (props changed)
incubator/servicemix/trunk/archetypes/servicemix-cxf-se-service-unit/ (props changed)
incubator/servicemix/trunk/build/src/main/resources/smx-checkstyle-suppressions.xml
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/container/JBIContainer.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/ComponentMBeanImpl.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/flow/jca/JCAFlow.java
incubator/servicemix/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/messaging/TransactionsTest.java
incubator/servicemix/trunk/core/servicemix-services/src/test/java/org/apache/servicemix/store/jdbc/JdbcStoreTransactionalTest.java
incubator/servicemix/trunk/deployables/serviceengines/servicemix-eip/src/test/java/org/apache/servicemix/eip/AbstractEIPTransactionalTest.java
incubator/servicemix/trunk/distributions/apache-servicemix/src/main/assembly/bin.xml
incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/conf/activemq.xml
incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/conf/jndi.xml
incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/conf/log4j.xml
incubator/servicemix/trunk/platforms/geronimo/dependencies/pom.xml
incubator/servicemix/trunk/platforms/geronimo/deployer-service/pom.xml
incubator/servicemix/trunk/platforms/geronimo/pom.xml
incubator/servicemix/trunk/platforms/geronimo/servicemix/pom.xml
incubator/servicemix/trunk/pom.xml
Propchange: incubator/servicemix/trunk/archetypes/servicemix-cxf-bc-service-unit/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Oct 11 02:59:07 2007
@@ -0,0 +1 @@
+target
Propchange: incubator/servicemix/trunk/archetypes/servicemix-cxf-se-service-unit/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Oct 11 02:59:07 2007
@@ -0,0 +1 @@
+target
Modified: incubator/servicemix/trunk/build/src/main/resources/smx-checkstyle-suppressions.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/build/src/main/resources/smx-checkstyle-suppressions.xml?rev=583763&r1=583762&r2=583763&view=diff
==============================================================================
--- incubator/servicemix/trunk/build/src/main/resources/smx-checkstyle-suppressions.xml (original)
+++ incubator/servicemix/trunk/build/src/main/resources/smx-checkstyle-suppressions.xml Thu Oct 11 02:59:07 2007
@@ -26,7 +26,7 @@
<suppress checks="IllegalType"
files=".+[\\\/]JbiInvokeAction\.java" />
<suppress checks="ThrowsCount"
- files=".+[\\\/]wsn[\\\/].+" />
+ files=".+[\\\/]wsn[\\\/].+|JCAFlow.java" />
<suppress checks="ParameterNumber"
files="(GraphArtifactCollector\.java)|(JbiComponentDescriptorWriter.java)" />
<suppress checks="ParameterNumber"
Modified: incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/container/JBIContainer.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/container/JBIContainer.java?rev=583763&r1=583762&r2=583763&view=diff
==============================================================================
--- incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/container/JBIContainer.java (original)
+++ incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/container/JBIContainer.java Thu Oct 11 02:59:07 2007
@@ -357,7 +357,7 @@
}
/**
- * @param useMBeanServer The useMBeanServer to set.
+ * @param createJmxConnector The createJmxConnector to set.
*/
public void setCreateJmxConnector(boolean createJmxConnector) {
managementContext.setCreateJmxConnector(createJmxConnector);
@@ -677,6 +677,7 @@
*/
public void shutDown() throws JBIException {
if (containerInitialized.compareAndSet(true, false)) {
+ LOG.info("Shutting down ServiceMix JBI Container (" + getName() + ") stopped");
removeShutdownHook();
adminCommandsService.shutDown();
autoDeployService.shutDown();
@@ -728,7 +729,7 @@
protected void containerShutdown() {
try {
shutDown();
- } catch (Exception e) {
+ } catch (Throwable e) {
System.err.println("Failed to shut down: " + e);
}
}
Modified: incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/ComponentMBeanImpl.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/ComponentMBeanImpl.java?rev=583763&r1=583762&r2=583763&view=diff
==============================================================================
--- incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/ComponentMBeanImpl.java (original)
+++ incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/ComponentMBeanImpl.java Thu Oct 11 02:59:07 2007
@@ -77,9 +77,9 @@
* @param name
* @param description
* @param component
- * @param dc
* @param binding
* @param service
+ * @param sharedLibraries
*/
public ComponentMBeanImpl(JBIContainer container,
ComponentNameSpace name,
Modified: incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/flow/jca/JCAFlow.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/flow/jca/JCAFlow.java?rev=583763&r1=583762&r2=583763&view=diff
==============================================================================
--- incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/flow/jca/JCAFlow.java (original)
+++ incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/flow/jca/JCAFlow.java Thu Oct 11 02:59:07 2007
@@ -46,8 +46,14 @@
import javax.resource.spi.XATerminator;
import javax.resource.spi.endpoint.MessageEndpointFactory;
import javax.resource.spi.work.WorkManager;
+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 org.apache.activemq.ActiveMQConnectionFactory;
@@ -62,6 +68,8 @@
import org.apache.activemq.ra.ActiveMQActivationSpec;
import org.apache.activemq.ra.ActiveMQManagedConnectionFactory;
import org.apache.activemq.ra.ActiveMQResourceAdapter;
+import org.apache.geronimo.transaction.manager.NamedXAResource;
+import org.apache.geronimo.transaction.manager.RecoverableTransactionManager;
import org.apache.servicemix.JbiConstants;
import org.apache.servicemix.executors.Executor;
import org.apache.servicemix.executors.ExecutorFactory;
@@ -557,7 +565,11 @@
public ConnectionManager getConnectionManager() throws Exception {
if (connectionManager == null) {
ConnectionManagerFactoryBean cmfb = new ConnectionManagerFactoryBean();
- cmfb.setTransactionManager((TransactionManager) broker.getContainer().getTransactionManager());
+ TransactionManager txmgr = (TransactionManager) broker.getContainer().getTransactionManager();
+ if (!(txmgr instanceof RecoverableTransactionManager)) {
+ txmgr = new RecoverableTransactionManagerWrapper(txmgr);
+ }
+ cmfb.setTransactionManager((RecoverableTransactionManager) txmgr);
cmfb.setTransaction("xa");
cmfb.afterPropertiesSet();
connectionManager = (ConnectionManager) cmfb.getObject();
@@ -647,6 +659,59 @@
throw new UnsupportedOperationException();
}
+ }
+
+ public static class RecoverableTransactionManagerWrapper implements RecoverableTransactionManager {
+ private final TransactionManager txMgr;
+
+ public RecoverableTransactionManagerWrapper(TransactionManager txMgr) {
+ this.txMgr = txMgr;
+ }
+
+ public void begin() throws NotSupportedException, SystemException {
+ txMgr.begin();
+ }
+
+ public void commit() throws HeuristicMixedException, HeuristicRollbackException, IllegalStateException,
+ RollbackException, SecurityException, SystemException {
+ txMgr.commit();
+ }
+
+ public int getStatus() throws SystemException {
+ return txMgr.getStatus();
+ }
+
+ public Transaction getTransaction() throws SystemException {
+ return txMgr.getTransaction();
+ }
+
+ public void resume(Transaction transaction) throws IllegalStateException, InvalidTransactionException, SystemException {
+ txMgr.resume(transaction);
+ }
+
+ public void rollback() throws IllegalStateException, SecurityException, SystemException {
+ txMgr.rollback();
+ }
+
+ public void setRollbackOnly() throws IllegalStateException, SystemException {
+ txMgr.setRollbackOnly();
+ }
+
+ public void setTransactionTimeout(int i) throws SystemException {
+ txMgr.setTransactionTimeout(i);
+ }
+
+ public Transaction suspend() throws SystemException {
+ return txMgr.suspend();
+ }
+
+ public void recoveryError(Exception e) {
+ throw new UnsupportedOperationException();
+ }
+
+ public void recoverResourceManager(NamedXAResource namedXAResource) {
+ throw new UnsupportedOperationException();
+ }
}
}
Modified: incubator/servicemix/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/messaging/TransactionsTest.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/messaging/TransactionsTest.java?rev=583763&r1=583762&r2=583763&view=diff
==============================================================================
--- incubator/servicemix/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/messaging/TransactionsTest.java (original)
+++ incubator/servicemix/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/messaging/TransactionsTest.java Thu Oct 11 02:59:07 2007
@@ -31,7 +31,6 @@
import javax.sql.DataSource;
import javax.sql.XADataSource;
import javax.transaction.Status;
-import javax.transaction.TransactionManager;
import javax.xml.namespace.QName;
import junit.framework.TestCase;
@@ -61,7 +60,7 @@
private JBIContainer jbi;
private BrokerService broker;
- private TransactionManager tm;
+ private GeronimoPlatformTransactionManager tm;
private ServiceMixClient client;
private DataSource dataSource;
private Connection connection;
Modified: incubator/servicemix/trunk/core/servicemix-services/src/test/java/org/apache/servicemix/store/jdbc/JdbcStoreTransactionalTest.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-services/src/test/java/org/apache/servicemix/store/jdbc/JdbcStoreTransactionalTest.java?rev=583763&r1=583762&r2=583763&view=diff
==============================================================================
--- incubator/servicemix/trunk/core/servicemix-services/src/test/java/org/apache/servicemix/store/jdbc/JdbcStoreTransactionalTest.java (original)
+++ incubator/servicemix/trunk/core/servicemix-services/src/test/java/org/apache/servicemix/store/jdbc/JdbcStoreTransactionalTest.java Thu Oct 11 02:59:07 2007
@@ -22,7 +22,6 @@
import javax.resource.spi.ManagedConnectionFactory;
import javax.sql.DataSource;
import javax.sql.XADataSource;
-import javax.transaction.TransactionManager;
import junit.framework.TestCase;
@@ -39,7 +38,7 @@
private DataSource dataSource;
private Connection connection;
private StoreFactory factory;
- private TransactionManager tm;
+ private GeronimoPlatformTransactionManager tm;
protected void setUp() throws Exception {
tm = new GeronimoPlatformTransactionManager();
Modified: incubator/servicemix/trunk/deployables/serviceengines/servicemix-eip/src/test/java/org/apache/servicemix/eip/AbstractEIPTransactionalTest.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/serviceengines/servicemix-eip/src/test/java/org/apache/servicemix/eip/AbstractEIPTransactionalTest.java?rev=583763&r1=583762&r2=583763&view=diff
==============================================================================
--- incubator/servicemix/trunk/deployables/serviceengines/servicemix-eip/src/test/java/org/apache/servicemix/eip/AbstractEIPTransactionalTest.java (original)
+++ incubator/servicemix/trunk/deployables/serviceengines/servicemix-eip/src/test/java/org/apache/servicemix/eip/AbstractEIPTransactionalTest.java Thu Oct 11 02:59:07 2007
@@ -20,7 +20,6 @@
import javax.resource.spi.ManagedConnectionFactory;
import javax.sql.DataSource;
import javax.sql.XADataSource;
-import javax.transaction.TransactionManager;
import org.apache.activemq.broker.BrokerService;
import org.apache.derby.jdbc.EmbeddedXADataSource;
@@ -40,7 +39,7 @@
public abstract class AbstractEIPTransactionalTest extends AbstractEIPTest {
protected BrokerService broker;
- protected TransactionManager tm;
+ protected GeronimoPlatformTransactionManager tm;
protected DataSource dataSource;
protected Store store;
Modified: incubator/servicemix/trunk/distributions/apache-servicemix/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/distributions/apache-servicemix/src/main/assembly/bin.xml?rev=583763&r1=583762&r2=583763&view=diff
==============================================================================
--- incubator/servicemix/trunk/distributions/apache-servicemix/src/main/assembly/bin.xml (original)
+++ incubator/servicemix/trunk/distributions/apache-servicemix/src/main/assembly/bin.xml Thu Oct 11 02:59:07 2007
@@ -116,7 +116,7 @@
<include>org.springframework:spring-dao</include>
<include>org.apache.geronimo.specs:geronimo-jms_1.1_spec</include>
- <include>org.apache.geronimo.specs:geronimo-jta_1.0.1B_spec</include>
+ <include>org.apache.geronimo.specs:geronimo-jta_1.1_spec</include>
<include>org.apache.geronimo.specs:geronimo-j2ee-management_1.0_spec</include>
<include>org.apache.geronimo.specs:geronimo-j2ee-jacc_1.0_spec</include>
<include>org.apache.geronimo.specs:geronimo-j2ee-connector_1.5_spec</include>
@@ -126,8 +126,8 @@
<include>org.jencks:jencks</include>
<include>org.objectweb.howl:howl</include>
- <include>org.apache.geronimo.modules:geronimo-connector</include>
- <include>org.apache.geronimo.modules:geronimo-transaction</include>
+ <include>org.apache.geronimo.components:geronimo-connector</include>
+ <include>org.apache.geronimo.components:geronimo-transaction</include>
<include>javax.activation:activation</include>
<include>javax.mail:mail</include>
Modified: incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/conf/activemq.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/conf/activemq.xml?rev=583763&r1=583762&r2=583763&view=diff
==============================================================================
--- incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/conf/activemq.xml (original)
+++ incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/conf/activemq.xml Thu Oct 11 02:59:07 2007
@@ -20,7 +20,7 @@
<beans xmlns:amq="http://activemq.org/config/1.0">
<!-- ActiveMQ JMS Broker configuration -->
- <amq:broker depends-on="jmxServer">
+ <amq:broker depends-on="jmxServer" useShutdownHook="false">
<!-- Disable creation of the jmx connector
which is created in the jmx.xml configuration file -->
Modified: incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/conf/jndi.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/conf/jndi.xml?rev=583763&r1=583762&r2=583763&view=diff
==============================================================================
--- incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/conf/jndi.xml (original)
+++ incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/conf/jndi.xml Thu Oct 11 02:59:07 2007
@@ -45,7 +45,9 @@
<!-- wsn2005 jms connection factory -->
<entry key="java:comp/env/jms/wsnotificationCF">
- <amq:connectionFactory brokerURL="${activemq.url}" />
+ <bean class="org.apache.activemq.pool.PooledConnectionFactory">
+ <constructor-arg value="${activemq.url}" />
+ </bean>
</entry>
<!-- transaction manager -->
Modified: incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/conf/log4j.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/conf/log4j.xml?rev=583763&r1=583762&r2=583763&view=diff
==============================================================================
--- incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/conf/log4j.xml (original)
+++ incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/conf/log4j.xml Thu Oct 11 02:59:07 2007
@@ -22,7 +22,7 @@
<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
- <param name="threshold" value="INFO"/>
+ <param name="threshold" value="DEBUG"/>
<layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern" value="%-5p - %-30c{1} - %m%n"/>
</layout>
Modified: incubator/servicemix/trunk/platforms/geronimo/dependencies/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/platforms/geronimo/dependencies/pom.xml?rev=583763&r1=583762&r2=583763&view=diff
==============================================================================
--- incubator/servicemix/trunk/platforms/geronimo/dependencies/pom.xml (original)
+++ incubator/servicemix/trunk/platforms/geronimo/dependencies/pom.xml Thu Oct 11 02:59:07 2007
@@ -43,6 +43,12 @@
<artifactId>j2ee-server</artifactId>
<version>${geronimo-version}</version>
<type>car</type>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-webservices</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
Modified: incubator/servicemix/trunk/platforms/geronimo/deployer-service/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/platforms/geronimo/deployer-service/pom.xml?rev=583763&r1=583762&r2=583763&view=diff
==============================================================================
--- incubator/servicemix/trunk/platforms/geronimo/deployer-service/pom.xml (original)
+++ incubator/servicemix/trunk/platforms/geronimo/deployer-service/pom.xml Thu Oct 11 02:59:07 2007
@@ -57,6 +57,12 @@
<artifactId>j2ee-deployer</artifactId>
<version>${geronimo-version}</version>
<type>car</type>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-webservices</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
Modified: incubator/servicemix/trunk/platforms/geronimo/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/platforms/geronimo/pom.xml?rev=583763&r1=583762&r2=583763&view=diff
==============================================================================
--- incubator/servicemix/trunk/platforms/geronimo/pom.xml (original)
+++ incubator/servicemix/trunk/platforms/geronimo/pom.xml Thu Oct 11 02:59:07 2007
@@ -33,7 +33,6 @@
<packaging>pom</packaging>
<properties>
- <geronimo-version>2.0.1</geronimo-version>
<geronimoVersion>${geronimo-version}</geronimoVersion>
<car-maven-plugin-version>${geronimo-version}</car-maven-plugin-version>
<geronimoSchemaVersion>1.2</geronimoSchemaVersion>
Modified: incubator/servicemix/trunk/platforms/geronimo/servicemix/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/platforms/geronimo/servicemix/pom.xml?rev=583763&r1=583762&r2=583763&view=diff
==============================================================================
--- incubator/servicemix/trunk/platforms/geronimo/servicemix/pom.xml (original)
+++ incubator/servicemix/trunk/platforms/geronimo/servicemix/pom.xml Thu Oct 11 02:59:07 2007
@@ -150,10 +150,20 @@
<artifactId>derby</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.woden</groupId>
+ <artifactId>woden</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>transaction</artifactId>
<version>${geronimo-version}</version>
<type>car</type>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-webservices</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- Only needed to build the car -->
<dependency>
Modified: incubator/servicemix/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/pom.xml?rev=583763&r1=583762&r2=583763&view=diff
==============================================================================
--- incubator/servicemix/trunk/pom.xml (original)
+++ incubator/servicemix/trunk/pom.xml Thu Oct 11 02:59:07 2007
@@ -38,7 +38,7 @@
</description>
<url>http://incubator.apache.org/servicemix</url>
<prerequisites>
- <maven>2.0.4</maven>
+ <maven>2.0.7</maven>
</prerequisites>
<inceptionYear>2005</inceptionYear>
@@ -196,20 +196,20 @@
<xfire-jsr181-api-version>1.0-M1</xfire-jsr181-api-version>
<xfire-version>1.2.5</xfire-version>
<mavenAssemblyPluginVersion>2.1</mavenAssemblyPluginVersion>
- <xbean-version>3.1</xbean-version>
+ <xbean-version>3.2</xbean-version>
<spring-version>2.0.6</spring-version>
<activemq-version>4.1.1</activemq-version>
<activeio-version>3.0.0-incubator</activeio-version>
<backport-util-concurrent-version>2.2</backport-util-concurrent-version>
<camel-version>1.1.0</camel-version>
- <jencks-version>2.0</jencks-version>
+ <jencks-version>2.1</jencks-version>
<jetty-version>6.1.5</jetty-version>
- <geronimo-version>1.2-beta</geronimo-version>
+ <geronimo-version>2.0.1</geronimo-version>
<servicemix-version>3.2-SNAPSHOT</servicemix-version>
<wsdl4j-version>1.6.1</wsdl4j-version>
<commons-beanutils-version>1.7.0</commons-beanutils-version>
<commons-fileupload-version>1.1.1</commons-fileupload-version>
- <woodstox-version>3.0.3</woodstox-version>
+ <woodstox-version>3.2.2</woodstox-version>
<msv-version>20050913</msv-version>
<oro-version>2.0.8</oro-version>
<sitemesh-version>2.2.1</sitemesh-version>