You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by xu...@apache.org on 2010/06/09 06:47:39 UTC
svn commit: r952898 - in /geronimo/server/branches/2.2/plugins:
axis2/geronimo-axis2-ejb/src/main/java/org/apache/geronimo/axis2/ejb/EJBMessageReceiver.java
cxf/geronimo-cxf-ejb/src/main/java/org/apache/geronimo/cxf/ejb/EJBMethodInvoker.java
Author: xuhaihong
Date: Wed Jun 9 04:47:39 2010
New Revision: 952898
URL: http://svn.apache.org/viewvc?rev=952898&view=rev
Log:
Identify the interface type while exposing EJB as web service, or OpenEJB could not determine the current invocation type while the same interface is used for both business interface and endpointInterface
Modified:
geronimo/server/branches/2.2/plugins/axis2/geronimo-axis2-ejb/src/main/java/org/apache/geronimo/axis2/ejb/EJBMessageReceiver.java
geronimo/server/branches/2.2/plugins/cxf/geronimo-cxf-ejb/src/main/java/org/apache/geronimo/cxf/ejb/EJBMethodInvoker.java
Modified: geronimo/server/branches/2.2/plugins/axis2/geronimo-axis2-ejb/src/main/java/org/apache/geronimo/axis2/ejb/EJBMessageReceiver.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/axis2/geronimo-axis2-ejb/src/main/java/org/apache/geronimo/axis2/ejb/EJBMessageReceiver.java?rev=952898&r1=952897&r2=952898&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/axis2/geronimo-axis2-ejb/src/main/java/org/apache/geronimo/axis2/ejb/EJBMessageReceiver.java (original)
+++ geronimo/server/branches/2.2/plugins/axis2/geronimo-axis2-ejb/src/main/java/org/apache/geronimo/axis2/ejb/EJBMessageReceiver.java Wed Jun 9 04:47:39 2010
@@ -42,6 +42,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.openejb.ApplicationException;
import org.apache.openejb.DeploymentInfo;
+import org.apache.openejb.InterfaceType;
import org.apache.openejb.RpcContainer;
public class EJBMessageReceiver implements MessageReceiver
@@ -96,7 +97,7 @@ public class EJBMessageReceiver implemen
ThreadContextMigratorUtil.performMigrationToThread(Constants.THREAD_CONTEXT_MIGRATOR_LIST_ID,
axisMsgCtx);
try {
- Object res = container.invoke(this.deploymentInfo.getDeploymentID(), callInterface, method, arguments, null);
+ Object res = container.invoke(this.deploymentInfo.getDeploymentID(), InterfaceType.SERVICE_ENDPOINT, callInterface, method, arguments, null);
// TODO: update response message with new response value?
} catch (ApplicationException e) {
if (e.getCause() instanceof AxisFault) {
Modified: geronimo/server/branches/2.2/plugins/cxf/geronimo-cxf-ejb/src/main/java/org/apache/geronimo/cxf/ejb/EJBMethodInvoker.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/cxf/geronimo-cxf-ejb/src/main/java/org/apache/geronimo/cxf/ejb/EJBMethodInvoker.java?rev=952898&r1=952897&r2=952898&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/cxf/geronimo-cxf-ejb/src/main/java/org/apache/geronimo/cxf/ejb/EJBMethodInvoker.java (original)
+++ geronimo/server/branches/2.2/plugins/cxf/geronimo-cxf-ejb/src/main/java/org/apache/geronimo/cxf/ejb/EJBMethodInvoker.java Wed Jun 9 04:47:39 2010
@@ -35,6 +35,7 @@ import org.apache.cxf.message.FaultMode;
import org.apache.cxf.message.MessageContentsList;
import org.apache.cxf.service.invoker.Factory;
import org.apache.openejb.DeploymentInfo;
+import org.apache.openejb.InterfaceType;
import org.apache.openejb.RpcContainer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -124,7 +125,7 @@ public class EJBMethodInvoker extends Ab
Class callInterface = this.deploymentInfo.getServiceEndpointInterface();
method = getMostSpecificMethod(method, callInterface);
- Object res = container.invoke(this.deploymentInfo.getDeploymentID(), callInterface, method, arguments, null);
+ Object res = container.invoke(this.deploymentInfo.getDeploymentID(), InterfaceType.SERVICE_ENDPOINT, callInterface, method, arguments, null);
if (exchange.isOneWay()) {
return null;