[jbossws-commits] JBossWS SVN: r2447 - in trunk: integration-jboss50 and 16 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Fri Feb 23 12:35:50 EST 2007
Author: thomas.diesler at jboss.com
Date: 2007-02-23 12:35:49 -0500 (Fri, 23 Feb 2007)
New Revision: 2447
Added:
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/
trunk/jbossws-tests/src/main/resources/jaxrpc/serviceref/
Removed:
trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/WebServiceClientDeployer.java
trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/WebServiceClientDeployerMBean.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/webserviceref/
trunk/jbossws-tests/src/main/resources/jaxrpc/webserviceref/
Modified:
trunk/integration-jboss50/.classpath
trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/ServiceRefHandler.java
trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/ServiceRefHandlerMBean.java
trunk/jbossws-tests/ant-import/build-jars-jaxrpc.xml
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1205/JBWS1205TestCase.java
trunk/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/EJBClient.java
trunk/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/EJBRemoteHome.java
trunk/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/TestEndpoint.java
trunk/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/TestEndpointService.java
trunk/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/WebServiceRefEJBTestCase.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/WebServiceRefServletTestCase.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsse/WebClientTestCase.java
trunk/jbossws-tests/src/main/resources/jaxrpc/serviceref/META-INF/application-client.xml
trunk/jbossws-tests/src/main/resources/jaxrpc/serviceref/META-INF/ejb-jar.xml
trunk/jbossws-tests/src/main/resources/jaxrpc/serviceref/META-INF/jaxrpc-mapping.xml
trunk/jbossws-tests/src/main/resources/jaxrpc/serviceref/META-INF/wsdl/TestEndpoint.wsdl
trunk/jbossws-tests/src/main/resources/jaxrpc/serviceref/WEB-INF/web.xml
trunk/jbossws-tests/src/main/resources/jaxrpc/serviceref/WEB-INF/webservices.xml
trunk/jbossws-tests/src/main/resources/jaxrpc/serviceref/servlet-client/WEB-INF/web.xml
trunk/jbossws-tests/src/main/resources/jaxrpc/serviceref/wstools-java-wsdl.xml
trunk/jbossws-tests/src/main/resources/jaxrpc/serviceref/wstools-wsdl-java.xml
trunk/jbossws-tests/src/main/resources/jaxws/samples/handlerchain/META-INF/jboss-client.xml
trunk/jbossws-tests/src/main/resources/jaxws/samples/webserviceref/META-INF-override/jboss-client.xml
trunk/jbossws-tests/src/main/resources/jaxws/samples/webserviceref/META-INF-secure/jboss-client.xml
trunk/jbossws-tests/src/main/resources/jaxws/samples/webserviceref/META-INF/jboss-client.xml
trunk/jbossws-tests/src/main/resources/jaxws/samples/webserviceref/META-INF/jboss-web.xml
trunk/jbossws-tests/src/main/resources/jaxws/samples/webserviceref/META-INF/jboss.xml
Log:
Fix <service-ref> handling
Deleted: trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/WebServiceClientDeployer.java
===================================================================
--- trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/WebServiceClientDeployer.java 2007-02-23 13:54:55 UTC (rev 2446)
+++ trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/WebServiceClientDeployer.java 2007-02-23 17:35:49 UTC (rev 2447)
@@ -1,139 +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.ws.integration.jboss42;
-
-// $Id$
-
-import java.net.URL;
-import java.util.Iterator;
-
-import javax.naming.Context;
-import javax.wsdl.Definition;
-import javax.wsdl.WSDLException;
-import javax.xml.rpc.JAXRPCException;
-
-import org.jboss.deployment.DeploymentException;
-import org.jboss.deployment.DeploymentInfo;
-import org.jboss.metadata.serviceref.ServiceRefMetaData;
-import org.jboss.system.ServiceMBeanSupport;
-import org.jboss.util.naming.Util;
-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.tools.wsdl.WSDL11DefinitionFactory;
-
-/**
- * Binds a JAXRPC Service object in the client's ENC for every service-ref element in the
- * deployment descriptor.
- *
- * @author Thomas.Diesler at jboss.org
- * @since 15-Jan-2005
- */
-public class WebServiceClientDeployer extends ServiceMBeanSupport implements WebServiceClientDeployerMBean
-{
- /**
- * This binds a jaxrpc Service into the callers ENC for every service-ref element
- *
- * @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 di The client's deployment info
- * @throws org.jboss.deployment.DeploymentException if it goes wrong
- */
- public void setupServiceRefEnvironment(Context envCtx, Iterator serviceRefs, DeploymentInfo di) throws DeploymentException
- {
- try
- {
- while (serviceRefs.hasNext())
- {
- ServiceRefMetaData serviceRef = (ServiceRefMetaData)serviceRefs.next();
- String serviceRefName = serviceRef.getServiceRefName();
-
- // Build the container independent deployment info
- UnifiedDeploymentInfo udi = new JAXRPCClientDeployment(UnifiedDeploymentInfo.DeploymentType.JAXRPC_Client);
- DeploymentInfoAdaptor.buildDeploymentInfo(udi, di);
-
- UnifiedServiceRefMetaData wsServiceRef = ServiceRefMetaDataAdaptor.buildUnifiedServiceRefMetaData(udi, serviceRef);
-
- JavaWsdlMapping javaWsdlMapping = getJavaWsdlMapping(wsServiceRef);
- wsServiceRef.setJavaWsdlMapping(javaWsdlMapping);
-
- Definition wsdlDefinition = getWsdlDefinition(wsServiceRef);
- wsServiceRef.setWsdlDefinition(wsdlDefinition);
-
- ServiceReferenceable ref = new ServiceReferenceable(wsServiceRef, udi);
- Util.bind(envCtx, serviceRefName, ref);
-
- log.debug("Webservice binding: java:comp/env/" + serviceRefName);
- }
- }
- catch (Exception e)
- {
- throw new DeploymentException("Cannot bind webservice to client environment", e);
- }
- }
-
- private JavaWsdlMapping getJavaWsdlMapping(UnifiedServiceRefMetaData serviceRef)
- {
- JavaWsdlMapping javaWsdlMapping = null;
- URL mappingURL = serviceRef.getMappingLocation();
- if (mappingURL != null)
- {
- try
- {
- // setup the XML binding Unmarshaller
- JavaWsdlMappingFactory mappingFactory = JavaWsdlMappingFactory.newInstance();
- javaWsdlMapping = mappingFactory.parse(mappingURL);
- }
- catch (Exception e)
- {
- throw new JAXRPCException("Cannot unmarshal jaxrpc-mapping-file: " + mappingURL, e);
- }
- }
- return javaWsdlMapping;
- }
-
- private Definition getWsdlDefinition(UnifiedServiceRefMetaData serviceRef)
- {
- Definition wsdlDefinition = null;
- {
- URL wsdlOverride = serviceRef.getWsdlOverride();
- URL wsdlURL = serviceRef.getWsdlLocation();
- if (wsdlOverride == null && wsdlURL != null)
- {
- try
- {
- WSDL11DefinitionFactory factory = WSDL11DefinitionFactory.newInstance();
- wsdlDefinition = factory.parse(wsdlURL);
- }
- catch (WSDLException e)
- {
- throw new WSException("Cannot unmarshall wsdl, cause: " + e.toString());
- }
- }
- }
- return wsdlDefinition;
- }
-}
Deleted: trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/WebServiceClientDeployerMBean.java
===================================================================
--- trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/WebServiceClientDeployerMBean.java 2007-02-23 13:54:55 UTC (rev 2446)
+++ trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/WebServiceClientDeployerMBean.java 2007-02-23 17:35:49 UTC (rev 2447)
@@ -1,38 +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.ws.integration.jboss42;
-
-import javax.management.ObjectName;
-
-import org.jboss.system.ServiceMBean;
-import org.jboss.webservice.WebServiceClientDeployment;
-import org.jboss.ws.core.utils.ObjectNameFactory;
-
-/**
- * MBean interface.
- * @since 19-Jan-2005
- */
-public interface WebServiceClientDeployerMBean extends WebServiceClientDeployment, ServiceMBean
-{
- // default object name
- public static final ObjectName OBJECT_NAME = ObjectNameFactory.create("jboss.ws:service=WebServiceClientDeployer");
-}
Modified: trunk/integration-jboss50/.classpath
===================================================================
--- trunk/integration-jboss50/.classpath 2007-02-23 13:54:55 UTC (rev 2446)
+++ trunk/integration-jboss50/.classpath 2007-02-23 17:35:49 UTC (rev 2447)
@@ -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: trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/ServiceRefHandler.java
===================================================================
--- trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/ServiceRefHandler.java 2007-02-23 13:54:55 UTC (rev 2446)
+++ trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/ServiceRefHandler.java 2007-02-23 17:35:49 UTC (rev 2447)
@@ -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.util.naming.Util;
import org.jboss.webservice.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: trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/ServiceRefHandlerMBean.java
===================================================================
--- trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/ServiceRefHandlerMBean.java 2007-02-23 13:54:55 UTC (rev 2446)
+++ trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/ServiceRefHandlerMBean.java 2007-02-23 17:35:49 UTC (rev 2447)
@@ -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: trunk/jbossws-tests/ant-import/build-jars-jaxrpc.xml
===================================================================
--- trunk/jbossws-tests/ant-import/build-jars-jaxrpc.xml 2007-02-23 13:54:55 UTC (rev 2446)
+++ trunk/jbossws-tests/ant-import/build-jars-jaxrpc.xml 2007-02-23 17:35:49 UTC (rev 2447)
@@ -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: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1205/JBWS1205TestCase.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1205/JBWS1205TestCase.java 2007-02-23 13:54:55 UTC (rev 2446)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1205/JBWS1205TestCase.java 2007-02-23 17:35:49 UTC (rev 2447)
@@ -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: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref (from rev 2441, trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/webserviceref)
Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/ApplicationClient.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/webserviceref/ApplicationClient.java 2007-02-22 17:01:05 UTC (rev 2441)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/ApplicationClient.java 2007-02-23 17:35:49 UTC (rev 2447)
@@ -19,7 +19,7 @@
* 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.webserviceref;
+package org.jboss.test.ws.jaxrpc.serviceref;
import java.rmi.RemoteException;
import java.util.ArrayList;
Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/EJBClient.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/webserviceref/EJBClient.java 2007-02-22 17:01:05 UTC (rev 2441)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/EJBClient.java 2007-02-23 17:35:49 UTC (rev 2447)
@@ -19,7 +19,7 @@
* 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.webserviceref;
+package org.jboss.test.ws.jaxrpc.serviceref;
import java.rmi.RemoteException;
import java.util.ArrayList;
Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/EJBRemote.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/webserviceref/EJBRemote.java 2007-02-22 17:01:05 UTC (rev 2441)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/EJBRemote.java 2007-02-23 17:35:49 UTC (rev 2447)
@@ -19,7 +19,7 @@
* 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.webserviceref;
+package org.jboss.test.ws.jaxrpc.serviceref;
import java.rmi.RemoteException;
Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/EJBRemoteHome.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/webserviceref/EJBRemoteHome.java 2007-02-22 17:01:05 UTC (rev 2441)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/EJBRemoteHome.java 2007-02-23 17:35:49 UTC (rev 2447)
@@ -19,7 +19,7 @@
* 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.webserviceref;
+package org.jboss.test.ws.jaxrpc.serviceref;
import java.rmi.RemoteException;
Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/ServletClient.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/webserviceref/ServletClient.java 2007-02-22 17:01:05 UTC (rev 2441)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/ServletClient.java 2007-02-23 17:35:49 UTC (rev 2447)
@@ -19,7 +19,7 @@
* 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.webserviceref;
+package org.jboss.test.ws.jaxrpc.serviceref;
import java.io.IOException;
import java.util.ArrayList;
Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/TestEndpoint.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/webserviceref/TestEndpoint.java 2007-02-22 17:01:05 UTC (rev 2441)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/TestEndpoint.java 2007-02-23 17:35:49 UTC (rev 2447)
@@ -19,7 +19,7 @@
* 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.webserviceref;
+package org.jboss.test.ws.jaxrpc.serviceref;
import java.rmi.Remote;
import java.rmi.RemoteException;
Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/TestEndpointImpl.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/webserviceref/TestEndpointImpl.java 2007-02-22 17:01:05 UTC (rev 2441)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/TestEndpointImpl.java 2007-02-23 17:35:49 UTC (rev 2447)
@@ -19,7 +19,7 @@
* 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.webserviceref;
+package org.jboss.test.ws.jaxrpc.serviceref;
import org.jboss.logging.Logger;
Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/TestEndpointService.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/webserviceref/TestEndpointService.java 2007-02-22 17:01:05 UTC (rev 2441)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/TestEndpointService.java 2007-02-23 17:35:49 UTC (rev 2447)
@@ -5,7 +5,7 @@
//Auto Generated by jbossws - Please do not edit!!!
-package org.jboss.test.ws.jaxrpc.webserviceref;
+package org.jboss.test.ws.jaxrpc.serviceref;
import javax.xml.rpc.ServiceException;
@@ -14,6 +14,6 @@
public interface TestEndpointService extends javax.xml.rpc.Service
{
- public org.jboss.test.ws.jaxrpc.webserviceref.TestEndpoint getTestEndpointPort() throws ServiceException;
+ public org.jboss.test.ws.jaxrpc.serviceref.TestEndpoint getTestEndpointPort() throws ServiceException;
}
Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/WebServiceRefClientTestCase.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/webserviceref/WebServiceRefClientTestCase.java 2007-02-22 17:01:05 UTC (rev 2441)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/WebServiceRefClientTestCase.java 2007-02-23 17:35:49 UTC (rev 2447)
@@ -19,7 +19,7 @@
* 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.webserviceref;
+package org.jboss.test.ws.jaxrpc.serviceref;
import java.io.File;
import java.net.MalformedURLException;
@@ -46,11 +46,11 @@
*/
public class WebServiceRefClientTestCase extends JBossWSTest
{
- public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxrpc-webserviceref";
+ public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxrpc-serviceref";
public static Test suite()
{
- return JBossWSTestSetup.newTestSetup(WebServiceRefClientTestCase.class, "jaxrpc-webserviceref.war, jaxrpc-webserviceref-client.jar");
+ return JBossWSTestSetup.newTestSetup(WebServiceRefClientTestCase.class, "jaxrpc-serviceref.war, jaxrpc-serviceref-client.jar");
}
public void testWSDLAccess() throws MalformedURLException
@@ -63,8 +63,8 @@
public void testDynamicProxy() throws Exception
{
- URL wsdlURL = new File("resources/jaxrpc/webserviceref/META-INF/wsdl/TestEndpoint.wsdl").toURL();
- URL mappingURL = new File("resources/jaxrpc/webserviceref/META-INF/jaxrpc-mapping.xml").toURL();
+ 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);
@@ -76,7 +76,7 @@
public void testDynamicProxyNeg() throws Exception
{
- URL wsdlURL = new File("resources/jaxrpc/webserviceref/META-INF/wsdl/TestEndpoint.wsdl").toURL();
+ 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
Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/WebServiceRefEJBTestCase.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/webserviceref/WebServiceRefEJBTestCase.java 2007-02-22 17:01:05 UTC (rev 2441)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/WebServiceRefEJBTestCase.java 2007-02-23 17:35:49 UTC (rev 2447)
@@ -19,7 +19,7 @@
* 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.webserviceref;
+package org.jboss.test.ws.jaxrpc.serviceref;
import java.io.File;
import java.net.MalformedURLException;
@@ -45,11 +45,11 @@
*/
public class WebServiceRefEJBTestCase extends JBossWSTest
{
- public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxrpc-webserviceref";
+ public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxrpc-serviceref";
public static Test suite()
{
- return JBossWSTestSetup.newTestSetup(WebServiceRefEJBTestCase.class, "jaxrpc-webserviceref.war, jaxrpc-webserviceref-ejb-client.jar");
+ return JBossWSTestSetup.newTestSetup(WebServiceRefEJBTestCase.class, "jaxrpc-serviceref.war, jaxrpc-serviceref-ejb-client.jar");
}
public void testWSDLAccess() throws MalformedURLException
@@ -62,8 +62,8 @@
public void testDynamicProxy() throws Exception
{
- URL wsdlURL = new File("resources/jaxrpc/webserviceref/META-INF/wsdl/TestEndpoint.wsdl").toURL();
- URL mappingURL = new File("resources/jaxrpc/webserviceref/META-INF/jaxrpc-mapping.xml").toURL();
+ 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);
Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/WebServiceRefServletTestCase.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/webserviceref/WebServiceRefServletTestCase.java 2007-02-22 17:01:05 UTC (rev 2441)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/WebServiceRefServletTestCase.java 2007-02-23 17:35:49 UTC (rev 2447)
@@ -19,7 +19,7 @@
* 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.webserviceref;
+package org.jboss.test.ws.jaxrpc.serviceref;
import java.io.BufferedReader;
import java.io.File;
@@ -46,11 +46,11 @@
*/
public class WebServiceRefServletTestCase extends JBossWSTest
{
- public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxrpc-webserviceref";
+ public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxrpc-serviceref";
public static Test suite()
{
- return JBossWSTestSetup.newTestSetup(WebServiceRefServletTestCase.class, "jaxrpc-webserviceref.war, jaxrpc-webserviceref-servlet-client.war");
+ return JBossWSTestSetup.newTestSetup(WebServiceRefServletTestCase.class, "jaxrpc-serviceref.war, jaxrpc-serviceref-servlet-client.war");
}
public void testWSDLAccess() throws MalformedURLException
@@ -63,8 +63,8 @@
public void testDynamicProxy() throws Exception
{
- URL wsdlURL = new File("resources/jaxrpc/webserviceref/META-INF/wsdl/TestEndpoint.wsdl").toURL();
- URL mappingURL = new File("resources/jaxrpc/webserviceref/META-INF/jaxrpc-mapping.xml").toURL();
+ 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);
@@ -76,12 +76,6 @@
public void testServletClient() throws Exception
{
- if (isTargetJBoss50())
- {
- System.out.println("FIXME: [JBAS-3824] Fix ENC for EJB2.1 and Servlets");
- return;
- }
-
URL url = new URL(TARGET_ENDPOINT_ADDRESS + "-servlet-client?echo=HelloWorld");
BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()));
String retStr = br.readLine();
Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsse/WebClientTestCase.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsse/WebClientTestCase.java 2007-02-23 13:54:55 UTC (rev 2446)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsse/WebClientTestCase.java 2007-02-23 17:35:49 UTC (rev 2447)
@@ -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: trunk/jbossws-tests/src/main/resources/jaxrpc/serviceref (from rev 2441, trunk/jbossws-tests/src/main/resources/jaxrpc/webserviceref)
Modified: trunk/jbossws-tests/src/main/resources/jaxrpc/serviceref/META-INF/application-client.xml
===================================================================
--- trunk/jbossws-tests/src/main/resources/jaxrpc/webserviceref/META-INF/application-client.xml 2007-02-22 17:01:05 UTC (rev 2441)
+++ trunk/jbossws-tests/src/main/resources/jaxrpc/serviceref/META-INF/application-client.xml 2007-02-23 17:35:49 UTC (rev 2447)
@@ -13,17 +13,17 @@
<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.webserviceref.TestEndpoint</service-endpoint-interface>
+ <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.webserviceref.TestEndpointService</service-interface>
+ <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.webserviceref.TestEndpoint</service-endpoint-interface>
+ <service-endpoint-interface>org.jboss.test.ws.jaxrpc.serviceref.TestEndpoint</service-endpoint-interface>
</port-component-ref>
</service-ref>
Modified: trunk/jbossws-tests/src/main/resources/jaxrpc/serviceref/META-INF/ejb-jar.xml
===================================================================
--- trunk/jbossws-tests/src/main/resources/jaxrpc/webserviceref/META-INF/ejb-jar.xml 2007-02-22 17:01:05 UTC (rev 2441)
+++ trunk/jbossws-tests/src/main/resources/jaxrpc/serviceref/META-INF/ejb-jar.xml 2007-02-23 17:35:49 UTC (rev 2447)
@@ -8,9 +8,9 @@
<enterprise-beans>
<session>
<ejb-name>ejb/EJBClient</ejb-name>
- <home>org.jboss.test.ws.jaxrpc.webserviceref.EJBRemoteHome</home>
- <remote>org.jboss.test.ws.jaxrpc.webserviceref.EJBRemote</remote>
- <ejb-class>org.jboss.test.ws.jaxrpc.webserviceref.EJBClient</ejb-class>
+ <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>
@@ -20,17 +20,17 @@
<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.webserviceref.TestEndpoint</service-endpoint-interface>
+ <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.webserviceref.TestEndpointService</service-interface>
+ <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.webserviceref.TestEndpoint</service-endpoint-interface>
+ <service-endpoint-interface>org.jboss.test.ws.jaxrpc.serviceref.TestEndpoint</service-endpoint-interface>
</port-component-ref>
</service-ref>
Modified: trunk/jbossws-tests/src/main/resources/jaxrpc/serviceref/META-INF/jaxrpc-mapping.xml
===================================================================
--- trunk/jbossws-tests/src/main/resources/jaxrpc/webserviceref/META-INF/jaxrpc-mapping.xml 2007-02-22 17:01:05 UTC (rev 2441)
+++ trunk/jbossws-tests/src/main/resources/jaxrpc/serviceref/META-INF/jaxrpc-mapping.xml 2007-02-23 17:35:49 UTC (rev 2447)
@@ -1,10 +1,10 @@
<?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.webserviceref</package-type>
+ <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.webserviceref.TestEndpointService</service-interface>
+ <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>
@@ -12,7 +12,7 @@
</port-mapping>
</service-interface-mapping>
<service-endpoint-interface-mapping>
- <service-endpoint-interface>org.jboss.test.ws.jaxrpc.webserviceref.TestEndpoint</service-endpoint-interface>
+ <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>
Modified: trunk/jbossws-tests/src/main/resources/jaxrpc/serviceref/META-INF/wsdl/TestEndpoint.wsdl
===================================================================
--- trunk/jbossws-tests/src/main/resources/jaxrpc/webserviceref/META-INF/wsdl/TestEndpoint.wsdl 2007-02-22 17:01:05 UTC (rev 2441)
+++ trunk/jbossws-tests/src/main/resources/jaxrpc/serviceref/META-INF/wsdl/TestEndpoint.wsdl 2007-02-23 17:35:49 UTC (rev 2447)
@@ -27,7 +27,7 @@
</binding>
<service name='TestEndpointService'>
<port binding='tns:TestEndpointBinding' name='TestEndpointPort'>
- <soap:address location='http://@jbosstest.host.name@:8080/jaxrpc-webserviceref'/>
+ <soap:address location='http://@jbosstest.host.name@:8080/jaxrpc-serviceref'/>
</port>
</service>
</definitions>
\ No newline at end of file
Modified: trunk/jbossws-tests/src/main/resources/jaxrpc/serviceref/WEB-INF/web.xml
===================================================================
--- trunk/jbossws-tests/src/main/resources/jaxrpc/webserviceref/WEB-INF/web.xml 2007-02-22 17:01:05 UTC (rev 2441)
+++ trunk/jbossws-tests/src/main/resources/jaxrpc/serviceref/WEB-INF/web.xml 2007-02-23 17:35:49 UTC (rev 2447)
@@ -5,7 +5,7 @@
<servlet>
<servlet-name>TestEndpoint</servlet-name>
- <servlet-class>org.jboss.test.ws.jaxrpc.webserviceref.TestEndpointImpl</servlet-class>
+ <servlet-class>org.jboss.test.ws.jaxrpc.serviceref.TestEndpointImpl</servlet-class>
</servlet>
<servlet-mapping>
Modified: trunk/jbossws-tests/src/main/resources/jaxrpc/serviceref/WEB-INF/webservices.xml
===================================================================
--- trunk/jbossws-tests/src/main/resources/jaxrpc/webserviceref/WEB-INF/webservices.xml 2007-02-22 17:01:05 UTC (rev 2441)
+++ trunk/jbossws-tests/src/main/resources/jaxrpc/serviceref/WEB-INF/webservices.xml 2007-02-23 17:35:49 UTC (rev 2447)
@@ -6,7 +6,7 @@
<port-component>
<port-component-name>TestEndpointPort</port-component-name>
<wsdl-port>impl:TestEndpointPort</wsdl-port>
- <service-endpoint-interface>org.jboss.test.ws.jaxrpc.webserviceref.TestEndpoint</service-endpoint-interface>
+ <service-endpoint-interface>org.jboss.test.ws.jaxrpc.serviceref.TestEndpoint</service-endpoint-interface>
<service-impl-bean>
<servlet-link>TestEndpoint</servlet-link>
</service-impl-bean>
Modified: trunk/jbossws-tests/src/main/resources/jaxrpc/serviceref/servlet-client/WEB-INF/web.xml
===================================================================
--- trunk/jbossws-tests/src/main/resources/jaxrpc/webserviceref/servlet-client/WEB-INF/web.xml 2007-02-22 17:01:05 UTC (rev 2441)
+++ trunk/jbossws-tests/src/main/resources/jaxrpc/serviceref/servlet-client/WEB-INF/web.xml 2007-02-23 17:35:49 UTC (rev 2447)
@@ -5,7 +5,7 @@
<servlet>
<servlet-name>ServletClient</servlet-name>
- <servlet-class>org.jboss.test.ws.jaxrpc.webserviceref.ServletClient</servlet-class>
+ <servlet-class>org.jboss.test.ws.jaxrpc.serviceref.ServletClient</servlet-class>
</servlet>
<servlet-mapping>
@@ -19,17 +19,17 @@
<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.webserviceref.TestEndpoint</service-endpoint-interface>
+ <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.webserviceref.TestEndpointService</service-interface>
+ <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.webserviceref.TestEndpoint</service-endpoint-interface>
+ <service-endpoint-interface>org.jboss.test.ws.jaxrpc.serviceref.TestEndpoint</service-endpoint-interface>
</port-component-ref>
</service-ref>
Modified: trunk/jbossws-tests/src/main/resources/jaxrpc/serviceref/wstools-java-wsdl.xml
===================================================================
--- trunk/jbossws-tests/src/main/resources/jaxrpc/webserviceref/wstools-java-wsdl.xml 2007-02-22 17:01:05 UTC (rev 2441)
+++ trunk/jbossws-tests/src/main/resources/jaxrpc/serviceref/wstools-java-wsdl.xml 2007-02-23 17:35:49 UTC (rev 2447)
@@ -8,11 +8,11 @@
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.webserviceref" namespace="http://org.jboss.ws/wsref"/>
+ <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.webserviceref.TestEndpoint"/>
+ <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"/>
Modified: trunk/jbossws-tests/src/main/resources/jaxrpc/serviceref/wstools-wsdl-java.xml
===================================================================
--- trunk/jbossws-tests/src/main/resources/jaxrpc/webserviceref/wstools-wsdl-java.xml 2007-02-22 17:01:05 UTC (rev 2441)
+++ trunk/jbossws-tests/src/main/resources/jaxrpc/serviceref/wstools-wsdl-java.xml 2007-02-23 17:35:49 UTC (rev 2447)
@@ -8,7 +8,7 @@
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.webserviceref" namespace="http://org.jboss.ws/wsref"/>
+ <package-namespace package="org.jboss.test.ws.jaxrpc.serviceref" namespace="http://org.jboss.ws/wsref"/>
</global>
<wsdl-java location="META-INF/wsdl/TestEndpoint.wsdl">
Modified: trunk/jbossws-tests/src/main/resources/jaxws/samples/handlerchain/META-INF/jboss-client.xml
===================================================================
--- trunk/jbossws-tests/src/main/resources/jaxws/samples/handlerchain/META-INF/jboss-client.xml 2007-02-23 13:54:55 UTC (rev 2446)
+++ trunk/jbossws-tests/src/main/resources/jaxws/samples/handlerchain/META-INF/jboss-client.xml 2007-02-23 17:35:49 UTC (rev 2447)
@@ -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: trunk/jbossws-tests/src/main/resources/jaxws/samples/webserviceref/META-INF/jboss-client.xml
===================================================================
--- trunk/jbossws-tests/src/main/resources/jaxws/samples/webserviceref/META-INF/jboss-client.xml 2007-02-23 13:54:55 UTC (rev 2446)
+++ trunk/jbossws-tests/src/main/resources/jaxws/samples/webserviceref/META-INF/jboss-client.xml 2007-02-23 17:35:49 UTC (rev 2447)
@@ -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: trunk/jbossws-tests/src/main/resources/jaxws/samples/webserviceref/META-INF/jboss-web.xml
===================================================================
--- trunk/jbossws-tests/src/main/resources/jaxws/samples/webserviceref/META-INF/jboss-web.xml 2007-02-23 13:54:55 UTC (rev 2446)
+++ trunk/jbossws-tests/src/main/resources/jaxws/samples/webserviceref/META-INF/jboss-web.xml 2007-02-23 17:35:49 UTC (rev 2447)
@@ -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: trunk/jbossws-tests/src/main/resources/jaxws/samples/webserviceref/META-INF/jboss.xml
===================================================================
--- trunk/jbossws-tests/src/main/resources/jaxws/samples/webserviceref/META-INF/jboss.xml 2007-02-23 13:54:55 UTC (rev 2446)
+++ trunk/jbossws-tests/src/main/resources/jaxws/samples/webserviceref/META-INF/jboss.xml 2007-02-23 17:35:49 UTC (rev 2447)
@@ -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: trunk/jbossws-tests/src/main/resources/jaxws/samples/webserviceref/META-INF-override/jboss-client.xml
===================================================================
--- trunk/jbossws-tests/src/main/resources/jaxws/samples/webserviceref/META-INF-override/jboss-client.xml 2007-02-23 13:54:55 UTC (rev 2446)
+++ trunk/jbossws-tests/src/main/resources/jaxws/samples/webserviceref/META-INF-override/jboss-client.xml 2007-02-23 17:35:49 UTC (rev 2447)
@@ -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: trunk/jbossws-tests/src/main/resources/jaxws/samples/webserviceref/META-INF-secure/jboss-client.xml
===================================================================
--- trunk/jbossws-tests/src/main/resources/jaxws/samples/webserviceref/META-INF-secure/jboss-client.xml 2007-02-23 13:54:55 UTC (rev 2446)
+++ trunk/jbossws-tests/src/main/resources/jaxws/samples/webserviceref/META-INF-secure/jboss-client.xml 2007-02-23 17:35:49 UTC (rev 2447)
@@ -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