[jboss-svn-commits] JBoss Common SVN: r2605 - in jbossxb/trunk/src/test: java/org/jboss/test/ejb/metadata/test and 1 other directories.

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

Author: scott.stark at jboss.org
Date: 2007-10-05 17:10:49 -0400 (Fri, 05 Oct 2007)
New Revision: 2605

Modified:
   jbossxb/trunk/src/test/java/org/jboss/javaee/metadata/spec/ServiceReferenceHandlerChainMetaData.java
   jbossxb/trunk/src/test/java/org/jboss/javaee/metadata/spec/ServiceReferenceMetaData.java
   jbossxb/trunk/src/test/java/org/jboss/test/ejb/metadata/test/EjbJar3xUnitTestCase.java
   jbossxb/trunk/src/test/resources/org/jboss/test/ejb/metadata/test/EjbJar3x_testServiceRefs.xml
Log:
Add handler-chain to service-ref test

Modified: jbossxb/trunk/src/test/java/org/jboss/javaee/metadata/spec/ServiceReferenceHandlerChainMetaData.java
===================================================================
--- jbossxb/trunk/src/test/java/org/jboss/javaee/metadata/spec/ServiceReferenceHandlerChainMetaData.java	2007-10-05 13:54:05 UTC (rev 2604)
+++ jbossxb/trunk/src/test/java/org/jboss/javaee/metadata/spec/ServiceReferenceHandlerChainMetaData.java	2007-10-05 21:10:49 UTC (rev 2605)
@@ -76,7 +76,7 @@
     * @param handlers the handlers.
     * @throws IllegalArgumentException for a null handlers
     */
-   @XmlElement(name="handler")
+   @XmlElement(name="handler-chain")
    public void setHandlers(ServiceReferenceHandlersMetaData handlers)
    {
       if (handlers == null)

Modified: jbossxb/trunk/src/test/java/org/jboss/javaee/metadata/spec/ServiceReferenceMetaData.java
===================================================================
--- jbossxb/trunk/src/test/java/org/jboss/javaee/metadata/spec/ServiceReferenceMetaData.java	2007-10-05 13:54:05 UTC (rev 2604)
+++ jbossxb/trunk/src/test/java/org/jboss/javaee/metadata/spec/ServiceReferenceMetaData.java	2007-10-05 21:10:49 UTC (rev 2605)
@@ -53,13 +53,16 @@
 
    /** The service qname */
    private QName serviceQname;
-   
+
+   /** The port-component-ref */
+   private PortComponentRef portComponentRef;
+
    /** The handlers */
    private ServiceReferenceHandlersMetaData handlers;
    
    /** The handler chains */
    private ServiceReferenceHandlerChainsMetaData handlerChains;
-   
+
    /**
     * Create a new ServiceReferenceMetaData.
     */
@@ -206,6 +209,17 @@
       this.wsdlFile = wsdlFile;
    }
 
+
+   public PortComponentRef getPortComponentRef()
+   {
+      return portComponentRef;
+   }
+
+   public void setPortComponentRef(PortComponentRef portComponentRef)
+   {
+      this.portComponentRef = portComponentRef;
+   }
+
    /**
     * Get the handlers.
     * 

Modified: jbossxb/trunk/src/test/java/org/jboss/test/ejb/metadata/test/EjbJar3xUnitTestCase.java
===================================================================
--- jbossxb/trunk/src/test/java/org/jboss/test/ejb/metadata/test/EjbJar3xUnitTestCase.java	2007-10-05 13:54:05 UTC (rev 2604)
+++ jbossxb/trunk/src/test/java/org/jboss/test/ejb/metadata/test/EjbJar3xUnitTestCase.java	2007-10-05 21:10:49 UTC (rev 2605)
@@ -42,6 +42,7 @@
 import org.jboss.javaee.metadata.spec.EnvironmentEntryMetaData;
 import org.jboss.javaee.metadata.spec.IconImpl;
 import org.jboss.javaee.metadata.spec.ResourceInjectionTargetMetaData;
+import org.jboss.javaee.metadata.spec.ServiceReferencesMetaData;
 //import org.jboss.metadata.ApplicationMetaData;
 //import org.jboss.metadata.BeanMetaData;
 import org.jboss.test.javaee.metadata.AbstractJavaEEMetaDataTest;
@@ -192,10 +193,15 @@
    public void testServiceRefs()
       throws Exception
    {
-         EjbJar3xMetaData result = unmarshal();
-         EnterpriseBeansMetaData beans = result.getEnterpriseBeans();
-         assertNotNull(beans);
+      enableTrace("org.jboss.xb");
+      EjbJar3xMetaData result = unmarshal();
+      EnterpriseBeansMetaData beans = result.getEnterpriseBeans();
+      assertNotNull(beans);
+      EnterpriseBeanMetaData bean = beans.get("StatelessSession1");
+      ServiceReferencesMetaData serviceRefs = bean.getServiceReferences();
+      assertNotNull(serviceRefs);
    }
+
    /**
     * Simple session/ejb-ref test
     * @throws Exception

Modified: jbossxb/trunk/src/test/resources/org/jboss/test/ejb/metadata/test/EjbJar3x_testServiceRefs.xml
===================================================================
--- jbossxb/trunk/src/test/resources/org/jboss/test/ejb/metadata/test/EjbJar3x_testServiceRefs.xml	2007-10-05 13:54:05 UTC (rev 2604)
+++ jbossxb/trunk/src/test/resources/org/jboss/test/ejb/metadata/test/EjbJar3x_testServiceRefs.xml	2007-10-05 21:10:49 UTC (rev 2605)
@@ -26,13 +26,30 @@
                 <wsdl-file>session1-wsdl-file</wsdl-file>
                 <!-- Java<->XML mapping file -->
                 <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
+                <service-qname xmlns:session1="http://www.jboss.org">session1:TestEndpointService</service-qname>
                 <port-component-ref>
                     <!-- service endpoint interface class -->
                     <service-endpoint-interface>org.jboss.test.security.interfaces.HelloEndPoint</service-endpoint-interface>
                 </port-component-ref>
+                <handler-chains>
+                    <handler-chain id="session1-chain1">
+                        <service-name-pattern>*</service-name-pattern>
+                        <handler id="sesion1-chain1-handler1">
+                            <handler-name>session1.Handler1</handler-name>
+                            <handler-class>session1.Handler1</handler-class>
+                            <init-param>
+                                <param-name>param1</param-name>
+                                <param-value>value1</param-value>
+                            </init-param>
+                            <soap-header xmlns:session1="http://www.jboss.org">session1:soap-header</soap-header>
+                            <soap-role>session1:soap-role</soap-role>
+                            <port-name>session1:soap-role</port-name>
+                        </handler>
+                    </handler-chain>
+                </handler-chains>
             </service-ref>
         </session>
-        <session>
+        <session id="session2">
             <description>A secured trival echo session bean</description>
             <ejb-name>StatelessSession2</ejb-name>
             <home>org.jboss.test.security.interfaces.StatelessSessionHome</home>