[jbossws-commits] JBossWS SVN: r8741 - in stack/metro/branches/asoldano/modules/server/src/main/java/org/jboss/wsf/stack/metro: metadata and 1 other directory.

[jbossws-commits at lists.jboss.org]

Author: alessio.soldano at jboss.com
Date: 2008-11-18 03:24:49 -0500 (Tue, 18 Nov 2008)
New Revision: 8741

Modified:
   stack/metro/branches/asoldano/modules/server/src/main/java/org/jboss/wsf/stack/metro/SunJaxwsDeploymentAspect.java
   stack/metro/branches/asoldano/modules/server/src/main/java/org/jboss/wsf/stack/metro/metadata/RuntimeModelDeploymentAspect.java
Log:
Run metro specific DA for JAXWS only


Modified: stack/metro/branches/asoldano/modules/server/src/main/java/org/jboss/wsf/stack/metro/SunJaxwsDeploymentAspect.java
===================================================================
--- stack/metro/branches/asoldano/modules/server/src/main/java/org/jboss/wsf/stack/metro/SunJaxwsDeploymentAspect.java	2008-11-18 08:23:50 UTC (rev 8740)
+++ stack/metro/branches/asoldano/modules/server/src/main/java/org/jboss/wsf/stack/metro/SunJaxwsDeploymentAspect.java	2008-11-18 08:24:49 UTC (rev 8741)
@@ -24,6 +24,7 @@
 import org.jboss.wsf.spi.deployment.Deployment;
 import org.jboss.wsf.spi.deployment.DeploymentAspect;
 import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.deployment.Deployment.DeploymentType;
 import org.jboss.wsf.stack.metro.metadata.sunjaxws.DDEndpoint;
 import org.jboss.wsf.stack.metro.metadata.sunjaxws.DDEndpoints;
 import org.jboss.wsf.stack.metro.metadata.RuntimeModelDeploymentAspect;
@@ -47,6 +48,12 @@
    @SuppressWarnings("unchecked")
    public void create(Deployment dep)
    {
+      DeploymentType dt = dep.getType();
+      if (!DeploymentType.JAXWS_JSE.equals(dt) && !DeploymentType.JAXWS_EJB3.equals(dt))
+      {
+        return;
+      }
+      
       DDEndpoints ddEndpoints = dep.getAttachment(DDEndpoints.class);
       if (ddEndpoints == null)
       {
@@ -80,6 +87,12 @@
    @Override
    public void destroy(Deployment dep)
    {
+      DeploymentType dt = dep.getType();
+      if (!DeploymentType.JAXWS_JSE.equals(dt) && !DeploymentType.JAXWS_EJB3.equals(dt))
+      {
+        return;
+      }
+      
       DDEndpoints dd = dep.getAttachment(DDEndpoints.class);
       if (dd != null)
       {

Modified: stack/metro/branches/asoldano/modules/server/src/main/java/org/jboss/wsf/stack/metro/metadata/RuntimeModelDeploymentAspect.java
===================================================================
--- stack/metro/branches/asoldano/modules/server/src/main/java/org/jboss/wsf/stack/metro/metadata/RuntimeModelDeploymentAspect.java	2008-11-18 08:23:50 UTC (rev 8740)
+++ stack/metro/branches/asoldano/modules/server/src/main/java/org/jboss/wsf/stack/metro/metadata/RuntimeModelDeploymentAspect.java	2008-11-18 08:24:49 UTC (rev 8741)
@@ -38,6 +38,7 @@
 import org.jboss.wsf.spi.deployment.DeploymentAspect;
 import org.jboss.wsf.spi.deployment.Endpoint;
 import org.jboss.wsf.spi.deployment.UnifiedVirtualFile;
+import org.jboss.wsf.spi.deployment.Deployment.DeploymentType;
 import org.jboss.wsf.stack.metro.DeploymentDescriptorParserExt;
 import org.jboss.wsf.stack.metro.DeploymentDescriptorParserJBWS;
 import org.jboss.wsf.stack.metro.MessageStreamAdapter;
@@ -74,6 +75,12 @@
    
    public void start(Deployment deployment)
    {
+      DeploymentType dt = deployment.getType();
+      if (!DeploymentType.JAXWS_JSE.equals(dt) && !DeploymentType.JAXWS_EJB3.equals(dt))
+      {
+        return;
+      }
+      
       ClassLoader runtimeLoader = deployment.getRuntimeClassLoader();
       if(null == runtimeLoader)
          throw new IllegalArgumentException("Null runtimeLoader");