[jbossws-commits] JBossWS SVN: r8648 - in container/jboss50: trunk/src/main/java/org/jboss/wsf/container/jboss50/deployment and 1 other directory.

[jbossws-commits at lists.jboss.org]

Author: richard.opalka at jboss.com
Date: 2008-11-04 09:02:48 -0500 (Tue, 04 Nov 2008)
New Revision: 8648

Modified:
   container/jboss50/branches/jboss500CR2/src/main/java/org/jboss/wsf/container/jboss50/deployment/RuntimeLoaderDeploymentAspect.java
   container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/deployment/RuntimeLoaderDeploymentAspect.java
Log:
[JBWS-2246] hack for .sar incorporating webservices deployment on AS bootstrap

Modified: container/jboss50/branches/jboss500CR2/src/main/java/org/jboss/wsf/container/jboss50/deployment/RuntimeLoaderDeploymentAspect.java
===================================================================
--- container/jboss50/branches/jboss500CR2/src/main/java/org/jboss/wsf/container/jboss50/deployment/RuntimeLoaderDeploymentAspect.java	2008-11-04 05:59:54 UTC (rev 8647)
+++ container/jboss50/branches/jboss500CR2/src/main/java/org/jboss/wsf/container/jboss50/deployment/RuntimeLoaderDeploymentAspect.java	2008-11-04 14:02:48 UTC (rev 8648)
@@ -23,6 +23,7 @@
 
 import org.jboss.metadata.ejb.jboss.JBossMetaData;
 import org.jboss.metadata.web.jboss.JBossWebMetaData;
+import org.jboss.wsf.spi.deployment.ArchiveDeployment;
 import org.jboss.wsf.spi.deployment.Deployment;
 import org.jboss.wsf.spi.deployment.DeploymentAspect;
 import org.jboss.wsf.spi.deployment.integration.WebServiceDeployment;
@@ -52,6 +53,11 @@
       {
          JBossWebMetaData webMetaData = dep.getAttachment(JBossWebMetaData.class);
          ClassLoader classLoader = webMetaData.getContextLoader();
+         if (classLoader == null)
+         {
+            // [JBWS-2246] hack for .sar deployments incorporating web services deployments on AS bootstrap.
+            classLoader = dep.getInitialClassLoader();  
+         }
          dep.setRuntimeClassLoader(classLoader);
       }
       else

Modified: container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/deployment/RuntimeLoaderDeploymentAspect.java
===================================================================
--- container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/deployment/RuntimeLoaderDeploymentAspect.java	2008-11-04 05:59:54 UTC (rev 8647)
+++ container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/deployment/RuntimeLoaderDeploymentAspect.java	2008-11-04 14:02:48 UTC (rev 8648)
@@ -23,6 +23,7 @@
 
 import org.jboss.metadata.ejb.jboss.JBossMetaData;
 import org.jboss.metadata.web.jboss.JBossWebMetaData;
+import org.jboss.wsf.spi.deployment.ArchiveDeployment;
 import org.jboss.wsf.spi.deployment.Deployment;
 import org.jboss.wsf.spi.deployment.DeploymentAspect;
 import org.jboss.wsf.spi.deployment.integration.WebServiceDeployment;
@@ -52,6 +53,11 @@
       {
          JBossWebMetaData webMetaData = dep.getAttachment(JBossWebMetaData.class);
          ClassLoader classLoader = webMetaData.getContextLoader();
+         if (classLoader == null)
+         {
+            // [JBWS-2246] hack for .sar deployments incorporating web services deployments on AS bootstrap.
+            classLoader = dep.getInitialClassLoader();  
+         }
          dep.setRuntimeClassLoader(classLoader);
       }
       else