[jbossws-commits] JBossWS SVN: r15030 - in common/trunk/src/main/java/org/jboss/ws/common: invocation and 1 other directory.

[jbossws-commits at lists.jboss.org]

Author: richard.opalka at jboss.com
Date: 2011-10-03 09:10:26 -0400 (Mon, 03 Oct 2011)
New Revision: 15030

Modified:
   common/trunk/src/main/java/org/jboss/ws/common/deployment/AbstractDefaultEndpoint.java
   common/trunk/src/main/java/org/jboss/ws/common/deployment/EndpointHandlerDeploymentAspect.java
   common/trunk/src/main/java/org/jboss/ws/common/invocation/InvocationHandlerJAXWS.java
Log:
[JBWS-3363] extending SPI - providing hook for instances retrieval

Modified: common/trunk/src/main/java/org/jboss/ws/common/deployment/AbstractDefaultEndpoint.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/deployment/AbstractDefaultEndpoint.java	2011-10-03 13:05:58 UTC (rev 15029)
+++ common/trunk/src/main/java/org/jboss/ws/common/deployment/AbstractDefaultEndpoint.java	2011-10-03 13:10:26 UTC (rev 15030)
@@ -38,6 +38,7 @@
 import org.jboss.wsf.spi.deployment.Endpoint;
 import org.jboss.wsf.spi.deployment.EndpointState;
 import org.jboss.wsf.spi.deployment.EndpointType;
+import org.jboss.wsf.spi.deployment.InstanceProvider;
 import org.jboss.wsf.spi.deployment.LifecycleHandler;
 import org.jboss.wsf.spi.deployment.Service;
 import org.jboss.wsf.spi.deployment.WSFDeploymentException;
@@ -70,6 +71,7 @@
    protected String address;
    protected List<RecordProcessor> recordProcessors = new Vector<RecordProcessor>();
    protected SecurityDomainContext securityDomainContext;
+   protected InstanceProvider instanceProvider;
    
    AbstractDefaultEndpoint(String targetBean)
    {
@@ -308,4 +310,15 @@
       this.securityDomainContext = securityDomainContext;
    }
 
+   public InstanceProvider getInstanceProvider()
+   {
+      return instanceProvider;
+   }
+
+   public void setInstanceProvider(final InstanceProvider instanceProvider)
+   {
+      assertEndpointSetterAccess();
+      this.instanceProvider = instanceProvider;
+   }
+
 }

Modified: common/trunk/src/main/java/org/jboss/ws/common/deployment/EndpointHandlerDeploymentAspect.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/deployment/EndpointHandlerDeploymentAspect.java	2011-10-03 13:05:58 UTC (rev 15029)
+++ common/trunk/src/main/java/org/jboss/ws/common/deployment/EndpointHandlerDeploymentAspect.java	2011-10-03 13:10:26 UTC (rev 15030)
@@ -54,18 +54,18 @@
    {
       for (final Endpoint ep : dep.getService().getEndpoints())
       {
-         ep.setRequestHandler(getRequestHandler(dep));
-         ep.setLifecycleHandler(getLifecycleHandler(dep));
+         ep.setRequestHandler(getRequestHandler());
+         ep.setLifecycleHandler(getLifecycleHandler());
          ep.setInvocationHandler(getInvocationHandler(ep));
       }
    }
 
-   private RequestHandler getRequestHandler(final Deployment dep)
+   private RequestHandler getRequestHandler()
    {
       return spiProvider.getSPI(RequestHandlerFactory.class).newRequestHandler();
    }
 
-   private LifecycleHandler getLifecycleHandler(final Deployment dep)
+   private LifecycleHandler getLifecycleHandler()
    {
       return spiProvider.getSPI(LifecycleHandlerFactory.class).newLifecycleHandler();
    }

Modified: common/trunk/src/main/java/org/jboss/ws/common/invocation/InvocationHandlerJAXWS.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/invocation/InvocationHandlerJAXWS.java	2011-10-03 13:05:58 UTC (rev 15029)
+++ common/trunk/src/main/java/org/jboss/ws/common/invocation/InvocationHandlerJAXWS.java	2011-10-03 13:10:26 UTC (rev 15030)
@@ -59,7 +59,9 @@
    public void onEndpointInstantiated(final Endpoint endpoint, final Invocation invocation)
    {
       final InjectionsMetaData injectionsMD = endpoint.getAttachment(InjectionsMetaData.class);
-      final Object targetBean = this.getTargetBean(invocation);
+      final Object _targetBean = this.getTargetBean(invocation);
+      // TODO: refactor injection to AS IL
+      final Object targetBean = endpoint.getInstanceProvider().getInstance(_targetBean.getClass().getName());
 
       this.log.debug("Injecting resources on JAXWS JSE endpoint: " + targetBean);
       if (injectionsMD != null)