[jboss-cvs] JBossAS SVN: r88058 - in trunk: webservices/src/main/org/jboss/wsf/container/jboss60/deployment/metadata and 1 other directory.

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

Author: richard.opalka at jboss.com
Date: 2009-04-30 07:18:42 -0400 (Thu, 30 Apr 2009)
New Revision: 88058

Modified:
   trunk/component-matrix/pom.xml
   trunk/webservices/src/main/org/jboss/wsf/container/jboss60/deployment/metadata/InjectionMetaDataDeploymentAspect.java
Log:
[JBWS-2074] JBossWS SPI refactoring

Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml	2009-04-30 11:06:17 UTC (rev 88057)
+++ trunk/component-matrix/pom.xml	2009-04-30 11:18:42 UTC (rev 88058)
@@ -33,9 +33,9 @@
     <version.javax.faces>1.2_12</version.javax.faces>
     <version.jboss.jaxr>1.2.1.GA</version.jboss.jaxr>
     <version.jboss.jbossts>4.4.0.GA</version.jboss.jbossts>
-    <version.jboss.jbossws-common>1.0.11.CR1</version.jboss.jbossws-common>
-    <version.jboss.jbossws-framework>3.1.2.CR1</version.jboss.jbossws-framework>
-    <version.jboss.jbossws-spi>1.1.2.CR1</version.jboss.jbossws-spi>
+    <version.jboss.jbossws-common>1.0.11.CR2</version.jboss.jbossws-common>
+    <version.jboss.jbossws-framework>3.1.2.CR2</version.jboss.jbossws-framework>
+    <version.jboss.jbossws-spi>1.1.2.CR2</version.jboss.jbossws-spi>
     <version.jboss.jbossws>3.1.2.CR1</version.jboss.jbossws>
     <version.jboss.jms-integration-tests>1.0.1.GA</version.jboss.jms-integration-tests>
     <version.jboss.messaging>1.4.1.GA</version.jboss.messaging>

Modified: trunk/webservices/src/main/org/jboss/wsf/container/jboss60/deployment/metadata/InjectionMetaDataDeploymentAspect.java
===================================================================
--- trunk/webservices/src/main/org/jboss/wsf/container/jboss60/deployment/metadata/InjectionMetaDataDeploymentAspect.java	2009-04-30 11:06:17 UTC (rev 88057)
+++ trunk/webservices/src/main/org/jboss/wsf/container/jboss60/deployment/metadata/InjectionMetaDataDeploymentAspect.java	2009-04-30 11:18:42 UTC (rev 88058)
@@ -29,7 +29,6 @@
 
 import javax.jws.WebService;
 import javax.naming.Context;
-import javax.naming.InitialContext;
 import javax.naming.NamingException;
 import javax.xml.ws.WebServiceProvider;
 
