Author: dain
Date: Sat Sep 22 15:09:19 2007
New Revision: 578513
URL: http://svn.apache.org/viewvc?rev=578513&view=rev
Log:
Revert 578471 since it broke the build
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/logging.properties
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=578513&r1=578512&r2=578513&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 Sep 22 15:09:19 2007
@@ -17,8 +17,6 @@
*/
package org.apache.openejb.core.mdb;
-import org.apache.geronimo.transaction.manager.NamedXAResource;
-import org.apache.geronimo.transaction.manager.WrapperNamedXAResource;
import org.apache.openejb.DeploymentInfo;
import org.apache.openejb.core.CoreDeploymentInfo;
@@ -56,11 +54,7 @@
}
public MessageEndpoint createEndpoint(XAResource xaResource) throws
UnavailableException {
- // Hack to get GERONIMO-3354 error from not ocurring.
- //TODO Create an abstraction so that we need not use geronimo api
classes(NamedXAResource).
- //TODO Confirm that this is all that is required for transaction
recovery
- NamedXAResource wrapper = new WrapperNamedXAResource(xaResource,
container.getContainerID().toString());
- EndpointHandler endpointHandler = new EndpointHandler(container,
deploymentInfo, instanceFactory, wrapper);
+ EndpointHandler endpointHandler = new EndpointHandler(container,
deploymentInfo, instanceFactory, xaResource);
MessageEndpoint messageEndpoint = (MessageEndpoint)
Proxy.newProxyInstance(classLoader, interfaces, endpointHandler);
return messageEndpoint;
}
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/resources/logging.properties
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/resources/logging.properties?rev=578513&r1=578512&r2=578513&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/resources/logging.properties
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/resources/logging.properties
Sat Sep 22 15:09:19 2007
@@ -1,4 +1,5 @@
-## ---------------------------------------------------------------------------
+
+### ---------------------------------------------------------------------------
## Licensed to the Apache Software Foundation (ASF) under one or more
## contributor license agreements. See the NOTICE file distributed with
## this work for additional information regarding copyright ownership.
