[jboss-cvs] JBossAS SVN: r66567 - in projects/metadata/trunk/src/main/java/org/jboss: metamodel/descriptor and 1 other directory.

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

Author: thomas.diesler at jboss.com
Date: 2007-10-30 10:08:12 -0400 (Tue, 30 Oct 2007)
New Revision: 66567

Modified:
   projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossMetaData.java
   projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/WebservicesMetaData.java
   projects/metadata/trunk/src/main/java/org/jboss/metamodel/descriptor/ServiceRefDelegate.java
Log:
Merge webservices meta data

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossMetaData.java	2007-10-30 13:51:50 UTC (rev 66566)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossMetaData.java	2007-10-30 14:08:12 UTC (rev 66567)
@@ -579,25 +579,27 @@
    public void merge(JBossMetaData override, EjbJarMetaData original)
    {
       super.merge(override, original);
-      if(this.assemblyDescriptor == null)
+      if(assemblyDescriptor == null)
          assemblyDescriptor = new JBossAssemblyDescriptorMetaData();
-      if(this.resourceManagers == null)
+      if(resourceManagers == null)
          resourceManagers = new ResourceManagersMetaData();
-      if(this.containerConfigurations == null)
+      if(containerConfigurations == null)
          containerConfigurations = new ContainerConfigurationsMetaData();
       if(override != null && override.containerConfigurations != null)
          containerConfigurations.merge(override.containerConfigurations);
-      if(this.invokerProxyBindings == null)
+      if(invokerProxyBindings == null)
          invokerProxyBindings = new InvokerProxyBindingsMetaData();
       if(override != null && override.invokerProxyBindings != null)
          invokerProxyBindings.merge(override.invokerProxyBindings);
-      if(this.interceptors == null)
+      if(interceptors == null)
          interceptors = new InterceptorsMetaData();
+      if(override != null && override.webservices != null)
+         webservices = new WebservicesMetaData();
 
       if(original != null)
       {
-         this.ejbVersion = original.getVersion();
-         this.relationships = original.getRelationships();
+         ejbVersion = original.getVersion();
+         relationships = original.getRelationships();
       }
 
       if(override != null && override.assemblyDescriptor != null)
@@ -630,21 +632,26 @@
          if(override.unauthenticatedPrincipal != null)
             unauthenticatedPrincipal = override.unauthenticatedPrincipal;         
       }
+      
+      if (webservices != null && override != null)
+         webservices.merge(override.webservices);
 
-      if(this.enterpriseBeans == null)
+      if(enterpriseBeans == null)
       {
          enterpriseBeans = new JBossEnterpriseBeansMetaData();
          enterpriseBeans.setJBossMetaData(this);
       }
+      
       JBossEnterpriseBeansMetaData jbeans = null;
       if(override != null)
          jbeans = override.enterpriseBeans;
+      
       EnterpriseBeansMetaData beans = null;
       if(original != null)
          beans = original.getEnterpriseBeans();
+      
       boolean isEJB3x = (original == null || original.isEJB3x());
       enterpriseBeans.merge(jbeans, beans, "ejb-jar.xml", "jboss.xml", !isEJB3x);
-
    }
 
    /**

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/WebservicesMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/WebservicesMetaData.java	2007-10-30 13:51:50 UTC (rev 66566)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/WebservicesMetaData.java	2007-10-30 14:08:12 UTC (rev 66567)
@@ -90,4 +90,13 @@
          throw new IllegalArgumentException("Null webserviceDescriptions");
       this.webserviceDescriptions = webserviceDescriptions;
    }
+
+   public void merge(WebservicesMetaData orignal)
+   {
+      if (orignal != null)
+      {
+         contextRoot = orignal.contextRoot;
+         webserviceDescriptions = orignal.webserviceDescriptions;
+      }
+   }
 }

Modified: projects/metadata/trunk/src/main/java/org/jboss/metamodel/descriptor/ServiceRefDelegate.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metamodel/descriptor/ServiceRefDelegate.java	2007-10-30 13:51:50 UTC (rev 66566)
+++ projects/metadata/trunk/src/main/java/org/jboss/metamodel/descriptor/ServiceRefDelegate.java	2007-10-30 14:08:12 UTC (rev 66567)
@@ -27,7 +27,6 @@
 import javax.naming.NamingException;
 
 import org.jboss.logging.Logger;
-import org.jboss.metadata.serviceref.ServiceReferenceHandler;
 import org.jboss.wsf.spi.SPIProvider;
 import org.jboss.wsf.spi.SPIProviderResolver;
 import org.jboss.wsf.spi.deployment.UnifiedVirtualFile;