[jbossws-commits] JBossWS SVN: r4034 - in trunk/integration: jboss42/src/main/resources and 1 other directories.

[jbossws-commits at lists.jboss.org]

Author: thomas.diesler at jboss.com
Date: 2007-07-31 05:40:33 -0400 (Tue, 31 Jul 2007)
New Revision: 4034

Modified:
   trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentAspectHttpServer.java
   trunk/integration/jboss42/src/main/resources/jbossws-jboss42-config.xml
   trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/DeploymentAspectManagerImpl.java
Log:
More Endpoint API

Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentAspectHttpServer.java
===================================================================
--- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentAspectHttpServer.java	2007-07-31 09:37:40 UTC (rev 4033)
+++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentAspectHttpServer.java	2007-07-31 09:40:33 UTC (rev 4034)
@@ -34,6 +34,7 @@
 import org.jboss.wsf.spi.deployment.Deployment;
 import org.jboss.wsf.spi.deployment.DeploymentAspectManagerFactory;
 import org.jboss.wsf.spi.deployment.DeploymentModelFactory;
+import org.jboss.wsf.spi.deployment.Service;
 import org.jboss.wsf.spi.deployment.Deployment.DeploymentType;
 import org.jboss.wsf.spi.http.HttpContext;
 import org.jboss.wsf.spi.http.HttpContextFactory;
@@ -69,12 +70,22 @@
 
       try
       {
-         // Create the deployment
+         // Get the deployment model factory
          SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
          DeploymentModelFactory depModelFactory = spiProvider.getSPI(DeploymentModelFactory.class);
+         
+         // Create/Setup the deployment
          Deployment dep = depModelFactory.newDeployment("endpoint-deployment", implClass.getClassLoader());
-         dep.getService().addEndpoint(depModelFactory.newEndpoint(implClass.getName()));
          
+         // Create/Setup the service
+         Service service = dep.getService();
+         service.setContextRoot(context.getContextRoot());
+         
+         // Create/Setup the endpoint
+         org.jboss.wsf.spi.deployment.Endpoint ep = depModelFactory.newEndpoint(implClass.getName());
+         ep.setURLPattern("/*");
+         service.addEndpoint(ep);
+         
          // Deploy using deployment aspects
          DeploymentAspectManagerFactory depManagerFactory = spiProvider.getSPI(DeploymentAspectManagerFactory.class);
          depManagerFactory.getDeploymentAspectManager(DeploymentType.JAXWS_JSE);

Modified: trunk/integration/jboss42/src/main/resources/jbossws-jboss42-config.xml
===================================================================
--- trunk/integration/jboss42/src/main/resources/jbossws-jboss42-config.xml	2007-07-31 09:37:40 UTC (rev 4033)
+++ trunk/integration/jboss42/src/main/resources/jbossws-jboss42-config.xml	2007-07-31 09:40:33 UTC (rev 4034)
@@ -208,6 +208,15 @@
     <property name="manager"><inject bean="WSDeploymentAspectManagerEndpointAPI"/></property>
     <property name="aspects">
       <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
+        <inject bean="WSEndpointAddressDeploymentAspect"/>
+        <inject bean="WSEndpointHandlerDeploymentAspect"/>
+        <inject bean="WSEndpointLifecycleDeploymentAspect"/>
+        <inject bean="WSEndpointMetricsDeploymentAspect"/>
+        <inject bean="WSEndpointNameDeploymentAspect"/>
+        <inject bean="WSEndpointRegistryDeploymentAspect"/>
+        <inject bean="WSURLPatternDeploymentAspect"/>
+        <inject bean="WSWebAppDeploymentAspect"/>
+        <inject bean="WSWebAppGeneratorDeploymentAspect"/>
       </set>
     </property>
   </bean>

Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/DeploymentAspectManagerImpl.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/DeploymentAspectManagerImpl.java	2007-07-31 09:37:40 UTC (rev 4033)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/DeploymentAspectManagerImpl.java	2007-07-31 09:40:33 UTC (rev 4034)
@@ -61,7 +61,7 @@
       this.name = name;
    }
 
-   public List<DeploymentAspect> getDeploymentAspects()
+   public synchronized List<DeploymentAspect> getDeploymentAspects()
    {
       // This cannot be done in 'create' because we add aspects from different MC configurations
       if (sortedAspects == null)