@@ -58,64 +57,62 @@
 {
 
    private static final String EJB3_JNDI_PREFIX = "java:env/";
-   private static final String POJO_JNDI_PREFIX = "java:comp/env/";
-   
+
    @Override
    public void create(Deployment dep)
    {
       super.create(dep);
 
-      JBossWebMetaData webMD = dep.getAttachment(JBossWebMetaData.class);
-      if (webMD == null)
-         throw new IllegalStateException("JBossWebMetaData not found");
-      
-      DeploymentUnit unit = dep.getAttachment(DeploymentUnit.class);
-      if (unit == null)
-         throw new IllegalStateException("DeploymentUnit not found");
-      
       List<InjectionMetaData> injectionMD = new LinkedList<InjectionMetaData>();
       DeploymentType deploymentType = dep.getType();
 
-      if (deploymentType == DeploymentType.JAXWS_JSE)
+      try
       {
-         injectionMD.addAll(buildInjectionMetaData(webMD.getEnvironmentEntries()));
-         try
+         if (deploymentType == DeploymentType.JAXWS_JSE)
          {
-            final Context ctx = new InitialContext();
+            JBossWebMetaData webMD = dep.getAttachment(JBossWebMetaData.class);
+            if (webMD == null)
+               throw new IllegalStateException("JBossWebMetaData not found");
+
+            injectionMD.addAll(buildInjectionMetaData(webMD.getEnvironmentEntries()));
             for (Endpoint endpoint : dep.getService().getEndpoints())
             {
-               InjectionsMetaData injectionsMD = new InjectionsMetaData(injectionMD, ctx, POJO_JNDI_PREFIX);
+               InjectionsMetaData injectionsMD = new InjectionsMetaData(injectionMD, null);
                endpoint.addAttachment(InjectionsMetaData.class, injectionsMD);
             }
          }
-         catch (NamingException ne)
+         else if (deploymentType == DeploymentType.JAXWS_EJB3)
          {
-            throw new RuntimeException(ne);
-         }
-      }
-      else if (deploymentType == DeploymentType.JAXWS_EJB3)
-      {
-         JBossMetaData jbossMD = unit.getAttachment(JBossMetaData.class);
-         JBossEnterpriseBeansMetaData jebMDs = jbossMD.getEnterpriseBeans();
-         
-         WebServiceDeployment webServiceDeployment = unit.getAttachment(WebServiceDeployment.class);
-         
-         Iterator<WebServiceDeclaration> it = webServiceDeployment.getServiceEndpoints().iterator();
-         while (it.hasNext())
-         {
-            WebServiceDeclaration container = it.next();
-            if (isWebServiceBean(container))
+            DeploymentUnit unit = dep.getAttachment(DeploymentUnit.class);
+            if (unit == null)
+               throw new IllegalStateException("DeploymentUnit not found");
+
+            JBossMetaData jbossMD = unit.getAttachment(JBossMetaData.class);
+            JBossEnterpriseBeansMetaData jebMDs = jbossMD.getEnterpriseBeans();
+
+            WebServiceDeployment webServiceDeployment = unit.getAttachment(WebServiceDeployment.class);
+
+            Iterator<WebServiceDeclaration> it = webServiceDeployment.getServiceEndpoints().iterator();
+            while (it.hasNext())
             {
-               Context ctx = container.getContext();
-               String ejbName = container.getComponentName();
-               EnvironmentEntriesMetaData ejbEnvEntries = jebMDs.get(ejbName).getEnvironmentEntries(); 
-               injectionMD.addAll(buildInjectionMetaData(ejbEnvEntries));
-               Endpoint endpoint = dep.getService().getEndpointByName(ejbName);
-               InjectionsMetaData injectionsMD = new InjectionsMetaData(injectionMD, ctx, EJB3_JNDI_PREFIX);
-               endpoint.addAttachment(InjectionsMetaData.class, injectionsMD);
+               WebServiceDeclaration container = it.next();
+               if (isWebServiceBean(container))
+               {
+                  final Context ctx = (Context)container.getContext().lookup(EJB3_JNDI_PREFIX);
+                  String ejbName = container.getComponentName();
+                  EnvironmentEntriesMetaData ejbEnvEntries = jebMDs.get(ejbName).getEnvironmentEntries(); 
+                  injectionMD.addAll(buildInjectionMetaData(ejbEnvEntries));
+                  Endpoint endpoint = dep.getService().getEndpointByName(ejbName);
+                  InjectionsMetaData injectionsMD = new InjectionsMetaData(injectionMD, ctx);
+                  endpoint.addAttachment(InjectionsMetaData.class, injectionsMD);
+               }
             }
          }
       }
+      catch (NamingException ne)
+      {
+         throw new RuntimeException(ne);
+      }
    }
 
    @Override
@@ -125,14 +122,14 @@
 
       super.destroy(dep);
    }
-   
+
    private List<InjectionMetaData> buildInjectionMetaData(EnvironmentEntriesMetaData envEntries)
    {
       if ((envEntries == null) || (envEntries.size() == 0))
       {
          return Collections.emptyList();
       }
-      
+
       EnvironmentEntryMetaData eeMD = null;
       LinkedList<InjectionMetaData> retVal = new LinkedList<InjectionMetaData>();
       String envEntryName = null;
@@ -140,7 +137,7 @@
       String targetClass = null;
       String targetName = null;
       String valueClass = null;
-      
+
       for (Iterator<EnvironmentEntryMetaData> i = envEntries.iterator(); i.hasNext();)
       {
          eeMD = i.next();
@@ -161,7 +158,7 @@
             }
          }
       }
-      
+
       return retVal;
    }
 
@@ -169,7 +166,7 @@
    {
       boolean isWebService = container.getAnnotation(WebService.class) != null;
       boolean isWebServiceProvider = container.getAnnotation(WebServiceProvider.class) != null;
-      
+
       return isWebService || isWebServiceProvider;
    }