Author: thomas.diesler(a)jboss.com
Date: 2007-07-05 12:44:32 -0400 (Thu, 05 Jul 2007)
New Revision: 3802
Modified:
trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/InvokerEJB3.java
trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/InvokerJSE.java
trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/SunJaxwsDeployer.java
trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/InvokerEJB3.java
trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/InvokerJSE.java
trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/XFireServicesDeployer.java
Log:
Fix compile issues
Modified:
trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/InvokerEJB3.java
===================================================================
---
trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/InvokerEJB3.java 2007-07-05
13:07:51 UTC (rev 3801)
+++
trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/InvokerEJB3.java 2007-07-05
16:44:32 UTC (rev 3802)
@@ -95,7 +95,7 @@
Object retObj = null;
try
{
- invHandler.invoke(ep, null, inv);
+ invHandler.invoke(ep, inv);
retObj = inv.getReturnValue();
}
catch (Exception ex)
Modified: trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/InvokerJSE.java
===================================================================
---
trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/InvokerJSE.java 2007-07-05
13:07:51 UTC (rev 3801)
+++
trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/InvokerJSE.java 2007-07-05
16:44:32 UTC (rev 3802)
@@ -32,6 +32,7 @@
import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.deployment.EndpointAssociation;
import org.jboss.wsf.spi.invocation.Invocation;
+import org.jboss.wsf.spi.invocation.InvocationContext;
import org.jboss.wsf.spi.invocation.InvocationHandler;
import com.sun.istack.NotNull;
@@ -82,9 +83,10 @@
public Object invoke(Packet p, Method m, Object... args) throws
InvocationTargetException, IllegalAccessException
{
Endpoint ep = EndpointAssociation.getEndpoint();
-
InvocationHandler invHandler = ep.getInvocationHandler();
+
Invocation inv = invHandler.createInvocation();
+ InvocationContext invContext = inv.getInvocationContext();
inv.setJavaMethod(m);
inv.setArgs(args);
@@ -92,7 +94,8 @@
try
{
Object targetBean = resolver.resolve(p);
- invHandler.invoke(ep, targetBean, inv);
+ invContext.setTargetBean(targetBean);
+ invHandler.invoke(ep, inv);
retObj = inv.getReturnValue();
}
catch (Exception ex)
Modified:
trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/SunJaxwsDeployer.java
===================================================================
---
trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/SunJaxwsDeployer.java 2007-07-05
13:07:51 UTC (rev 3801)
+++
trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/SunJaxwsDeployer.java 2007-07-05
16:44:32 UTC (rev 3802)
@@ -47,7 +47,7 @@
for (Endpoint ep : dep.getService().getEndpoints())
{
String epName = ep.getShortName();
- String targetBean = ep.getTargetBean();
+ String targetBean = ep.getTargetBeanName();
String urlPattern = ep.getURLPattern();
DDEndpoint ddep = new DDEndpoint(epName, targetBean, urlPattern);
Modified:
trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/InvokerEJB3.java
===================================================================
---
trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/InvokerEJB3.java 2007-07-05
13:07:51 UTC (rev 3801)
+++
trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/InvokerEJB3.java 2007-07-05
16:44:32 UTC (rev 3802)
@@ -55,7 +55,7 @@
Object retObj = null;
try
{
- invHandler.invoke(ep, null, inv);
+ invHandler.invoke(ep, inv);
retObj = inv.getReturnValue();
}
catch (Exception ex)
Modified: trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/InvokerJSE.java
===================================================================
---
trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/InvokerJSE.java 2007-07-05
13:07:51 UTC (rev 3801)
+++
trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/InvokerJSE.java 2007-07-05
16:44:32 UTC (rev 3802)
@@ -32,6 +32,7 @@
import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.deployment.EndpointAssociation;
import org.jboss.wsf.spi.invocation.Invocation;
+import org.jboss.wsf.spi.invocation.InvocationContext;
import org.jboss.wsf.spi.invocation.InvocationHandler;
/**
@@ -48,16 +49,17 @@
InvocationHandler invHandler = ep.getInvocationHandler();
Invocation inv = invHandler.createInvocation();
+ InvocationContext invContext = inv.getInvocationContext();
//inv.getInvocationContext().addAttachment(WebServiceContext.class, new
WebServiceContextJSE(context));
- inv.getInvocationContext().addAttachment(MessageContext.class, context);
+ invContext.addAttachment(MessageContext.class, context);
inv.setJavaMethod(m);
inv.setArgs(params);
Object retObj = null;
try
{
- Object targetBean = getTargetBean(ep);
- invHandler.invoke(ep, targetBean, inv);
+ invContext.setTargetBean(getTargetBean(ep));
+ invHandler.invoke(ep, inv);
retObj = inv.getReturnValue();
}
catch (Exception ex)
Modified:
trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/XFireServicesDeployer.java
===================================================================
---
trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/XFireServicesDeployer.java 2007-07-05
13:07:51 UTC (rev 3801)
+++
trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/XFireServicesDeployer.java 2007-07-05
16:44:32 UTC (rev 3802)
@@ -23,6 +23,7 @@
//$Id$
+import org.jboss.logging.Logger;
import org.jboss.wsf.spi.deployment.AbstractDeployer;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.Endpoint;
@@ -39,6 +40,9 @@
*/
public class XFireServicesDeployer extends AbstractDeployer
{
+ // provide logging
+ private static final Logger log = Logger.getLogger(XFireServicesDeployer.class);
+
private String serviceFactory;
private String invokerEJB3;
private String invokerJSE;
@@ -69,7 +73,7 @@
for (Endpoint ep : dep.getService().getEndpoints())
{
String epName = ep.getShortName();
- String targetBean = ep.getTargetBean();
+ String targetBean = ep.getTargetBeanName();
DDService ddser = new DDService(epName, targetBean);
ddser.setServiceFactory(serviceFactory);
Show replies by date