[jboss-cvs] JBossAS SVN: r66512 - 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 Oct 27 02:54:11 EDT 2007
Author: scott.stark at jboss.org
Date: 2007-10-27 02:54:11 -0400 (Sat, 27 Oct 2007)
New Revision: 66512
Added:
projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/client/ApplicationClient14_testJBossServiceRef.xml
projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/client/ApplicationClient14_testServiceRef.xml
Modified:
projects/metadata/trunk/src/main/java/org/jboss/metadata/client/jboss/JBossClientMetaData.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/client/ApplicationClient14UnitTestCase.java
Log:
Test the client metadata service reference usage
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/client/jboss/JBossClientMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/client/jboss/JBossClientMetaData.java 2007-10-27 06:53:02 UTC (rev 66511)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/client/jboss/JBossClientMetaData.java 2007-10-27 06:54:11 UTC (rev 66512)
@@ -26,11 +26,14 @@
import java.util.List;
import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlTransient;
import org.jboss.metadata.client.spec.ApplicationClientMetaData;
+import org.jboss.metadata.ejb.jboss.JBossEnvironmentRefsGroupMetaData;
import org.jboss.metadata.javaee.spec.EJBReferenceMetaData;
import org.jboss.metadata.javaee.spec.EJBReferencesMetaData;
+import org.jboss.metadata.javaee.spec.Environment;
import org.jboss.metadata.javaee.spec.EnvironmentEntriesMetaData;
import org.jboss.metadata.javaee.spec.EnvironmentEntryMetaData;
import org.jboss.metadata.javaee.spec.MessageDestinationMetaData;
@@ -67,7 +70,7 @@
private String jndiName;
/** The environment */
- private RemoteEnvironmentRefsGroupMetaData jndiEnvironmentRefsGroup;
+ private JBossEnvironmentRefsGroupMetaData jndiEnvironmentRefsGroup;
/** A list of extra dependencies to wait on */
private List<String> depends;
/** The legacy dtd public id */
@@ -175,15 +178,16 @@
this.jndiName = jndiName;
}
- public RemoteEnvironmentRefsGroupMetaData getJndiEnvironmentRefsGroup()
+ public Environment getJndiEnvironmentRefsGroup()
{
return jndiEnvironmentRefsGroup;
}
- public void setJndiEnvironmentRefsGroup(RemoteEnvironmentRefsGroupMetaData jndiEnvironmentRefsGroup)
+ @XmlElement(type=JBossEnvironmentRefsGroupMetaData.class)
+ public void setJndiEnvironmentRefsGroup(Environment jndiEnvironmentRefsGroup)
{
if(jndiEnvironmentRefsGroup == null)
throw new IllegalArgumentException("jndiEnvironmentRefsGroup is null");
- this.jndiEnvironmentRefsGroup = jndiEnvironmentRefsGroup;
+ this.jndiEnvironmentRefsGroup = (JBossEnvironmentRefsGroupMetaData) jndiEnvironmentRefsGroup;
}
// Convinence accessors
@@ -316,7 +320,7 @@
this.dtdSystemId = jboss.dtdSystemId;
if(jboss.version != null)
this.version = jboss.version;
- jbossEnv = jboss.getJndiEnvironmentRefsGroup();
+ jbossEnv = jboss.jndiEnvironmentRefsGroup;
jbossMsgs = jboss.getMessageDestinations();
}
if(spec != null)
@@ -335,7 +339,7 @@
this.setCallbackHandler(spec.getCallbackHandler());
if(jndiEnvironmentRefsGroup == null)
- jndiEnvironmentRefsGroup = new RemoteEnvironmentRefsGroupMetaData();
+ jndiEnvironmentRefsGroup = new JBossEnvironmentRefsGroupMetaData();
jndiEnvironmentRefsGroup.merge(jbossEnv, specEnv, false);
// Get the merged resource-env-refs
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-10-27 06:53:02 UTC (rev 66511)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/client/ApplicationClient14UnitTestCase.java 2007-10-27 06:54:11 UTC (rev 66512)
@@ -21,22 +21,29 @@
*/
package org.jboss.test.metadata.client;
+import java.util.List;
import java.util.Set;
+import javax.xml.namespace.QName;
+
import org.jboss.metadata.client.jboss.JBossClient5DTDMetaData;
import org.jboss.metadata.client.jboss.JBossClientMetaData;
import org.jboss.metadata.client.spec.ApplicationClient14MetaData;
import org.jboss.metadata.client.spec.ApplicationClientMetaData;
import org.jboss.metadata.ear.spec.Ear13DTDMetaData;
+import org.jboss.metadata.javaee.jboss.JBossPortComponentRef;
+import org.jboss.metadata.javaee.jboss.JBossServiceReferenceMetaData;
import org.jboss.metadata.javaee.spec.LifecycleCallbacksMetaData;
import org.jboss.metadata.javaee.spec.MessageDestinationMetaData;
import org.jboss.metadata.javaee.spec.MessageDestinationReferenceMetaData;
import org.jboss.metadata.javaee.spec.MessageDestinationUsageType;
import org.jboss.metadata.javaee.spec.MessageDestinationsMetaData;
import org.jboss.metadata.javaee.spec.PersistenceUnitReferencesMetaData;
+import org.jboss.metadata.javaee.spec.PortComponentRef;
import org.jboss.metadata.javaee.spec.ResourceEnvironmentReferenceMetaData;
import org.jboss.metadata.javaee.spec.ResourceInjectionTargetMetaData;
import org.jboss.metadata.javaee.spec.ResourceReferenceMetaData;
+import org.jboss.metadata.javaee.spec.ServiceReferenceMetaData;
import org.jboss.test.metadata.javaee.AbstractJavaEEEverythingTest;
import org.jboss.xb.binding.sunday.unmarshalling.DefaultSchemaResolver;
import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
@@ -60,6 +67,7 @@
DefaultSchemaResolver resolver = new DefaultSchemaResolver();
resolver.addClassBindingForLocation("application-client_1_4.xsd", ApplicationClient14MetaData.class);
resolver.addClassBindingForLocation("jboss-client_4_0.dtd", JBossClient5DTDMetaData.class);
+ resolver.addClassBindingForLocation("jboss-client_4_2.dtd", JBossClient5DTDMetaData.class);
return resolver;
}
@@ -144,6 +152,30 @@
assertEquals("queue/B", md0.getMappedName());
}
+ public void testServiceRef() throws Exception
+ {
+ ApplicationClientMetaData appClientMetaData = unmarshal("ApplicationClient14_testServiceRef.xml", ApplicationClientMetaData.class, null);
+ JBossClientMetaData jbossClientMetaData = unmarshal("ApplicationClient14_testJBossServiceRef.xml", JBossClientMetaData.class, null);
+ JBossClientMetaData metaData = new JBossClientMetaData();
+ metaData.merge(jbossClientMetaData, appClientMetaData, true);
+
+ ServiceReferenceMetaData sref = metaData.getServiceReferenceByName("service/beanMirrorSEI");
+ assertNotNull(sref);
+ assertTrue(sref instanceof JBossServiceReferenceMetaData);
+ JBossServiceReferenceMetaData jsref = (JBossServiceReferenceMetaData) sref;
+
+ assertEquals("javax.xml.rpc.Service", jsref.getServiceInterface());
+ 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();
+ assertEquals(1, pcrefs.size());
+ JBossPortComponentRef pcref = (JBossPortComponentRef) pcrefs.get(0);
+ assertEquals("com.sun.ts.tests.webservices.deploy.beanMirrorSEI.HelloWs", pcref.getServiceEndpointInterface());
+ QName qname = new QName("http://BeanMirrorSEI.org", "HelloWsPort");
+ assertEquals(qname, pcref.getPortQname());
+ }
+
protected ApplicationClientMetaData unmarshal() throws Exception
{
return unmarshal(ApplicationClientMetaData.class);
Added: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/client/ApplicationClient14_testJBossServiceRef.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/client/ApplicationClient14_testJBossServiceRef.xml (rev 0)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/client/ApplicationClient14_testJBossServiceRef.xml 2007-10-27 06:54:11 UTC (rev 66512)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jboss-client
+ PUBLIC "-//JBoss//DTD Application Client 4.2//EN"
+ "http://www.jboss.org/j2ee/dtd/jboss-client_4_2.dtd">
+
+<jboss-client>
+ <jndi-name>BeanMirrorSEIClient_client</jndi-name>
+ <service-ref>
+ <service-ref-name>service/beanMirrorSEI</service-ref-name>
+ <port-component-ref>
+ <service-endpoint-interface>com.sun.ts.tests.webservices.deploy.beanMirrorSEI.HelloWs</service-endpoint-interface>
+ <port-qname>{http://BeanMirrorSEI.org}HelloWsPort</port-qname>
+ </port-component-ref>
+ <wsdl-override>http://localhost:8080/BeanMirrorSEIWeb/ws4ee/beanMirrorSEI?WSDL</wsdl-override>
+ </service-ref>
+</jboss-client>
Property changes on: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/client/ApplicationClient14_testJBossServiceRef.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ native
Added: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/client/ApplicationClient14_testServiceRef.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/client/ApplicationClient14_testServiceRef.xml (rev 0)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/client/ApplicationClient14_testServiceRef.xml 2007-10-27 06:54:11 UTC (rev 66512)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<application-client xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ version="1.4"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd">
+ <display-name>BeanMirrorSEIClient_client</display-name>
+ <service-ref>
+ <service-ref-name>service/beanMirrorSEI</service-ref-name>
+ <service-interface>javax.xml.rpc.Service</service-interface>
+ <wsdl-file>META-INF/wsdl/BeanMirrorSEI.wsdl</wsdl-file>
+ <jaxrpc-mapping-file>BeanMirrorSEI.xml</jaxrpc-mapping-file>
+ <port-component-ref>
+ <service-endpoint-interface>com.sun.ts.tests.webservices.deploy.beanMirrorSEI.HelloWs</service-endpoint-interface>
+ </port-component-ref>
+ </service-ref>
+</application-client>
Property changes on: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/client/ApplicationClient14_testServiceRef.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ native
More information about the jboss-cvs-commits
mailing list