[jboss-cvs] JBossAS SVN: r109846 - in branches/JBPAPP_4_2_0_GA_CP: ejb3/src/resources/43specific/org/jboss/ejb3 and 2 other directories.

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

Author: darran.lofthouse at jboss.com
Date: 2010-12-12 09:09:22 -0500 (Sun, 12 Dec 2010)
New Revision: 109846

Modified:
   branches/JBPAPP_4_2_0_GA_CP/ejb3/src/main/org/jboss/ejb3/metamodel/EnterpriseBean.java
   branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/43specific/org/jboss/ejb3/Ejb3DescriptorHandler.java
   branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/43specific/org/jboss/ejb3/metamodel/EnterpriseBeans.java
   branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/43specific/org/jboss/ejb3/metamodel/JBossDDObjectFactory.java
   branches/JBPAPP_4_2_0_GA_CP/webservices/src/main/org/jboss/wsf/container/jboss42/EJBArchiveMetaDataAdapterEJB3.java
Log:
[JBPAPP-5576] port-component-uri in jboss.xml ignored for JAX-WS / EJB3 deployments

Modified: branches/JBPAPP_4_2_0_GA_CP/ejb3/src/main/org/jboss/ejb3/metamodel/EnterpriseBean.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/src/main/org/jboss/ejb3/metamodel/EnterpriseBean.java	2010-12-12 10:18:05 UTC (rev 109845)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/src/main/org/jboss/ejb3/metamodel/EnterpriseBean.java	2010-12-12 14:09:22 UTC (rev 109846)
@@ -80,6 +80,8 @@
    private String securityDomain;
 
    private boolean callByValue = false;
+   
+   private String portComponentURI;
 
    private String aopDomainName = null;
 
@@ -209,8 +211,18 @@
    public boolean isCallByValue()
    {
       return callByValue;
+   }      
+
+   public String getPortComponentURI()
+   {
+      return portComponentURI;
    }
 
+   public void setPortComponentURI(String portComponentURI)
+   {
+      this.portComponentURI = portComponentURI;
+   }
+
    public String getSecurityDomain()
    {
       return securityDomain;

Modified: branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/43specific/org/jboss/ejb3/Ejb3DescriptorHandler.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/43specific/org/jboss/ejb3/Ejb3DescriptorHandler.java	2010-12-12 10:18:05 UTC (rev 109845)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/43specific/org/jboss/ejb3/Ejb3DescriptorHandler.java	2010-12-12 14:09:22 UTC (rev 109846)
@@ -709,17 +709,30 @@
 
    private void addWebServiceAnnotations(EJBContainer container, EnterpriseBean enterpriseBean, String ejbName)
    {
-      if(dd.getWebservices()!=null)
+      WebContextImpl webContextImpl = null;
+      if (dd.getWebservices() != null)
       {
          Webservices webservices = dd.getWebservices();
-         if(webservices.getContextRoot()!=null)
+         if (webservices.getContextRoot() != null)
          {
-            WebContextImpl webContextImpl = new WebContextImpl();
+            webContextImpl = new WebContextImpl();
             webContextImpl.setContextRoot(webservices.getContextRoot());
+         }
+      }
 
-            addClassAnnotation(container, WebContext.class, webContextImpl);
+      if (enterpriseBean != null && enterpriseBean.getPortComponentURI() != null)
+      {
+         if (webContextImpl == null)
+         {
+            webContextImpl = new WebContextImpl();
          }
+         webContextImpl.setUrlpattern(enterpriseBean.getPortComponentURI());
       }
+
+      if (webContextImpl != null)
+      {
+         addClassAnnotation(container, WebContext.class, webContextImpl);
+      }
    }
 
    /**

Modified: branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/43specific/org/jboss/ejb3/metamodel/EnterpriseBeans.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/43specific/org/jboss/ejb3/metamodel/EnterpriseBeans.java	2010-12-12 10:18:05 UTC (rev 109845)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/43specific/org/jboss/ejb3/metamodel/EnterpriseBeans.java	2010-12-12 14:09:22 UTC (rev 109846)
@@ -203,6 +203,11 @@
    {
       currentEjb.setCallByValue(callByValue);
    }
+   
+   public void setPortComponentURI(String portComponentURI)
+   {
+      currentEjb.setPortComponentURI(portComponentURI);
+   }
 
    public void setJndiName(String jndiName)
    {

Modified: branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/43specific/org/jboss/ejb3/metamodel/JBossDDObjectFactory.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/43specific/org/jboss/ejb3/metamodel/JBossDDObjectFactory.java	2010-12-12 10:18:05 UTC (rev 109845)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/43specific/org/jboss/ejb3/metamodel/JBossDDObjectFactory.java	2010-12-12 14:09:22 UTC (rev 109846)
@@ -792,6 +792,10 @@
       {
          ejbs.setConcurrent(getValue(localName, value));
       }
+      else if (localName.equals("port-component-uri"))
+      {
+         ejbs.setPortComponentURI(getValue(localName, value));
+      }
    }
 
    /**

Modified: branches/JBPAPP_4_2_0_GA_CP/webservices/src/main/org/jboss/wsf/container/jboss42/EJBArchiveMetaDataAdapterEJB3.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/webservices/src/main/org/jboss/wsf/container/jboss42/EJBArchiveMetaDataAdapterEJB3.java	2010-12-12 10:18:05 UTC (rev 109845)
+++ branches/JBPAPP_4_2_0_GA_CP/webservices/src/main/org/jboss/wsf/container/jboss42/EJBArchiveMetaDataAdapterEJB3.java	2010-12-12 14:09:22 UTC (rev 109846)
@@ -77,7 +77,7 @@
                usmd.setEjbName(slc.getEjbName());
                usmd.setEjbClass(slc.getBeanClassName());
                beans.add(usmd);
-               buildWebServiceMetaData(appMetaData, slc);
+               buildWebServiceMetaData(appMetaData, slc, usmd);
             }
          }
 
@@ -86,9 +86,9 @@
       return appMetaData;
    }
 
-   private void buildWebServiceMetaData(EJBArchiveMetaData appMetaData, EJBContainer container)
+   private void buildWebServiceMetaData(EJBArchiveMetaData appMetaData, EJBContainer container, EJBMetaData usmd)
    {
-      WebContext webContext = (WebContext) container.resolveAnnotation(WebContext.class);
+      WebContext webContext = (WebContext)container.resolveAnnotation(WebContext.class);
       if (webContext != null)
       {
          String contextRoot = webContext.contextRoot();
@@ -96,6 +96,12 @@
          {
             appMetaData.setWebServiceContextRoot(contextRoot);
          }
+
+         String portComponentURI = webContext.urlPattern();
+         if (portComponentURI != null && portComponentURI.length() > 0)
+         {
+            usmd.setPortComponentURI(portComponentURI);
+         }
       }
    }