[jboss-cvs] JBossAS SVN: r60910 - in branches/Branch_4_2/ejb3: src/resources/test/webservices/META-INF and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Feb 26 10:56:51 EST 2007
Author: wolfc
Date: 2007-02-26 10:56:51 -0500 (Mon, 26 Feb 2007)
New Revision: 60910
Modified:
branches/Branch_4_2/ejb3/build-test.xml
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/wsdl/TestService.wsdl
branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jaxws/EndpointEJB.java
branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/webservices/jsr181/EJB3Bean.java
Log:
Fixed some jbossws tests
Modified: branches/Branch_4_2/ejb3/build-test.xml
===================================================================
--- branches/Branch_4_2/ejb3/build-test.xml 2007-02-26 15:34:34 UTC (rev 60909)
+++ branches/Branch_4_2/ejb3/build-test.xml 2007-02-26 15:56:51 UTC (rev 60910)
@@ -71,6 +71,8 @@
<property name="jbosstest.dist" value="${ejb3.dist}"/>
<property name="ejb3.jboss.jvmargs" value="-Xmx128m"/>
+
+ <property name="endorsed.dirs" value="${ejb3.dist}/lib/endorsed/"/>
<macrodef name="wait-on-host">
<attribute name="seconds" default="${jboss.startup.timeout}"/>
@@ -146,6 +148,9 @@
<path refid="jboss.microcontainer.classpath"/>
<path refid="jboss.jbossxb.classpath"/>
<path refid="hsqldb.hsqldb.classpath"/>
+
+ <!-- For jbossws -->
+ <path refid="ibm.wsdl4j.classpath"/>
</path>
<!-- ======= -->
@@ -253,6 +258,12 @@
<pathelement path="${ejb3.dist}/client/hibernate-annotations.jar"/>
<pathelement path="${ejb3.dist}/client/trove.jar"/>
<pathelement path="${ejb3.dist}/client/antlr.jar"/>
+
+ <!-- For jbossws -->
+ <pathelement path="${ejb3.dist}/client/jaxb-api.jar"/>
+ <pathelement path="${ejb3.dist}/client/jaxb-impl.jar"/>
+ <pathelement path="${ejb3.dist}/client/wsdl4j.jar"/>
+ <pathelement path="${ejb3.dist}/client/jbossws-client.jar"/>
</path>
<!-- The "security" test needs JaasSecurityManagerServiceMBean -->
@@ -3016,6 +3027,7 @@
showoutput="yes"
fork="true">
+ <sysproperty key="java.endorsed.dirs" value="${endorsed.dirs}"/>
<sysproperty key="jbosstest.deploy.dir" value="${build.lib}"/>
<sysproperty key="build.testlog" value="${build.testlog}"/>
<sysproperty key="log4j.configuration" value="file:${resources}/test/log4j.xml"/>
Modified: 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 2007-02-26 15:34:34 UTC (rev 60909)
+++ branches/Branch_4_2/ejb3/src/resources/test/webservices/META-INF/jaxrpc-mapping.xml 2007-02-26 15:56:51 UTC (rev 60910)
@@ -28,14 +28,14 @@
<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>String_1</wsdl-message-part-name>
+ <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>result</wsdl-message-part-name>
+ <wsdl-message-part-name>return</wsdl-message-part-name>
</wsdl-return-value-mapping>
</service-endpoint-method-mapping>
</service-endpoint-interface-mapping>
Modified: branches/Branch_4_2/ejb3/src/resources/test/webservices/META-INF/wsdl/TestService.wsdl
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/webservices/META-INF/wsdl/TestService.wsdl 2007-02-26 15:34:34 UTC (rev 60909)
+++ branches/Branch_4_2/ejb3/src/resources/test/webservices/META-INF/wsdl/TestService.wsdl 2007-02-26 15:56:51 UTC (rev 60910)
@@ -3,13 +3,13 @@
<definitions name="TestService" targetNamespace="http://www.openuri.org/2004/04/HelloWorld" xmlns:tns="http://www.openuri.org/2004/04/HelloWorld" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
<types/>
<message name="EndpointInterface_echo">
- <part name="String_1" type="xsd:string"/>
+ <part name="arg0" type="xsd:string"/>
</message>
<message name="EndpointInterface_echoResponse">
- <part name="result" type="xsd:string"/>
+ <part name="return" type="xsd:string"/>
</message>
<portType name="EndpointInterface">
- <operation name="echo" parameterOrder="String_1">
+ <operation name="echo" parameterOrder="arg0">
<input message="tns:EndpointInterface_echo"/>
<output message="tns:EndpointInterface_echoResponse"/>
</operation>
Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jaxws/EndpointEJB.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jaxws/EndpointEJB.java 2007-02-26 15:34:34 UTC (rev 60909)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jaxws/EndpointEJB.java 2007-02-26 15:56:51 UTC (rev 60910)
@@ -33,7 +33,10 @@
import javax.xml.ws.WebServiceContext;
import javax.xml.ws.WebServiceException;
+import org.jboss.ws.annotation.WebContext;
+
@WebService(endpointInterface = "org.jboss.ejb3.test.jaxws.EndpointInterface", serviceName = "TestService", targetNamespace = "http://org.jboss.ws/jaxws/context")
+ at WebContext(urlPattern="/*")
@Stateless
public class EndpointEJB
{
@@ -58,6 +61,8 @@
private String getValueJAXWS() throws SOAPException
{
+ if(wsCtx == null)
+ throw new IllegalStateException("wsCtx was not injected");
javax.xml.ws.handler.soap.SOAPMessageContext jaxwsContext = (javax.xml.ws.handler.soap.SOAPMessageContext)wsCtx.getMessageContext();
SOAPMessage soapMessage = jaxwsContext.getMessage();
SOAPElement soapElement = (SOAPElement)soapMessage.getSOAPBody().getChildElements().next();
@@ -67,6 +72,8 @@
private String getValueJAXRPC() throws SOAPException
{
+ if(ejbCtx == null)
+ throw new IllegalStateException("ejbCtx was not injected");
javax.xml.rpc.handler.soap.SOAPMessageContext jaxrpcContext = (javax.xml.rpc.handler.soap.SOAPMessageContext)ejbCtx.getMessageContext();
SOAPMessage soapMessage = jaxrpcContext.getMessage();
SOAPElement soapElement = (SOAPElement)soapMessage.getSOAPBody().getChildElements().next();
Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/webservices/jsr181/EJB3Bean.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/webservices/jsr181/EJB3Bean.java 2007-02-26 15:34:34 UTC (rev 60909)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/webservices/jsr181/EJB3Bean.java 2007-02-26 15:56:51 UTC (rev 60910)
@@ -22,6 +22,7 @@
package org.jboss.ejb3.test.webservices.jsr181;
import org.jboss.annotation.ejb.RemoteBinding;
+import org.jboss.ws.annotation.WebContext;
import javax.ejb.Remote;
import javax.ejb.Stateless;
@@ -34,6 +35,7 @@
* @version $Revision$
*/
@WebService(name = "EndpointInterface", targetNamespace = "http://www.openuri.org/2004/04/HelloWorld", serviceName = "TestService")
+ at WebContext(urlPattern="/*")
@SOAPBinding(style = SOAPBinding.Style.RPC)
@Remote(EJB3RemoteInterface.class)
@RemoteBinding(jndiBinding = "/ejb3/EJB3EndpointInterface")
More information about the jboss-cvs-commits
mailing list