You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by dj...@apache.org on 2008/03/15 08:04:32 UTC
svn commit: r637368 - in /openejb/trunk/openejb3:
container/openejb-core/src/main/java/org/apache/openejb/core/mdb/
container/openejb-core/src/main/resources/META-INF/org.apache.openejb.embedded/
container/openejb-core/src/main/resources/META-INF/org.a...
Author: djencks
Date: Sat Mar 15 00:04:30 2008
New Revision: 637368
URL: http://svn.apache.org/viewvc?rev=637368&view=rev
Log:
OPENEJB-702 fix the missing mdb delivery transaction logging
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/EndpointFactory.java
openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb.embedded/service-jar.xml
openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/service-jar.xml
openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/ActiveMqTestJms.java
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/EndpointFactory.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/EndpointFactory.java?rev=637368&r1=637367&r2=637368&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/EndpointFactory.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/EndpointFactory.java Sat Mar 15 00:04:30 2008
@@ -19,6 +19,8 @@
import org.apache.openejb.DeploymentInfo;
import org.apache.openejb.core.CoreDeploymentInfo;
+import org.apache.geronimo.transaction.manager.NamedXAResource;
+import org.apache.geronimo.transaction.manager.WrapperNamedXAResource;
import javax.resource.spi.UnavailableException;
import javax.resource.spi.ActivationSpec;
@@ -54,7 +56,8 @@
}
public MessageEndpoint createEndpoint(XAResource xaResource) throws UnavailableException {
- EndpointHandler endpointHandler = new EndpointHandler(container, deploymentInfo, instanceFactory, xaResource);
+ NamedXAResource wrapper = new WrapperNamedXAResource(xaResource, container.getContainerID().toString());
+ EndpointHandler endpointHandler = new EndpointHandler(container, deploymentInfo, instanceFactory, wrapper);
MessageEndpoint messageEndpoint = (MessageEndpoint) Proxy.newProxyInstance(classLoader, interfaces, endpointHandler);
return messageEndpoint;
}
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb.embedded/service-jar.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb.embedded/service-jar.xml?rev=637368&r1=637367&r2=637368&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb.embedded/service-jar.xml (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb.embedded/service-jar.xml Sat Mar 15 00:04:30 2008
@@ -639,7 +639,9 @@
BrokerXmlConfig broker:(tcp://localhost:61616)?useJmx=false
# Broker address
- ServerUrl vm://localhost?async=true
+ # ServerUrl vm://localhost?async=true
+ ServerUrl tcp://localhost:61616
+
# DataSource for persistence messages
DataSource
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/service-jar.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/service-jar.xml?rev=637368&r1=637367&r2=637368&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/service-jar.xml (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/service-jar.xml Sat Mar 15 00:04:30 2008
@@ -640,7 +640,8 @@
BrokerXmlConfig broker:(tcp://localhost:61616)?useJmx=false
# Broker address
- ServerUrl vm://localhost?async=true
+ # ServerUrl vm://localhost?async=true
+ ServerUrl tcp://localhost:61616
# DataSource for persistence messages
DataSource Default Unmanaged JDBC Database
Modified: openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/ActiveMqTestJms.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/ActiveMqTestJms.java?rev=637368&r1=637367&r2=637368&view=diff
==============================================================================
--- openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/ActiveMqTestJms.java (original)
+++ openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/ActiveMqTestJms.java Sat Mar 15 00:04:30 2008
@@ -30,6 +30,6 @@
}
public ConnectionFactory getConnectionFactory() {
- return new ActiveMQConnectionFactory();
+ return new ActiveMQConnectionFactory("tcp://localhost:61616");
}
}