Author: thomas.diesler(a)jboss.com
Date: 2007-01-30 13:10:06 -0500 (Tue, 30 Jan 2007)
New Revision: 2197
Removed:
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/jsr181ejb/META-INF/application-client.xml
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/jsr181ejb/META-INF/jboss-client.xml
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/jsr181ejb/wstools-config.xml
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/jsr181pojo/META-INF/application-client.xml
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/jsr181pojo/META-INF/jboss-client.xml
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/jsr181pojo/docwrapped/META-INF/application-client.xml
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/jsr181pojo/docwrapped/META-INF/jboss-client.xml
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/jsr181pojo/docwrapped/wstools-config.xml
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/jsr181pojo/wstools-config.xml
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/webparam/jaxrpc-mapping.xml
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/webresult/jaxrpc-mapping.xml
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/wsaddressing/META-INF/application-client.xml
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/wsaddressing/META-INF/jboss-client.xml
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/wsaddressing/wstools-config.xml
Modified:
branches/jbossws-1.2.0/jbossws-tests/ant-import/build-jars-jaxws.xml
branches/jbossws-1.2.0/jbossws-tests/build.xml
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jsr181ejb/EJB3Bean01.java
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jsr181ejb/EndpointInterface.java
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jsr181ejb/JSR181WebServiceEJB3TestCase.java
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jsr181pojo/EndpointInterface.java
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jsr181pojo/JSR181WebServiceJSETestCase.java
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/jsr181ejb/META-INF/wsdl/TestService.wsdl
Log:
Convert jaxws sample clients. More to come ...
Modified: branches/jbossws-1.2.0/jbossws-tests/ant-import/build-jars-jaxws.xml
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/ant-import/build-jars-jaxws.xml 2007-01-30
17:34:18 UTC (rev 2196)
+++ branches/jbossws-1.2.0/jbossws-tests/ant-import/build-jars-jaxws.xml 2007-01-30
18:10:06 UTC (rev 2197)
@@ -269,19 +269,6 @@
<include name="wsse.*"/>
</metainf>
</jar>
- <jar
jarfile="${tests.output.dir}/libs/jaxws-samples-jsr181ejb-client.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include
name="org/jboss/test/ws/jaxws/samples/jsr181ejb/EndpointInterface.class"/>
- </fileset>
- <metainf
dir="${tests.output.dir}/resources/jaxws/samples/jsr181ejb/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- <include name="jboss-wsse-client.xml"/>
- <include name="wsse.*"/>
- </metainf>
- </jar>
<!-- jaxws-samples-jsr181pojo -->
<war warfile="${tests.output.dir}/libs/jaxws-samples-jsr181pojo.war"
webxml="${tests.output.dir}/resources/jaxws/samples/jsr181pojo/WEB-INF/web.xml">
@@ -289,17 +276,6 @@
<include
name="org/jboss/test/ws/jaxws/samples/jsr181pojo/JSEBean01.class"/>
</classes>
</war>
- <jar
jarfile="${tests.output.dir}/libs/jaxws-samples-jsr181pojo-client.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include
name="org/jboss/test/ws/jaxws/samples/jsr181pojo/EndpointInterface.class"/>
- </fileset>
- <metainf
dir="${tests.output.dir}/resources/jaxws/samples/jsr181pojo/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- </jar>
<!-- jaxws-samples-jsr181pojo-docwrapped -->
<war
warfile="${tests.output.dir}/libs/jaxws-samples-jsr181pojo-docwrapped.war"
@@ -599,19 +575,6 @@
<include name="jaxws-handlers.xml"/>
</webinf>
</war>
- <jar
destfile="${tests.output.dir}/libs/jaxws-samples-wsaddressing-client.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include
name="org/jboss/test/ws/jaxws/samples/wsaddressing/StatefulEndpoint.class"/>
- <include
name="org/jboss/test/ws/jaxws/samples/wsaddressing/ClientHandler.class"/>
- </fileset>
- <metainf
dir="${tests.output.dir}/resources/jaxws/samples/wsaddressing/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- <include name="jbossws-client-config.xml"/>
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- </jar>
<!-- jaxws-samples-wseventing.war -->
<war warfile="${tests.output.dir}/libs/jaxws-samples-wseventing.war"
webxml="${tests.output.dir}/resources/jaxws/samples/wseventing/WEB-INF/web.xml">
Modified: branches/jbossws-1.2.0/jbossws-tests/build.xml
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/build.xml 2007-01-30 17:34:18 UTC (rev 2196)
+++ branches/jbossws-1.2.0/jbossws-tests/build.xml 2007-01-30 18:10:06 UTC (rev 2197)
@@ -345,10 +345,6 @@
<wstools
dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/secureejb/META-INF"
config="${tests.resources.dir}/jaxrpc/samples/secureejb/wstools-config.xml"/>
<wstools
dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF"
config="${tests.resources.dir}/jaxrpc/samples/wsbpel/hello/wstools-config.xml"
/>
<wstools
dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/wssecurity/WEB-INF"
config="${tests.resources.dir}/jaxrpc/samples/wssecurity/wstools-config.xml"/>
- <wstools
dest="${tests.output.dir}/wstools/resources/jaxws/samples/jsr181ejb/META-INF"
config="${tests.resources.dir}/jaxws/samples/jsr181ejb/wstools-config.xml"/>
- <wstools
dest="${tests.output.dir}/wstools/resources/jaxws/samples/jsr181pojo/META-INF"
config="${tests.resources.dir}/jaxws/samples/jsr181pojo/wstools-config.xml"/>
- <wstools
dest="${tests.output.dir}/wstools/resources/jaxws/samples/jsr181pojo/docwrapped/META-INF"
config="${tests.resources.dir}/jaxws/samples/jsr181pojo/docwrapped/wstools-config.xml"/>
- <wstools
dest="${tests.output.dir}/wstools/resources/jaxws/samples/wsaddressing/META-INF"
config="${tests.resources.dir}/jaxws/samples/wsaddressing/wstools-config.xml"/>
<move todir="${tests.output.dir}/wstools/java">
<fileset
dir="${tests.output.dir}/wstools/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF"
includes="org/**"/>
</move>
Modified:
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jsr181ejb/EJB3Bean01.java
===================================================================
---
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jsr181ejb/EJB3Bean01.java 2007-01-30
17:34:18 UTC (rev 2196)
+++
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jsr181ejb/EJB3Bean01.java 2007-01-30
18:10:06 UTC (rev 2197)
@@ -33,7 +33,6 @@
import org.jboss.annotation.ejb.RemoteBinding;
import org.jboss.annotation.security.SecurityDomain;
import org.jboss.ws.annotation.WebContext;
-import org.jboss.ws.annotation.EndpointConfig;
/**
* Test the JSR-181 annotation: javax.jws.WebService
@@ -54,7 +53,6 @@
// jboss propriatary annotations
@RemoteBinding(jndiBinding = "/ejb3/EJB3Bean01")
@WebContext(authMethod="BASIC", transportGuarantee="NONE",
secureWSDLAccess=false)
-@EndpointConfig(configName="Standard WSSecurity Endpoint")
@SecurityDomain("JBossWS")
public class EJB3Bean01 implements EJB3RemoteInterface
{
Modified:
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jsr181ejb/EndpointInterface.java
===================================================================
---
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jsr181ejb/EndpointInterface.java 2007-01-30
17:34:18 UTC (rev 2196)
+++
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jsr181ejb/EndpointInterface.java 2007-01-30
18:10:06 UTC (rev 2197)
@@ -1,37 +1,34 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site:
http://www.fsf.org.
- */
+
package org.jboss.test.ws.jaxws.samples.jsr181ejb;
-import java.rmi.Remote;
-import java.rmi.RemoteException;
+import javax.jws.WebMethod;
+import javax.jws.WebParam;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+
/**
- * Test the JSR-181 annotation: javax.jws.WebService
- * This interface is only used in the client deployment.
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 29-Apr-2005
+ * This class was generated by the JAXWS SI.
+ * JAX-WS RI 2.1-11/15/2006 04:41 PM(vivek)-EA3
+ * Generated source version: 2.1
+ *
*/
-public interface EndpointInterface extends Remote
-{
- String echo(String input) throws RemoteException;
+@WebService(name = "EndpointInterface", targetNamespace =
"http://org.jboss.ws/samples/jsr181ejb")
+@SOAPBinding(style = SOAPBinding.Style.RPC)
+public interface EndpointInterface {
+
+
+ /**
+ *
+ * @param string1
+ * @return
+ * returns java.lang.String
+ */
+ @WebMethod
+ @WebResult(name = "result", partName = "result")
+ public String echo(
+ @WebParam(name = "String_1", partName = "String_1")
+ String string1);
+
}
Modified:
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jsr181ejb/JSR181WebServiceEJB3TestCase.java
===================================================================
---
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jsr181ejb/JSR181WebServiceEJB3TestCase.java 2007-01-30
17:34:18 UTC (rev 2196)
+++
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jsr181ejb/JSR181WebServiceEJB3TestCase.java 2007-01-30
18:10:06 UTC (rev 2197)
@@ -21,12 +21,14 @@
*/
package org.jboss.test.ws.jaxws.samples.jsr181ejb;
-import java.net.MalformedURLException;
+import java.io.File;
import java.net.URL;
+import java.util.Map;
import javax.naming.InitialContext;
-import javax.xml.rpc.Service;
-import javax.xml.rpc.Stub;
+import javax.xml.namespace.QName;
+import javax.xml.ws.BindingProvider;
+import javax.xml.ws.Service;
import junit.framework.Test;
@@ -34,8 +36,6 @@
import org.jboss.security.SimplePrincipal;
import org.jboss.test.ws.JBossWSTest;
import org.jboss.test.ws.JBossWSTestSetup;
-import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
-import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory;
/**
* Test the JSR-181 annotation: javax.jws.WebService
@@ -49,7 +49,7 @@
public static Test suite()
{
- return JBossWSTestSetup.newTestSetup(JSR181WebServiceEJB3TestCase.class,
"jaxws-samples-jsr181ejb.jar, jaxws-samples-jsr181ejb-client.jar");
+ return JBossWSTestSetup.newTestSetup(JSR181WebServiceEJB3TestCase.class,
"jaxws-samples-jsr181ejb.jar");
}
public void testRemoteAccess() throws Exception
@@ -67,22 +67,17 @@
public void testWebService() throws Exception
{
- if (isTargetJBoss50())
- {
- System.out.println("FIXME: [JBAS-3825] Fix BASIC authentication");
- return;
- }
-
- InitialContext iniCtx = getInitialContext();
- Service service =
(Service)iniCtx.lookup("java:comp/env/service/TestService");
+ URL wsdlURL = new
File("resources/jaxws/samples/jsr181ejb/META-INF/wsdl/TestService.wsdl").toURL();
+ QName serviceName = new QName("http://org.jboss.ws/samples/jsr181ejb",
"TestService");
+ Service service = Service.create(wsdlURL, serviceName);
EndpointInterface port =
(EndpointInterface)service.getPort(EndpointInterface.class);
- ((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY,
TARGET_ENDPOINT_ADDRESS);
+ BindingProvider bindingProvider = (BindingProvider)port;
+ Map<String, Object> reqContext = bindingProvider.getRequestContext();
+ reqContext.put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
TARGET_ENDPOINT_ADDRESS);
+ reqContext.put(BindingProvider.USERNAME_PROPERTY, "kermit");
+ reqContext.put(BindingProvider.PASSWORD_PROPERTY, "thefrog");
- Stub stub = (Stub)port;
- stub._setProperty(Stub.USERNAME_PROPERTY, "kermit");
- stub._setProperty(Stub.PASSWORD_PROPERTY, "thefrog");
-
String helloWorld = "Hello world!";
Object retObj = port.echo(helloWorld);
assertEquals(helloWorld, retObj);
Modified:
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jsr181pojo/EndpointInterface.java
===================================================================
---
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jsr181pojo/EndpointInterface.java 2007-01-30
17:34:18 UTC (rev 2196)
+++
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jsr181pojo/EndpointInterface.java 2007-01-30
18:10:06 UTC (rev 2197)
@@ -1,37 +1,34 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site:
http://www.fsf.org.
- */
+
package org.jboss.test.ws.jaxws.samples.jsr181pojo;
-import java.rmi.Remote;
-import java.rmi.RemoteException;
+import javax.jws.WebMethod;
+import javax.jws.WebParam;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+
/**
- * Test the JSR-181 annotation: javax.jws.WebService
- * This interface is only used in the client deployment.
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 29-Apr-2005
+ * This class was generated by the JAXWS SI.
+ * JAX-WS RI 2.1-11/15/2006 04:41 PM(vivek)-EA3
+ * Generated source version: 2.1
+ *
*/
-public interface EndpointInterface extends Remote
-{
- String echo(String input) throws RemoteException;
+@WebService(name = "EndpointInterface", targetNamespace =
"http://org.jboss.ws/samples/jsr181pojo")
+@SOAPBinding(style = SOAPBinding.Style.RPC)
+public interface EndpointInterface {
+
+
+ /**
+ *
+ * @param string1
+ * @return
+ * returns java.lang.String
+ */
+ @WebMethod
+ @WebResult(name = "result", partName = "result")
+ public String echo(
+ @WebParam(name = "String_1", partName = "String_1")
+ String string1);
+
}
Modified:
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jsr181pojo/JSR181WebServiceJSETestCase.java
===================================================================
---
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jsr181pojo/JSR181WebServiceJSETestCase.java 2007-01-30
17:34:18 UTC (rev 2196)
+++
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jsr181pojo/JSR181WebServiceJSETestCase.java 2007-01-30
18:10:06 UTC (rev 2197)
@@ -22,20 +22,15 @@
package org.jboss.test.ws.jaxws.samples.jsr181pojo;
import java.io.File;
-import java.net.MalformedURLException;
import java.net.URL;
-import javax.naming.InitialContext;
import javax.xml.namespace.QName;
-import javax.xml.rpc.Service;
+import javax.xml.ws.Service;
import junit.framework.Test;
import org.jboss.test.ws.JBossWSTest;
import org.jboss.test.ws.JBossWSTestSetup;
-import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl;
-import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
-import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory;
/**
* Test the JSR-181 annotation: javax.jws.WebService
@@ -51,46 +46,18 @@
public static Test suite()
{
- return JBossWSTestSetup.newTestSetup(JSR181WebServiceJSETestCase.class,
"jaxws-samples-jsr181pojo.war, jaxws-samples-jsr181pojo-client.jar");
+ return JBossWSTestSetup.newTestSetup(JSR181WebServiceJSETestCase.class,
"jaxws-samples-jsr181pojo.war");
}
- protected void setUp() throws Exception
- {
- super.setUp();
- if (port == null)
- {
- if (isTargetJBoss())
- {
- InitialContext iniCtx = getInitialContext();
- Service service =
(Service)iniCtx.lookup("java:comp/env/service/TestService");
- port = (EndpointInterface)service.getPort(EndpointInterface.class);
- }
- else
- {
- ServiceFactoryImpl factory = new ServiceFactoryImpl();
- URL wsdlURL = new
File("resources/jaxws/samples/jsr181pojo/META-INF/wsdl/TestService.wsdl").toURL();
- URL mappingURL = new
File("resources/jaxws/samples/jsr181pojo/META-INF/jaxrpc-mapping.xml").toURL();
- QName qname = new QName("http://org.jboss.ws/samples/jsr181pojo",
"TestService");
- Service service = factory.createService(wsdlURL, qname, mappingURL);
- port = (EndpointInterface)service.getPort(EndpointInterface.class);
- }
- }
- }
-
public void testWebService() throws Exception
{
- assertWSDLAccess();
+ URL wsdlURL = new
File("resources/jaxws/samples/jsr181pojo/META-INF/wsdl/TestService.wsdl").toURL();
+ QName qname = new QName("http://org.jboss.ws/samples/jsr181pojo",
"TestService");
+ Service service = Service.create(wsdlURL, qname);
+ port = (EndpointInterface)service.getPort(EndpointInterface.class);
String helloWorld = "Hello world!";
Object retObj = port.echo(helloWorld);
assertEquals(helloWorld, retObj);
}
-
- private void assertWSDLAccess() throws MalformedURLException
- {
- URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl");
- WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance();
- WSDLDefinitions wsdlDefinitions = factory.parse(wsdlURL);
- assertNotNull(wsdlDefinitions);
- }
}
Deleted:
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/jsr181ejb/META-INF/application-client.xml
===================================================================
---
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/jsr181ejb/META-INF/application-client.xml 2007-01-30
17:34:18 UTC (rev 2196)
+++
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/jsr181ejb/META-INF/application-client.xml 2007-01-30
18:10:06 UTC (rev 2197)
@@ -1,21 +0,0 @@
-<?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"
-
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd"
- version="1.4">
-
- <display-name>JSR-181 Annotation test</display-name>
-
- <service-ref>
- <service-ref-name>service/TestService</service-ref-name>
- <service-interface>javax.xml.rpc.Service</service-interface>
- <wsdl-file>META-INF/wsdl/TestService.wsdl</wsdl-file>
- <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
- <port-component-ref>
-
<service-endpoint-interface>org.jboss.test.ws.jaxws.samples.jsr181ejb.EndpointInterface</service-endpoint-interface>
- </port-component-ref>
- </service-ref>
-
-</application-client>
-
Deleted:
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/jsr181ejb/META-INF/jboss-client.xml
===================================================================
---
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/jsr181ejb/META-INF/jboss-client.xml 2007-01-30
17:34:18 UTC (rev 2196)
+++
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/jsr181ejb/META-INF/jboss-client.xml 2007-01-30
18:10:06 UTC (rev 2197)
@@ -1,11 +0,0 @@
-<?xml version='1.0' encoding='UTF-8' ?>
-
-<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN"
"http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
-
-<jboss-client>
- <jndi-name>jbossws-client</jndi-name>
- <service-ref>
- <service-ref-name>service/TestService</service-ref-name>
- <config-name>Standard WSSecurity Client</config-name>
- </service-ref>
-</jboss-client>
Modified:
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/jsr181ejb/META-INF/wsdl/TestService.wsdl
===================================================================
---
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/jsr181ejb/META-INF/wsdl/TestService.wsdl 2007-01-30
17:34:18 UTC (rev 2196)
+++
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/jsr181ejb/META-INF/wsdl/TestService.wsdl 2007-01-30
18:10:06 UTC (rev 2197)
@@ -1,3 +1,6 @@
+<!--
+ wsimport -keep -p org.jboss.test.ws.jaxws.samples.jsr181ejb
META-INF/wsdl/TestService.wsdl
+-->
<definitions name='TestService'
targetNamespace='http://org.jboss.ws/samples/jsr181ejb'
xmlns='http://schemas.xmlsoap.org/wsdl/'
xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/'
xmlns:tns='http://org.jboss.ws/samples/jsr181ejb'
xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
<types></types>
<message name='EndpointInterface_echoResponse'>
Deleted:
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/jsr181ejb/wstools-config.xml
===================================================================
---
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/jsr181ejb/wstools-config.xml 2007-01-30
17:34:18 UTC (rev 2196)
+++
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/jsr181ejb/wstools-config.xml 2007-01-30
18:10:06 UTC (rev 2197)
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- wstools -config wstools-config.xml
--->
-
-<configuration
xmlns="http://www.jboss.org/jbossws-tools"
-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-
xsi:schemaLocation="http://www.jboss.org/jbossws-tools
http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd">
-
- <global>
- <package-namespace package="org.jboss.test.ws.jaxws.samples.jsr181ejb"
namespace="http://org.jboss.ws/samples/jsr181ejb"/>
- </global>
- <wsdl-java
location="resources/jaxws/samples/jsr181ejb/META-INF/wsdl/TestService.wsdl">
- <mapping file="jaxrpc-mapping.xml" />
- </wsdl-java>
-
-</configuration>
\ No newline at end of file
Deleted:
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/jsr181pojo/META-INF/application-client.xml
===================================================================
---
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/jsr181pojo/META-INF/application-client.xml 2007-01-30
17:34:18 UTC (rev 2196)
+++
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/jsr181pojo/META-INF/application-client.xml 2007-01-30
18:10:06 UTC (rev 2197)
@@ -1,21 +0,0 @@
-<?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"
-
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd"
- version="1.4">
-
- <display-name>JSR-181 Annotation test</display-name>
-
- <service-ref>
- <service-ref-name>service/TestService</service-ref-name>
- <service-interface>javax.xml.rpc.Service</service-interface>
- <wsdl-file>META-INF/wsdl/TestService.wsdl</wsdl-file>
- <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
- <port-component-ref>
-
<service-endpoint-interface>org.jboss.test.ws.jaxws.samples.jsr181pojo.EndpointInterface</service-endpoint-interface>
- </port-component-ref>
- </service-ref>
-
-</application-client>
-
Deleted:
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/jsr181pojo/META-INF/jboss-client.xml
===================================================================
---
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/jsr181pojo/META-INF/jboss-client.xml 2007-01-30
17:34:18 UTC (rev 2196)
+++
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/jsr181pojo/META-INF/jboss-client.xml 2007-01-30
18:10:06 UTC (rev 2197)
@@ -1,7 +0,0 @@
-<?xml version='1.0' encoding='UTF-8' ?>
-
-<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN"
"http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
-
-<jboss-client>
- <jndi-name>jbossws-client</jndi-name>
-</jboss-client>
Deleted:
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/jsr181pojo/docwrapped/META-INF/application-client.xml
===================================================================
---
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/jsr181pojo/docwrapped/META-INF/application-client.xml 2007-01-30
17:34:18 UTC (rev 2196)
+++
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/jsr181pojo/docwrapped/META-INF/application-client.xml 2007-01-30
18:10:06 UTC (rev 2197)
@@ -1,21 +0,0 @@
-<?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"
-
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd"
- version="1.4">
-
- <display-name>JSR-181 Annotation test</display-name>
-
- <service-ref>
- <service-ref-name>service/TestService</service-ref-name>
- <service-interface>javax.xml.rpc.Service</service-interface>
- <wsdl-file>META-INF/wsdl/TestService.wsdl</wsdl-file>
- <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
- <port-component-ref>
-
<service-endpoint-interface>org.jboss.test.ws.jaxws.samples.jsr181pojo.docwrapped.EndpointInterface</service-endpoint-interface>
- </port-component-ref>
- </service-ref>
-
-</application-client>
-
Deleted:
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/jsr181pojo/docwrapped/META-INF/jboss-client.xml
===================================================================
---
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/jsr181pojo/docwrapped/META-INF/jboss-client.xml 2007-01-30
17:34:18 UTC (rev 2196)
+++
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/jsr181pojo/docwrapped/META-INF/jboss-client.xml 2007-01-30
18:10:06 UTC (rev 2197)
@@ -1,7 +0,0 @@
-<?xml version='1.0' encoding='UTF-8' ?>
-
-<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN"
"http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
-
-<jboss-client>
- <jndi-name>jbossws-client</jndi-name>
-</jboss-client>
Deleted:
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/jsr181pojo/docwrapped/wstools-config.xml
===================================================================
---
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/jsr181pojo/docwrapped/wstools-config.xml 2007-01-30
17:34:18 UTC (rev 2196)
+++
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/jsr181pojo/docwrapped/wstools-config.xml 2007-01-30
18:10:06 UTC (rev 2197)
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- wstools -config wstools-config.xml
--->
-
-<configuration
xmlns="http://www.jboss.org/jbossws-tools"
-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-
xsi:schemaLocation="http://www.jboss.org/jbossws-tools
http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd">
-
- <global>
- <package-namespace
package="org.jboss.test.ws.jaxws.samples.jsr181pojo.docwrapped"
namespace="http://org.jboss.ws/samples/jsr181pojo/docwrapped"/>
- </global>
- <wsdl-java parameter-style="wrapped"
location="resources/jaxws/samples/jsr181pojo/docwrapped/META-INF/wsdl/TestService.wsdl">
- <mapping file="jaxrpc-mapping.xml" />
- </wsdl-java>
-
-</configuration>
Deleted:
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/jsr181pojo/wstools-config.xml
===================================================================
---
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/jsr181pojo/wstools-config.xml 2007-01-30
17:34:18 UTC (rev 2196)
+++
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/jsr181pojo/wstools-config.xml 2007-01-30
18:10:06 UTC (rev 2197)
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- wstools -config wstools-config.xml
--->
-
-<configuration
xmlns="http://www.jboss.org/jbossws-tools"
-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-
xsi:schemaLocation="http://www.jboss.org/jbossws-tools
http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd">
-
- <global>
- <package-namespace package="org.jboss.test.ws.jaxws.samples.jsr181pojo"
namespace="http://org.jboss.ws/samples/jsr181pojo"/>
- </global>
- <wsdl-java
location="resources/jaxws/samples/jsr181pojo/META-INF/wsdl/TestService.wsdl">
- <mapping file="jaxrpc-mapping.xml" />
- </wsdl-java>
-
-</configuration>
Deleted:
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/webparam/jaxrpc-mapping.xml
===================================================================
---
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/webparam/jaxrpc-mapping.xml 2007-01-30
17:34:18 UTC (rev 2196)
+++
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/webparam/jaxrpc-mapping.xml 2007-01-30
18:10:06 UTC (rev 2197)
@@ -1,11 +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.test.ws.jaxws.samples.webparam</package-type>
-
<
namespaceURI>http://www.openuri.org/jsr181/WebParamExample</namespa...
- </package-mapping>
-
-</java-wsdl-mapping>
Deleted:
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/webresult/jaxrpc-mapping.xml
===================================================================
---
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/webresult/jaxrpc-mapping.xml 2007-01-30
17:34:18 UTC (rev 2196)
+++
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/webresult/jaxrpc-mapping.xml 2007-01-30
18:10:06 UTC (rev 2197)
@@ -1,11 +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.test.ws.jaxws.samples.webresult</package-type>
-
<
namespaceURI>http://webresult.samples.jaxws.ws.test.jboss.org/</nam...
- </package-mapping>
-
-</java-wsdl-mapping>
Deleted:
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/wsaddressing/META-INF/application-client.xml
===================================================================
---
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/wsaddressing/META-INF/application-client.xml 2007-01-30
17:34:18 UTC (rev 2196)
+++
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/wsaddressing/META-INF/application-client.xml 2007-01-30
18:10:06 UTC (rev 2197)
@@ -1,25 +0,0 @@
-<?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"
-
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd"
- version="1.4">
-
- <display-name>JAXRPC simple tests</display-name>
-
- <service-ref>
- <service-ref-name>service/TestService</service-ref-name>
- <service-interface>javax.xml.rpc.Service</service-interface>
- <wsdl-file>META-INF/wsdl/TestService.wsdl</wsdl-file>
- <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
- <port-component-ref>
-
<service-endpoint-interface>org.jboss.test.ws.jaxws.samples.wsaddressing.StatefulEndpoint</service-endpoint-interface>
- </port-component-ref>
- <handler>
- <handler-name>ClientHandler</handler-name>
-
<handler-class>org.jboss.test.ws.jaxws.samples.wsaddressing.ClientHandler</handler-class>
- </handler>
- </service-ref>
-
-</application-client>
-
Deleted:
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/wsaddressing/META-INF/jboss-client.xml
===================================================================
---
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/wsaddressing/META-INF/jboss-client.xml 2007-01-30
17:34:18 UTC (rev 2196)
+++
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/wsaddressing/META-INF/jboss-client.xml 2007-01-30
18:10:06 UTC (rev 2197)
@@ -1,11 +0,0 @@
-<?xml version='1.0' encoding='UTF-8' ?>
-
-<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN"
"http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
-
-<jboss-client>
- <jndi-name>jbossws-client</jndi-name>
- <service-ref>
- <service-ref-name>service/TestService</service-ref-name>
- <config-name>Standard WSAddressing Client</config-name>
- </service-ref>
-</jboss-client>
Deleted:
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/wsaddressing/wstools-config.xml
===================================================================
---
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/wsaddressing/wstools-config.xml 2007-01-30
17:34:18 UTC (rev 2196)
+++
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/wsaddressing/wstools-config.xml 2007-01-30
18:10:06 UTC (rev 2197)
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- wstools -config wstools-config.xml
--->
-
-<configuration
xmlns="http://www.jboss.org/jbossws-tools"
-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-
xsi:schemaLocation="http://www.jboss.org/jbossws-tools
http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd">
-
- <global>
- <package-namespace
package="org.jboss.test.ws.jaxws.samples.wsaddressing"
namespace="http://org.jboss.ws/samples/wsaddressing"/>
- </global>
- <wsdl-java
location="resources/jaxws/samples/wsaddressing/META-INF/wsdl/TestService.wsdl">
- <mapping file="jaxrpc-mapping.xml"/>
- </wsdl-java>
-
-</configuration>