[jbossws-commits] JBossWS SVN: r3415 - in trunk/jbossws-core: src/test/java/org/jboss/test/ws/jaxrpc/jbws165 and 1 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Sun Jun 3 19:52:32 EDT 2007
Author: thomas.diesler at jboss.com
Date: 2007-06-03 19:52:32 -0400 (Sun, 03 Jun 2007)
New Revision: 3415
Removed:
trunk/jbossws-core/src/test/resources/jaxrpc/jbws165/META-INF/application-client.xml
trunk/jbossws-core/src/test/resources/jaxrpc/jbws165/META-INF/jboss-client.xml
Modified:
trunk/jbossws-core/ant-import-tests/build-jars-jaxrpc.xml
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws165/JBWS165TestCase.java
trunk/jbossws-core/src/test/resources/jaxrpc/jbws165/META-INF/application.xml
Log:
Fix jbws165 for jboss40
Modified: trunk/jbossws-core/ant-import-tests/build-jars-jaxrpc.xml
===================================================================
--- trunk/jbossws-core/ant-import-tests/build-jars-jaxrpc.xml 2007-06-03 21:54:02 UTC (rev 3414)
+++ trunk/jbossws-core/ant-import-tests/build-jars-jaxrpc.xml 2007-06-03 23:52:32 UTC (rev 3415)
@@ -717,23 +717,12 @@
<include name="wsdl/**"/>
</metainf>
</jar>
- <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws165-client.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/jbws165/Hello.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws165/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- <include name="jaxrpc-mapping.xml"/>
- </metainf>
- </jar>
<ear destfile="${tests.output.dir}/libs/jaxrpc-jbws165.ear" appxml="${tests.output.dir}/resources/jaxrpc/jbws165/META-INF/application.xml">
<fileset dir="${tests.output.dir}/libs">
<include name="jaxrpc-jbws165-none.jar"/>
<include name="jaxrpc-jbws165-pcuri.jar"/>
<include name="jaxrpc-jbws165-ctxroot.jar"/>
<include name="jaxrpc-jbws165-both.jar"/>
- <include name="jaxrpc-jbws165-client.jar"/>
</fileset>
</ear>
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws165/JBWS165TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws165/JBWS165TestCase.java 2007-06-03 21:54:02 UTC (rev 3414)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws165/JBWS165TestCase.java 2007-06-03 23:52:32 UTC (rev 3415)
@@ -21,12 +21,18 @@
*/
package org.jboss.test.ws.jaxrpc.jbws165;
+import java.io.File;
+import java.net.URL;
+
import javax.naming.InitialContext;
import javax.xml.namespace.QName;
import javax.xml.rpc.Service;
+import javax.xml.rpc.Stub;
import junit.framework.Test;
+import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl;
+import org.jboss.ws.core.jaxrpc.client.ServiceImpl;
import org.jboss.wsf.spi.test.JBossWSTest;
import org.jboss.wsf.spi.test.JBossWSTestSetup;
@@ -48,8 +54,10 @@
public void testNone() throws Exception
{
- InitialContext iniCtx = getInitialContext();
- Service service = (Service) iniCtx.lookup("java:comp/env/service/HelloNone");
+ URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxrpc-jbws165-jaxrpc-jbws165-none/HelloNone?wsdl");
+ URL mappingURL = new File("resources/jaxrpc/jbws165/META-INF/jaxrpc-mapping.xml").toURL();
+ QName serviceName = new QName("http://org.jboss.test.webservice/jbws165", "HelloServiceNone");
+ Service service = new ServiceFactoryImpl().createService(wsdlURL, serviceName, mappingURL);
Hello port = (Hello) service.getPort(Hello.class);
String retObj = port.hello(getName());
assertEquals(getName(), retObj);
@@ -57,8 +65,15 @@
public void testPortComponentURIOne() throws Exception
{
- InitialContext iniCtx = getInitialContext();
- Service service = (Service) iniCtx.lookup("java:comp/env/service/HelloPCOne");
+ URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxrpc-jbws165-jaxrpc-jbws165-pcuri/Explicit/Path/HelloPCOne?wsdl");
+
+ // In JBoss40 the context-root is derived from the first token in port-component-uri
+ if (isTargetJBoss40())
+ wsdlURL = new URL("http://" + getServerHost() + ":8080/Explicit/Path/HelloPCOne?wsdl");
+
+ URL mappingURL = new File("resources/jaxrpc/jbws165/META-INF/jaxrpc-mapping.xml").toURL();
+ QName serviceName = new QName("http://org.jboss.test.webservice/jbws165", "HelloServicePcURI");
+ Service service = new ServiceFactoryImpl().createService(wsdlURL, serviceName, mappingURL);
QName portName = new QName("http://org.jboss.test.webservice/jbws165", "HelloPortOne");
Hello port = (Hello) service.getPort(portName, Hello.class);
String retObj = port.hello(getName());
@@ -67,8 +82,15 @@
public void testPortComponentURITwo() throws Exception
{
- InitialContext iniCtx = getInitialContext();
- Service service = (Service) iniCtx.lookup("java:comp/env/service/HelloPCTwo");
+ URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxrpc-jbws165-jaxrpc-jbws165-pcuri/Explicit/Path/HelloPCTwo?wsdl");
+
+ // In JBoss40 the context-root is derived from the first token in port-component-uri
+ if (isTargetJBoss40())
+ wsdlURL = new URL("http://" + getServerHost() + ":8080/Explicit/Path/HelloPCTwo?wsdl");
+
+ URL mappingURL = new File("resources/jaxrpc/jbws165/META-INF/jaxrpc-mapping.xml").toURL();
+ QName serviceName = new QName("http://org.jboss.test.webservice/jbws165", "HelloServicePcURI");
+ Service service = new ServiceFactoryImpl().createService(wsdlURL, serviceName, mappingURL);
QName portName = new QName("http://org.jboss.test.webservice/jbws165", "HelloPortTwo");
Hello port = (Hello) service.getPort(portName, Hello.class);
String retObj = port.hello(getName());
@@ -77,8 +99,10 @@
public void testContextRoot() throws Exception
{
- InitialContext iniCtx = getInitialContext();
- Service service = (Service) iniCtx.lookup("java:comp/env/service/HelloContextRoot");
+ URL wsdlURL = new URL("http://" + getServerHost() + ":8080/Explicit/Context/HelloContextRoot?wsdl");
+ URL mappingURL = new File("resources/jaxrpc/jbws165/META-INF/jaxrpc-mapping.xml").toURL();
+ QName serviceName = new QName("http://org.jboss.test.webservice/jbws165", "HelloServiceCtxRoot");
+ Service service = new ServiceFactoryImpl().createService(wsdlURL, serviceName, mappingURL);
Hello port = (Hello) service.getPort(Hello.class);
String retObj = port.hello(getName());
assertEquals(getName(), retObj);
@@ -86,8 +110,10 @@
public void testBoth() throws Exception
{
- InitialContext iniCtx = getInitialContext();
- Service service = (Service) iniCtx.lookup("java:comp/env/service/HelloBoth");
+ URL wsdlURL = new URL("http://" + getServerHost() + ":8080/Explicit/Both/Explicit/Path?wsdl");
+ URL mappingURL = new File("resources/jaxrpc/jbws165/META-INF/jaxrpc-mapping.xml").toURL();
+ QName serviceName = new QName("http://org.jboss.test.webservice/jbws165", "HelloServiceBoth");
+ Service service = new ServiceFactoryImpl().createService(wsdlURL, serviceName, mappingURL);
Hello port = (Hello) service.getPort(Hello.class);
String retObj = port.hello(getName());
assertEquals(getName(), retObj);
Deleted: trunk/jbossws-core/src/test/resources/jaxrpc/jbws165/META-INF/application-client.xml
===================================================================
--- trunk/jbossws-core/src/test/resources/jaxrpc/jbws165/META-INF/application-client.xml 2007-06-03 21:54:02 UTC (rev 3414)
+++ trunk/jbossws-core/src/test/resources/jaxrpc/jbws165/META-INF/application-client.xml 2007-06-03 23:52:32 UTC (rev 3415)
@@ -1,61 +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>HelloNoneService</display-name>
-
- <service-ref>
- <service-ref-name>service/HelloNone</service-ref-name>
- <service-interface>javax.xml.rpc.Service</service-interface>
- <wsdl-file>USE_WSDL_OVERRIDE</wsdl-file>
- <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
- <port-component-ref>
- <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws165.Hello</service-endpoint-interface>
- </port-component-ref>
- </service-ref>
-
- <service-ref>
- <service-ref-name>service/HelloPCOne</service-ref-name>
- <service-interface>javax.xml.rpc.Service</service-interface>
- <wsdl-file>USE_WSDL_OVERRIDE</wsdl-file>
- <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
- <port-component-ref>
- <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws165.Hello</service-endpoint-interface>
- </port-component-ref>
- </service-ref>
-
- <service-ref>
- <service-ref-name>service/HelloPCTwo</service-ref-name>
- <service-interface>javax.xml.rpc.Service</service-interface>
- <wsdl-file>USE_WSDL_OVERRIDE</wsdl-file>
- <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
- <port-component-ref>
- <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws165.Hello</service-endpoint-interface>
- </port-component-ref>
- </service-ref>
-
- <service-ref>
- <service-ref-name>service/HelloContextRoot</service-ref-name>
- <service-interface>javax.xml.rpc.Service</service-interface>
- <wsdl-file>USE_WSDL_OVERRIDE</wsdl-file>
- <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
- <port-component-ref>
- <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws165.Hello</service-endpoint-interface>
- </port-component-ref>
- </service-ref>
-
- <service-ref>
- <service-ref-name>service/HelloBoth</service-ref-name>
- <service-interface>javax.xml.rpc.Service</service-interface>
- <wsdl-file>USE_WSDL_OVERRIDE</wsdl-file>
- <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
- <port-component-ref>
- <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws165.Hello</service-endpoint-interface>
- </port-component-ref>
- </service-ref>
-
-</application-client>
-
Modified: trunk/jbossws-core/src/test/resources/jaxrpc/jbws165/META-INF/application.xml
===================================================================
--- trunk/jbossws-core/src/test/resources/jaxrpc/jbws165/META-INF/application.xml 2007-06-03 21:54:02 UTC (rev 3414)
+++ trunk/jbossws-core/src/test/resources/jaxrpc/jbws165/META-INF/application.xml 2007-06-03 23:52:32 UTC (rev 3415)
@@ -19,9 +19,6 @@
<module>
<java>jaxrpc-jbws165-both.jar</java>
</module>
- <module>
- <java>jaxrpc-jbws165-client.jar</java>
- </module>
</application>
Deleted: trunk/jbossws-core/src/test/resources/jaxrpc/jbws165/META-INF/jboss-client.xml
===================================================================
--- trunk/jbossws-core/src/test/resources/jaxrpc/jbws165/META-INF/jboss-client.xml 2007-06-03 21:54:02 UTC (rev 3414)
+++ trunk/jbossws-core/src/test/resources/jaxrpc/jbws165/META-INF/jboss-client.xml 2007-06-03 23:52:32 UTC (rev 3415)
@@ -1,35 +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/HelloNone</service-ref-name>
- <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws165-jaxrpc-jbws165-none/HelloNone?wsdl</wsdl-override>
- </service-ref>
-
- <service-ref>
- <service-ref-name>service/HelloPCOne</service-ref-name>
- <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws165-jaxrpc-jbws165-pcuri/Explicit/Path/HelloPCOne?wsdl</wsdl-override>
- </service-ref>
-
- <service-ref>
- <service-ref-name>service/HelloPCTwo</service-ref-name>
- <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws165-jaxrpc-jbws165-pcuri/Explicit/Path/HelloPCTwo?wsdl</wsdl-override>
- </service-ref>
-
- <service-ref>
- <service-ref-name>service/HelloContextRoot</service-ref-name>
- <wsdl-override>http://@jboss.bind.address@:8080/Explicit/Context/HelloContextRoot?wsdl</wsdl-override>
- </service-ref>
-
- <service-ref>
- <service-ref-name>service/HelloBoth</service-ref-name>
- <wsdl-override>http://@jboss.bind.address@:8080/Explicit/Both/Explicit/Path?wsdl</wsdl-override>
- </service-ref>
-
-</jboss-client>
More information about the jbossws-commits
mailing list