[jboss-cvs] JBossAS SVN: r66700 - in projects/metadata/trunk/src: test/java/org/jboss/test/metadata/client and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sat Nov 3 04:44:47 EDT 2007
Author: scott.stark at jboss.org
Date: 2007-11-03 04:44:47 -0400 (Sat, 03 Nov 2007)
New Revision: 66700
Modified:
projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/jboss/JBossPortComponentRef.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/jboss/JBossServiceReferenceMetaData.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/client/ApplicationClient14UnitTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/client/ApplicationClient5UnitTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss42UnitTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss50UnitTestCase.java
Log:
Update port component ref merging
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/jboss/JBossPortComponentRef.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/jboss/JBossPortComponentRef.java 2007-11-03 08:01:12 UTC (rev 66699)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/jboss/JBossPortComponentRef.java 2007-11-03 08:44:47 UTC (rev 66700)
@@ -130,17 +130,17 @@
if (override != null && override.portQname != null)
portQname = override.portQname;
else if (original != null && original.portQname != null)
- portQname = override.portQname;
+ portQname = original.portQname;
if (override != null && override.configName != null)
configName = override.configName;
else if (original != null && original.configName != null)
- configName = override.configName;
+ configName = original.configName;
if (override != null && override.configFile != null)
configFile = override.configFile;
else if (original != null && original.configFile != null)
- configFile = override.configFile;
+ configFile = original.configFile;
if (stubProperties == null)
stubProperties = new ArrayList<StubPropertyMetaData>();
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/jboss/JBossServiceReferenceMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/jboss/JBossServiceReferenceMetaData.java 2007-11-03 08:01:12 UTC (rev 66699)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/jboss/JBossServiceReferenceMetaData.java 2007-11-03 08:44:47 UTC (rev 66700)
@@ -150,7 +150,14 @@
this.jbossPortComponentRef = (List<JBossPortComponentRef>)portComponentRef;
}
+ @Override
+ public List<? extends PortComponentRef> getPortComponentRef()
+ {
+ return jbossPortComponentRef;
+ }
+
@XmlTransient
+ @Override
public void setPortComponentRef(List<? extends PortComponentRef> portComponentRef)
{
super.setPortComponentRef(portComponentRef);
@@ -193,26 +200,41 @@
super.merge(sr0, sr1);
// TODO: how to merge portComponentRef
- if (override != null && override.getPortComponentRef() != null)
+ if (original != null && original.getPortComponentRef() != null)
{
if (jbossPortComponentRef == null)
jbossPortComponentRef = new ArrayList<JBossPortComponentRef>();
- for (PortComponentRef ref : override.getPortComponentRef())
+ for (PortComponentRef ref : original.getPortComponentRef())
{
JBossPortComponentRef jref = new JBossPortComponentRef();
jref.merge(null, ref);
jbossPortComponentRef.add(jref);
}
}
- if (original != null && original.getPortComponentRef() != null)
+ if (override != null && override.getJBossPortComponentRef() != null)
{
if (jbossPortComponentRef == null)
jbossPortComponentRef = new ArrayList<JBossPortComponentRef>();
- for (PortComponentRef ref : original.getPortComponentRef())
+ for (JBossPortComponentRef ref : override.getJBossPortComponentRef())
{
- JBossPortComponentRef jref = new JBossPortComponentRef();
+ JBossPortComponentRef jref = null;
+ boolean shouldAdd = true;
+ // TODO: there is no unique key so
+ for(JBossPortComponentRef ref2 : jbossPortComponentRef)
+ {
+ String sei = ref2.getServiceEndpointInterface();
+ if(sei != null && sei.equals(ref.getServiceEndpointInterface()))
+ {
+ jref = ref2;
+ shouldAdd = false;
+ break;
+ }
+ }
+ if(jref == null)
+ jref = new JBossPortComponentRef();
jref.merge(null, ref);
- jbossPortComponentRef.add(jref);
+ if(shouldAdd)
+ jbossPortComponentRef.add(jref);
}
}
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/client/ApplicationClient14UnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/client/ApplicationClient14UnitTestCase.java 2007-11-03 08:01:12 UTC (rev 66699)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/client/ApplicationClient14UnitTestCase.java 2007-11-03 08:44:47 UTC (rev 66700)
@@ -168,7 +168,7 @@
assertEquals("META-INF/wsdl/BeanMirrorSEI.wsdl", jsref.getWsdlFile());
assertEquals("BeanMirrorSEI.xml", jsref.getJaxrpcMappingFile());
assertEquals("http://localhost:8080/BeanMirrorSEIWeb/ws4ee/beanMirrorSEI?WSDL", jsref.getWsdlOverride());
- List<? extends PortComponentRef> pcrefs = jsref.getPortComponentRef();
+ List<? extends PortComponentRef> pcrefs = jsref.getJBossPortComponentRef();
assertEquals(1, pcrefs.size());
JBossPortComponentRef pcref = (JBossPortComponentRef) pcrefs.get(0);
assertEquals("com.sun.ts.tests.webservices.deploy.beanMirrorSEI.HelloWs", pcref.getServiceEndpointInterface());
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/client/ApplicationClient5UnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/client/ApplicationClient5UnitTestCase.java 2007-11-03 08:01:12 UTC (rev 66699)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/client/ApplicationClient5UnitTestCase.java 2007-11-03 08:44:47 UTC (rev 66700)
@@ -72,7 +72,7 @@
assertEquals(7, mergedMetaData.getServiceReferences().size());
JBossServiceReferenceMetaData port2 = (JBossServiceReferenceMetaData) mergedMetaData.getServiceReferenceByName("Port2");
- List<? extends PortComponentRef> pcrefs = port2.getPortComponentRef();
+ List<? extends PortComponentRef> pcrefs = port2.getJBossPortComponentRef();
assertEquals(1, pcrefs.size());
JBossPortComponentRef pcref = (JBossPortComponentRef) pcrefs.get(0);
assertEquals("META-INF/jbossws-client-config.xml", pcref.getConfigFile());
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss42UnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss42UnitTestCase.java 2007-11-03 08:01:12 UTC (rev 66699)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss42UnitTestCase.java 2007-11-03 08:44:47 UTC (rev 66700)
@@ -140,7 +140,7 @@
assertEquals("org.jboss.tests.ws.jaxws.webserviceref.SecureEndpointService", jSecureService.getServiceClass());
QName name = new QName("http://org.jboss.ws/wsref", "SecureEndpointService");
assertEquals(name, SecureService.getServiceQname());
- List<? extends PortComponentRef> pcrefs = SecureService.getPortComponentRef();
+ List<? extends PortComponentRef> pcrefs = jSecureService.getJBossPortComponentRef();
assertEquals(1, pcrefs.size());
JBossPortComponentRef pcref = (JBossPortComponentRef) pcrefs.get(0);
assertNotNull(pcref);
@@ -157,7 +157,7 @@
JBossServiceReferenceMetaData jsession0ServiceRef0 = (JBossServiceReferenceMetaData) session0ServiceRef0;
assertEquals("session0ServiceRef0", session0ServiceRef0.getServiceRefName());
assertEquals("session0ServiceImplClass", jsession0ServiceRef0.getServiceClass());
- List<? extends PortComponentRef> session0Pcrefs = session0ServiceRef0.getPortComponentRef();
+ List<? extends PortComponentRef> session0Pcrefs = jsession0ServiceRef0.getJBossPortComponentRef();
assertEquals(1, session0Pcrefs.size());
JBossPortComponentRef session0Pcref = (JBossPortComponentRef) session0Pcrefs.get(0);
assertNotNull(session0Pcref);
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss50UnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss50UnitTestCase.java 2007-11-03 08:01:12 UTC (rev 66699)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss50UnitTestCase.java 2007-11-03 08:44:47 UTC (rev 66700)
@@ -707,7 +707,15 @@
jbossMetaData.merge(jbossXmlMetaData, specData);
validateResourceRefs(jbossMetaData);
}
-
+
+ public void test3xEjb()
+ throws Exception
+ {
+ JBossXBTestDelegate xbdelegate = (JBossXBTestDelegate) super.getDelegate();
+ xbdelegate.setValidateSchema(true);
+ JBossMetaData jbossXmlMetaData = unmarshal();
+ }
+
protected void validateResourceRefs(JBossMetaData jbossMetaData)
{
// Validate the resource managers
@@ -745,4 +753,5 @@
assertEquals("topicref", jmsRef2.getResourceName());
assertEquals("topic/testTopic", jmsRef2.getJndiName());
}
+
}
More information about the jboss-cvs-commits
mailing list