[jboss-cvs] JBossAS SVN: r70085 - in trunk/webservices: src/main/org/jboss/wsf/container/jboss50 and 1 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: thomas.diesler at jboss.com
Date: 2008-02-26 06:38:07 -0500 (Tue, 26 Feb 2008)
New Revision: 70085

Modified:
   trunk/webservices/.classpath
   trunk/webservices/src/main/org/jboss/wsf/container/jboss50/WebAppDeploymentAspect.java
   trunk/webservices/src/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml
Log:
More work on endpont API deployment (WIP)

Modified: trunk/webservices/.classpath
===================================================================
--- trunk/webservices/.classpath	2008-02-26 11:17:02 UTC (rev 70084)
+++ trunk/webservices/.classpath	2008-02-26 11:38:07 UTC (rev 70085)
@@ -40,5 +40,6 @@
 	<classpathentry kind="lib" path="/thirdparty/jboss/jbossws-framework/lib/jbossws-framework.jar" sourcepath="/thirdparty/jboss/jbossws-framework/lib/jbossws-framework-src.zip"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/jboss-ejb3-ext-api/lib/jboss-ejb3-ext-api.jar" sourcepath="/thirdparty/jboss/jboss-ejb3-ext-api/lib/jboss-ejb3-ext-api-sources.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/jboss-ejb3-interceptors/lib/jboss-ejb3-interceptors.jar" sourcepath="/thirdparty/jboss/jboss-ejb3-interceptors/lib/jboss-ejb3-interceptors-sources.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-deployers-client.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-deployers-client-sources.jar"/>
 	<classpathentry kind="output" path="output/eclipse-classes"/>
 </classpath>

Modified: trunk/webservices/src/main/org/jboss/wsf/container/jboss50/WebAppDeploymentAspect.java
===================================================================
--- trunk/webservices/src/main/org/jboss/wsf/container/jboss50/WebAppDeploymentAspect.java	2008-02-26 11:17:02 UTC (rev 70084)
+++ trunk/webservices/src/main/org/jboss/wsf/container/jboss50/WebAppDeploymentAspect.java	2008-02-26 11:38:07 UTC (rev 70085)
@@ -25,6 +25,9 @@
 
 import javax.xml.ws.WebServiceException;
 
+import org.jboss.deployers.client.plugins.deployment.AbstractDeployment;
+import org.jboss.deployers.client.spi.DeployerClient;
+import org.jboss.deployers.spi.attachments.MutableAttachments;
 import org.jboss.deployers.structure.spi.DeploymentUnit;
 import org.jboss.logging.Logger;
 import org.jboss.metadata.web.jboss.JBossWebMetaData;
@@ -44,12 +47,18 @@
    private static Logger log = Logger.getLogger(WebAppDeploymentAspect.class);
 
    private WebMetaDataModifier webMetaDataModifier;
+   private DeployerClient mainDeployer;
 
    public void setWebMetaDataModifier(WebMetaDataModifier webMetaDataModifier)
    {
       this.webMetaDataModifier = webMetaDataModifier;
    }
 
+   public void setMainDeployer(DeployerClient mainDeployer)
+   {
+      this.mainDeployer = mainDeployer;
+   }
+
    public void create(Deployment dep)
    {
       JBossWebMetaData jbwmd = dep.getAttachment(JBossWebMetaData.class);
@@ -68,7 +77,11 @@
          }
          else
          {
-            // TODO: endpoint API cannot use an existing deployment unit
+            AbstractDeployment deployment = createSimpleDeployment(dep.getSimpleName());
+            MutableAttachments mutableAttachments = (MutableAttachments)deployment.getPredeterminedManagedObjects();
+            mutableAttachments.addAttachment(WebMetaDataModifier.PROPERTY_GENERATED_WEBAPP, Boolean.TRUE);
+            mutableAttachments.addAttachment(JBossWebMetaData.class, jbwmd);
+            mainDeployer.deploy(deployment);
          }
       }
       catch (Exception ex)
@@ -76,4 +89,10 @@
          WSFDeploymentException.rethrow(ex);
       }
    }
+   
+   private AbstractDeployment createSimpleDeployment(String name)
+   {
+      AbstractDeployment unit = new AbstractDeployment(name);
+      return unit;
+   }
 }

Modified: trunk/webservices/src/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml
===================================================================
--- trunk/webservices/src/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml	2008-02-26 11:17:02 UTC (rev 70084)
+++ trunk/webservices/src/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml	2008-02-26 11:38:07 UTC (rev 70085)
@@ -252,6 +252,7 @@
   <bean name="WSWebAppDeploymentAspect" class="org.jboss.wsf.container.jboss50.WebAppDeploymentAspect">
     <property name="requires">WebMetaData, ContextProperties</property>
     <property name="webMetaDataModifier"><inject bean="WSWebMetaDataModifier"/></property>
+    <property name="mainDeployer"><inject bean="MainDeployer"/></property>
   </bean>
   
   <bean name="WSWebAppGeneratorDeploymentAspect" class="org.jboss.wsf.container.jboss50.WebAppGeneratorDeploymentAspect">