[jboss-cvs] JBossAS SVN: r69129 - in branches/Branch_4_2/ejb3: src/resources/test/webservices/META-INF and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Jan 18 13:11:09 EST 2008
Author: heiko.braun at jboss.com
Date: 2008-01-18 13:11:09 -0500 (Fri, 18 Jan 2008)
New Revision: 69129
Removed:
branches/Branch_4_2/ejb3/src/resources/test/webservices/META-INF/jaxrpc-mapping.xml
Modified:
branches/Branch_4_2/ejb3/build-test.xml
branches/Branch_4_2/ejb3/src/resources/test/webservices/META-INF/ejb-jar.xml
branches/Branch_4_2/ejb3/src/resources/test/webservices/META-INF/jboss.xml
Log:
Fix jsr181 test cases
Modified: branches/Branch_4_2/ejb3/build-test.xml
===================================================================
--- branches/Branch_4_2/ejb3/build-test.xml 2008-01-18 18:00:16 UTC (rev 69128)
+++ branches/Branch_4_2/ejb3/build-test.xml 2008-01-18 18:11:09 UTC (rev 69129)
@@ -4866,16 +4866,15 @@
<start-jboss conf="all" host="${node0}" jboss.dist="${ejb3.dist}" jvmargs="${ejb3.jboss.jvmargs}"/>
<wait-on-host/>
- <antcall target="no-start-jboss-iiop-tests" inheritRefs="true"/>
+ <antcall target="no-start-jboss-webservices-tests" inheritRefs="true"/>
<stop-jboss jboss.dist="${ejb3.dist}"/>
<wait-on-shutdown conf="all"/>
</target>
<target name="no-start-jboss-webservices-tests" depends="init" description="Execute all webservices tests">
- <antcall target="jacorb-test" inheritRefs="true">
+ <antcall target="test" inheritRefs="true">
<param name="test" value="webservices"/>
</antcall>
- <!-- TODO: call sunorb-test, but the report gets overwritten -->
</target>
</project>
Modified: branches/Branch_4_2/ejb3/src/resources/test/webservices/META-INF/ejb-jar.xml
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/webservices/META-INF/ejb-jar.xml 2008-01-18 18:00:16 UTC (rev 69128)
+++ branches/Branch_4_2/ejb3/src/resources/test/webservices/META-INF/ejb-jar.xml 2008-01-18 18:11:09 UTC (rev 69129)
@@ -1,51 +1,32 @@
<?xml version="1.0" encoding="UTF-8"?>
-<ejb-jar
- xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd"
- version="3.0">
- <description>jBoss test application </description>
+<ejb-jar version="3.0"
+ xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd">
+
+ <description>jBoss test application</description>
<display-name>Test</display-name>
<enterprise-beans>
<session>
<ejb-name>StatelessBean</ejb-name>
<service-ref>
- <service-ref-name>service/Endpoint3</service-ref-name>
- <service-interface>org.jboss.ejb3.test.webservices.jsr181.EndpointInterface</service-interface>
- <mapped-name>jbossws-client/service/TestService</mapped-name>
- <injection-target>
- <injection-target-class>org.jboss.ejb3.test.webservices.jsr181.StatelessBean</injection-target-class>
+ <service-ref-name>service/Endpoint3</service-ref-name>
+ <service-interface>javax.xml.ws.Service</service-interface>
+ <mapped-name>jbossws-client/service/TestService</mapped-name>
+ <injection-target>
+ <injection-target-class>org.jboss.test.ws.jaxws.jbws1841.StatelessBean</injection-target-class>
<injection-target-name>endpoint3</injection-target-name>
</injection-target>
- </service-ref>
- <service-ref>
- <service-ref-name>service/Endpoint4</service-ref-name>
- <service-interface>org.jboss.ejb3.test.webservices.jsr181.EndpointInterface</service-interface>
- <mapped-name>jbossws-client/service/TestService</mapped-name>
- <injection-target>
- <injection-target-class>org.jboss.ejb3.test.webservices.jsr181.StatelessBean</injection-target-class>
+ </service-ref>
+ <service-ref>
+ <service-ref-name>service/Endpoint4</service-ref-name>
+ <service-interface>javax.xml.ws.Service</service-interface>
+ <mapped-name>jbossws-client/service/TestService</mapped-name>
+ <injection-target>
+ <injection-target-class>org.jboss.test.ws.jaxws.jbws1841.StatelessBean</injection-target-class>
<injection-target-name>setEndpoint4</injection-target-name>
</injection-target>
- </service-ref>
- <service-ref>
- <service-ref-name>service/Service3</service-ref-name>
- <service-interface>org.jboss.ejb3.test.webservices.jsr181.EndpointInterface</service-interface>
- <mapped-name>jbossws-client/service/TestService</mapped-name>
- <injection-target>
- <injection-target-class>org.jboss.ejb3.test.webservices.jsr181.StatelessBean</injection-target-class>
- <injection-target-name>service3</injection-target-name>
- </injection-target>
- </service-ref>
- <service-ref>
- <service-ref-name>service/Service4</service-ref-name>
- <service-interface>org.jboss.ejb3.test.webservices.jsr181.EndpointInterface</service-interface>
- <mapped-name>jbossws-client/service/TestService</mapped-name>
- <injection-target>
- <injection-target-class>org.jboss.ejb3.test.webservices.jsr181.StatelessBean</injection-target-class>
- <injection-target-name>setService4</injection-target-name>
- </injection-target>
- </service-ref>
+ </service-ref>
</session>
</enterprise-beans>
</ejb-jar>
Deleted: branches/Branch_4_2/ejb3/src/resources/test/webservices/META-INF/jaxrpc-mapping.xml
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/webservices/META-INF/jaxrpc-mapping.xml 2008-01-18 18:00:16 UTC (rev 69128)
+++ branches/Branch_4_2/ejb3/src/resources/test/webservices/META-INF/jaxrpc-mapping.xml 2008-01-18 18:11:09 UTC (rev 69129)
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd">
- <package-mapping>
- <package-type>org.jboss.ejb3.test.webservices.jsr181</package-type>
- <namespaceURI>http://www.openuri.org/2004/04/HelloWorld/types</namespaceURI>
- </package-mapping>
- <package-mapping>
- <package-type>org.jboss.ejb3.test.webservices.jsr181</package-type>
- <namespaceURI>http://www.openuri.org/2004/04/HelloWorld</namespaceURI>
- </package-mapping>
- <service-interface-mapping>
- <service-interface>org.jboss.ejb3.test.webservices.jsr181.TestService</service-interface>
- <wsdl-service-name xmlns:serviceNS="http://www.openuri.org/2004/04/HelloWorld">serviceNS:TestService</wsdl-service-name>
- <port-mapping>
- <port-name>EndpointInterfacePort</port-name>
- <java-port-name>EndpointInterfacePort</java-port-name>
- </port-mapping>
- </service-interface-mapping>
- <service-endpoint-interface-mapping>
- <service-endpoint-interface>org.jboss.ejb3.test.webservices.jsr181.EndpointInterface</service-endpoint-interface>
- <wsdl-port-type xmlns:portTypeNS="http://www.openuri.org/2004/04/HelloWorld">portTypeNS:EndpointInterface</wsdl-port-type>
- <wsdl-binding xmlns:bindingNS="http://www.openuri.org/2004/04/HelloWorld">bindingNS:EndpointInterfaceBinding</wsdl-binding>
- <service-endpoint-method-mapping>
- <java-method-name>echo</java-method-name>
- <wsdl-operation>echo</wsdl-operation>
- <method-param-parts-mapping>
- <param-position>0</param-position>
- <param-type>java.lang.String</param-type>
- <wsdl-message-mapping>
- <wsdl-message xmlns:wsdlMsgNS="http://www.openuri.org/2004/04/HelloWorld">wsdlMsgNS:EndpointInterface_echo</wsdl-message>
- <wsdl-message-part-name>arg0</wsdl-message-part-name>
- <parameter-mode>IN</parameter-mode>
- </wsdl-message-mapping>
- </method-param-parts-mapping>
- <wsdl-return-value-mapping>
- <method-return-value>java.lang.String</method-return-value>
- <wsdl-message xmlns:wsdlMsgNS="http://www.openuri.org/2004/04/HelloWorld">wsdlMsgNS:EndpointInterface_echoResponse</wsdl-message>
- <wsdl-message-part-name>return</wsdl-message-part-name>
- </wsdl-return-value-mapping>
- </service-endpoint-method-mapping>
- </service-endpoint-interface-mapping>
-</java-wsdl-mapping>
Modified: branches/Branch_4_2/ejb3/src/resources/test/webservices/META-INF/jboss.xml
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/webservices/META-INF/jboss.xml 2008-01-18 18:00:16 UTC (rev 69128)
+++ branches/Branch_4_2/ejb3/src/resources/test/webservices/META-INF/jboss.xml 2008-01-18 18:11:09 UTC (rev 69129)
@@ -1,20 +1,19 @@
-<jboss
- xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- http://www.jboss.org/j2ee/schema/jboss_5_0.xsd"
- version="3.0">
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd">
+
+<jboss>
+
<enterprise-beans>
<session>
<ejb-name>StatelessBean</ejb-name>
<service-ref>
- <service-ref-name>service/Endpoint3</service-ref-name>
+ <service-ref-name>service/Endpoint3</service-ref-name>
<wsdl-override>META-INF/wsdl/TestService.wsdl</wsdl-override>
- </service-ref>
- <service-ref>
- <service-ref-name>service/Endpoint4</service-ref-name>
+ </service-ref>
+ <service-ref>
+ <service-ref-name>service/Endpoint4</service-ref-name>
<wsdl-override>META-INF/wsdl/TestService.wsdl</wsdl-override>
- </service-ref>
+ </service-ref>
</session>
</enterprise-beans>
</jboss>
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list