Permalink
Browse files

[ENTESB-1430]FuseByExample esb-transaction doesn't work with JBoss FU…

…SE 6.1
  • Loading branch information...
1 parent ecad165 commit 57dfe1476932dddb013b11489dec12ddfca98ea1 @ffang ffang committed Apr 25, 2014
View
@@ -37,8 +37,15 @@
<dependency>
<groupId>org.apache.geronimo.components</groupId>
<artifactId>geronimo-connector</artifactId>
- <version>2.2.2</version>
- </dependency>
+ <version>3.1.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.6.6</version>
+ </dependency>
+
</dependencies>
<build>
@@ -49,4 +56,4 @@
</plugin>
</plugins>
</build>
-</project>
+</project>
@@ -32,6 +32,6 @@ public synchronized void setManagedConnectionFactory(
public void doRecovery() {
logger.info("Recovering XA resource " + managedConnectionFactory);
- connectionManagerContainer.doRecovery(managedConnectionFactory);
+ connectionManagerContainer.doRecovery();
}
-}
+}
@@ -49,8 +49,9 @@
<argument index="2"><null /></argument>
<argument index="3"><null /></argument>
<argument index="4" ref="transactionManager" />
- <argument index="5" value="Derby-DS" />
- <argument index="6" ref="classLoader" />
+ <argument index="5" ref="jdbcManagedConnectionFactory" />
+ <argument index="6" value="Derby-DS" />
+ <argument index="7" ref="classLoader" />
</bean>
<bean id="classLoader" class="org.apache.aries.util.AriesFrameworkUtil" factory-method="getClassLoader">
@@ -122,4 +123,4 @@
</service-properties>
</service>
-->
-</blueprint>
+</blueprint>
@@ -30,7 +30,8 @@
following bundles to be installed.
See Notes in datasource/src/main/resources/OSGI-INF/blueprint/datasource.xml
-->
- <bundle>mvn:org.apache.geronimo.components/geronimo-connector/2.2.2</bundle>
+ <bundle>mvn:javax.validation/validation-api/1.1.0.Final</bundle>
+ <bundle>mvn:org.apache.geronimo.components/geronimo-connector/3.1.1</bundle>
<bundle>wrap:mvn:org.tranql/tranql-connector/1.7</bundle>
<bundle>wrap:mvn:org.tranql/tranql-connector-derby-common/1.4</bundle>
<!-- end of bundles needed for workaround -->
@@ -41,4 +42,4 @@
<bundle>mvn:org.fusesource.example.transactions/routing/${project.version}</bundle>
</feature>
-</features>
+</features>

0 comments on commit 57dfe14

Please sign in to comment.