[jboss-cvs] JBossAS SVN: r66205 - in projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee: spec and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Oct 17 00:40:21 EDT 2007
Author: scott.stark at jboss.org
Date: 2007-10-17 00:40:20 -0400 (Wed, 17 Oct 2007)
New Revision: 66205
Modified:
projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/jboss/JBossRemoteEnvironmentRefsGroupMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/ServiceReferenceMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/ServiceReferencesMetaData.java
Log:
Integrate service-ref into jboss remote environment
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/jboss/JBossRemoteEnvironmentRefsGroupMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/jboss/JBossRemoteEnvironmentRefsGroupMetaData.java 2007-10-17 04:39:43 UTC (rev 66204)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/jboss/JBossRemoteEnvironmentRefsGroupMetaData.java 2007-10-17 04:40:20 UTC (rev 66205)
@@ -30,6 +30,7 @@
import org.jboss.metadata.javaee.spec.RemoteEnvironmentRefsGroupMetaData;
import org.jboss.metadata.javaee.spec.ResourceEnvironmentReferencesMetaData;
import org.jboss.metadata.javaee.spec.ResourceReferencesMetaData;
+import org.jboss.metadata.javaee.spec.ServiceReferencesMetaData;
import org.jboss.xb.annotations.JBossXmlModelGroup;
/**
@@ -42,6 +43,7 @@
propOrder={
"environmentEntries",
"ejbReferences",
+ "serviceReferences",
"resourceReferences",
"resourceEnvironmentReferences",
"messageDestinationReferences",
@@ -63,6 +65,8 @@
EnvironmentEntriesMetaData envEntries = null;
EJBReferencesMetaData ejbRefs = null;
EJBReferencesMetaData jbossEjbRefs = null;
+ ServiceReferencesMetaData serviceRefs = null;
+ ServiceReferencesMetaData jbossServiceRefs = null;
ResourceReferencesMetaData resRefs = null;
ResourceReferencesMetaData jbossResRefs = null;
ResourceEnvironmentReferencesMetaData resEnvRefs = null;
@@ -77,7 +81,7 @@
{
envEntries = environmentRefsGroup.getEnvironmentEntries();
ejbRefs = environmentRefsGroup.getEjbReferences();
- // ServiceRefs
+ serviceRefs = environmentRefsGroup.getServiceReferences();
resRefs = environmentRefsGroup.getResourceReferences();
resEnvRefs = environmentRefsGroup.getResourceEnvironmentReferences();
messageDestinationRefs = environmentRefsGroup.getMessageDestinationReferences();
@@ -89,6 +93,7 @@
if (jbossEnvironmentRefsGroup != null)
{
jbossEjbRefs = jbossEnvironmentRefsGroup.getEjbReferences();
+ jbossServiceRefs = jbossEnvironmentRefsGroup.getServiceReferences();
jbossResRefs = jbossEnvironmentRefsGroup.getResourceReferences();
jbossResEnvRefs = jbossEnvironmentRefsGroup.getResourceEnvironmentReferences();
jbossMessageDestinationRefs = jbossEnvironmentRefsGroup.getMessageDestinationReferences();
@@ -98,6 +103,10 @@
if (mergedEjbRefs != null)
merged.setEjbReferences(mergedEjbRefs);
+ ServiceReferencesMetaData mergedServiceRefs = ServiceReferencesMetaData.merge(jbossServiceRefs, serviceRefs, overridenFile, overrideFile);
+ if (mergedServiceRefs != null)
+ merged.setServiceReferences(mergedServiceRefs);
+
ResourceReferencesMetaData mergedResRefs = ResourceReferencesMetaData.merge(jbossResRefs, resRefs, overridenFile, overrideFile);
if (mergedResRefs != null)
merged.setResourceReferences(mergedResRefs);
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/ServiceReferenceMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/ServiceReferenceMetaData.java 2007-10-17 04:39:43 UTC (rev 66204)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/ServiceReferenceMetaData.java 2007-10-17 04:40:20 UTC (rev 66205)
@@ -25,16 +25,19 @@
import javax.xml.bind.annotation.XmlType;
import javax.xml.namespace.QName;
+import org.jboss.metadata.javaee.support.MergeableMappedMetaData;
import org.jboss.metadata.javaee.support.ResourceInjectionMetaDataWithDescriptionGroup;
/**
* ServiceReferenceMetaData.
*
* @author <a href="adrian at jboss.com">Adrian Brock</a>
- * @version $Revision: 1.1 $
+ * @author Scott.Stark at jboss.org
+ * @version $Revision$
*/
@XmlType(name="service-refType")
public class ServiceReferenceMetaData extends ResourceInjectionMetaDataWithDescriptionGroup
+ implements MergeableMappedMetaData<ServiceReferenceMetaData>
{
/** The serialVersionUID */
private static final long serialVersionUID = 5693673588576610322L;
@@ -71,7 +74,57 @@
// For serialization
}
+ public ServiceReferenceMetaData merge(ServiceReferenceMetaData original)
+ {
+ ServiceReferenceMetaData merged = new ServiceReferenceMetaData();
+ merge(merged, original);
+ return merged;
+ }
+
/**
+ * Merge
+ *
+ * @param merged the data to merge into
+ * @param original the original data
+ */
+ public void merge(ServiceReferenceMetaData merged, ServiceReferenceMetaData original)
+ {
+ super.merge(merged, original);
+ if (serviceInterface != null)
+ merged.setServiceInterface(serviceInterface);
+ else if (original.serviceInterface != null)
+ merged.setServiceInterface(original.serviceInterface);
+ if(serviceRefType != null)
+ merged.setServiceRefType(serviceRefType);
+ else if (original.serviceRefType != null)
+ merged.setServiceRefType(original.serviceRefType);
+ if(wsdlFile != null)
+ merged.setWsdlFile(wsdlFile);
+ else if (original.wsdlFile != null)
+ merged.setWsdlFile(original.wsdlFile);
+ if(jaxrpcMappingFile != null)
+ merged.setJaxrpcMappingFile(jaxrpcMappingFile);
+ else if (original.jaxrpcMappingFile != null)
+ merged.setJaxrpcMappingFile(original.jaxrpcMappingFile);
+ if(serviceQname != null)
+ merged.setServiceQname(serviceQname);
+ else if (original.serviceQname != null)
+ merged.setServiceQname(original.serviceQname);
+ if(portComponentRef != null)
+ merged.setPortComponentRef(portComponentRef);
+ else if (original.portComponentRef != null)
+ merged.setPortComponentRef(original.portComponentRef);
+ if(handlers != null)
+ merged.setHandlers(handlers);
+ else if (original.handlers != null)
+ merged.setHandlers(original.handlers);
+ if(handlerChains != null)
+ merged.setHandlerChains(handlerChains);
+ else if (original.handlers != null)
+ merged.setHandlerChains(original.handlerChains);
+ }
+
+ /**
* Get the serviceRefName.
*
* @return the serviceRefName.
Property changes on: projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/ServiceReferenceMetaData.java
___________________________________________________________________
Name: svn:keywords
+ Revision
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/ServiceReferencesMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/ServiceReferencesMetaData.java 2007-10-17 04:39:43 UTC (rev 66204)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/ServiceReferencesMetaData.java 2007-10-17 04:40:20 UTC (rev 66205)
@@ -22,6 +22,7 @@
package org.jboss.metadata.javaee.spec;
import org.jboss.metadata.javaee.support.AbstractMappedMetaData;
+import org.jboss.metadata.javaee.support.JavaEEMetaDataUtil;
/**
* The service-refGroup type
@@ -43,4 +44,25 @@
{
super("service ref name for service ref");
}
+ /**
+ * Merge resource references
+ *
+ * @param override the override references
+ * @param overriden the overriden references
+ * @param overridenFile the overriden file name
+ * @param overrideFile the override file
+ * @return the merged referencees
+ */
+ public static ServiceReferencesMetaData merge(ServiceReferencesMetaData override, ServiceReferencesMetaData overriden, String overridenFile, String overrideFile)
+ {
+ if (override == null && overriden == null)
+ return null;
+
+ if (override == null)
+ return overriden;
+
+ ServiceReferencesMetaData merged = new ServiceReferencesMetaData();
+ return JavaEEMetaDataUtil.merge(merged, overriden, override, "service-ref", overridenFile, overrideFile, true);
+ }
+
}
More information about the jboss-cvs-commits
mailing list