[jbossws-commits] JBossWS SVN: r2455 - in branches/jbossws-1.2.0: integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50 and 16 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Fri Feb 23 15:11:35 EST 2007
Author: thomas.diesler at jboss.com
Date: 2007-02-23 15:11:35 -0500 (Fri, 23 Feb 2007)
New Revision: 2455
Added:
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/ApplicationClient.java
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/EJBClient.java
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/EJBRemote.java
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/EJBRemoteHome.java
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/ServletClient.java
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/TestEndpoint.java
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/TestEndpointImpl.java
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/TestEndpointService.java
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/WebServiceRefClientTestCase.java
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/WebServiceRefEJBTestCase.java
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/WebServiceRefServletTestCase.java
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/serviceref/
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/serviceref/META-INF/
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/serviceref/META-INF/application-client.xml
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/serviceref/META-INF/ejb-jar.xml
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/serviceref/META-INF/jaxrpc-mapping.xml
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/serviceref/META-INF/jboss-client.xml
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/serviceref/META-INF/wsdl/
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/serviceref/META-INF/wsdl/TestEndpoint.wsdl
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/serviceref/WEB-INF/
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/serviceref/WEB-INF/web.xml
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/serviceref/WEB-INF/webservices.xml
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/serviceref/servlet-client/
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/serviceref/servlet-client/WEB-INF/
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/serviceref/servlet-client/WEB-INF/web.xml
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/serviceref/wstools-java-wsdl.xml
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/serviceref/wstools-wsdl-java.xml
Removed:
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/ApplicationClient.java
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/EJBClient.java
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/EJBRemote.java
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/EJBRemoteHome.java
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/ServletClient.java
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/TestEndpoint.java
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/TestEndpointImpl.java
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/TestEndpointService.java
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/WebServiceRefClientTestCase.java
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/WebServiceRefEJBTestCase.java
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/WebServiceRefServletTestCase.java
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/webserviceref/
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/serviceref/META-INF/
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/serviceref/META-INF/application-client.xml
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/serviceref/META-INF/ejb-jar.xml
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/serviceref/META-INF/jaxrpc-mapping.xml
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/serviceref/META-INF/jboss-client.xml
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/serviceref/META-INF/wsdl/
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/serviceref/META-INF/wsdl/TestEndpoint.wsdl
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/serviceref/WEB-INF/
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/serviceref/WEB-INF/web.xml
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/serviceref/WEB-INF/webservices.xml
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/serviceref/servlet-client/
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/serviceref/servlet-client/WEB-INF/
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/serviceref/servlet-client/WEB-INF/web.xml
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/serviceref/wstools-java-wsdl.xml
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/serviceref/wstools-wsdl-java.xml
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/webserviceref/
Modified:
branches/jbossws-1.2.0/integration-jboss50/.classpath
branches/jbossws-1.2.0/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/ServiceRefHandler.java
branches/jbossws-1.2.0/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/ServiceRefHandlerMBean.java
branches/jbossws-1.2.0/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/ServiceRefMetaDataAdaptor.java
branches/jbossws-1.2.0/jbossws-tests/ant-import/build-jars-jaxrpc.xml
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1205/JBWS1205TestCase.java
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsse/WebClientTestCase.java
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/handlerchain/META-INF/jboss-client.xml
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/webserviceref/META-INF-override/jboss-client.xml
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/webserviceref/META-INF-secure/jboss-client.xml
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/webserviceref/META-INF/jboss-client.xml
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/webserviceref/META-INF/jboss-web.xml
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/webserviceref/META-INF/jboss.xml
Log:
Fix <service-ref> handling in jboss50
Modified: branches/jbossws-1.2.0/integration-jboss50/.classpath
===================================================================
--- branches/jbossws-1.2.0/integration-jboss50/.classpath 2007-02-23 20:10:38 UTC (rev 2454)
+++ branches/jbossws-1.2.0/integration-jboss50/.classpath 2007-02-23 20:11:35 UTC (rev 2455)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry excluding="org/jboss/ws/integration/jboss50/ServiceRefHandler.java" kind="src" path="src/main/java"/>
+ <classpathentry kind="src" path="src/main/java"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry combineaccessrules="false" kind="src" path="/jbossws-core"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-vfs.jar" sourcepath="/build/thirdparty/jboss-vfs-sources.jar"/>
Modified: branches/jbossws-1.2.0/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/ServiceRefHandler.java
===================================================================
--- branches/jbossws-1.2.0/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/ServiceRefHandler.java 2007-02-23 20:10:38 UTC (rev 2454)
+++ branches/jbossws-1.2.0/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/ServiceRefHandler.java 2007-02-23 20:11:35 UTC (rev 2455)
@@ -35,16 +35,15 @@
import org.jboss.deployers.spi.deployer.DeploymentUnit;
import org.jboss.logging.Logger;
import org.jboss.mx.util.MBeanServerLocator;
-import org.jboss.naming.Util;
-import org.jboss.virtual.VirtualFile;
-import org.jboss.webservice.metadata.serviceref.ServiceRefMetaData;
+import org.jboss.util.naming.Util;
+import org.jboss.metadata.serviceref.ServiceRefMetaData;
import org.jboss.ws.WSException;
import org.jboss.ws.core.jaxrpc.client.ServiceReferenceable;
+import org.jboss.ws.core.server.UnifiedDeploymentInfo;
import org.jboss.ws.metadata.builder.jaxrpc.JAXRPCClientDeployment;
import org.jboss.ws.metadata.j2ee.UnifiedServiceRefMetaData;
import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping;
import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMappingFactory;
-import org.jboss.ws.core.server.UnifiedDeploymentInfo;
import org.jboss.ws.tools.wsdl.WSDL11DefinitionFactory;
/**
@@ -64,16 +63,10 @@
*
* @param envCtx ENC to bind the javax.rpc.xml.Service object to
* @param serviceRefs An iterator of the service-ref elements in the client deployment descriptor
- * @param deployment The client deployment
- * @throws org.jboss.deployment.DeploymentException if it goes wrong
+ * @param unit The client deployment
*/
- public void setupServiceRefEnvironment(Context envCtx, Iterator serviceRefs, Object deployment)
+ public void bindServiceRefs(Context envCtx, Iterator serviceRefs, DeploymentUnit unit)
{
- String className = (deployment != null ? deployment.getClass().getName() : null);
- if ((deployment instanceof DeploymentUnit) == false)
- throw new IllegalArgumentException("Expected " + DeploymentUnit.class.getName() + ", but was: " + className);
-
- DeploymentUnit unit = (DeploymentUnit)deployment;
try
{
while (serviceRefs.hasNext())
Modified: branches/jbossws-1.2.0/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/ServiceRefHandlerMBean.java
===================================================================
--- branches/jbossws-1.2.0/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/ServiceRefHandlerMBean.java 2007-02-23 20:10:38 UTC (rev 2454)
+++ branches/jbossws-1.2.0/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/ServiceRefHandlerMBean.java 2007-02-23 20:11:35 UTC (rev 2455)
@@ -27,6 +27,7 @@
import javax.naming.Context;
import org.jboss.deployers.spi.DeploymentException;
+import org.jboss.deployers.spi.deployer.DeploymentUnit;
import org.jboss.ws.core.utils.ObjectNameFactory;
/**
@@ -42,8 +43,8 @@
*
* @param envCtx ENC to bind the javax.rpc.xml.Service object to
* @param serviceRefs An iterator of the service-ref elements in the client deployment descriptor
- * @param deployment The client's deployment unit
+ * @param unit The client's deployment unit
* @throws DeploymentException if it goes wrong
*/
- void setupServiceRefEnvironment(Context envCtx, Iterator serviceRefs, Object deployment);
+ void bindServiceRefs(Context envCtx, Iterator serviceRefs, DeploymentUnit unit);
}
Modified: branches/jbossws-1.2.0/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/ServiceRefMetaDataAdaptor.java
===================================================================
--- branches/jbossws-1.2.0/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/ServiceRefMetaDataAdaptor.java 2007-02-23 20:10:38 UTC (rev 2454)
+++ branches/jbossws-1.2.0/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/ServiceRefMetaDataAdaptor.java 2007-02-23 20:11:35 UTC (rev 2455)
@@ -29,10 +29,10 @@
import javax.xml.namespace.QName;
-import org.jboss.webservice.metadata.serviceref.HandlerMetaData;
-import org.jboss.webservice.metadata.serviceref.InitParamMetaData;
-import org.jboss.webservice.metadata.serviceref.PortComponentRefMetaData;
-import org.jboss.webservice.metadata.serviceref.ServiceRefMetaData;
+import org.jboss.metadata.serviceref.HandlerMetaData;
+import org.jboss.metadata.serviceref.InitParamMetaData;
+import org.jboss.metadata.serviceref.PortComponentRefMetaData;
+import org.jboss.metadata.serviceref.ServiceRefMetaData;
import org.jboss.ws.core.server.UnifiedDeploymentInfo;
import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData;
import org.jboss.ws.metadata.j2ee.UnifiedPortComponentRefMetaData;
Modified: branches/jbossws-1.2.0/jbossws-tests/ant-import/build-jars-jaxrpc.xml
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/ant-import/build-jars-jaxrpc.xml 2007-02-23 20:10:38 UTC (rev 2454)
+++ branches/jbossws-1.2.0/jbossws-tests/ant-import/build-jars-jaxrpc.xml 2007-02-23 20:11:35 UTC (rev 2455)
@@ -2277,6 +2277,7 @@
</webinf>
<webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1205/SimpleEndpoint/WEB-INF">
<include name="simple-mapping.xml"/>
+ <include name="wsdl/**"/>
</webinf>
</war>
<jar jarfile="${tests.output.dir}/libs/jaxrpc-jbws1205-client.jar">
@@ -2485,85 +2486,85 @@
</metainf>
</jar>
- <!-- jaxrpc-utf16 -->
- <war warfile="${tests.output.dir}/libs/jaxrpc-utf16.war" webxml="${tests.output.dir}/resources/jaxrpc/utf16/WEB-INF/web.xml">
+ <!-- jaxrpc-serviceref -->
+ <war warfile="${tests.output.dir}/libs/jaxrpc-serviceref.war" webxml="${tests.output.dir}/resources/jaxrpc/serviceref/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/utf16/Hello.class"/>
- <include name="org/jboss/test/ws/jaxrpc/utf16/HelloJavaBean.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/serviceref/TestEndpointImpl.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/serviceref/TestEndpoint.class"/>
</classes>
- <webinf dir="${tests.output.dir}/resources/jaxrpc/utf16/WEB-INF">
- <include name="webservices.xml"/>
+ <webinf dir="${tests.output.dir}/resources/jaxrpc/serviceref/META-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</webinf>
+ <webinf dir="${tests.output.dir}/resources/jaxrpc/serviceref/WEB-INF">
+ <include name="webservices.xml"/>
+ </webinf>
</war>
- <jar destfile="${tests.output.dir}/libs/jaxrpc-utf16-client.jar">
+ <jar destfile="${tests.output.dir}/libs/jaxrpc-serviceref-client.jar">
<fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/utf16/Hello.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/serviceref/ApplicationClient.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/serviceref/TestEndpointService.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/serviceref/TestEndpoint.class"/>
</fileset>
- <metainf dir="${tests.output.dir}/resources/jaxrpc/utf16/META-INF">
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/serviceref/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
- </metainf>
- <metainf dir="${tests.output.dir}/resources/jaxrpc/utf16/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
</jar>
-
- <!-- jaxrpc-webserviceref -->
- <war warfile="${tests.output.dir}/libs/jaxrpc-webserviceref.war" webxml="${tests.output.dir}/resources/jaxrpc/webserviceref/WEB-INF/web.xml">
+ <war destfile="${tests.output.dir}/libs/jaxrpc-serviceref-servlet-client.war" webxml="${tests.output.dir}/resources/jaxrpc/serviceref/servlet-client/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/webserviceref/TestEndpointImpl.class"/>
- <include name="org/jboss/test/ws/jaxrpc/webserviceref/TestEndpoint.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/serviceref/ServletClient.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/serviceref/TestEndpointService.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/serviceref/TestEndpoint.class"/>
</classes>
- <webinf dir="${tests.output.dir}/resources/jaxrpc/webserviceref/META-INF">
+ <webinf dir="${tests.output.dir}/resources/jaxrpc/serviceref/META-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</webinf>
- <webinf dir="${tests.output.dir}/resources/jaxrpc/webserviceref/WEB-INF">
- <include name="webservices.xml"/>
- </webinf>
</war>
- <jar destfile="${tests.output.dir}/libs/jaxrpc-webserviceref-client.jar">
+ <jar destfile="${tests.output.dir}/libs/jaxrpc-serviceref-ejb-client.jar">
<fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/webserviceref/ApplicationClient.class"/>
- <include name="org/jboss/test/ws/jaxrpc/webserviceref/TestEndpointService.class"/>
- <include name="org/jboss/test/ws/jaxrpc/webserviceref/TestEndpoint.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/serviceref/EJBClient.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/serviceref/EJBRemote.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/serviceref/EJBRemoteHome.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/serviceref/TestEndpointService.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/serviceref/TestEndpoint.class"/>
</fileset>
- <metainf dir="${tests.output.dir}/resources/jaxrpc/webserviceref/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/serviceref/META-INF">
+ <include name="ejb-jar.xml"/>
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
</jar>
- <war destfile="${tests.output.dir}/libs/jaxrpc-webserviceref-servlet-client.war" webxml="${tests.output.dir}/resources/jaxrpc/webserviceref/servlet-client/WEB-INF/web.xml">
+
+ <!-- jaxrpc-utf16 -->
+ <war warfile="${tests.output.dir}/libs/jaxrpc-utf16.war" webxml="${tests.output.dir}/resources/jaxrpc/utf16/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/webserviceref/ServletClient.class"/>
- <include name="org/jboss/test/ws/jaxrpc/webserviceref/TestEndpointService.class"/>
- <include name="org/jboss/test/ws/jaxrpc/webserviceref/TestEndpoint.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/utf16/Hello.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/utf16/HelloJavaBean.class"/>
</classes>
- <webinf dir="${tests.output.dir}/resources/jaxrpc/webserviceref/META-INF">
+ <webinf dir="${tests.output.dir}/resources/jaxrpc/utf16/WEB-INF">
+ <include name="webservices.xml"/>
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <jar destfile="${tests.output.dir}/libs/jaxrpc-webserviceref-ejb-client.jar">
+ <jar destfile="${tests.output.dir}/libs/jaxrpc-utf16-client.jar">
<fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/webserviceref/EJBClient.class"/>
- <include name="org/jboss/test/ws/jaxrpc/webserviceref/EJBRemote.class"/>
- <include name="org/jboss/test/ws/jaxrpc/webserviceref/EJBRemoteHome.class"/>
- <include name="org/jboss/test/ws/jaxrpc/webserviceref/TestEndpointService.class"/>
- <include name="org/jboss/test/ws/jaxrpc/webserviceref/TestEndpoint.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/utf16/Hello.class"/>
</fileset>
- <metainf dir="${tests.output.dir}/resources/jaxrpc/webserviceref/META-INF">
- <include name="ejb-jar.xml"/>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/utf16/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ </metainf>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/utf16/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
</jar>
-
+
<!-- jaxrpc-wsdlpublish -->
<war warfile="${tests.output.dir}/libs/jaxrpc-wsdlpublish.war" webxml="${tests.output.dir}/resources/jaxrpc/wsdlpublish/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/classes">
Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1205/JBWS1205TestCase.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1205/JBWS1205TestCase.java 2007-02-23 20:10:38 UTC (rev 2454)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1205/JBWS1205TestCase.java 2007-02-23 20:11:35 UTC (rev 2455)
@@ -61,12 +61,6 @@
public void testEndpoint() throws Exception
{
- if (isTargetJBoss50())
- {
- System.out.println("FIXME: [JBAS-3824] Fix ENC for EJB2.1 and Servlets");
- return;
- }
-
port.performTest();
}
}
Copied: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref (from rev 2448, trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref)
Deleted: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/ApplicationClient.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/ApplicationClient.java 2007-02-23 17:51:35 UTC (rev 2448)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/ApplicationClient.java 2007-02-23 20:11:35 UTC (rev 2455)
@@ -1,68 +0,0 @@
-/*
- * 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.jaxrpc.serviceref;
-
-import java.rmi.RemoteException;
-import java.util.ArrayList;
-
-import javax.naming.InitialContext;
-import javax.xml.rpc.JAXRPCException;
-import javax.xml.rpc.Service;
-
-import org.jboss.logging.Logger;
-
-public class ApplicationClient
-{
- // Provide logging
- private static Logger log = Logger.getLogger(ApplicationClient.class);
-
- public static InitialContext encCtx;
- public static String retStr;
-
- public static void main(String[] args) throws RemoteException
- {
- String inStr = args[0];
- log.info("echo: " + inStr);
-
- ArrayList ports = new ArrayList();
- try
- {
- ports.add((TestEndpoint)((Service)encCtx.lookup("java:comp/env/service1")).getPort(TestEndpoint.class));
- ports.add(((TestEndpointService)encCtx.lookup("java:comp/env/service2")).getTestEndpointPort());
- }
- catch (Exception ex)
- {
- log.error("Cannot add port", ex);
- throw new JAXRPCException(ex);
- }
-
- for (int i = 0; i < ports.size(); i++)
- {
- TestEndpoint port = (TestEndpoint)ports.get(i);
- String outStr = port.echo(inStr);
- if (inStr.equals(outStr) == false)
- throw new JAXRPCException("Invalid echo return: " + inStr);
- }
-
- retStr = inStr;
- }
-}
Copied: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/ApplicationClient.java (from rev 2448, trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/ApplicationClient.java)
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/ApplicationClient.java (rev 0)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/ApplicationClient.java 2007-02-23 20:11:35 UTC (rev 2455)
@@ -0,0 +1,68 @@
+/*
+ * 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.jaxrpc.serviceref;
+
+import java.rmi.RemoteException;
+import java.util.ArrayList;
+
+import javax.naming.InitialContext;
+import javax.xml.rpc.JAXRPCException;
+import javax.xml.rpc.Service;
+
+import org.jboss.logging.Logger;
+
+public class ApplicationClient
+{
+ // Provide logging
+ private static Logger log = Logger.getLogger(ApplicationClient.class);
+
+ public static InitialContext encCtx;
+ public static String retStr;
+
+ public static void main(String[] args) throws RemoteException
+ {
+ String inStr = args[0];
+ log.info("echo: " + inStr);
+
+ ArrayList ports = new ArrayList();
+ try
+ {
+ ports.add((TestEndpoint)((Service)encCtx.lookup("java:comp/env/service1")).getPort(TestEndpoint.class));
+ ports.add(((TestEndpointService)encCtx.lookup("java:comp/env/service2")).getTestEndpointPort());
+ }
+ catch (Exception ex)
+ {
+ log.error("Cannot add port", ex);
+ throw new JAXRPCException(ex);
+ }
+
+ for (int i = 0; i < ports.size(); i++)
+ {
+ TestEndpoint port = (TestEndpoint)ports.get(i);
+ String outStr = port.echo(inStr);
+ if (inStr.equals(outStr) == false)
+ throw new JAXRPCException("Invalid echo return: " + inStr);
+ }
+
+ retStr = inStr;
+ }
+}
Deleted: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/EJBClient.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/EJBClient.java 2007-02-23 17:51:35 UTC (rev 2448)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/EJBClient.java 2007-02-23 20:11:35 UTC (rev 2455)
@@ -1,93 +0,0 @@
-/*
- * 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.jaxrpc.serviceref;
-
-import java.rmi.RemoteException;
-import java.util.ArrayList;
-
-import javax.ejb.EJBException;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.naming.InitialContext;
-import javax.xml.rpc.JAXRPCException;
-import javax.xml.rpc.Service;
-
-import org.jboss.logging.Logger;
-
-public class EJBClient implements SessionBean
-{
- // Provide logging
- private static Logger log = Logger.getLogger(EJBClient.class);
-
- private SessionContext context;
-
- public String echo(String inStr) throws RemoteException
- {
- log.info("echo: " + inStr);
-
- ArrayList ports = new ArrayList();
- try
- {
- InitialContext iniCtx = new InitialContext();
- ports.add((TestEndpoint)((Service)iniCtx.lookup("java:comp/env/service1")).getPort(TestEndpoint.class));
- ports.add(((TestEndpointService)iniCtx.lookup("java:comp/env/service2")).getTestEndpointPort());
- }
- catch (Exception ex)
- {
- log.error("Cannot add port", ex);
- throw new JAXRPCException(ex);
- }
-
- for (int i = 0; i < ports.size(); i++)
- {
- TestEndpoint port = (TestEndpoint)ports.get(i);
- String outStr = port.echo(inStr);
- if (inStr.equals(outStr) == false)
- throw new JAXRPCException("Invalid echo return: " + inStr);
- }
-
- return inStr;
- }
-
- // EJB Lifecycle ----------------------------------------------------------------------
-
- public void setSessionContext(SessionContext context) throws EJBException, RemoteException
- {
- this.context = context;
- }
-
- public void ejbCreate()
- {
- }
-
- public void ejbRemove()
- {
- }
-
- public void ejbActivate()
- {
- }
-
- public void ejbPassivate()
- {
- }
-}
Copied: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/EJBClient.java (from rev 2448, trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/EJBClient.java)
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/EJBClient.java (rev 0)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/EJBClient.java 2007-02-23 20:11:35 UTC (rev 2455)
@@ -0,0 +1,93 @@
+/*
+ * 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.jaxrpc.serviceref;
+
+import java.rmi.RemoteException;
+import java.util.ArrayList;
+
+import javax.ejb.EJBException;
+import javax.ejb.SessionBean;
+import javax.ejb.SessionContext;
+import javax.naming.InitialContext;
+import javax.xml.rpc.JAXRPCException;
+import javax.xml.rpc.Service;
+
+import org.jboss.logging.Logger;
+
+public class EJBClient implements SessionBean
+{
+ // Provide logging
+ private static Logger log = Logger.getLogger(EJBClient.class);
+
+ private SessionContext context;
+
+ public String echo(String inStr) throws RemoteException
+ {
+ log.info("echo: " + inStr);
+
+ ArrayList ports = new ArrayList();
+ try
+ {
+ InitialContext iniCtx = new InitialContext();
+ ports.add((TestEndpoint)((Service)iniCtx.lookup("java:comp/env/service1")).getPort(TestEndpoint.class));
+ ports.add(((TestEndpointService)iniCtx.lookup("java:comp/env/service2")).getTestEndpointPort());
+ }
+ catch (Exception ex)
+ {
+ log.error("Cannot add port", ex);
+ throw new JAXRPCException(ex);
+ }
+
+ for (int i = 0; i < ports.size(); i++)
+ {
+ TestEndpoint port = (TestEndpoint)ports.get(i);
+ String outStr = port.echo(inStr);
+ if (inStr.equals(outStr) == false)
+ throw new JAXRPCException("Invalid echo return: " + inStr);
+ }
+
+ return inStr;
+ }
+
+ // EJB Lifecycle ----------------------------------------------------------------------
+
+ public void setSessionContext(SessionContext context) throws EJBException, RemoteException
+ {
+ this.context = context;
+ }
+
+ public void ejbCreate()
+ {
+ }
+
+ public void ejbRemove()
+ {
+ }
+
+ public void ejbActivate()
+ {
+ }
+
+ public void ejbPassivate()
+ {
+ }
+}
Deleted: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/EJBRemote.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/EJBRemote.java 2007-02-23 17:51:35 UTC (rev 2448)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/EJBRemote.java 2007-02-23 20:11:35 UTC (rev 2455)
@@ -1,31 +0,0 @@
-/*
- * 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.jaxrpc.serviceref;
-
-import java.rmi.RemoteException;
-
-import javax.ejb.EJBObject;
-
-public interface EJBRemote extends EJBObject
-{
- String echo(String input) throws RemoteException;
-}
Copied: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/EJBRemote.java (from rev 2448, trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/EJBRemote.java)
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/EJBRemote.java (rev 0)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/EJBRemote.java 2007-02-23 20:11:35 UTC (rev 2455)
@@ -0,0 +1,31 @@
+/*
+ * 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.jaxrpc.serviceref;
+
+import java.rmi.RemoteException;
+
+import javax.ejb.EJBObject;
+
+public interface EJBRemote extends EJBObject
+{
+ String echo(String input) throws RemoteException;
+}
Deleted: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/EJBRemoteHome.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/EJBRemoteHome.java 2007-02-23 17:51:35 UTC (rev 2448)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/EJBRemoteHome.java 2007-02-23 20:11:35 UTC (rev 2455)
@@ -1,32 +0,0 @@
-/*
- * 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.jaxrpc.serviceref;
-
-import java.rmi.RemoteException;
-
-import javax.ejb.CreateException;
-import javax.ejb.EJBHome;
-
-public interface EJBRemoteHome extends EJBHome
-{
- EJBRemote create() throws CreateException, RemoteException;
-}
Copied: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/EJBRemoteHome.java (from rev 2448, trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/EJBRemoteHome.java)
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/EJBRemoteHome.java (rev 0)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/EJBRemoteHome.java 2007-02-23 20:11:35 UTC (rev 2455)
@@ -0,0 +1,32 @@
+/*
+ * 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.jaxrpc.serviceref;
+
+import java.rmi.RemoteException;
+
+import javax.ejb.CreateException;
+import javax.ejb.EJBHome;
+
+public interface EJBRemoteHome extends EJBHome
+{
+ EJBRemote create() throws CreateException, RemoteException;
+}
Deleted: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/ServletClient.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/ServletClient.java 2007-02-23 17:51:35 UTC (rev 2448)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/ServletClient.java 2007-02-23 20:11:35 UTC (rev 2455)
@@ -1,70 +0,0 @@
-/*
- * 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.jaxrpc.serviceref;
-
-import java.io.IOException;
-import java.util.ArrayList;
-
-import javax.naming.InitialContext;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.xml.rpc.JAXRPCException;
-import javax.xml.rpc.Service;
-
-import org.jboss.logging.Logger;
-
-public class ServletClient extends HttpServlet
-{
- // Provide logging
- private static Logger log = Logger.getLogger(ServletClient.class);
-
- protected void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException
- {
- String inStr = req.getParameter("echo");
- log.info("doGet: " + inStr);
-
- ArrayList ports = new ArrayList();
- try
- {
- InitialContext iniCtx = new InitialContext();
- ports.add((TestEndpoint)((Service)iniCtx.lookup("java:comp/env/service1")).getPort(TestEndpoint.class));
- ports.add(((TestEndpointService)iniCtx.lookup("java:comp/env/service2")).getTestEndpointPort());
- }
- catch (Exception ex)
- {
- log.error("Cannot add port", ex);
- throw new JAXRPCException(ex);
- }
-
- for (int i = 0; i < ports.size(); i++)
- {
- TestEndpoint port = (TestEndpoint)ports.get(i);
- String outStr = port.echo(inStr);
- if (inStr.equals(outStr) == false)
- throw new JAXRPCException("Invalid echo return: " + inStr);
- }
-
- res.getWriter().print(inStr);
- }
-}
Copied: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/ServletClient.java (from rev 2448, trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/ServletClient.java)
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/ServletClient.java (rev 0)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/ServletClient.java 2007-02-23 20:11:35 UTC (rev 2455)
@@ -0,0 +1,70 @@
+/*
+ * 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.jaxrpc.serviceref;
+
+import java.io.IOException;
+import java.util.ArrayList;
+
+import javax.naming.InitialContext;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.xml.rpc.JAXRPCException;
+import javax.xml.rpc.Service;
+
+import org.jboss.logging.Logger;
+
+public class ServletClient extends HttpServlet
+{
+ // Provide logging
+ private static Logger log = Logger.getLogger(ServletClient.class);
+
+ protected void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException
+ {
+ String inStr = req.getParameter("echo");
+ log.info("doGet: " + inStr);
+
+ ArrayList ports = new ArrayList();
+ try
+ {
+ InitialContext iniCtx = new InitialContext();
+ ports.add((TestEndpoint)((Service)iniCtx.lookup("java:comp/env/service1")).getPort(TestEndpoint.class));
+ ports.add(((TestEndpointService)iniCtx.lookup("java:comp/env/service2")).getTestEndpointPort());
+ }
+ catch (Exception ex)
+ {
+ log.error("Cannot add port", ex);
+ throw new JAXRPCException(ex);
+ }
+
+ for (int i = 0; i < ports.size(); i++)
+ {
+ TestEndpoint port = (TestEndpoint)ports.get(i);
+ String outStr = port.echo(inStr);
+ if (inStr.equals(outStr) == false)
+ throw new JAXRPCException("Invalid echo return: " + inStr);
+ }
+
+ res.getWriter().print(inStr);
+ }
+}
Deleted: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/TestEndpoint.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/TestEndpoint.java 2007-02-23 17:51:35 UTC (rev 2448)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/TestEndpoint.java 2007-02-23 20:11:35 UTC (rev 2455)
@@ -1,31 +0,0 @@
-/*
- * 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.jaxrpc.serviceref;
-
-import java.rmi.Remote;
-import java.rmi.RemoteException;
-
-
-public interface TestEndpoint extends Remote
-{
- String echo(String arg0) throws RemoteException;
-}
Copied: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/TestEndpoint.java (from rev 2448, trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/TestEndpoint.java)
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/TestEndpoint.java (rev 0)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/TestEndpoint.java 2007-02-23 20:11:35 UTC (rev 2455)
@@ -0,0 +1,31 @@
+/*
+ * 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.jaxrpc.serviceref;
+
+import java.rmi.Remote;
+import java.rmi.RemoteException;
+
+
+public interface TestEndpoint extends Remote
+{
+ String echo(String arg0) throws RemoteException;
+}
Deleted: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/TestEndpointImpl.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/TestEndpointImpl.java 2007-02-23 17:51:35 UTC (rev 2448)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/TestEndpointImpl.java 2007-02-23 20:11:35 UTC (rev 2455)
@@ -1,42 +0,0 @@
-/*
- * 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.jaxrpc.serviceref;
-
-import org.jboss.logging.Logger;
-
-/**
- * Test the JAXRPC <service-ref>
- *
- * @author Thomas.Diesler at jboss.org
- * @since 23-Oct-2006
- */
-public class TestEndpointImpl implements TestEndpoint
-{
- // Provide logging
- private static Logger log = Logger.getLogger(TestEndpointImpl.class);
-
- public String echo(String input)
- {
- log.info(input);
- return input;
- }
-}
Copied: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/TestEndpointImpl.java (from rev 2448, trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/TestEndpointImpl.java)
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/TestEndpointImpl.java (rev 0)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/TestEndpointImpl.java 2007-02-23 20:11:35 UTC (rev 2455)
@@ -0,0 +1,42 @@
+/*
+ * 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.jaxrpc.serviceref;
+
+import org.jboss.logging.Logger;
+
+/**
+ * Test the JAXRPC <service-ref>
+ *
+ * @author Thomas.Diesler at jboss.org
+ * @since 23-Oct-2006
+ */
+public class TestEndpointImpl implements TestEndpoint
+{
+ // Provide logging
+ private static Logger log = Logger.getLogger(TestEndpointImpl.class);
+
+ public String echo(String input)
+ {
+ log.info(input);
+ return input;
+ }
+}
Deleted: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/TestEndpointService.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/TestEndpointService.java 2007-02-23 17:51:35 UTC (rev 2448)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/TestEndpointService.java 2007-02-23 20:11:35 UTC (rev 2455)
@@ -1,19 +0,0 @@
-/*
-* JBoss, the OpenSource EJB server
-* Distributable under LGPL license. See terms of license at gnu.org.
-*/
-
-//Auto Generated by jbossws - Please do not edit!!!
-
-package org.jboss.test.ws.jaxrpc.serviceref;
-
-
-import javax.xml.rpc.ServiceException;
-
-
-public interface TestEndpointService extends javax.xml.rpc.Service
-{
-
- public org.jboss.test.ws.jaxrpc.serviceref.TestEndpoint getTestEndpointPort() throws ServiceException;
-
-}
Copied: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/TestEndpointService.java (from rev 2448, trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/TestEndpointService.java)
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/TestEndpointService.java (rev 0)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/TestEndpointService.java 2007-02-23 20:11:35 UTC (rev 2455)
@@ -0,0 +1,19 @@
+/*
+* JBoss, the OpenSource EJB server
+* Distributable under LGPL license. See terms of license at gnu.org.
+*/
+
+//Auto Generated by jbossws - Please do not edit!!!
+
+package org.jboss.test.ws.jaxrpc.serviceref;
+
+
+import javax.xml.rpc.ServiceException;
+
+
+public interface TestEndpointService extends javax.xml.rpc.Service
+{
+
+ public org.jboss.test.ws.jaxrpc.serviceref.TestEndpoint getTestEndpointPort() throws ServiceException;
+
+}
Deleted: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/WebServiceRefClientTestCase.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/WebServiceRefClientTestCase.java 2007-02-23 17:51:35 UTC (rev 2448)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/WebServiceRefClientTestCase.java 2007-02-23 20:11:35 UTC (rev 2455)
@@ -1,104 +0,0 @@
-/*
- * 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.jaxrpc.serviceref;
-
-import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import javax.xml.namespace.QName;
-import javax.xml.rpc.Service;
-import javax.xml.rpc.ServiceException;
-import javax.xml.rpc.ServiceFactory;
-
-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 JAXRPC <service-ref>
- *
- * @author Thomas.Diesler at jboss.com
- * @since 23-Oct-2005
- */
-public class WebServiceRefClientTestCase extends JBossWSTest
-{
- public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxrpc-serviceref";
-
- public static Test suite()
- {
- return JBossWSTestSetup.newTestSetup(WebServiceRefClientTestCase.class, "jaxrpc-serviceref.war, jaxrpc-serviceref-client.jar");
- }
-
- public void testWSDLAccess() throws MalformedURLException
- {
- URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl");
- WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance();
- WSDLDefinitions wsdlDefinitions = factory.parse(wsdlURL);
- assertNotNull(wsdlDefinitions);
- }
-
- public void testDynamicProxy() throws Exception
- {
- URL wsdlURL = new File("resources/jaxrpc/serviceref/META-INF/wsdl/TestEndpoint.wsdl").toURL();
- URL mappingURL = new File("resources/jaxrpc/serviceref/META-INF/jaxrpc-mapping.xml").toURL();
- QName qname = new QName("http://org.jboss.ws/wsref", "TestEndpointService");
- Service service = new ServiceFactoryImpl().createService(wsdlURL, qname, mappingURL);
- TestEndpoint port = (TestEndpoint)service.getPort(TestEndpoint.class);
-
- String helloWorld = "Hello World!";
- Object retObj = port.echo(helloWorld);
- assertEquals(helloWorld, retObj);
- }
-
- public void testDynamicProxyNeg() throws Exception
- {
- URL wsdlURL = new File("resources/jaxrpc/serviceref/META-INF/wsdl/TestEndpoint.wsdl").toURL();
- QName qname = new QName("http://org.jboss.ws/wsref", "TestEndpointService");
- Service service = ServiceFactory.newInstance().createService(wsdlURL, qname);
- try
- {
- TestEndpoint port = (TestEndpoint)service.getPort(java.rmi.activation.Activator.class);
- fail("Expected ServiceException, but got: " + port);
- }
- catch (ServiceException ex)
- {
- // this is tested by the CTS
- }
- catch (Exception ex)
- {
- fail("Expected ServiceException, but got: " + ex);
- }
- }
-
- public void testApplicationClient() throws Exception
- {
- String helloWorld = "Hello World!";
- ApplicationClient.encCtx = getInitialContext();
- ApplicationClient.main(new String[] { helloWorld });
- assertEquals(helloWorld, ApplicationClient.retStr);
- }
-}
Copied: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/WebServiceRefClientTestCase.java (from rev 2448, trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/WebServiceRefClientTestCase.java)
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/WebServiceRefClientTestCase.java (rev 0)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/WebServiceRefClientTestCase.java 2007-02-23 20:11:35 UTC (rev 2455)
@@ -0,0 +1,104 @@
+/*
+ * 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.jaxrpc.serviceref;
+
+import java.io.File;
+import java.net.MalformedURLException;
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+import javax.xml.rpc.Service;
+import javax.xml.rpc.ServiceException;
+import javax.xml.rpc.ServiceFactory;
+
+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 JAXRPC <service-ref>
+ *
+ * @author Thomas.Diesler at jboss.com
+ * @since 23-Oct-2005
+ */
+public class WebServiceRefClientTestCase extends JBossWSTest
+{
+ public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxrpc-serviceref";
+
+ public static Test suite()
+ {
+ return JBossWSTestSetup.newTestSetup(WebServiceRefClientTestCase.class, "jaxrpc-serviceref.war, jaxrpc-serviceref-client.jar");
+ }
+
+ public void testWSDLAccess() throws MalformedURLException
+ {
+ URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl");
+ WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance();
+ WSDLDefinitions wsdlDefinitions = factory.parse(wsdlURL);
+ assertNotNull(wsdlDefinitions);
+ }
+
+ public void testDynamicProxy() throws Exception
+ {
+ URL wsdlURL = new File("resources/jaxrpc/serviceref/META-INF/wsdl/TestEndpoint.wsdl").toURL();
+ URL mappingURL = new File("resources/jaxrpc/serviceref/META-INF/jaxrpc-mapping.xml").toURL();
+ QName qname = new QName("http://org.jboss.ws/wsref", "TestEndpointService");
+ Service service = new ServiceFactoryImpl().createService(wsdlURL, qname, mappingURL);
+ TestEndpoint port = (TestEndpoint)service.getPort(TestEndpoint.class);
+
+ String helloWorld = "Hello World!";
+ Object retObj = port.echo(helloWorld);
+ assertEquals(helloWorld, retObj);
+ }
+
+ public void testDynamicProxyNeg() throws Exception
+ {
+ URL wsdlURL = new File("resources/jaxrpc/serviceref/META-INF/wsdl/TestEndpoint.wsdl").toURL();
+ QName qname = new QName("http://org.jboss.ws/wsref", "TestEndpointService");
+ Service service = ServiceFactory.newInstance().createService(wsdlURL, qname);
+ try
+ {
+ TestEndpoint port = (TestEndpoint)service.getPort(java.rmi.activation.Activator.class);
+ fail("Expected ServiceException, but got: " + port);
+ }
+ catch (ServiceException ex)
+ {
+ // this is tested by the CTS
+ }
+ catch (Exception ex)
+ {
+ fail("Expected ServiceException, but got: " + ex);
+ }
+ }
+
+ public void testApplicationClient() throws Exception
+ {
+ String helloWorld = "Hello World!";
+ ApplicationClient.encCtx = getInitialContext();
+ ApplicationClient.main(new String[] { helloWorld });
+ assertEquals(helloWorld, ApplicationClient.retStr);
+ }
+}
Deleted: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/WebServiceRefEJBTestCase.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/WebServiceRefEJBTestCase.java 2007-02-23 17:51:35 UTC (rev 2448)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/WebServiceRefEJBTestCase.java 2007-02-23 20:11:35 UTC (rev 2455)
@@ -1,87 +0,0 @@
-/*
- * 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.jaxrpc.serviceref;
-
-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 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 JAXRPC <service-ref>
- *
- * @author Thomas.Diesler at jboss.com
- * @since 23-Oct-2005
- */
-public class WebServiceRefEJBTestCase extends JBossWSTest
-{
- public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxrpc-serviceref";
-
- public static Test suite()
- {
- return JBossWSTestSetup.newTestSetup(WebServiceRefEJBTestCase.class, "jaxrpc-serviceref.war, jaxrpc-serviceref-ejb-client.jar");
- }
-
- public void testWSDLAccess() throws MalformedURLException
- {
- URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl");
- WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance();
- WSDLDefinitions wsdlDefinitions = factory.parse(wsdlURL);
- assertNotNull(wsdlDefinitions);
- }
-
- public void testDynamicProxy() throws Exception
- {
- URL wsdlURL = new File("resources/jaxrpc/serviceref/META-INF/wsdl/TestEndpoint.wsdl").toURL();
- URL mappingURL = new File("resources/jaxrpc/serviceref/META-INF/jaxrpc-mapping.xml").toURL();
- QName qname = new QName("http://org.jboss.ws/wsref", "TestEndpointService");
- Service service = new ServiceFactoryImpl().createService(wsdlURL, qname, mappingURL);
- TestEndpoint port = (TestEndpoint)service.getPort(TestEndpoint.class);
-
- String helloWorld = "Hello World!";
- Object retObj = port.echo(helloWorld);
- assertEquals(helloWorld, retObj);
- }
-
- public void testEJBClient() throws Exception
- {
- InitialContext iniCtx = getInitialContext();
- EJBRemoteHome ejbHome = (EJBRemoteHome)iniCtx.lookup("/ejb/EJBClient");
- EJBRemote ejbRemote = ejbHome.create();
-
- String helloWorld = "Hello World!";
- Object retObj = ejbRemote.echo(helloWorld);
- assertEquals(helloWorld, retObj);
-
- }
-}
Copied: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/WebServiceRefEJBTestCase.java (from rev 2448, trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/WebServiceRefEJBTestCase.java)
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/WebServiceRefEJBTestCase.java (rev 0)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/WebServiceRefEJBTestCase.java 2007-02-23 20:11:35 UTC (rev 2455)
@@ -0,0 +1,87 @@
+/*
+ * 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.jaxrpc.serviceref;
+
+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 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 JAXRPC <service-ref>
+ *
+ * @author Thomas.Diesler at jboss.com
+ * @since 23-Oct-2005
+ */
+public class WebServiceRefEJBTestCase extends JBossWSTest
+{
+ public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxrpc-serviceref";
+
+ public static Test suite()
+ {
+ return JBossWSTestSetup.newTestSetup(WebServiceRefEJBTestCase.class, "jaxrpc-serviceref.war, jaxrpc-serviceref-ejb-client.jar");
+ }
+
+ public void testWSDLAccess() throws MalformedURLException
+ {
+ URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl");
+ WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance();
+ WSDLDefinitions wsdlDefinitions = factory.parse(wsdlURL);
+ assertNotNull(wsdlDefinitions);
+ }
+
+ public void testDynamicProxy() throws Exception
+ {
+ URL wsdlURL = new File("resources/jaxrpc/serviceref/META-INF/wsdl/TestEndpoint.wsdl").toURL();
+ URL mappingURL = new File("resources/jaxrpc/serviceref/META-INF/jaxrpc-mapping.xml").toURL();
+ QName qname = new QName("http://org.jboss.ws/wsref", "TestEndpointService");
+ Service service = new ServiceFactoryImpl().createService(wsdlURL, qname, mappingURL);
+ TestEndpoint port = (TestEndpoint)service.getPort(TestEndpoint.class);
+
+ String helloWorld = "Hello World!";
+ Object retObj = port.echo(helloWorld);
+ assertEquals(helloWorld, retObj);
+ }
+
+ public void testEJBClient() throws Exception
+ {
+ InitialContext iniCtx = getInitialContext();
+ EJBRemoteHome ejbHome = (EJBRemoteHome)iniCtx.lookup("/ejb/EJBClient");
+ EJBRemote ejbRemote = ejbHome.create();
+
+ String helloWorld = "Hello World!";
+ Object retObj = ejbRemote.echo(helloWorld);
+ assertEquals(helloWorld, retObj);
+
+ }
+}
Deleted: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/WebServiceRefServletTestCase.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/WebServiceRefServletTestCase.java 2007-02-23 17:51:35 UTC (rev 2448)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/WebServiceRefServletTestCase.java 2007-02-23 20:11:35 UTC (rev 2455)
@@ -1,84 +0,0 @@
-/*
- * 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.jaxrpc.serviceref;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.InputStreamReader;
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import javax.xml.namespace.QName;
-import javax.xml.rpc.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 JAXRPC <service-ref>
- *
- * @author Thomas.Diesler at jboss.com
- * @since 23-Oct-2005
- */
-public class WebServiceRefServletTestCase extends JBossWSTest
-{
- public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxrpc-serviceref";
-
- public static Test suite()
- {
- return JBossWSTestSetup.newTestSetup(WebServiceRefServletTestCase.class, "jaxrpc-serviceref.war, jaxrpc-serviceref-servlet-client.war");
- }
-
- public void testWSDLAccess() throws MalformedURLException
- {
- URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl");
- WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance();
- WSDLDefinitions wsdlDefinitions = factory.parse(wsdlURL);
- assertNotNull(wsdlDefinitions);
- }
-
- public void testDynamicProxy() throws Exception
- {
- URL wsdlURL = new File("resources/jaxrpc/serviceref/META-INF/wsdl/TestEndpoint.wsdl").toURL();
- URL mappingURL = new File("resources/jaxrpc/serviceref/META-INF/jaxrpc-mapping.xml").toURL();
- QName qname = new QName("http://org.jboss.ws/wsref", "TestEndpointService");
- Service service = new ServiceFactoryImpl().createService(wsdlURL, qname, mappingURL);
- TestEndpoint port = (TestEndpoint)service.getPort(TestEndpoint.class);
-
- String helloWorld = "Hello World!";
- Object retObj = port.echo(helloWorld);
- assertEquals(helloWorld, retObj);
- }
-
- public void testServletClient() throws Exception
- {
- URL url = new URL(TARGET_ENDPOINT_ADDRESS + "-servlet-client?echo=HelloWorld");
- BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()));
- String retStr = br.readLine();
- assertEquals("HelloWorld", retStr);
- }
-}
Copied: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/WebServiceRefServletTestCase.java (from rev 2448, trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/WebServiceRefServletTestCase.java)
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/WebServiceRefServletTestCase.java (rev 0)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/WebServiceRefServletTestCase.java 2007-02-23 20:11:35 UTC (rev 2455)
@@ -0,0 +1,84 @@
+/*
+ * 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.jaxrpc.serviceref;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.InputStreamReader;
+import java.net.MalformedURLException;
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+import javax.xml.rpc.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 JAXRPC <service-ref>
+ *
+ * @author Thomas.Diesler at jboss.com
+ * @since 23-Oct-2005
+ */
+public class WebServiceRefServletTestCase extends JBossWSTest
+{
+ public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxrpc-serviceref";
+
+ public static Test suite()
+ {
+ return JBossWSTestSetup.newTestSetup(WebServiceRefServletTestCase.class, "jaxrpc-serviceref.war, jaxrpc-serviceref-servlet-client.war");
+ }
+
+ public void testWSDLAccess() throws MalformedURLException
+ {
+ URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl");
+ WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance();
+ WSDLDefinitions wsdlDefinitions = factory.parse(wsdlURL);
+ assertNotNull(wsdlDefinitions);
+ }
+
+ public void testDynamicProxy() throws Exception
+ {
+ URL wsdlURL = new File("resources/jaxrpc/serviceref/META-INF/wsdl/TestEndpoint.wsdl").toURL();
+ URL mappingURL = new File("resources/jaxrpc/serviceref/META-INF/jaxrpc-mapping.xml").toURL();
+ QName qname = new QName("http://org.jboss.ws/wsref", "TestEndpointService");
+ Service service = new ServiceFactoryImpl().createService(wsdlURL, qname, mappingURL);
+ TestEndpoint port = (TestEndpoint)service.getPort(TestEndpoint.class);
+
+ String helloWorld = "Hello World!";
+ Object retObj = port.echo(helloWorld);
+ assertEquals(helloWorld, retObj);
+ }
+
+ public void testServletClient() throws Exception
+ {
+ URL url = new URL(TARGET_ENDPOINT_ADDRESS + "-servlet-client?echo=HelloWorld");
+ BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()));
+ String retStr = br.readLine();
+ assertEquals("HelloWorld", retStr);
+ }
+}
Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsse/WebClientTestCase.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsse/WebClientTestCase.java 2007-02-23 20:10:38 UTC (rev 2454)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsse/WebClientTestCase.java 2007-02-23 20:11:35 UTC (rev 2455)
@@ -48,12 +48,6 @@
*/
public void testWebClient() throws Exception
{
- if (isTargetJBoss50())
- {
- System.out.println("FIXME: [JBAS-3824] Fix ENC for EJB2.1 and Servlets");
- return;
- }
-
URL url = new URL("http://" + getServerHost() + ":8080/jaxrpc-wsse-rpc/RpcTestClientServlet?input=Hello");
BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()));
String res = br.readLine();
Copied: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/serviceref (from rev 2448, trunk/jbossws-tests/src/main/resources/jaxrpc/serviceref)
Copied: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/serviceref/META-INF (from rev 2448, trunk/jbossws-tests/src/main/resources/jaxrpc/serviceref/META-INF)
Deleted: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/serviceref/META-INF/application-client.xml
===================================================================
--- trunk/jbossws-tests/src/main/resources/jaxrpc/serviceref/META-INF/application-client.xml 2007-02-23 17:51:35 UTC (rev 2448)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/serviceref/META-INF/application-client.xml 2007-02-23 20:11:35 UTC (rev 2455)
@@ -1,31 +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>service1</service-ref-name>
- <service-interface>javax.xml.rpc.Service</service-interface>
- <wsdl-file>META-INF/wsdl/TestEndpoint.wsdl</wsdl-file>
- <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
- <port-component-ref>
- <service-endpoint-interface>org.jboss.test.ws.jaxrpc.serviceref.TestEndpoint</service-endpoint-interface>
- </port-component-ref>
- </service-ref>
-
- <service-ref>
- <service-ref-name>service2</service-ref-name>
- <service-interface>org.jboss.test.ws.jaxrpc.serviceref.TestEndpointService</service-interface>
- <wsdl-file>META-INF/wsdl/TestEndpoint.wsdl</wsdl-file>
- <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
- <port-component-ref>
- <service-endpoint-interface>org.jboss.test.ws.jaxrpc.serviceref.TestEndpoint</service-endpoint-interface>
- </port-component-ref>
- </service-ref>
-
-</application-client>
-
Copied: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/serviceref/META-INF/application-client.xml (from rev 2448, trunk/jbossws-tests/src/main/resources/jaxrpc/serviceref/META-INF/application-client.xml)
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/serviceref/META-INF/application-client.xml (rev 0)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/serviceref/META-INF/application-client.xml 2007-02-23 20:11:35 UTC (rev 2455)
@@ -0,0 +1,31 @@
+<?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>service1</service-ref-name>
+ <service-interface>javax.xml.rpc.Service</service-interface>
+ <wsdl-file>META-INF/wsdl/TestEndpoint.wsdl</wsdl-file>
+ <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
+ <port-component-ref>
+ <service-endpoint-interface>org.jboss.test.ws.jaxrpc.serviceref.TestEndpoint</service-endpoint-interface>
+ </port-component-ref>
+ </service-ref>
+
+ <service-ref>
+ <service-ref-name>service2</service-ref-name>
+ <service-interface>org.jboss.test.ws.jaxrpc.serviceref.TestEndpointService</service-interface>
+ <wsdl-file>META-INF/wsdl/TestEndpoint.wsdl</wsdl-file>
+ <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
+ <port-component-ref>
+ <service-endpoint-interface>org.jboss.test.ws.jaxrpc.serviceref.TestEndpoint</service-endpoint-interface>
+ </port-component-ref>
+ </service-ref>
+
+</application-client>
+
Deleted: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/serviceref/META-INF/ejb-jar.xml
===================================================================
--- trunk/jbossws-tests/src/main/resources/jaxrpc/serviceref/META-INF/ejb-jar.xml 2007-02-23 17:51:35 UTC (rev 2448)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/serviceref/META-INF/ejb-jar.xml 2007-02-23 20:11:35 UTC (rev 2455)
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<ejb-jar 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/ejb-jar_2_1.xsd"
- version="2.1">
-
- <enterprise-beans>
- <session>
- <ejb-name>ejb/EJBClient</ejb-name>
- <home>org.jboss.test.ws.jaxrpc.serviceref.EJBRemoteHome</home>
- <remote>org.jboss.test.ws.jaxrpc.serviceref.EJBRemote</remote>
- <ejb-class>org.jboss.test.ws.jaxrpc.serviceref.EJBClient</ejb-class>
- <session-type>Stateless</session-type>
- <transaction-type>Container</transaction-type>
-
- <service-ref>
- <service-ref-name>service1</service-ref-name>
- <service-interface>javax.xml.rpc.Service</service-interface>
- <wsdl-file>META-INF/wsdl/TestEndpoint.wsdl</wsdl-file>
- <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
- <port-component-ref>
- <service-endpoint-interface>org.jboss.test.ws.jaxrpc.serviceref.TestEndpoint</service-endpoint-interface>
- </port-component-ref>
- </service-ref>
-
- <service-ref>
- <service-ref-name>service2</service-ref-name>
- <service-interface>org.jboss.test.ws.jaxrpc.serviceref.TestEndpointService</service-interface>
- <wsdl-file>META-INF/wsdl/TestEndpoint.wsdl</wsdl-file>
- <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
- <port-component-ref>
- <service-endpoint-interface>org.jboss.test.ws.jaxrpc.serviceref.TestEndpoint</service-endpoint-interface>
- </port-component-ref>
- </service-ref>
-
- </session>
- </enterprise-beans>
-
-</ejb-jar>
-
Copied: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/serviceref/META-INF/ejb-jar.xml (from rev 2448, trunk/jbossws-tests/src/main/resources/jaxrpc/serviceref/META-INF/ejb-jar.xml)
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/serviceref/META-INF/ejb-jar.xml (rev 0)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/serviceref/META-INF/ejb-jar.xml 2007-02-23 20:11:35 UTC (rev 2455)
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<ejb-jar 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/ejb-jar_2_1.xsd"
+ version="2.1">
+
+ <enterprise-beans>
+ <session>
+ <ejb-name>ejb/EJBClient</ejb-name>
+ <home>org.jboss.test.ws.jaxrpc.serviceref.EJBRemoteHome</home>
+ <remote>org.jboss.test.ws.jaxrpc.serviceref.EJBRemote</remote>
+ <ejb-class>org.jboss.test.ws.jaxrpc.serviceref.EJBClient</ejb-class>
+ <session-type>Stateless</session-type>
+ <transaction-type>Container</transaction-type>
+
+ <service-ref>
+ <service-ref-name>service1</service-ref-name>
+ <service-interface>javax.xml.rpc.Service</service-interface>
+ <wsdl-file>META-INF/wsdl/TestEndpoint.wsdl</wsdl-file>
+ <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
+ <port-component-ref>
+ <service-endpoint-interface>org.jboss.test.ws.jaxrpc.serviceref.TestEndpoint</service-endpoint-interface>
+ </port-component-ref>
+ </service-ref>
+
+ <service-ref>
+ <service-ref-name>service2</service-ref-name>
+ <service-interface>org.jboss.test.ws.jaxrpc.serviceref.TestEndpointService</service-interface>
+ <wsdl-file>META-INF/wsdl/TestEndpoint.wsdl</wsdl-file>
+ <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
+ <port-component-ref>
+ <service-endpoint-interface>org.jboss.test.ws.jaxrpc.serviceref.TestEndpoint</service-endpoint-interface>
+ </port-component-ref>
+ </service-ref>
+
+ </session>
+ </enterprise-beans>
+
+</ejb-jar>
+
Deleted: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/serviceref/META-INF/jaxrpc-mapping.xml
===================================================================
--- trunk/jbossws-tests/src/main/resources/jaxrpc/serviceref/META-INF/jaxrpc-mapping.xml 2007-02-23 17:51:35 UTC (rev 2448)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/serviceref/META-INF/jaxrpc-mapping.xml 2007-02-23 20:11:35 UTC (rev 2455)
@@ -1,37 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' 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://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'>
- <package-mapping>
- <package-type>org.jboss.test.ws.jaxrpc.serviceref</package-type>
- <namespaceURI>http://org.jboss.ws/wsref/types</namespaceURI>
- </package-mapping>
- <service-interface-mapping>
- <service-interface>org.jboss.test.ws.jaxrpc.serviceref.TestEndpointService</service-interface>
- <wsdl-service-name xmlns:serviceNS='http://org.jboss.ws/wsref'>serviceNS:TestEndpointService</wsdl-service-name>
- <port-mapping>
- <port-name>TestEndpointPort</port-name>
- <java-port-name>TestEndpointPort</java-port-name>
- </port-mapping>
- </service-interface-mapping>
- <service-endpoint-interface-mapping>
- <service-endpoint-interface>org.jboss.test.ws.jaxrpc.serviceref.TestEndpoint</service-endpoint-interface>
- <wsdl-port-type xmlns:portTypeNS='http://org.jboss.ws/wsref'>portTypeNS:TestEndpoint</wsdl-port-type>
- <wsdl-binding xmlns:bindingNS='http://org.jboss.ws/wsref'>bindingNS:TestEndpointBinding</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://org.jboss.ws/wsref'>wsdlMsgNS:TestEndpoint_echo</wsdl-message>
- <wsdl-message-part-name>String_1</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://org.jboss.ws/wsref'>wsdlMsgNS:TestEndpoint_echoResponse</wsdl-message>
- <wsdl-message-part-name>result</wsdl-message-part-name>
- </wsdl-return-value-mapping>
- </service-endpoint-method-mapping>
- </service-endpoint-interface-mapping>
-</java-wsdl-mapping>
\ No newline at end of file
Copied: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/serviceref/META-INF/jaxrpc-mapping.xml (from rev 2448, trunk/jbossws-tests/src/main/resources/jaxrpc/serviceref/META-INF/jaxrpc-mapping.xml)
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/serviceref/META-INF/jaxrpc-mapping.xml (rev 0)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/serviceref/META-INF/jaxrpc-mapping.xml 2007-02-23 20:11:35 UTC (rev 2455)
@@ -0,0 +1,37 @@
+<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' 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://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'>
+ <package-mapping>
+ <package-type>org.jboss.test.ws.jaxrpc.serviceref</package-type>
+ <namespaceURI>http://org.jboss.ws/wsref/types</namespaceURI>
+ </package-mapping>
+ <service-interface-mapping>
+ <service-interface>org.jboss.test.ws.jaxrpc.serviceref.TestEndpointService</service-interface>
+ <wsdl-service-name xmlns:serviceNS='http://org.jboss.ws/wsref'>serviceNS:TestEndpointService</wsdl-service-name>
+ <port-mapping>
+ <port-name>TestEndpointPort</port-name>
+ <java-port-name>TestEndpointPort</java-port-name>
+ </port-mapping>
+ </service-interface-mapping>
+ <service-endpoint-interface-mapping>
+ <service-endpoint-interface>org.jboss.test.ws.jaxrpc.serviceref.TestEndpoint</service-endpoint-interface>
+ <wsdl-port-type xmlns:portTypeNS='http://org.jboss.ws/wsref'>portTypeNS:TestEndpoint</wsdl-port-type>
+ <wsdl-binding xmlns:bindingNS='http://org.jboss.ws/wsref'>bindingNS:TestEndpointBinding</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://org.jboss.ws/wsref'>wsdlMsgNS:TestEndpoint_echo</wsdl-message>
+ <wsdl-message-part-name>String_1</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://org.jboss.ws/wsref'>wsdlMsgNS:TestEndpoint_echoResponse</wsdl-message>
+ <wsdl-message-part-name>result</wsdl-message-part-name>
+ </wsdl-return-value-mapping>
+ </service-endpoint-method-mapping>
+ </service-endpoint-interface-mapping>
+</java-wsdl-mapping>
\ No newline at end of file
Deleted: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/serviceref/META-INF/jboss-client.xml
===================================================================
--- trunk/jbossws-tests/src/main/resources/jaxrpc/serviceref/META-INF/jboss-client.xml 2007-02-23 17:51:35 UTC (rev 2448)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/serviceref/META-INF/jboss-client.xml 2007-02-23 20:11:35 UTC (rev 2455)
@@ -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>
Copied: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/serviceref/META-INF/jboss-client.xml (from rev 2448, trunk/jbossws-tests/src/main/resources/jaxrpc/serviceref/META-INF/jboss-client.xml)
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/serviceref/META-INF/jboss-client.xml (rev 0)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/serviceref/META-INF/jboss-client.xml 2007-02-23 20:11:35 UTC (rev 2455)
@@ -0,0 +1,7 @@
+<?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>
Copied: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/serviceref/META-INF/wsdl (from rev 2448, trunk/jbossws-tests/src/main/resources/jaxrpc/serviceref/META-INF/wsdl)
Deleted: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/serviceref/META-INF/wsdl/TestEndpoint.wsdl
===================================================================
--- trunk/jbossws-tests/src/main/resources/jaxrpc/serviceref/META-INF/wsdl/TestEndpoint.wsdl 2007-02-23 17:51:35 UTC (rev 2448)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/serviceref/META-INF/wsdl/TestEndpoint.wsdl 2007-02-23 20:11:35 UTC (rev 2455)
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions name='TestEndpointService' targetNamespace='http://org.jboss.ws/wsref' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.ws/wsref' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
- <types/>
- <message name='TestEndpoint_echo'>
- <part name='String_1' type='xsd:string'/>
- </message>
- <message name='TestEndpoint_echoResponse'>
- <part name='result' type='xsd:string'/>
- </message>
- <portType name='TestEndpoint'>
- <operation name='echo' parameterOrder='String_1'>
- <input message='tns:TestEndpoint_echo'/>
- <output message='tns:TestEndpoint_echoResponse'/>
- </operation>
- </portType>
- <binding name='TestEndpointBinding' type='tns:TestEndpoint'>
- <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/>
- <operation name='echo'>
- <soap:operation soapAction=''/>
- <input>
- <soap:body namespace='http://org.jboss.ws/wsref' use='literal'/>
- </input>
- <output>
- <soap:body namespace='http://org.jboss.ws/wsref' use='literal'/>
- </output>
- </operation>
- </binding>
- <service name='TestEndpointService'>
- <port binding='tns:TestEndpointBinding' name='TestEndpointPort'>
- <soap:address location='http://@jbosstest.host.name@:8080/jaxrpc-serviceref'/>
- </port>
- </service>
-</definitions>
\ No newline at end of file
Copied: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/serviceref/META-INF/wsdl/TestEndpoint.wsdl (from rev 2448, trunk/jbossws-tests/src/main/resources/jaxrpc/serviceref/META-INF/wsdl/TestEndpoint.wsdl)
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/serviceref/META-INF/wsdl/TestEndpoint.wsdl (rev 0)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/serviceref/META-INF/wsdl/TestEndpoint.wsdl 2007-02-23 20:11:35 UTC (rev 2455)
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name='TestEndpointService' targetNamespace='http://org.jboss.ws/wsref' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.ws/wsref' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+ <types/>
+ <message name='TestEndpoint_echo'>
+ <part name='String_1' type='xsd:string'/>
+ </message>
+ <message name='TestEndpoint_echoResponse'>
+ <part name='result' type='xsd:string'/>
+ </message>
+ <portType name='TestEndpoint'>
+ <operation name='echo' parameterOrder='String_1'>
+ <input message='tns:TestEndpoint_echo'/>
+ <output message='tns:TestEndpoint_echoResponse'/>
+ </operation>
+ </portType>
+ <binding name='TestEndpointBinding' type='tns:TestEndpoint'>
+ <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/>
+ <operation name='echo'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body namespace='http://org.jboss.ws/wsref' use='literal'/>
+ </input>
+ <output>
+ <soap:body namespace='http://org.jboss.ws/wsref' use='literal'/>
+ </output>
+ </operation>
+ </binding>
+ <service name='TestEndpointService'>
+ <port binding='tns:TestEndpointBinding' name='TestEndpointPort'>
+ <soap:address location='http://@jbosstest.host.name@:8080/jaxrpc-serviceref'/>
+ </port>
+ </service>
+</definitions>
\ No newline at end of file
Copied: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/serviceref/WEB-INF (from rev 2448, trunk/jbossws-tests/src/main/resources/jaxrpc/serviceref/WEB-INF)
Deleted: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/serviceref/WEB-INF/web.xml
===================================================================
--- trunk/jbossws-tests/src/main/resources/jaxrpc/serviceref/WEB-INF/web.xml 2007-02-23 17:51:35 UTC (rev 2448)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/serviceref/WEB-INF/web.xml 2007-02-23 20:11:35 UTC (rev 2455)
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<web-app version="2.4" 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/web-app_2_4.xsd">
-
- <servlet>
- <servlet-name>TestEndpoint</servlet-name>
- <servlet-class>org.jboss.test.ws.jaxrpc.serviceref.TestEndpointImpl</servlet-class>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>TestEndpoint</servlet-name>
- <url-pattern>/*</url-pattern>
- </servlet-mapping>
-</web-app>
\ No newline at end of file
Copied: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/serviceref/WEB-INF/web.xml (from rev 2448, trunk/jbossws-tests/src/main/resources/jaxrpc/serviceref/WEB-INF/web.xml)
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/serviceref/WEB-INF/web.xml (rev 0)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/serviceref/WEB-INF/web.xml 2007-02-23 20:11:35 UTC (rev 2455)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<web-app version="2.4" 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/web-app_2_4.xsd">
+
+ <servlet>
+ <servlet-name>TestEndpoint</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxrpc.serviceref.TestEndpointImpl</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>TestEndpoint</servlet-name>
+ <url-pattern>/*</url-pattern>
+ </servlet-mapping>
+</web-app>
\ No newline at end of file
Deleted: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/serviceref/WEB-INF/webservices.xml
===================================================================
--- trunk/jbossws-tests/src/main/resources/jaxrpc/serviceref/WEB-INF/webservices.xml 2007-02-23 17:51:35 UTC (rev 2448)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/serviceref/WEB-INF/webservices.xml 2007-02-23 20:11:35 UTC (rev 2455)
@@ -1,15 +0,0 @@
-<webservices version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:impl='http://org.jboss.ws/wsref' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd'>
- <webservice-description>
- <webservice-description-name>TestEndpointService</webservice-description-name>
- <wsdl-file>WEB-INF/wsdl/TestEndpoint.wsdl</wsdl-file>
- <jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
- <port-component>
- <port-component-name>TestEndpointPort</port-component-name>
- <wsdl-port>impl:TestEndpointPort</wsdl-port>
- <service-endpoint-interface>org.jboss.test.ws.jaxrpc.serviceref.TestEndpoint</service-endpoint-interface>
- <service-impl-bean>
- <servlet-link>TestEndpoint</servlet-link>
- </service-impl-bean>
- </port-component>
- </webservice-description>
-</webservices>
\ No newline at end of file
Copied: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/serviceref/WEB-INF/webservices.xml (from rev 2448, trunk/jbossws-tests/src/main/resources/jaxrpc/serviceref/WEB-INF/webservices.xml)
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/serviceref/WEB-INF/webservices.xml (rev 0)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/serviceref/WEB-INF/webservices.xml 2007-02-23 20:11:35 UTC (rev 2455)
@@ -0,0 +1,15 @@
+<webservices version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:impl='http://org.jboss.ws/wsref' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd'>
+ <webservice-description>
+ <webservice-description-name>TestEndpointService</webservice-description-name>
+ <wsdl-file>WEB-INF/wsdl/TestEndpoint.wsdl</wsdl-file>
+ <jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
+ <port-component>
+ <port-component-name>TestEndpointPort</port-component-name>
+ <wsdl-port>impl:TestEndpointPort</wsdl-port>
+ <service-endpoint-interface>org.jboss.test.ws.jaxrpc.serviceref.TestEndpoint</service-endpoint-interface>
+ <service-impl-bean>
+ <servlet-link>TestEndpoint</servlet-link>
+ </service-impl-bean>
+ </port-component>
+ </webservice-description>
+</webservices>
\ No newline at end of file
Copied: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/serviceref/servlet-client (from rev 2448, trunk/jbossws-tests/src/main/resources/jaxrpc/serviceref/servlet-client)
Copied: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/serviceref/servlet-client/WEB-INF (from rev 2448, trunk/jbossws-tests/src/main/resources/jaxrpc/serviceref/servlet-client/WEB-INF)
Deleted: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/serviceref/servlet-client/WEB-INF/web.xml
===================================================================
--- trunk/jbossws-tests/src/main/resources/jaxrpc/serviceref/servlet-client/WEB-INF/web.xml 2007-02-23 17:51:35 UTC (rev 2448)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/serviceref/servlet-client/WEB-INF/web.xml 2007-02-23 20:11:35 UTC (rev 2455)
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<web-app version="2.4" 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/web-app_2_4.xsd">
-
- <servlet>
- <servlet-name>ServletClient</servlet-name>
- <servlet-class>org.jboss.test.ws.jaxrpc.serviceref.ServletClient</servlet-class>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>ServletClient</servlet-name>
- <url-pattern>/*</url-pattern>
- </servlet-mapping>
-
- <service-ref>
- <service-ref-name>service1</service-ref-name>
- <service-interface>javax.xml.rpc.Service</service-interface>
- <wsdl-file>WEB-INF/wsdl/TestEndpoint.wsdl</wsdl-file>
- <jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
- <port-component-ref>
- <service-endpoint-interface>org.jboss.test.ws.jaxrpc.serviceref.TestEndpoint</service-endpoint-interface>
- </port-component-ref>
- </service-ref>
-
- <service-ref>
- <service-ref-name>service2</service-ref-name>
- <service-interface>org.jboss.test.ws.jaxrpc.serviceref.TestEndpointService</service-interface>
- <wsdl-file>WEB-INF/wsdl/TestEndpoint.wsdl</wsdl-file>
- <jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
- <port-component-ref>
- <service-endpoint-interface>org.jboss.test.ws.jaxrpc.serviceref.TestEndpoint</service-endpoint-interface>
- </port-component-ref>
- </service-ref>
-
-</web-app>
\ No newline at end of file
Copied: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/serviceref/servlet-client/WEB-INF/web.xml (from rev 2448, trunk/jbossws-tests/src/main/resources/jaxrpc/serviceref/servlet-client/WEB-INF/web.xml)
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/serviceref/servlet-client/WEB-INF/web.xml (rev 0)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/serviceref/servlet-client/WEB-INF/web.xml 2007-02-23 20:11:35 UTC (rev 2455)
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<web-app version="2.4" 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/web-app_2_4.xsd">
+
+ <servlet>
+ <servlet-name>ServletClient</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxrpc.serviceref.ServletClient</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>ServletClient</servlet-name>
+ <url-pattern>/*</url-pattern>
+ </servlet-mapping>
+
+ <service-ref>
+ <service-ref-name>service1</service-ref-name>
+ <service-interface>javax.xml.rpc.Service</service-interface>
+ <wsdl-file>WEB-INF/wsdl/TestEndpoint.wsdl</wsdl-file>
+ <jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
+ <port-component-ref>
+ <service-endpoint-interface>org.jboss.test.ws.jaxrpc.serviceref.TestEndpoint</service-endpoint-interface>
+ </port-component-ref>
+ </service-ref>
+
+ <service-ref>
+ <service-ref-name>service2</service-ref-name>
+ <service-interface>org.jboss.test.ws.jaxrpc.serviceref.TestEndpointService</service-interface>
+ <wsdl-file>WEB-INF/wsdl/TestEndpoint.wsdl</wsdl-file>
+ <jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
+ <port-component-ref>
+ <service-endpoint-interface>org.jboss.test.ws.jaxrpc.serviceref.TestEndpoint</service-endpoint-interface>
+ </port-component-ref>
+ </service-ref>
+
+</web-app>
\ No newline at end of file
Deleted: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/serviceref/wstools-java-wsdl.xml
===================================================================
--- trunk/jbossws-tests/src/main/resources/jaxrpc/serviceref/wstools-java-wsdl.xml 2007-02-23 17:51:35 UTC (rev 2448)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/serviceref/wstools-java-wsdl.xml 2007-02-23 20:11:35 UTC (rev 2455)
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- wstools -cp ../../../../../output/classes -config wstools-java-wsdl.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.jaxrpc.serviceref" namespace="http://org.jboss.ws/wsref"/>
- </global>
-
- <java-wsdl>
- <service name="TestEndpointService" style="rpc" endpoint="org.jboss.test.ws.jaxrpc.serviceref.TestEndpoint"/>
- <namespaces target-namespace="http://org.jboss.ws/wsref" type-namespace="http://org.jboss.ws/wsref/types"/>
- <mapping file="jaxrpc-mapping.xml"/>
- <webservices servlet-link="TestEndpoint"/>
- </java-wsdl>
-
-</configuration>
\ No newline at end of file
Copied: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/serviceref/wstools-java-wsdl.xml (from rev 2448, trunk/jbossws-tests/src/main/resources/jaxrpc/serviceref/wstools-java-wsdl.xml)
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/serviceref/wstools-java-wsdl.xml (rev 0)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/serviceref/wstools-java-wsdl.xml 2007-02-23 20:11:35 UTC (rev 2455)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ wstools -cp ../../../../../output/classes -config wstools-java-wsdl.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.jaxrpc.serviceref" namespace="http://org.jboss.ws/wsref"/>
+ </global>
+
+ <java-wsdl>
+ <service name="TestEndpointService" style="rpc" endpoint="org.jboss.test.ws.jaxrpc.serviceref.TestEndpoint"/>
+ <namespaces target-namespace="http://org.jboss.ws/wsref" type-namespace="http://org.jboss.ws/wsref/types"/>
+ <mapping file="jaxrpc-mapping.xml"/>
+ <webservices servlet-link="TestEndpoint"/>
+ </java-wsdl>
+
+</configuration>
\ No newline at end of file
Deleted: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/serviceref/wstools-wsdl-java.xml
===================================================================
--- trunk/jbossws-tests/src/main/resources/jaxrpc/serviceref/wstools-wsdl-java.xml 2007-02-23 17:51:35 UTC (rev 2448)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/serviceref/wstools-wsdl-java.xml 2007-02-23 20:11:35 UTC (rev 2455)
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- wstools -config wstools-wsdl-java.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.jaxrpc.serviceref" namespace="http://org.jboss.ws/wsref"/>
- </global>
-
- <wsdl-java location="META-INF/wsdl/TestEndpoint.wsdl">
- <mapping file="jaxrpc-mapping.xml"/>
- </wsdl-java>
-
-</configuration>
\ No newline at end of file
Copied: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/serviceref/wstools-wsdl-java.xml (from rev 2448, trunk/jbossws-tests/src/main/resources/jaxrpc/serviceref/wstools-wsdl-java.xml)
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/serviceref/wstools-wsdl-java.xml (rev 0)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/serviceref/wstools-wsdl-java.xml 2007-02-23 20:11:35 UTC (rev 2455)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ wstools -config wstools-wsdl-java.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.jaxrpc.serviceref" namespace="http://org.jboss.ws/wsref"/>
+ </global>
+
+ <wsdl-java location="META-INF/wsdl/TestEndpoint.wsdl">
+ <mapping file="jaxrpc-mapping.xml"/>
+ </wsdl-java>
+
+</configuration>
\ No newline at end of file
Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/handlerchain/META-INF/jboss-client.xml
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/handlerchain/META-INF/jboss-client.xml 2007-02-23 20:10:38 UTC (rev 2454)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/handlerchain/META-INF/jboss-client.xml 2007-02-23 20:11:35 UTC (rev 2455)
@@ -5,20 +5,20 @@
<jboss-client>
<jndi-name>jbossws-client</jndi-name>
- <service-ref>
+ <webservice-ref>
<service-ref-name>Service1</service-ref-name>
<wsdl-override>http://@jbosstest.host.name@:8080/jaxws-samples-handlerchain/TestService?wsdl</wsdl-override>
- </service-ref>
+ </webservice-ref>
- <service-ref>
+ <webservice-ref>
<service-ref-name>Service2</service-ref-name>
<wsdl-override>http://@jbosstest.host.name@:8080/jaxws-samples-handlerchain/TestService?wsdl</wsdl-override>
- </service-ref>
+ </webservice-ref>
- <service-ref>
+ <webservice-ref>
<service-ref-name>Service3</service-ref-name>
<handler-chain>jaxws-handlers.xml</handler-chain>
<wsdl-override>http://@jbosstest.host.name@:8080/jaxws-samples-handlerchain/TestService?wsdl</wsdl-override>
- </service-ref>
+ </webservice-ref>
</jboss-client>
\ No newline at end of file
Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/webserviceref/META-INF/jboss-client.xml
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/webserviceref/META-INF/jboss-client.xml 2007-02-23 20:10:38 UTC (rev 2454)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/webserviceref/META-INF/jboss-client.xml 2007-02-23 20:11:35 UTC (rev 2455)
@@ -7,90 +7,90 @@
<!--
@WebServiceRef(name = "service1", value = TestEndpointService.class, wsdlLocation = "META-INF/wsdl/TestEndpoint.wsdl")
- <service-ref>
+ <webservice-ref>
<service-ref-name>service1</service-ref-name>
<wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
- </service-ref>
+ </webservice-ref>
-->
<!--
@WebServiceRef(name = "service2", value = TestEndpointService.class)
-->
- <service-ref>
+ <webservice-ref>
<service-ref-name>service2</service-ref-name>
<wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
- </service-ref>
+ </webservice-ref>
<!--
@WebServiceRef(name = "TestEndpointService3")
-->
- <service-ref>
+ <webservice-ref>
<service-ref-name>TestEndpointService3</service-ref-name>
<wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
- </service-ref>
+ </webservice-ref>
<!--
@WebServiceRef
-->
- <service-ref>
+ <webservice-ref>
<service-ref-name>org.jboss.test.ws.jaxws.samples.webserviceref.TestEndpointClientOne/service4</service-ref-name>
<wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
- </service-ref>
+ </webservice-ref>
<!--
@WebServiceRef(name = "TestEndpointService5")
-->
- <service-ref>
+ <webservice-ref>
<service-ref-name>TestEndpointService5</service-ref-name>
<wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
- </service-ref>
+ </webservice-ref>
<!--
@WebServiceRef
-->
- <service-ref>
+ <webservice-ref>
<service-ref-name>org.jboss.test.ws.jaxws.samples.webserviceref.TestEndpointClientOne/service6</service-ref-name>
<wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
- </service-ref>
+ </webservice-ref>
<!--
@WebServiceRef(name = "port1", value = TestEndpointService.class, type = TestEndpoint.class)
-->
- <service-ref>
+ <webservice-ref>
<service-ref-name>port1</service-ref-name>
<wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
- </service-ref>
+ </webservice-ref>
<!--
@WebServiceRef(name = "Port2", value = TestEndpointService.class)
-->
- <service-ref>
+ <webservice-ref>
<service-ref-name>Port2</service-ref-name>
<wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
- </service-ref>
+ </webservice-ref>
<!--
@WebServiceRef(value = TestEndpointService.class)
-->
- <service-ref>
+ <webservice-ref>
<service-ref-name>org.jboss.test.ws.jaxws.samples.webserviceref.TestEndpointClientOne/port3</service-ref-name>
<wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
- </service-ref>
+ </webservice-ref>
<!--
@WebServiceRef
-->
- <service-ref>
+ <webservice-ref>
<service-ref-name>org.jboss.test.ws.jaxws.samples.webserviceref.TestEndpointClientOne/port4</service-ref-name>
<wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
- </service-ref>
+ </webservice-ref>
<!--
@WebServiceRef(name = "Port5")
-->
- <service-ref>
+ <webservice-ref>
<service-ref-name>Port5</service-ref-name>
<wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
- </service-ref>
+ </webservice-ref>
</jboss-client>
\ No newline at end of file
Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/webserviceref/META-INF/jboss-web.xml
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/webserviceref/META-INF/jboss-web.xml 2007-02-23 20:10:38 UTC (rev 2454)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/webserviceref/META-INF/jboss-web.xml 2007-02-23 20:11:35 UTC (rev 2455)
@@ -7,74 +7,74 @@
<!--
@WebServiceRef(name = "service1", value = TestEndpointService.class, wsdlLocation = "WEB-INF/wsdl/TestEndpoint.wsdl")
- <service-ref>
+ <webservice-ref>
<service-ref-name>service1</service-ref-name>
<wsdl-override>WEB-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
- </service-ref>
+ </webservice-ref>
-->
<!--
@WebServiceRef(name = "service2", value = TestEndpointService.class)
-->
- <service-ref>
+ <webservice-ref>
<service-ref-name>service2</service-ref-name>
<wsdl-override>WEB-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
- </service-ref>
+ </webservice-ref>
<!--
@WebServiceRef(name = "TestEndpointService3")
-->
- <service-ref>
+ <webservice-ref>
<service-ref-name>TestEndpointService3</service-ref-name>
<wsdl-override>WEB-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
- </service-ref>
+ </webservice-ref>
<!--
@WebServiceRef
-->
- <service-ref>
+ <webservice-ref>
<service-ref-name>org.jboss.test.ws.jaxws.samples.webserviceref.ServletClient/service4</service-ref-name>
<wsdl-override>WEB-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
- </service-ref>
+ </webservice-ref>
<!--
@WebServiceRef(name = "TestEndpointService5")
-->
- <service-ref>
+ <webservice-ref>
<service-ref-name>TestEndpointService5</service-ref-name>
<wsdl-override>WEB-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
- </service-ref>
+ </webservice-ref>
<!--
@WebServiceRef
-->
- <service-ref>
+ <webservice-ref>
<service-ref-name>org.jboss.test.ws.jaxws.samples.webserviceref.ServletClient/service6</service-ref-name>
<wsdl-override>WEB-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
- </service-ref>
+ </webservice-ref>
<!--
@WebServiceRef(name = "port1", value = TestEndpointService.class, type = TestEndpoint.class)
-->
- <service-ref>
+ <webservice-ref>
<service-ref-name>port1</service-ref-name>
<wsdl-override>WEB-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
- </service-ref>
+ </webservice-ref>
<!--
@WebServiceRef(name = "Port2", value = TestEndpointService.class)
-->
- <service-ref>
+ <webservice-ref>
<service-ref-name>Port2</service-ref-name>
<wsdl-override>WEB-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
- </service-ref>
+ </webservice-ref>
<!--
@WebServiceRef(value = TestEndpointService.class)
-->
- <service-ref>
+ <webservice-ref>
<service-ref-name>org.jboss.test.ws.jaxws.samples.webserviceref.ServletClient/port3</service-ref-name>
<wsdl-override>WEB-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
- </service-ref>
+ </webservice-ref>
</jboss-web>
\ No newline at end of file
Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/webserviceref/META-INF/jboss.xml
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/webserviceref/META-INF/jboss.xml 2007-02-23 20:10:38 UTC (rev 2454)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/webserviceref/META-INF/jboss.xml 2007-02-23 20:11:35 UTC (rev 2455)
@@ -10,75 +10,75 @@
<!--
@WebServiceRef(name = "service1", value = TestEndpointService.class, wsdlLocation = "META-INF/wsdl/TestEndpoint.wsdl")
- <service-ref>
+ <webservice-ref>
<service-ref-name>service1</service-ref-name>
<wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
- </service-ref>
+ </webservice-ref>
-->
<!--
@WebServiceRef(name = "service2", value = TestEndpointService.class)
-->
- <service-ref>
+ <webservice-ref>
<service-ref-name>service2</service-ref-name>
<wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
- </service-ref>
+ </webservice-ref>
<!--
@WebServiceRef(name = "TestEndpointService3")
-->
- <service-ref>
+ <webservice-ref>
<service-ref-name>TestEndpointService3</service-ref-name>
<wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
- </service-ref>
+ </webservice-ref>
<!--
@WebServiceRef
-->
- <service-ref>
+ <webservice-ref>
<service-ref-name>org.jboss.test.ws.jaxws.samples.webserviceref.EJB3Client/service4</service-ref-name>
<wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
- </service-ref>
+ </webservice-ref>
<!--
@WebServiceRef(name = "TestEndpointService5")
-->
- <service-ref>
+ <webservice-ref>
<service-ref-name>TestEndpointService5</service-ref-name>
<wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
- </service-ref>
+ </webservice-ref>
<!--
@WebServiceRef
-->
- <service-ref>
+ <webservice-ref>
<service-ref-name>org.jboss.test.ws.jaxws.samples.webserviceref.EJB3Client/service6</service-ref-name>
<wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
- </service-ref>
+ </webservice-ref>
<!--
@WebServiceRef(name = "port1", value = TestEndpointService.class, type = TestEndpoint.class)
-->
- <service-ref>
+ <webservice-ref>
<service-ref-name>port1</service-ref-name>
<wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
- </service-ref>
+ </webservice-ref>
<!--
@WebServiceRef(name = "Port2", value = TestEndpointService.class)
-->
- <service-ref>
+ <webservice-ref>
<service-ref-name>Port2</service-ref-name>
<wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
- </service-ref>
+ </webservice-ref>
<!--
@WebServiceRef(value = TestEndpointService.class)
-->
- <service-ref>
+ <webservice-ref>
<service-ref-name>org.jboss.test.ws.jaxws.samples.webserviceref.EJB3Client/port3</service-ref-name>
<wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
- </service-ref>
+ </webservice-ref>
</session>
</enterprise-beans>
Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/webserviceref/META-INF-override/jboss-client.xml
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/webserviceref/META-INF-override/jboss-client.xml 2007-02-23 20:10:38 UTC (rev 2454)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/webserviceref/META-INF-override/jboss-client.xml 2007-02-23 20:11:35 UTC (rev 2455)
@@ -8,37 +8,37 @@
<!--
@WebServiceRef(name = "Service1")
-->
- <service-ref>
+ <webservice-ref>
<service-ref-name>Service1</service-ref-name>
<service-class-name>org.jboss.test.ws.jaxws.samples.webserviceref.TestEndpointService</service-class-name>
<service-qname>{http://org.jboss.ws/wsref}TestEndpointService</service-qname>
<wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
- </service-ref>
+ </webservice-ref>
<!--
@WebServiceRef(name = "Service2")
-->
- <service-ref>
+ <webservice-ref>
<service-ref-name>Service2</service-ref-name>
<config-name>Custom Client</config-name>
<config-file>META-INF/jbossws-client-config.xml</config-file>
<wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
- </service-ref>
+ </webservice-ref>
<!--
@WebServiceRef(name = "Service3")
-->
- <service-ref>
+ <webservice-ref>
<service-ref-name>Service3</service-ref-name>
<service-class-name>org.jboss.test.ws.jaxws.samples.webserviceref.TestEndpointService</service-class-name>
<service-qname>{http://org.jboss.ws/wsref}TestEndpointService</service-qname>
<wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
- </service-ref>
+ </webservice-ref>
<!--
@WebServiceRef(name = "Service4")
-->
- <service-ref>
+ <webservice-ref>
<service-ref-name>Service4</service-ref-name>
<port-info>
<service-endpoint-interface>org.jboss.test.ws.jaxws.samples.webserviceref.TestEndpoint</service-endpoint-interface>
@@ -46,12 +46,12 @@
<config-file>META-INF/jbossws-client-config.xml</config-file>
</port-info>
<wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
- </service-ref>
+ </webservice-ref>
<!--
@WebServiceRef(name = "Port1", type = TestEndpoint.class)
-->
- <service-ref>
+ <webservice-ref>
<service-ref-name>Port1</service-ref-name>
<port-info>
<port-qname>{http://org.jboss.ws/wsref}TestEndpointPort</port-qname>
@@ -59,12 +59,12 @@
<config-file>META-INF/jbossws-client-config.xml</config-file>
</port-info>
<wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
- </service-ref>
+ </webservice-ref>
<!--
@WebServiceRef(name = "Port2")
-->
- <service-ref>
+ <webservice-ref>
<service-ref-name>Port2</service-ref-name>
<port-info>
<service-endpoint-interface>org.jboss.test.ws.jaxws.samples.webserviceref.TestEndpoint</service-endpoint-interface>
@@ -72,12 +72,12 @@
<config-file>META-INF/jbossws-client-config.xml</config-file>
</port-info>
<wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
- </service-ref>
+ </webservice-ref>
<!--
@WebServiceRef(name = "Port3")
-->
- <service-ref>
+ <webservice-ref>
<service-ref-name>Port3</service-ref-name>
<port-info>
<service-endpoint-interface>org.jboss.test.ws.jaxws.samples.webserviceref.TestEndpoint</service-endpoint-interface>
@@ -92,6 +92,6 @@
</stub-property>
</port-info>
<wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
- </service-ref>
+ </webservice-ref>
</jboss-client>
\ No newline at end of file
Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/webserviceref/META-INF-secure/jboss-client.xml
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/webserviceref/META-INF-secure/jboss-client.xml 2007-02-23 20:10:38 UTC (rev 2454)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/webserviceref/META-INF-secure/jboss-client.xml 2007-02-23 20:11:35 UTC (rev 2455)
@@ -5,7 +5,7 @@
<jboss-client>
<jndi-name>jbossws-client</jndi-name>
- <service-ref>
+ <webservice-ref>
<service-ref-name>SecureService1</service-ref-name>
<service-class-name>org.jboss.test.ws.jaxws.samples.webserviceref.SecureEndpointService</service-class-name>
<service-qname>{http://org.jboss.ws/wsref}SecureEndpointService</service-qname>
@@ -22,9 +22,9 @@
</stub-property>
</port-info>
<wsdl-override>http://@jbosstest.host.name@:8080/jaxws-samples-webserviceref-secure/SecureEndpoint?wsdl</wsdl-override>
- </service-ref>
+ </webservice-ref>
- <service-ref>
+ <webservice-ref>
<service-ref-name>SecureService2</service-ref-name>
<port-info>
<port-qname>{http://org.jboss.ws/wsref}SecureEndpointPort</port-qname>
@@ -38,9 +38,9 @@
</stub-property>
</port-info>
<wsdl-override>http://@jbosstest.host.name@:8080/jaxws-samples-webserviceref-secure/SecureEndpoint?wsdl</wsdl-override>
- </service-ref>
+ </webservice-ref>
- <service-ref>
+ <webservice-ref>
<service-ref-name>SecurePort1</service-ref-name>
<port-info>
<service-endpoint-interface>org.jboss.test.ws.jaxws.samples.webserviceref.SecureEndpoint</service-endpoint-interface>
@@ -54,6 +54,6 @@
</stub-property>
</port-info>
<wsdl-override>http://@jbosstest.host.name@:8080/jaxws-samples-webserviceref-secure/SecureEndpoint?wsdl</wsdl-override>
- </service-ref>
+ </webservice-ref>
</jboss-client>
\ No newline at end of file
More information about the jbossws-commits
mailing list