JBossWS SVN: r1316 - in trunk: . src/main/java/org/jboss/ws/jaxws/injection src/main/java/org/jboss/ws/metadata/wsdl src/test/ant src/test/java/org/jboss/test/ws/jaxws/webserviceref src/test/resources/jaxws/webserviceref/META-INF
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2006-10-26 19:49:01 -0400 (Thu, 26 Oct 2006)
New Revision: 1316
Added:
trunk/src/main/java/org/jboss/ws/jaxws/injection/ServiceRef.java
trunk/src/test/resources/jaxws/webserviceref/META-INF/jboss-web.xml
trunk/src/test/resources/jaxws/webserviceref/META-INF/jboss.xml
Modified:
trunk/
trunk/src/main/java/org/jboss/ws/jaxws/injection/ServiceObjectFactory.java
trunk/src/main/java/org/jboss/ws/jaxws/injection/ServiceReferenceable.java
trunk/src/main/java/org/jboss/ws/jaxws/injection/WebServiceRefDeployer.java
trunk/src/main/java/org/jboss/ws/metadata/wsdl/WSDLDefinitionsFactory.java
trunk/src/test/ant/build-jars-jaxws.xml
trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/ApplicationClient.java
trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/EJB3Client.java
trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/ServletClient.java
trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/WebServiceRefClientTestCase.java
trunk/src/test/resources/jaxws/webserviceref/META-INF/jboss-client.xml
Log:
Support <service-ref> overrides for @WebServiceRef in jboss.xml, jboss-web.xml, jboss-client.xml
Property changes on: trunk
___________________________________________________________________
Name: svn:ignore
-
clipboard.xml
output
output-eclipse
thirdparty
ant.properties
version.properties.md5
+
clipboard.xml
output
output-eclipse
thirdparty
ant.properties
version.properties.md5
clipboard.txt
Modified: trunk/src/main/java/org/jboss/ws/jaxws/injection/ServiceObjectFactory.java
===================================================================
--- trunk/src/main/java/org/jboss/ws/jaxws/injection/ServiceObjectFactory.java 2006-10-26 06:46:29 UTC (rev 1315)
+++ trunk/src/main/java/org/jboss/ws/jaxws/injection/ServiceObjectFactory.java 2006-10-26 23:49:01 UTC (rev 1316)
@@ -24,7 +24,10 @@
// $Id$
+import java.io.ByteArrayInputStream;
import java.io.File;
+import java.io.IOException;
+import java.io.ObjectInputStream;
import java.lang.reflect.Constructor;
import java.lang.reflect.Method;
import java.net.MalformedURLException;
@@ -33,6 +36,8 @@
import javax.naming.Context;
import javax.naming.Name;
+import javax.naming.NamingException;
+import javax.naming.RefAddr;
import javax.naming.Reference;
import javax.naming.spi.ObjectFactory;
import javax.xml.namespace.QName;
@@ -81,28 +86,45 @@
String serviceTypeName = (String)ref.get(ServiceReferenceable.SERVICE_TYPE).getContent();
String portTypeName = (String)ref.get(ServiceReferenceable.PORT_TYPE).getContent();
- String wsdlLocation = (String)ref.get(ServiceReferenceable.WSDL_LOCATION).getContent();
+ ServiceRef serviceRef = unmarshallServiceRef(ref);
ClassLoader ctxLoader = Thread.currentThread().getContextClassLoader();
Class serviceType = ctxLoader.loadClass(serviceTypeName);
Class portType = (portTypeName != null ? ctxLoader.loadClass(portTypeName) : null);
-
+
if (Service.class.isAssignableFrom(serviceType) == false)
throw new IllegalArgumentException("WebServiceRef type '" + serviceType + "' is not assignable to javax.xml.ws.Service");
-
+
Object target;
- URL wsdlURL = getWsdlLocationURL(serviceType, wsdlLocation);
- if (wsdlURL != null)
+ URL wsdlURL = getWsdlLocationURL(serviceType, serviceRef.getWsdlLocation());
+
+ // Generic javax.xml.ws.Service
+ if (serviceType == Service.class)
{
- Constructor ctor = serviceType.getConstructor(new Class[] { URL.class, QName.class });
- target = (Service)ctor.newInstance(new Object[] { wsdlURL, null });
+ if (wsdlURL != null)
+ {
+ target = Service.create(wsdlURL, null);
+ }
+ else
+ {
+ throw new IllegalArgumentException("Cannot create generic javax.xml.ws.Service without wsdlLocation");
+ }
}
+ // Generated javax.xml.ws.Service subclass
else
{
- target = (Service)serviceType.newInstance();
+ if (wsdlURL != null)
+ {
+ Constructor ctor = serviceType.getConstructor(new Class[] { URL.class, QName.class });
+ target = (Service)ctor.newInstance(new Object[] { wsdlURL, null });
+ }
+ else
+ {
+ target = (Service)serviceType.newInstance();
+ }
}
-
+
if (portTypeName != null && portTypeName.equals(serviceTypeName) == false)
{
Object port = null;
@@ -117,7 +139,7 @@
break;
}
}
-
+
if (port == null)
throw new WebServiceException("Cannot find getter for port type: " + portTypeName);
}
@@ -131,6 +153,24 @@
}
}
+ private ServiceRef unmarshallServiceRef(Reference ref) throws ClassNotFoundException, NamingException
+ {
+ ServiceRef sref;
+ RefAddr refAddr = ref.get(ServiceReferenceable.SERVICE_REF);
+ ByteArrayInputStream bais = new ByteArrayInputStream((byte[])refAddr.getContent());
+ try
+ {
+ ObjectInputStream ois = new ObjectInputStream(bais);
+ sref = (ServiceRef)ois.readObject();
+ ois.close();
+ }
+ catch (IOException e)
+ {
+ throw new NamingException("Cannot unmarshall service ref meta data, cause: " + e.toString());
+ }
+ return sref;
+ }
+
private URL getWsdlLocationURL(Class type, String wsdlLocation)
{
URL wsdlURL = null;
Added: trunk/src/main/java/org/jboss/ws/jaxws/injection/ServiceRef.java
===================================================================
--- trunk/src/main/java/org/jboss/ws/jaxws/injection/ServiceRef.java 2006-10-26 06:46:29 UTC (rev 1315)
+++ trunk/src/main/java/org/jboss/ws/jaxws/injection/ServiceRef.java 2006-10-26 23:49:01 UTC (rev 1316)
@@ -0,0 +1,103 @@
+/*
+ * 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.jaxws.injection;
+
+//$Id$
+
+import java.io.Serializable;
+
+/**
+ * Represents a <service-ref> element of the jboss.xml, jboss-web.xml, jboss-client.xml deployment descriptor
+ * for the 5.0 schema
+ *
+ * @author Thomas.Diesler(a)jboss.com
+ */
+public class ServiceRef implements Serializable
+{
+ private static final long serialVersionUID = 223039007880052172L;
+
+ private String encName;
+ private String wsdlLocation;
+ private String configName;
+ private String configFile;
+
+ public ServiceRef()
+ {
+ }
+
+ public ServiceRef(String name)
+ {
+ this.encName = name;
+ }
+
+ public String getEncName()
+ {
+ return encName;
+ }
+
+ public void setEncName(String name)
+ {
+ this.encName = name;
+ }
+
+ public String getWsdlLocation()
+ {
+ return wsdlLocation;
+ }
+
+ public void setWsdlLocation(String wsdlLocation)
+ {
+ this.wsdlLocation = wsdlLocation;
+ }
+
+ public String getConfigFile()
+ {
+ return configFile;
+ }
+
+ public void setConfigFile(String configFile)
+ {
+ this.configFile = configFile;
+ }
+
+ public String getConfigName()
+ {
+ return configName;
+ }
+
+ public void setConfigName(String configName)
+ {
+ this.configName = configName;
+ }
+
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
+ sb.append("[");
+ sb.append("name=").append(encName);
+ sb.append(",config-name=").append(configName);
+ sb.append(",config-file=").append(configFile);
+ sb.append(",wsdl=").append(wsdlLocation);
+ sb.append("]");
+ return sb.toString();
+ }
+}
Property changes on: trunk/src/main/java/org/jboss/ws/jaxws/injection/ServiceRef.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: trunk/src/main/java/org/jboss/ws/jaxws/injection/ServiceReferenceable.java
===================================================================
--- trunk/src/main/java/org/jboss/ws/jaxws/injection/ServiceReferenceable.java 2006-10-26 06:46:29 UTC (rev 1315)
+++ trunk/src/main/java/org/jboss/ws/jaxws/injection/ServiceReferenceable.java 2006-10-26 23:49:01 UTC (rev 1316)
@@ -24,6 +24,11 @@
// $Id$
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.ObjectOutputStream;
+
+import javax.naming.BinaryRefAddr;
import javax.naming.NamingException;
import javax.naming.Reference;
import javax.naming.Referenceable;
@@ -41,19 +46,19 @@
*/
public class ServiceReferenceable implements Referenceable
{
- public static final String WSDL_LOCATION = "WSDL_LOCATION";
+ public static final String SERVICE_REF = "SERVICE_REF";
public static final String SERVICE_TYPE = "SERVICE_TYPE";
public static final String PORT_TYPE = "PORT_TYPE";
private String serviceType;
private String portType;
- private String wsdlLocation;
+ private ServiceRef sref;
- public ServiceReferenceable(String serviceType, String portType, String wsdlLocation)
+ public ServiceReferenceable(String serviceType, String portType, ServiceRef sref)
{
this.serviceType = serviceType;
this.portType = portType;
- this.wsdlLocation = wsdlLocation;
+ this.sref = sref;
}
/**
@@ -68,8 +73,24 @@
myRef.add(new StringRefAddr(SERVICE_TYPE, serviceType));
myRef.add(new StringRefAddr(PORT_TYPE, portType));
- myRef.add(new StringRefAddr(WSDL_LOCATION, wsdlLocation));
+ myRef.add(new BinaryRefAddr(SERVICE_REF, marshallServiceRef()));
return myRef;
}
+
+ private byte[] marshallServiceRef() throws NamingException
+ {
+ ByteArrayOutputStream baos = new ByteArrayOutputStream(512);
+ try
+ {
+ ObjectOutputStream oos = new ObjectOutputStream(baos);
+ oos.writeObject(sref);
+ oos.close();
+ }
+ catch (IOException e)
+ {
+ throw new NamingException("Cannot marshall service ref, cause: " + e.toString());
+ }
+ return baos.toByteArray();
+ }
}
\ No newline at end of file
Modified: trunk/src/main/java/org/jboss/ws/jaxws/injection/WebServiceRefDeployer.java
===================================================================
--- trunk/src/main/java/org/jboss/ws/jaxws/injection/WebServiceRefDeployer.java 2006-10-26 06:46:29 UTC (rev 1315)
+++ trunk/src/main/java/org/jboss/ws/jaxws/injection/WebServiceRefDeployer.java 2006-10-26 23:49:01 UTC (rev 1316)
@@ -46,14 +46,19 @@
// Hide ctor
}
- public static void setupWebServiceRef(Context ctx, String jndiName, Class refType, WebServiceRef ref) throws Exception
+ public static void setupWebServiceRef(Context ctx, String jndiName, Class refType, WebServiceRef wsref, ServiceRef sref) throws Exception
{
+ String externalName = ctx.getNameInNamespace() + "/" + jndiName;
+ String refTypeName = (refType != null ? refType.getName() : null);
+ String wsrefString = "[name=" + wsref.name() + ",value=" + wsref.value() + ",type=" + wsref.type() + ",wsdl=" + wsref.wsdlLocation() + ",mapped=" + wsref.mappedName() + "]";
+ log.debug("setupWebServiceRef [jndi=" + externalName + ",refType=" + refTypeName + ",wsref=" + wsrefString + ",sref=" + sref + "]");
+
String serviceTypeName = null;
String portTypeName = null;
// #1 Use the explicit @WebServiceRef.value
- if (ref.value() != Object.class)
- serviceTypeName = ref.value().getName();
+ if (wsref.value() != Object.class)
+ serviceTypeName = wsref.value().getName();
// #2 Use the target ref type
if (serviceTypeName == null && refType != null && Service.class.isAssignableFrom(refType))
@@ -64,16 +69,17 @@
serviceTypeName = Service.class.getName();
// #1 Use the explicit @WebServiceRef.type
- if (ref.type() != Object.class)
- portTypeName = ref.type().getName();
+ if (wsref.type() != Object.class)
+ portTypeName = wsref.type().getName();
// #2 Use the target ref type
if (portTypeName == null && refType != null && Service.class.isAssignableFrom(refType) == false)
portTypeName = refType.getName();
-
- Util.bind(ctx, jndiName, new ServiceReferenceable(serviceTypeName, portTypeName, ref.wsdlLocation()));
- String externalName = ctx.getNameInNamespace() + "/" + jndiName;
- log.debug("WebServiceRef bound [jndi=" + externalName + ",service=" + serviceTypeName + ",port=" + portTypeName + "]");
+ // Set the wsdlLocation if there is no override already
+ if (sref.getWsdlLocation() == null && wsref.wsdlLocation().length() > 0)
+ sref.setWsdlLocation(wsref.wsdlLocation());
+
+ Util.bind(ctx, jndiName, new ServiceReferenceable(serviceTypeName, portTypeName, sref));
}
}
Modified: trunk/src/main/java/org/jboss/ws/metadata/wsdl/WSDLDefinitionsFactory.java
===================================================================
--- trunk/src/main/java/org/jboss/ws/metadata/wsdl/WSDLDefinitionsFactory.java 2006-10-26 06:46:29 UTC (rev 1315)
+++ trunk/src/main/java/org/jboss/ws/metadata/wsdl/WSDLDefinitionsFactory.java 2006-10-26 23:49:01 UTC (rev 1316)
@@ -25,6 +25,7 @@
import java.io.InputStream;
import java.io.StringWriter;
+import java.net.ConnectException;
import java.net.URL;
import java.util.HashMap;
import java.util.Iterator;
@@ -33,6 +34,7 @@
import javax.wsdl.Definition;
import javax.wsdl.factory.WSDLFactory;
import javax.wsdl.xml.WSDLReader;
+import javax.xml.bind.JAXBContext;
import javax.xml.parsers.DocumentBuilder;
import org.jboss.logging.Logger;
@@ -97,7 +99,7 @@
if (wsdlLocation == null)
throw new IllegalArgumentException("URL cannot be null");
- log.trace("parse: " + wsdlLocation.toExternalForm());
+ log.debug("parse: " + wsdlLocation.toExternalForm());
EntityResolver entityResolver = new JBossWSEntityResolver();
WSDLDefinitions wsdlDefinitions = null;
@@ -189,13 +191,13 @@
wsdlInputStream.close();
}
}
- catch (RuntimeException rte)
+ catch (ConnectException ex)
{
- throw rte;
+ throw new WSDLException("Cannot connect to: " + wsdlLocation);
}
- catch (Exception e)
+ catch (Exception ex)
{
- throw new WSDLException(e);
+ throw new WSDLException("Cannot parse wsdlLocation: " + wsdlLocation, ex);
}
}
Modified: trunk/src/test/ant/build-jars-jaxws.xml
===================================================================
--- trunk/src/test/ant/build-jars-jaxws.xml 2006-10-26 06:46:29 UTC (rev 1315)
+++ trunk/src/test/ant/build-jars-jaxws.xml 2006-10-26 23:49:01 UTC (rev 1316)
@@ -443,6 +443,7 @@
<include name="org/jboss/test/ws/jaxws/webserviceref/Echo.class"/>
</classes>
<webinf dir="${build.test.dir}/resources/jaxws/webserviceref/META-INF">
+ <include name="jboss-web.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
@@ -456,6 +457,7 @@
<include name="org/jboss/test/ws/jaxws/webserviceref/Echo.class"/>
</fileset>
<metainf dir="${build.test.dir}/resources/jaxws/webserviceref/META-INF">
+ <include name="jboss.xml"/>
<include name="wsdl/**"/>
</metainf>
</jar>
Modified: trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/ApplicationClient.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/ApplicationClient.java 2006-10-26 06:46:29 UTC (rev 1315)
+++ trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/ApplicationClient.java 2006-10-26 23:49:01 UTC (rev 1316)
@@ -30,22 +30,51 @@
import org.jboss.logging.Logger;
+//Test on type with wsdlLocation
@WebServiceRef(name = "service1", value = TestEndpointService.class, wsdlLocation = "META-INF/wsdl/TestEndpoint.wsdl")
+
+// Test multiple on type
@WebServiceRefs( {
- @WebServiceRef(name = "service2", value = TestEndpointService.class, wsdlLocation = "META-INF/wsdl/TestEndpoint.wsdl"),
- @WebServiceRef(name = "port1", value = TestEndpointService.class, type = TestEndpoint.class, wsdlLocation = "META-INF/wsdl/TestEndpoint.wsdl") })
+ @WebServiceRef(name = "service2", value = TestEndpointService.class),
+ @WebServiceRef(name = "port1", value = TestEndpointService.class, type = TestEndpoint.class) })
public class ApplicationClient
{
// Provide logging
private static Logger log = Logger.getLogger(ApplicationClient.class);
- @WebServiceRef (name ="TestEndpointService", wsdlLocation ="META-INF/wsdl/TestEndpoint.wsdl")
+ // Test on field with name
+ @WebServiceRef(name = "TestEndpointService3")
public static TestEndpointService service3;
- @WebServiceRef (value = TestEndpointService.class, wsdlLocation ="META-INF/wsdl/TestEndpoint.wsdl")
+ // Test on field without name
+ @WebServiceRef
+ public static TestEndpointService service4;
+
+ // Test on method with value
+ @WebServiceRef(name = "TestEndpointService5")
+ public static void setServiceSetter5(TestEndpointService service)
+ {
+ ApplicationClient.service5 = service;
+ }
+ private static TestEndpointService service5;
+
+ // Test on method without name
+ @WebServiceRef
+ public static void setServiceSetter6(TestEndpointService service)
+ {
+ ApplicationClient.service6 = service;
+ }
+ private static TestEndpointService service6;
+
+ // Test on field with name and value
+ @WebServiceRef(name = "Port2", value = TestEndpointService.class)
public static TestEndpoint port2;
-
- public static InitialContext encCtx;
+
+ // Test on field with value
+ @WebServiceRef(value = TestEndpointService.class)
+ public static TestEndpoint port3;
+
+ public static InitialContext iniCtx;
public static String retStr;
public static void main(String[] args)
@@ -57,11 +86,21 @@
try
{
System.out.println("FIXME: EJBTHREE-760");
- //ports.add(((TestEndpointService)encCtx.lookup("java:comp/env/service1")).getTestEndpointPort());
- //ports.add(((TestEndpointService)encCtx.lookup("java:comp/env/service2")).getTestEndpointPort());
+ //ports.add(((TestEndpointService)iniCtx.lookup("java:comp/env/service1")).getTestEndpointPort());
+ //ports.add(((TestEndpointService)iniCtx.lookup("java:comp/env/service2")).getTestEndpointPort());
ports.add((TestEndpoint)service3.getPort(TestEndpoint.class));
- //ports.add((TestEndpoint)encCtx.lookup("java:comp/env/port1"));
+ //ports.add(((TestEndpointService)iniCtx.lookup("java:comp/env/TestEndpointService3")).getTestEndpointPort());
+ ports.add((TestEndpoint)service4.getPort(TestEndpoint.class));
+ //ports.add(((TestEndpointService)iniCtx.lookup("java:comp/env/" + ApplicationClient.class.getName() + "/service4")).getTestEndpointPort());
+ ports.add((TestEndpoint)service5.getPort(TestEndpoint.class));
+ //ports.add(((TestEndpointService)iniCtx.lookup("java:comp/env/TestEndpointService5")).getTestEndpointPort());
+ ports.add((TestEndpoint)service6.getPort(TestEndpoint.class));
+ //ports.add(((TestEndpointService)iniCtx.lookup("java:comp/env/" + ApplicationClient.class.getName() + "/serviceSetter6")).getTestEndpointPort());
+ //ports.add((TestEndpoint)iniCtx.lookup("java:comp/env/port1"));
ports.add(port2);
+ //ports.add((TestEndpoint)iniCtx.lookup("java:comp/env/Port2"));
+ ports.add(port3);
+ //ports.add((TestEndpoint)iniCtx.lookup("java:comp/env/" + ApplicationClient.class.getName() + "/port3"));
}
catch (Exception ex)
{
@@ -78,4 +117,5 @@
retStr = inStr;
}
+
}
Modified: trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/EJB3Client.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/EJB3Client.java 2006-10-26 06:46:29 UTC (rev 1315)
+++ trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/EJB3Client.java 2006-10-26 23:49:01 UTC (rev 1316)
@@ -38,21 +38,50 @@
@RemoteBinding(jndiBinding = "/ejb3/EJB3Client")
@Stateless
+// Test on type with wsdlLocation
@WebServiceRef(name = "service1", value = TestEndpointService.class, wsdlLocation = "META-INF/wsdl/TestEndpoint.wsdl")
+
+// Test multiple on type
@WebServiceRefs( {
- @WebServiceRef(name = "service2", value = TestEndpointService.class, wsdlLocation = "META-INF/wsdl/TestEndpoint.wsdl"),
- @WebServiceRef(name = "port1", value = TestEndpointService.class, type = TestEndpoint.class, wsdlLocation = "META-INF/wsdl/TestEndpoint.wsdl") })
+ @WebServiceRef(name = "service2", value = TestEndpointService.class),
+ @WebServiceRef(name = "port1", value = TestEndpointService.class, type = TestEndpoint.class) })
public class EJB3Client implements EJB3Remote
{
// Provide logging
private static Logger log = Logger.getLogger(EJB3Client.class);
- @WebServiceRef(name = "TestEndpointService", wsdlLocation = "META-INF/wsdl/TestEndpoint.wsdl")
+ // Test on field with name
+ @WebServiceRef(name = "TestEndpointService3")
public TestEndpointService service3;
- @WebServiceRef(value = TestEndpointService.class, wsdlLocation = "META-INF/wsdl/TestEndpoint.wsdl")
+ // Test on field without name
+ @WebServiceRef
+ public TestEndpointService service4;
+
+ // Test on method with value
+ @WebServiceRef(name = "TestEndpointService5")
+ public void setServiceSetter5(TestEndpointService service)
+ {
+ this.service5 = service;
+ }
+ private TestEndpointService service5;
+
+ // Test on method without name
+ @WebServiceRef
+ public void setServiceSetter6(TestEndpointService service)
+ {
+ this.service6 = service;
+ }
+ private TestEndpointService service6;
+
+ // Test on field with name and value
+ @WebServiceRef(name = "Port2", value = TestEndpointService.class)
public TestEndpoint port2;
+ // Test on field with value
+ @WebServiceRef(value = TestEndpointService.class)
+ public TestEndpoint port3;
+
public String echo(String inStr)
{
log.info("echo: " + inStr);
@@ -64,8 +93,18 @@
ports.add(((TestEndpointService)iniCtx.lookup("java:comp.ejb3/env/service1")).getTestEndpointPort());
ports.add(((TestEndpointService)iniCtx.lookup("java:comp.ejb3/env/service2")).getTestEndpointPort());
ports.add((TestEndpoint)service3.getPort(TestEndpoint.class));
+ ports.add(((TestEndpointService)iniCtx.lookup("java:comp.ejb3/env/TestEndpointService3")).getTestEndpointPort());
+ ports.add((TestEndpoint)service4.getPort(TestEndpoint.class));
+ ports.add(((TestEndpointService)iniCtx.lookup("java:comp.ejb3/env/" + getClass().getName() + "/service4")).getTestEndpointPort());
+ ports.add((TestEndpoint)service5.getPort(TestEndpoint.class));
+ ports.add(((TestEndpointService)iniCtx.lookup("java:comp.ejb3/env/TestEndpointService5")).getTestEndpointPort());
+ ports.add((TestEndpoint)service6.getPort(TestEndpoint.class));
+ ports.add(((TestEndpointService)iniCtx.lookup("java:comp.ejb3/env/" + getClass().getName() + "/serviceSetter6")).getTestEndpointPort());
ports.add((TestEndpoint)iniCtx.lookup("java:comp.ejb3/env/port1"));
ports.add(port2);
+ ports.add((TestEndpoint)iniCtx.lookup("java:comp.ejb3/env/Port2"));
+ ports.add(port3);
+ ports.add((TestEndpoint)iniCtx.lookup("java:comp.ejb3/env/" + getClass().getName() + "/port3"));
}
catch (Exception ex)
{
Modified: trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/ServletClient.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/ServletClient.java 2006-10-26 06:46:29 UTC (rev 1315)
+++ trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/ServletClient.java 2006-10-26 23:49:01 UTC (rev 1316)
@@ -35,21 +35,50 @@
import org.jboss.logging.Logger;
+//Test on type with wsdlLocation
@WebServiceRef(name = "service1", value = TestEndpointService.class, wsdlLocation = "WEB-INF/wsdl/TestEndpoint.wsdl")
+
+// Test multiple on type
@WebServiceRefs( {
- @WebServiceRef(name = "service2", value = TestEndpointService.class, wsdlLocation = "WEB-INF/wsdl/TestEndpoint.wsdl"),
- @WebServiceRef(name = "port1", value = TestEndpointService.class, type = TestEndpoint.class, wsdlLocation = "WEB-INF/wsdl/TestEndpoint.wsdl") })
+ @WebServiceRef(name = "service2", value = TestEndpointService.class),
+ @WebServiceRef(name = "port1", value = TestEndpointService.class, type = TestEndpoint.class) })
public class ServletClient extends HttpServlet
{
// Provide logging
private static Logger log = Logger.getLogger(ServletClient.class);
- @WebServiceRef (name ="TestEndpointService", wsdlLocation ="WEB-INF/wsdl/TestEndpoint.wsdl")
+ // Test on field with name
+ @WebServiceRef(name = "TestEndpointService3")
public TestEndpointService service3;
+
+ // Test on field without name
+ @WebServiceRef
+ public TestEndpointService service4;
+
+ // Test on method with value
+ @WebServiceRef(name = "TestEndpointService5")
+ public void setServiceSetter5(TestEndpointService service)
+ {
+ this.service5 = service;
+ }
+ private TestEndpointService service5;
- @WebServiceRef (value = TestEndpointService.class, wsdlLocation ="WEB-INF/wsdl/TestEndpoint.wsdl")
+ // Test on method without name
+ @WebServiceRef
+ public void setServiceSetter6(TestEndpointService service)
+ {
+ this.service6 = service;
+ }
+ private TestEndpointService service6;
+
+ // Test on field with name and value
+ @WebServiceRef(name = "Port2", value = TestEndpointService.class)
public TestEndpoint port2;
-
+
+ // Test on field with value
+ @WebServiceRef(value = TestEndpointService.class)
+ public TestEndpoint port3;
+
@Override
protected void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException
{
@@ -63,8 +92,18 @@
ports.add(((TestEndpointService)iniCtx.lookup("java:comp/env/service1")).getTestEndpointPort());
ports.add(((TestEndpointService)iniCtx.lookup("java:comp/env/service2")).getTestEndpointPort());
ports.add((TestEndpoint)service3.getPort(TestEndpoint.class));
+ ports.add(((TestEndpointService)iniCtx.lookup("java:comp/env/TestEndpointService3")).getTestEndpointPort());
+ ports.add((TestEndpoint)service4.getPort(TestEndpoint.class));
+ ports.add(((TestEndpointService)iniCtx.lookup("java:comp/env/" + getClass().getName() + "/service4")).getTestEndpointPort());
+ ports.add((TestEndpoint)service5.getPort(TestEndpoint.class));
+ ports.add(((TestEndpointService)iniCtx.lookup("java:comp/env/TestEndpointService5")).getTestEndpointPort());
+ ports.add((TestEndpoint)service6.getPort(TestEndpoint.class));
+ ports.add(((TestEndpointService)iniCtx.lookup("java:comp/env/" + getClass().getName() + "/serviceSetter6")).getTestEndpointPort());
ports.add((TestEndpoint)iniCtx.lookup("java:comp/env/port1"));
ports.add(port2);
+ ports.add((TestEndpoint)iniCtx.lookup("java:comp/env/Port2"));
+ ports.add(port3);
+ ports.add((TestEndpoint)iniCtx.lookup("java:comp/env/" + getClass().getName() + "/port3"));
}
catch (Exception ex)
{
Modified: trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/WebServiceRefClientTestCase.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/WebServiceRefClientTestCase.java 2006-10-26 06:46:29 UTC (rev 1315)
+++ trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/WebServiceRefClientTestCase.java 2006-10-26 23:49:01 UTC (rev 1316)
@@ -74,7 +74,7 @@
public void testApplicationClient() throws Exception
{
String helloWorld = "Hello World!";
- ApplicationClient.encCtx = getInitialContext();
+ ApplicationClient.iniCtx = getInitialContext();
ClientLauncher.launch(ApplicationClient.class.getName(), "jbossws-client", new String[]{helloWorld});
assertEquals(helloWorld, ApplicationClient.retStr);
}
Modified: trunk/src/test/resources/jaxws/webserviceref/META-INF/jboss-client.xml
===================================================================
--- trunk/src/test/resources/jaxws/webserviceref/META-INF/jboss-client.xml 2006-10-26 06:46:29 UTC (rev 1315)
+++ trunk/src/test/resources/jaxws/webserviceref/META-INF/jboss-client.xml 2006-10-26 23:49:01 UTC (rev 1316)
@@ -3,4 +3,77 @@
<jboss-client>
<jndi-name>jbossws-client</jndi-name>
-</jboss-client>
+
+ <!--
+ @WebServiceRef(name = "service1", value = TestEndpointService.class, wsdlLocation = "META-INF/wsdl/TestEndpoint.wsdl")
+ <service-ref>
+ <service-ref-name>service1</service-ref-name>
+ <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
+ </service-ref>
+ -->
+
+ <!--
+ @WebServiceRef(name = "service2", value = TestEndpointService.class)
+ -->
+ <service-ref>
+ <service-ref-name>service2</service-ref-name>
+ <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
+ </service-ref>
+
+ <!--
+ @WebServiceRef(name = "TestEndpointService3")
+ -->
+ <service-ref>
+ <service-ref-name>TestEndpointService3</service-ref-name>
+ <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
+ </service-ref>
+
+ <!--
+ @WebServiceRef
+ -->
+ <service-ref>
+ <service-ref-name>org.jboss.test.ws.jaxws.webserviceref.ApplicationClient/service4</service-ref-name>
+ <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
+ </service-ref>
+
+ <!--
+ @WebServiceRef(name = "TestEndpointService5")
+ -->
+ <service-ref>
+ <service-ref-name>TestEndpointService5</service-ref-name>
+ <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
+ </service-ref>
+
+ <!--
+ @WebServiceRef
+ -->
+ <service-ref>
+ <service-ref-name>org.jboss.test.ws.jaxws.webserviceref.ApplicationClient/serviceSetter6</service-ref-name>
+ <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
+ </service-ref>
+
+ <!--
+ @WebServiceRef(name = "port1", value = TestEndpointService.class, type = TestEndpoint.class)
+ -->
+ <service-ref>
+ <service-ref-name>port1</service-ref-name>
+ <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
+ </service-ref>
+
+ <!--
+ @WebServiceRef(name = "Port2", value = TestEndpointService.class)
+ -->
+ <service-ref>
+ <service-ref-name>Port2</service-ref-name>
+ <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
+ </service-ref>
+
+ <!--
+ @WebServiceRef(value = TestEndpointService.class)
+ -->
+ <service-ref>
+ <service-ref-name>org.jboss.test.ws.jaxws.webserviceref.ApplicationClient/port3</service-ref-name>
+ <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
+ </service-ref>
+
+</jboss-client>
\ No newline at end of file
Added: trunk/src/test/resources/jaxws/webserviceref/META-INF/jboss-web.xml
===================================================================
--- trunk/src/test/resources/jaxws/webserviceref/META-INF/jboss-web.xml 2006-10-26 06:46:29 UTC (rev 1315)
+++ trunk/src/test/resources/jaxws/webserviceref/META-INF/jboss-web.xml 2006-10-26 23:49:01 UTC (rev 1316)
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 5.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_5_0.dtd">
+
+<jboss-web>
+
+
+ <!--
+ @WebServiceRef(name = "service1", value = TestEndpointService.class, wsdlLocation = "WEB-INF/wsdl/TestEndpoint.wsdl")
+ <service-ref>
+ <service-ref-name>service1</service-ref-name>
+ <wsdl-override>WEB-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
+ </service-ref>
+ -->
+
+ <!--
+ @WebServiceRef(name = "service2", value = TestEndpointService.class)
+ -->
+ <service-ref>
+ <service-ref-name>service2</service-ref-name>
+ <wsdl-override>WEB-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
+ </service-ref>
+
+ <!--
+ @WebServiceRef(name = "TestEndpointService3")
+ -->
+ <service-ref>
+ <service-ref-name>TestEndpointService3</service-ref-name>
+ <wsdl-override>WEB-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
+ </service-ref>
+
+ <!--
+ @WebServiceRef
+ -->
+ <service-ref>
+ <service-ref-name>org.jboss.test.ws.jaxws.webserviceref.ServletClient/service4</service-ref-name>
+ <wsdl-override>WEB-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
+ </service-ref>
+
+ <!--
+ @WebServiceRef(name = "TestEndpointService5")
+ -->
+ <service-ref>
+ <service-ref-name>TestEndpointService5</service-ref-name>
+ <wsdl-override>WEB-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
+ </service-ref>
+
+ <!--
+ @WebServiceRef
+ -->
+ <service-ref>
+ <service-ref-name>org.jboss.test.ws.jaxws.webserviceref.ServletClient/serviceSetter6</service-ref-name>
+ <wsdl-override>WEB-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
+ </service-ref>
+
+ <!--
+ @WebServiceRef(name = "port1", value = TestEndpointService.class, type = TestEndpoint.class)
+ -->
+ <service-ref>
+ <service-ref-name>port1</service-ref-name>
+ <wsdl-override>WEB-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
+ </service-ref>
+
+ <!--
+ @WebServiceRef(name = "Port2", value = TestEndpointService.class)
+ -->
+ <service-ref>
+ <service-ref-name>Port2</service-ref-name>
+ <wsdl-override>WEB-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
+ </service-ref>
+
+ <!--
+ @WebServiceRef(value = TestEndpointService.class)
+ -->
+ <service-ref>
+ <service-ref-name>org.jboss.test.ws.jaxws.webserviceref.ServletClient/port3</service-ref-name>
+ <wsdl-override>WEB-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
+ </service-ref>
+
+</jboss-web>
\ No newline at end of file
Property changes on: trunk/src/test/resources/jaxws/webserviceref/META-INF/jboss-web.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/src/test/resources/jaxws/webserviceref/META-INF/jboss.xml
===================================================================
--- trunk/src/test/resources/jaxws/webserviceref/META-INF/jboss.xml 2006-10-26 06:46:29 UTC (rev 1315)
+++ trunk/src/test/resources/jaxws/webserviceref/META-INF/jboss.xml 2006-10-26 23:49:01 UTC (rev 1316)
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 5.0//EN" "http://www.jboss.org/j2ee/dtd/jboss_5_0.dtd">
+
+<jboss>
+
+ <enterprise-beans>
+ <session>
+ <ejb-name>EJB3Client</ejb-name>
+
+ <!--
+ @WebServiceRef(name = "service1", value = TestEndpointService.class, wsdlLocation = "META-INF/wsdl/TestEndpoint.wsdl")
+ <service-ref>
+ <service-ref-name>service1</service-ref-name>
+ <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
+ </service-ref>
+ -->
+
+ <!--
+ @WebServiceRef(name = "service2", value = TestEndpointService.class)
+ -->
+ <service-ref>
+ <service-ref-name>service2</service-ref-name>
+ <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
+ </service-ref>
+
+ <!--
+ @WebServiceRef(name = "TestEndpointService3")
+ -->
+ <service-ref>
+ <service-ref-name>TestEndpointService3</service-ref-name>
+ <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
+ </service-ref>
+
+ <!--
+ @WebServiceRef
+ -->
+ <service-ref>
+ <service-ref-name>org.jboss.test.ws.jaxws.webserviceref.EJB3Client/service4</service-ref-name>
+ <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
+ </service-ref>
+
+ <!--
+ @WebServiceRef(name = "TestEndpointService5")
+ -->
+ <service-ref>
+ <service-ref-name>TestEndpointService5</service-ref-name>
+ <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
+ </service-ref>
+
+ <!--
+ @WebServiceRef
+ -->
+ <service-ref>
+ <service-ref-name>org.jboss.test.ws.jaxws.webserviceref.EJB3Client/serviceSetter6</service-ref-name>
+ <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
+ </service-ref>
+
+ <!--
+ @WebServiceRef(name = "port1", value = TestEndpointService.class, type = TestEndpoint.class)
+ -->
+ <service-ref>
+ <service-ref-name>port1</service-ref-name>
+ <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
+ </service-ref>
+
+ <!--
+ @WebServiceRef(name = "Port2", value = TestEndpointService.class)
+ -->
+ <service-ref>
+ <service-ref-name>Port2</service-ref-name>
+ <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
+ </service-ref>
+
+ <!--
+ @WebServiceRef(value = TestEndpointService.class)
+ -->
+ <service-ref>
+ <service-ref-name>org.jboss.test.ws.jaxws.webserviceref.EJB3Client/port3</service-ref-name>
+ <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
+ </service-ref>
+ </session>
+ </enterprise-beans>
+
+</jboss>
\ No newline at end of file
Property changes on: trunk/src/test/resources/jaxws/webserviceref/META-INF/jboss.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
18 years, 2 months
- 1
- 0
JBossWS SVN: r1315 - in trunk/src/test/resources/jaxws/jsr181/complex: . META-INF META-INF/wsdl
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2006-10-26 02:46:29 -0400 (Thu, 26 Oct 2006)
New Revision: 1315
Added:
trunk/src/test/resources/jaxws/jsr181/complex/META-INF/
trunk/src/test/resources/jaxws/jsr181/complex/META-INF/wsdl/
trunk/src/test/resources/jaxws/jsr181/complex/META-INF/wsdl/RegistrationService.wsdl
Log:
Add wsdl generated from jbossws-1.0
Added: trunk/src/test/resources/jaxws/jsr181/complex/META-INF/wsdl/RegistrationService.wsdl
===================================================================
--- trunk/src/test/resources/jaxws/jsr181/complex/META-INF/wsdl/RegistrationService.wsdl 2006-10-26 06:40:22 UTC (rev 1314)
+++ trunk/src/test/resources/jaxws/jsr181/complex/META-INF/wsdl/RegistrationService.wsdl 2006-10-26 06:46:29 UTC (rev 1315)
@@ -0,0 +1,327 @@
+<!--
+This wsdl is only used for client artifact generation
+
+wsimport -keep -verbose -d ../../../java ./META-INF/wsdl/RegistrationService.wsdl
+
+$Id$
+-->
+<definitions name="RegistrationServiceService" targetNamespace="http://org.jboss.ws/jaxws/complex" xmlns="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:ns1="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws"
+ xmlns:ns2="http://extra.complex.jsr181.jaxws.ws.test.jboss.org/jaws" xmlns:tns="http://org.jboss.ws/jaxws/complex" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:jaxws="http://java.sun.com/xml/ns/jaxws" xmlns:jaxb="http://java.sun.com/xml/ns/jaxb">
+
+ <jaxws:bindings>
+ <jaxws:package name="org.jboss.test.ws.jaxws.jsr181.complex"/>
+ </jaxws:bindings>
+
+ <types>
+ <schema elementFormDefault="qualified" targetNamespace="http://org.jboss.ws/jaxws/complex" xmlns="http://www.w3.org/2001/XMLSchema"
+ xmlns:ns2="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws" xmlns:ns3="http://extra.complex.jsr181.jaxws.ws.test.jboss.org/jaws"
+ xmlns:tns="http://org.jboss.ws/jaxws/complex" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" jaxb:version="2.0">
+
+ <xsd:annotation>
+ <xsd:appinfo>
+ <jaxb:schemaBindings>
+ <jaxb:package name="org.jboss.test.ws.jaxws.jsr181.complex"/>
+ </jaxb:schemaBindings>
+ </xsd:appinfo>
+ </xsd:annotation>
+
+ <import namespace="http://extra.complex.jsr181.jaxws.ws.test.jboss.org/jaws"/>
+ <import namespace="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws"/>
+
+ <complexType name="AlreadyRegisteredException">
+ <complexContent>
+ <extension base="ns2:RegistrationException">
+ <sequence>
+ <element name="existingId" type="long"/>
+ </sequence>
+ </extension>
+ </complexContent>
+ </complexType>
+
+ <complexType name="BulkRegister">
+ <sequence>
+ <element maxOccurs="unbounded" minOccurs="0" name="Customers" nillable="true" type="ns2:Customer"/>
+ <element name="When" nillable="true" type="dateTime"/>
+ </sequence>
+ </complexType>
+
+ <complexType name="BulkRegisterResponse">
+ <sequence>
+ <element maxOccurs="unbounded" minOccurs="0" name="RegisteredIDs" type="long"/>
+ <element maxOccurs="unbounded" minOccurs="0" name="result" type="long"/>
+ </sequence>
+ </complexType>
+
+ <complexType name="GetStatistics">
+ <sequence>
+ <element name="Customer" nillable="true" type="ns2:Customer"/>
+ </sequence>
+ </complexType>
+
+ <complexType name="GetStatisticsResponse">
+ <sequence>
+ <element name="Statistics" nillable="true" type="ns3:Statistics"/>
+ <element name="result" nillable="true" type="ns3:Statistics"/>
+ </sequence>
+ </complexType>
+
+ <complexType name="Register">
+ <sequence>
+ <element name="Customer" nillable="true" type="ns2:Customer"/>
+ <element name="When" nillable="true" type="dateTime"/>
+ </sequence>
+ </complexType>
+
+ <complexType name="RegisterForInvoice">
+ <sequence>
+ <element name="InvoiceCustomer" nillable="true" type="ns2:InvoiceCustomer"/>
+ </sequence>
+ </complexType>
+
+ <complexType name="RegisterForInvoiceResponse">
+ <sequence>
+ <element name="done" type="boolean"/>
+ <element name="result" type="boolean"/>
+ </sequence>
+ </complexType>
+
+ <complexType name="RegisterResponse">
+ <sequence>
+ <element name="RegisteredID" type="long"/>
+ <element name="result" type="long"/>
+ </sequence>
+ </complexType>
+
+ <complexType name="ValidationException">
+ <complexContent>
+ <extension base="ns2:RegistrationException">
+ <sequence>
+ <element maxOccurs="unbounded" minOccurs="0" name="failiedCustomers" type="long"/>
+ </sequence>
+ </extension>
+ </complexContent>
+ </complexType>
+
+ <element name="AlreadyRegisteredException" type="tns:AlreadyRegisteredException"/>
+ <element name="BulkRegister" type="tns:BulkRegister"/>
+ <element name="BulkRegisterResponse" type="tns:BulkRegisterResponse"/>
+ <element name="GetStatistics" type="tns:GetStatistics"/>
+ <element name="GetStatisticsResponse" type="tns:GetStatisticsResponse"/>
+ <element name="Register" type="tns:Register"/>
+ <element name="RegisterForInvoice" type="tns:RegisterForInvoice"/>
+ <element name="RegisterForInvoiceResponse" type="tns:RegisterForInvoiceResponse"/>
+ <element name="RegisterResponse" type="tns:RegisterResponse"/>
+ <element name="ValidationException" type="tns:ValidationException"/>
+ </schema>
+
+ <schema elementFormDefault="qualified" targetNamespace="http://extra.complex.jsr181.jaxws.ws.test.jboss.org/jaws" xmlns="http://www.w3.org/2001/XMLSchema"
+ xmlns:ns1="http://org.jboss.ws/jaxws/complex" xmlns:ns2="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws"
+ xmlns:tns="http://extra.complex.jsr181.jaxws.ws.test.jboss.org/jaws" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" jaxb:version="2.0">
+
+ <xsd:annotation>
+ <xsd:appinfo>
+ <jaxb:schemaBindings>
+ <jaxb:package name="org.jboss.test.ws.jaxws.jsr181.complex.extra"/>
+ </jaxb:schemaBindings>
+ </xsd:appinfo>
+ </xsd:annotation>
+
+ <import namespace="http://org.jboss.ws/jaxws/complex"/>
+ <import namespace="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws"/>
+
+ <complexType name="Statistics">
+ <sequence>
+ <element name="activationTime" nillable="true" type="dateTime"/>
+ <element name="hits" type="long"/>
+ </sequence>
+ </complexType>
+ </schema>
+
+ <schema elementFormDefault="qualified" targetNamespace="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws" xmlns="http://www.w3.org/2001/XMLSchema"
+ xmlns:ns1="http://org.jboss.ws/jaxws/complex" xmlns:ns3="http://extra.complex.jsr181.jaxws.ws.test.jboss.org/jaws"
+ xmlns:tns="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" jaxb:version="2.0">
+
+ <xsd:annotation>
+ <xsd:appinfo>
+ <jaxb:schemaBindings>
+ <jaxb:package name="org.jboss.test.ws.jaxws.jsr181.complex"/>
+ </jaxb:schemaBindings>
+ </xsd:appinfo>
+ </xsd:annotation>
+
+ <import namespace="http://org.jboss.ws/jaxws/complex"/>
+ <import namespace="http://extra.complex.jsr181.jaxws.ws.test.jboss.org/jaws"/>
+
+ <complexType name="Address">
+ <sequence>
+ <element name="city" nillable="true" type="string"/>
+ <element name="state" nillable="true" type="string"/>
+ <element name="street" nillable="true" type="string"/>
+ <element name="zip" nillable="true" type="string"/>
+ </sequence>
+ </complexType>
+
+ <complexType name="Customer">
+ <sequence>
+ <element name="address" nillable="true" type="tns:Address"/>
+ <element maxOccurs="unbounded" minOccurs="0" name="contactNumbers" nillable="true" type="tns:PhoneNumber"/>
+ <element name="id" type="long"/>
+ <element name="name" nillable="true" type="tns:Name"/>
+ <element maxOccurs="unbounded" minOccurs="0" name="referredCustomers" nillable="true" type="tns:Customer"/>
+ </sequence>
+ </complexType>
+
+ <complexType name="InvoiceCustomer">
+ <complexContent>
+ <extension base="tns:Customer">
+ <sequence>
+ <element name="cycleDay" type="int"/>
+ </sequence>
+ </extension>
+ </complexContent>
+ </complexType>
+
+ <complexType name="Name">
+ <sequence>
+ <element name="firstName" nillable="true" type="string"/>
+ <element name="lastName" nillable="true" type="string"/>
+ <element name="middleName" nillable="true" type="string"/>
+ </sequence>
+ </complexType>
+
+ <complexType name="PhoneNumber">
+ <sequence>
+ <element name="areaCode" nillable="true" type="string"/>
+ <element name="exchange" nillable="true" type="string"/>
+ <element name="line" nillable="true" type="string"/>
+ </sequence>
+ </complexType>
+
+ <complexType name="RegistrationException">
+ <sequence>
+ <element name="message" nillable="true" type="string"/>
+ </sequence>
+ </complexType>
+ <element name="RegistrationException" type="tns:RegistrationException"/>
+ </schema>
+ </types>
+
+ <message name="RegistrationService_BulkRegister">
+ <part element="tns:BulkRegister" name="parameters"/>
+ </message>
+ <message name="RegistrationService_GetStatisticsResponse">
+ <part element="tns:GetStatisticsResponse" name="result"/>
+ </message>
+ <message name="AlreadyRegisteredException">
+ <part element="tns:AlreadyRegisteredException" name="AlreadyRegisteredException"/>
+ </message>
+ <message name="ValidationException">
+ <part element="tns:ValidationException" name="ValidationException"/>
+ </message>
+ <message name="RegistrationService_RegisterForInvoice">
+ <part element="tns:RegisterForInvoice" name="parameters"/>
+ </message>
+ <message name="RegistrationService_RegisterResponse">
+ <part element="tns:RegisterResponse" name="result"/>
+ </message>
+ <message name="RegistrationService_RegisterForInvoiceResponse">
+ <part element="tns:RegisterForInvoiceResponse" name="result"/>
+ </message>
+ <message name="RegistrationService_BulkRegisterResponse">
+ <part element="tns:BulkRegisterResponse" name="result"/>
+ </message>
+ <message name="RegistrationService_GetStatistics">
+ <part element="tns:GetStatistics" name="parameters"/>
+ </message>
+ <message name="RegistrationService_Register">
+ <part element="tns:Register" name="parameters"/>
+ </message>
+ <portType name="RegistrationService">
+ <operation name="BulkRegister">
+ <input message="tns:RegistrationService_BulkRegister"/>
+ <output message="tns:RegistrationService_BulkRegisterResponse"/>
+ <fault message="tns:AlreadyRegisteredException" name="AlreadyRegisteredException"/>
+ <fault message="tns:ValidationException" name="ValidationException"/>
+ </operation>
+ <operation name="GetStatistics">
+ <input message="tns:RegistrationService_GetStatistics"/>
+ <output message="tns:RegistrationService_GetStatisticsResponse"/>
+ </operation>
+ <operation name="Register">
+ <input message="tns:RegistrationService_Register"/>
+ <output message="tns:RegistrationService_RegisterResponse"/>
+ <fault message="tns:AlreadyRegisteredException" name="AlreadyRegisteredException"/>
+ <fault message="tns:ValidationException" name="ValidationException"/>
+ </operation>
+ <operation name="RegisterForInvoice">
+ <input message="tns:RegistrationService_RegisterForInvoice"/>
+ <output message="tns:RegistrationService_RegisterForInvoiceResponse"/>
+ <fault message="tns:AlreadyRegisteredException" name="AlreadyRegisteredException"/>
+ <fault message="tns:ValidationException" name="ValidationException"/>
+ </operation>
+ </portType>
+ <binding name="RegistrationServiceBinding" type="tns:RegistrationService">
+ <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+ <operation name="BulkRegister">
+ <soap:operation soapAction=""/>
+ <input>
+ <soap:body use="literal"/>
+ </input>
+ <output>
+ <soap:body use="literal"/>
+ </output>
+ <fault name="AlreadyRegisteredException">
+ <soap:fault name="AlreadyRegisteredException" use="literal"/>
+ </fault>
+ <fault name="ValidationException">
+ <soap:fault name="ValidationException" use="literal"/>
+ </fault>
+ </operation>
+ <operation name="GetStatistics">
+ <soap:operation soapAction=""/>
+ <input>
+ <soap:body use="literal"/>
+ </input>
+ <output>
+ <soap:body use="literal"/>
+ </output>
+ </operation>
+ <operation name="Register">
+ <soap:operation soapAction=""/>
+ <input>
+ <soap:body use="literal"/>
+ </input>
+ <output>
+ <soap:body use="literal"/>
+ </output>
+ <fault name="AlreadyRegisteredException">
+ <soap:fault name="AlreadyRegisteredException" use="literal"/>
+ </fault>
+ <fault name="ValidationException">
+ <soap:fault name="ValidationException" use="literal"/>
+ </fault>
+ </operation>
+ <operation name="RegisterForInvoice">
+ <soap:operation soapAction=""/>
+ <input>
+ <soap:body use="literal"/>
+ </input>
+ <output>
+ <soap:body use="literal"/>
+ </output>
+ <fault name="AlreadyRegisteredException">
+ <soap:fault name="AlreadyRegisteredException" use="literal"/>
+ </fault>
+ <fault name="ValidationException">
+ <soap:fault name="ValidationException" use="literal"/>
+ </fault>
+ </operation>
+ </binding>
+ <service name="RegistrationServiceService">
+ <port binding="tns:RegistrationServiceBinding" name="RegistrationServicePort">
+ <soap:address location="http://tdvaio:8080/jaxws-jsr181-complex/RegistrationService"/>
+ </port>
+ </service>
+</definitions>
\ No newline at end of file
Property changes on: trunk/src/test/resources/jaxws/jsr181/complex/META-INF/wsdl/RegistrationService.wsdl
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
18 years, 2 months
- 1
- 0
JBossWS SVN: r1314 - in trunk/src: main/java/org/jboss/ws/deployment test/ant test/java/org/jboss/test/ws/jaxws/provider test/resources/jaxws/provider test/resources/jaxws/provider/shared test/resources/jaxws/provider/shared/wsdl
by jbossws-commits＠lists.jboss.org
Author: jason.greene(a)jboss.com
Date: 2006-10-26 02:40:22 -0400 (Thu, 26 Oct 2006)
New Revision: 1314
Added:
trunk/src/test/resources/jaxws/provider/shared/
trunk/src/test/resources/jaxws/provider/shared/wsdl/
trunk/src/test/resources/jaxws/provider/shared/wsdl/Provider.wsdl
Modified:
trunk/src/main/java/org/jboss/ws/deployment/AnnotationsMetaDataBuilder.java
trunk/src/main/java/org/jboss/ws/deployment/JAXWSMetaDataBuilder.java
trunk/src/main/java/org/jboss/ws/deployment/JAXWSProviderMetaDataBuilderJSE.java
trunk/src/main/java/org/jboss/ws/deployment/JSR181MetaDataBuilder.java
trunk/src/test/ant/build-jars-jaxws.xml
trunk/src/test/java/org/jboss/test/ws/jaxws/provider/ProviderBeanJAXB.java
trunk/src/test/java/org/jboss/test/ws/jaxws/provider/ProviderBeanMessage.java
trunk/src/test/java/org/jboss/test/ws/jaxws/provider/ProviderBeanPayload.java
trunk/src/test/java/org/jboss/test/ws/jaxws/provider/ProviderJAXBTestCase.java
trunk/src/test/java/org/jboss/test/ws/jaxws/provider/ProviderMessageTestCase.java
trunk/src/test/java/org/jboss/test/ws/jaxws/provider/ProviderPayloadTestCase.java
Log:
Implement JBWS-1026
Fix bug in JSR181MetaDataBuilder relating to faults
Modified: trunk/src/main/java/org/jboss/ws/deployment/AnnotationsMetaDataBuilder.java
===================================================================
--- trunk/src/main/java/org/jboss/ws/deployment/AnnotationsMetaDataBuilder.java 2006-10-25 22:10:54 UTC (rev 1313)
+++ trunk/src/main/java/org/jboss/ws/deployment/AnnotationsMetaDataBuilder.java 2006-10-26 06:40:22 UTC (rev 1314)
@@ -68,56 +68,6 @@
}
}
- protected void processOrGenerateWSDL(Class wsClass, ServiceMetaData serviceMetaData, String wsdlLocation, EndpointMetaData endpointMetaData)
- {
- if (wsdlLocation.length() > 0)
- {
- serviceMetaData.setWsdlFile(wsdlLocation);
- }
- else
- {
- // Generate the wsdl
- ClassLoader ctxLoader = Thread.currentThread().getContextClassLoader();
- try
- {
- UnifiedMetaData wsMetaData = serviceMetaData.getUnifiedMetaData();
- Thread.currentThread().setContextClassLoader(wsMetaData.getClassLoader());
- String serviceName = serviceMetaData.getServiceName().getLocalPart();
-
- JavaToWSDL javaToWSDL = new JavaToWSDL(Constants.NS_WSDL11);
- javaToWSDL.setUnifiedMetaData(wsMetaData);
- javaToWSDL.setQualifiedElements(true);
- WSDLDefinitions wsdlDefinitions = javaToWSDL.generate(wsClass);
-
- ServerConfigFactory factory = ServerConfigFactory.getInstance();
- ServerConfig config = factory.getServerConfig();
- File tmpdir = new File(config.getServerTempDir().getCanonicalPath() + "/jbossws");
- tmpdir.mkdirs();
-
- File wsdlTmpFile = File.createTempFile(serviceName, ".wsdl", tmpdir);
- wsdlTmpFile.deleteOnExit();
-
- Writer writer = IOUtils.getCharsetFileWriter(wsdlTmpFile, Constants.DEFAULT_XML_CHARSET);
- wsdlDefinitions.write(writer, Constants.DEFAULT_XML_CHARSET);
- writer.close();
-
- serviceMetaData.setWsdlFile(wsdlTmpFile.toURL().toExternalForm());
- }
- catch (RuntimeException rte)
- {
- throw rte;
- }
- catch (IOException e)
- {
- throw new WSException("Cannot write generated wsdl", e);
- }
- finally
- {
- Thread.currentThread().setContextClassLoader(ctxLoader);
- }
- }
- }
-
protected void processPortComponent(UnifiedDeploymentInfo udi, Class wsClass, String linkName, ServerEndpointMetaData epMetaData)
{
String contextRoot = null;
@@ -136,12 +86,12 @@
String configName = anPortComponent.configName();
if (configName.length() > 0)
epMetaData.setConfigName(configName);
-
+
// setup config file
String configFile = anPortComponent.configFile();
if (configFile.length() > 0)
epMetaData.setConfigFile(configFile);
-
+
// setup endpoint url
if (anPortComponent.contextRoot().length() > 0)
{
Modified: trunk/src/main/java/org/jboss/ws/deployment/JAXWSMetaDataBuilder.java
===================================================================
--- trunk/src/main/java/org/jboss/ws/deployment/JAXWSMetaDataBuilder.java 2006-10-25 22:10:54 UTC (rev 1313)
+++ trunk/src/main/java/org/jboss/ws/deployment/JAXWSMetaDataBuilder.java 2006-10-26 06:40:22 UTC (rev 1314)
@@ -39,10 +39,4 @@
public JAXWSMetaDataBuilder()
{
}
-
- protected void replaceAddressLocation(ServerEndpointMetaData epMetaData)
- {
- // FIXME: JBWS-1026
- // Remove this method
- }
}
Modified: trunk/src/main/java/org/jboss/ws/deployment/JAXWSProviderMetaDataBuilderJSE.java
===================================================================
--- trunk/src/main/java/org/jboss/ws/deployment/JAXWSProviderMetaDataBuilderJSE.java 2006-10-25 22:10:54 UTC (rev 1313)
+++ trunk/src/main/java/org/jboss/ws/deployment/JAXWSProviderMetaDataBuilderJSE.java 2006-10-26 06:40:22 UTC (rev 1314)
@@ -116,7 +116,7 @@
// implement a typed Provider interface.
if (JavaUtils.isAssignableFrom(Provider.class, sepClass) == false)
throw new WebServiceException("Endpoint implementation does not implement javax.xml.ws.Provider: " + sepClass.getName());
-
+
// 5.4 Conformance (WebServiceProvider annotation): A Provider based service endpoint implementation
// MUST carry a WebServiceProvider annotation
WebServiceProvider anWebServiceProvider = (WebServiceProvider)sepClass.getAnnotation(WebServiceProvider.class);
@@ -169,12 +169,11 @@
// Process invoke method
processInvokeMethod(sepMetaData);
- // Process or generate WSDL
+ // Process WSDL
String wsdlLocation = anWebServiceProvider.wsdlLocation();
+ if (wsdlLocation != null)
+ serviceMetaData.setWsdlFile(wsdlLocation);
- // FIXME: JBWS-1026
- // processOrGenerateWSDL(wsClass, serviceMetaData, wsdlLocation, sepMetaData);
-
// Set the endpoint address
processPortComponent(udi, sepClass, linkName, sepMetaData);
@@ -185,6 +184,13 @@
return sepMetaData;
}
+ @Override
+ protected void replaceAddressLocation(ServerEndpointMetaData epMetaData)
+ {
+ // A provider may not have a WSDL file
+ if (epMetaData.getServiceMetaData().getWsdlFile() != null)
+ super.replaceAddressLocation(epMetaData);
+ }
private void processInvokeMethod(ServerEndpointMetaData epMetaData) throws SecurityException, NoSuchMethodException
{
Modified: trunk/src/main/java/org/jboss/ws/deployment/JSR181MetaDataBuilder.java
===================================================================
--- trunk/src/main/java/org/jboss/ws/deployment/JSR181MetaDataBuilder.java 2006-10-25 22:10:54 UTC (rev 1313)
+++ trunk/src/main/java/org/jboss/ws/deployment/JSR181MetaDataBuilder.java 2006-10-26 06:40:22 UTC (rev 1314)
@@ -774,6 +774,9 @@
String namespace;
String faultBeanName = null;
+ // Only the element name is effected by @WebFault, the type uses the same convention
+ QName xmlType = new QName(omd.getQName().getNamespaceURI(), exception.getSimpleName());
+
/*
* If @WebFault is present, and the exception contains getFaultInfo, the
* return value should be used. Otherwise we need to generate the bean.
@@ -795,16 +798,16 @@
}
else
{
- name = exception.getSimpleName();
- namespace = omd.getQName().getNamespaceURI();
+ name = xmlType.getLocalPart();
+ namespace = xmlType.getNamespaceURI();
}
if (faultBeanName == null)
faultBeanName = JavaUtils.getPackageName(omd.getEndpointMetaData().getServiceEndpointInterface()) + ".jaxws." + exception.getSimpleName() + "Bean";
- QName xmlName = new QName(omd.getQName().getNamespaceURI(), name);
+ QName xmlName = new QName(namespace, name);
- FaultMetaData fmd = new FaultMetaData(omd, xmlName, exception.getName());
+ FaultMetaData fmd = new FaultMetaData(omd, xmlName, xmlType, exception.getName());
fmd.setFaultBeanName(faultBeanName);
if (generate)
Modified: trunk/src/test/ant/build-jars-jaxws.xml
===================================================================
--- trunk/src/test/ant/build-jars-jaxws.xml 2006-10-25 22:10:54 UTC (rev 1313)
+++ trunk/src/test/ant/build-jars-jaxws.xml 2006-10-26 06:40:22 UTC (rev 1314)
@@ -298,6 +298,9 @@
<include name="org/jboss/test/ws/jaxws/provider/UserType.class"/>
<include name="org/jboss/test/ws/jaxws/provider/package-info.class"/>
</classes>
+ <webinf dir="${build.test.dir}/resources/jaxws/provider/shared">
+ <include name="wsdl/Provider.wsdl"/>
+ </webinf>
</war>
<!-- jaxws-provider-message -->
@@ -305,6 +308,9 @@
<classes dir="${build.test.dir}/classes">
<include name="org/jboss/test/ws/jaxws/provider/ProviderBeanMessage.class"/>
</classes>
+ <webinf dir="${build.test.dir}/resources/jaxws/provider/shared">
+ <include name="wsdl/Provider.wsdl"/>
+ </webinf>
</war>
<!-- jaxws-provider-payload -->
@@ -312,6 +318,9 @@
<classes dir="${build.test.dir}/classes">
<include name="org/jboss/test/ws/jaxws/provider/ProviderBeanPayload.class"/>
</classes>
+ <webinf dir="${build.test.dir}/resources/jaxws/provider/shared">
+ <include name="wsdl/Provider.wsdl"/>
+ </webinf>
</war>
<!-- jaxws-samples-jsr181ejb -->
Modified: trunk/src/test/java/org/jboss/test/ws/jaxws/provider/ProviderBeanJAXB.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxws/provider/ProviderBeanJAXB.java 2006-10-25 22:10:54 UTC (rev 1313)
+++ trunk/src/test/java/org/jboss/test/ws/jaxws/provider/ProviderBeanJAXB.java 2006-10-26 06:40:22 UTC (rev 1314)
@@ -42,23 +42,27 @@
* @author Thomas.Diesler(a)jboss.org
* @since 29-Jun-2006
*/
-@WebServiceProvider
+@WebServiceProvider(
+ serviceName = "ProviderService",
+ portName = "ProviderPort",
+ targetNamespace = "http://org.jboss.ws/provider",
+ wsdlLocation = "WEB-INF/wsdl/Provider.wsdl")
@ServiceMode(value = Service.Mode.PAYLOAD)
public class ProviderBeanJAXB implements Provider<Source>
{
// provide logging
private static Logger log = Logger.getLogger(ProviderBeanJAXB.class);
-
+
public Source invoke(Source request)
{
try
{
JAXBContext jc = JAXBContext.newInstance(UserType.class.getPackage().getName());
JAXBElement reqElement = (JAXBElement)jc.createUnmarshaller().unmarshal(request);
-
+
UserType user = (UserType)reqElement.getValue();
log.info("[string=" + user.getString() + ",qname=" + user.getQname() + "]");
-
+
JAXBElement resElement = new JAXBElement(new QName("http://org.jboss.ws/provider", "user"), UserType.class, user);
return new JAXBSource(jc, resElement);
}
Modified: trunk/src/test/java/org/jboss/test/ws/jaxws/provider/ProviderBeanMessage.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxws/provider/ProviderBeanMessage.java 2006-10-25 22:10:54 UTC (rev 1313)
+++ trunk/src/test/java/org/jboss/test/ws/jaxws/provider/ProviderBeanMessage.java 2006-10-26 06:40:22 UTC (rev 1314)
@@ -35,7 +35,11 @@
* @author Thomas.Diesler(a)jboss.org
* @since 29-Jun-2006
*/
-@WebServiceProvider
+@WebServiceProvider(
+ serviceName = "ProviderService",
+ portName = "ProviderPort",
+ targetNamespace = "http://org.jboss.ws/provider",
+ wsdlLocation = "WEB-INF/wsdl/Provider.wsdl")
@ServiceMode(value = Service.Mode.MESSAGE)
public class ProviderBeanMessage implements Provider<SOAPMessage>
{
Modified: trunk/src/test/java/org/jboss/test/ws/jaxws/provider/ProviderBeanPayload.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxws/provider/ProviderBeanPayload.java 2006-10-25 22:10:54 UTC (rev 1313)
+++ trunk/src/test/java/org/jboss/test/ws/jaxws/provider/ProviderBeanPayload.java 2006-10-26 06:40:22 UTC (rev 1314)
@@ -41,8 +41,12 @@
* @author Thomas.Diesler(a)jboss.org
* @since 29-Jun-2006
*/
-@WebServiceProvider
-// in absence PAYLOAD is implicit
+@WebServiceProvider(
+ serviceName = "ProviderService",
+ portName = "ProviderPort",
+ targetNamespace = "http://org.jboss.ws/provider",
+ wsdlLocation = "WEB-INF/wsdl/Provider.wsdl")
+// in absence PAYLOAD is implicit
// @ServiceMode(value = Service.Mode.PAYLOAD)
public class ProviderBeanPayload implements Provider<Source>
{
Modified: trunk/src/test/java/org/jboss/test/ws/jaxws/provider/ProviderJAXBTestCase.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxws/provider/ProviderJAXBTestCase.java 2006-10-25 22:10:54 UTC (rev 1313)
+++ trunk/src/test/java/org/jboss/test/ws/jaxws/provider/ProviderJAXBTestCase.java 2006-10-26 06:40:22 UTC (rev 1314)
@@ -40,6 +40,8 @@
import org.jboss.test.ws.JBossWSTest;
import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
+import org.jboss.ws.metadata.wsdl.WSDLDefinitionsFactory;
import org.w3c.dom.Element;
/**
@@ -57,26 +59,23 @@
public void testWSDLAccess() throws Exception
{
- System.out.println("FIXME: JBWS-1026");
- /*
URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-provider-jaxb?wsdl");
WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance();
WSDLDefinitions wsdlDefinitions = factory.parse(wsdlURL);
assertNotNull(wsdlDefinitions);
- */
}
-
+
public void testProviderMessage() throws Exception
{
- String reqString =
- "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>" +
- " <env:Header/>" +
- " <env:Body>" +
- " <ns1:user xmlns:ns1='http://org.jboss.ws/provider'>" +
- " <ns1:string>Kermit</ns1:string>" +
- " <ns1:qname>The Frog</ns1:qname>" +
- " </ns1:user>" +
- " </env:Body>" +
+ String reqString =
+ "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>" +
+ " <env:Header/>" +
+ " <env:Body>" +
+ " <ns1:user xmlns:ns1='http://org.jboss.ws/provider'>" +
+ " <ns1:string>Kermit</ns1:string>" +
+ " <ns1:qname>The Frog</ns1:qname>" +
+ " </ns1:user>" +
+ " </env:Body>" +
"</env:Envelope>";
MessageFactory msgFactory = MessageFactory.newInstance();
@@ -86,12 +85,12 @@
URL epURL = new URL("http://" + getServerHost() + ":8080/jaxws-provider-jaxb");
SOAPMessage resMsg = con.call(reqMsg, epURL);
SOAPEnvelope resEnv = resMsg.getSOAPPart().getEnvelope();
-
+
Element child = (Element)resEnv.getBody().getChildElements().next();
JAXBContext jc = JAXBContext.newInstance(UserType.class.getPackage().getName());
JAXBElement jaxbEl = (JAXBElement)jc.createUnmarshaller().unmarshal(new DOMSource(child));
UserType user = (UserType)jaxbEl.getValue();
-
+
assertEquals("Kermit", user.getString());
assertEquals(new QName("The Frog"), user.getQname());
}
Modified: trunk/src/test/java/org/jboss/test/ws/jaxws/provider/ProviderMessageTestCase.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxws/provider/ProviderMessageTestCase.java 2006-10-25 22:10:54 UTC (rev 1313)
+++ trunk/src/test/java/org/jboss/test/ws/jaxws/provider/ProviderMessageTestCase.java 2006-10-26 06:40:22 UTC (rev 1314)
@@ -36,6 +36,8 @@
import org.jboss.test.ws.JBossWSTest;
import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
+import org.jboss.ws.metadata.wsdl.WSDLDefinitionsFactory;
/**
* Test a Provider<SOAPMessage>
@@ -52,23 +54,20 @@
public void testWSDLAccess() throws Exception
{
- System.out.println("FIXME: JBWS-1026");
- /*
URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-provider-message?wsdl");
WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance();
WSDLDefinitions wsdlDefinitions = factory.parse(wsdlURL);
assertNotNull(wsdlDefinitions);
- */
}
-
+
public void testProviderMessage() throws Exception
{
- String msgString =
- "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>" +
- " <env:Header/>" +
- " <env:Body>" +
- " <ns1:somePayload xmlns:ns1='http://org.jboss.ws/provider'/>" +
- " </env:Body>" +
+ String msgString =
+ "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>" +
+ " <env:Header/>" +
+ " <env:Body>" +
+ " <ns1:somePayload xmlns:ns1='http://org.jboss.ws/provider'/>" +
+ " </env:Body>" +
"</env:Envelope>";
MessageFactory msgFactory = MessageFactory.newInstance();
@@ -79,7 +78,7 @@
URL epURL = new URL("http://" + getServerHost() + ":8080/jaxws-provider-message");
SOAPMessage resMsg = con.call(reqMsg, epURL);
SOAPEnvelope resEnv = resMsg.getSOAPPart().getEnvelope();
-
+
assertEquals(reqEnv, resEnv);
}
}
Modified: trunk/src/test/java/org/jboss/test/ws/jaxws/provider/ProviderPayloadTestCase.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxws/provider/ProviderPayloadTestCase.java 2006-10-25 22:10:54 UTC (rev 1313)
+++ trunk/src/test/java/org/jboss/test/ws/jaxws/provider/ProviderPayloadTestCase.java 2006-10-26 06:40:22 UTC (rev 1314)
@@ -36,6 +36,8 @@
import org.jboss.test.ws.JBossWSTest;
import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
+import org.jboss.ws.metadata.wsdl.WSDLDefinitionsFactory;
/**
* Test a Provider<SOAPMessage>
@@ -52,23 +54,20 @@
public void testWSDLAccess() throws Exception
{
- System.out.println("FIXME: JBWS-1026");
- /*
URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-provider-payload?wsdl");
WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance();
WSDLDefinitions wsdlDefinitions = factory.parse(wsdlURL);
assertNotNull(wsdlDefinitions);
- */
}
-
+
public void testProviderMessage() throws Exception
{
- String reqString =
- "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>" +
- " <env:Header/>" +
- " <env:Body>" +
- " <ns1:somePayload xmlns:ns1='http://org.jboss.ws/provider'/>" +
- " </env:Body>" +
+ String reqString =
+ "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>" +
+ " <env:Header/>" +
+ " <env:Body>" +
+ " <ns1:somePayload xmlns:ns1='http://org.jboss.ws/provider'/>" +
+ " </env:Body>" +
"</env:Envelope>";
MessageFactory msgFactory = MessageFactory.newInstance();
@@ -79,7 +78,7 @@
URL epURL = new URL("http://" + getServerHost() + ":8080/jaxws-provider-payload");
SOAPMessage resMsg = con.call(reqMsg, epURL);
SOAPEnvelope resEnv = resMsg.getSOAPPart().getEnvelope();
-
+
assertEquals(reqEnv, resEnv);
}
}
Added: trunk/src/test/resources/jaxws/provider/shared/wsdl/Provider.wsdl
===================================================================
--- trunk/src/test/resources/jaxws/provider/shared/wsdl/Provider.wsdl 2006-10-25 22:10:54 UTC (rev 1313)
+++ trunk/src/test/resources/jaxws/provider/shared/wsdl/Provider.wsdl 2006-10-26 06:40:22 UTC (rev 1314)
@@ -0,0 +1,43 @@
+<?xml version='1.0'?>
+<definitions name='ProviderService' targetNamespace='http://org.jboss.ws/provider' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.ws/provider' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+ <types>
+ <xs:schema targetNamespace='http://org.jboss.ws/provider' xmlns:tns='http://org.jboss.ws/provider' version='1.0' xmlns:xs='http://www.w3.org/2001/XMLSchema'>
+ <xs:element name='user' type='tns:UserType'/>
+ <xs:complexType name='UserType'>
+ <xs:sequence>
+ <xs:element name='string' type='xs:string'/>
+ <xs:element name='qname' type='xs:QName'/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:schema>
+ </types>
+ <message name='echo'>
+ <part element='tns:user' name='user'/>
+ </message>
+ <message name='echoResponse'>
+ <part element='tns:user' name='user'/>
+ </message>
+ <portType name='Provider'>
+ <operation name='echo'>
+ <input message='tns:echo'/>
+ <output message='tns:echoResponse'/>
+ </operation>
+ </portType>
+ <binding name='ProviderBinding' type='tns:Provider'>
+ <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/>
+ <operation name='echo'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body use='literal'/>
+ </input>
+ <output>
+ <soap:body use='literal'/>
+ </output>
+ </operation>
+ </binding>
+ <service name='ProviderService'>
+ <port binding='tns:ProviderBinding' name='ProviderPort'>
+ <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
+ </port>
+ </service>
+</definitions>
Property changes on: trunk/src/test/resources/jaxws/provider/shared/wsdl/Provider.wsdl
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
18 years, 2 months
- 1
- 0
JBossWS SVN: r1313 - in trunk/src/test/java/org/jboss/test/ws/jaxrpc: jbws1205 webserviceref wsse
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2006-10-25 18:10:54 -0400 (Wed, 25 Oct 2006)
New Revision: 1313
Modified:
trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/JBWS1205TestCase.java
trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/WebServiceRefServletTestCase.java
trunk/src/test/java/org/jboss/test/ws/jaxrpc/wsse/WebClientTestCase.java
Log:
Add FIXME JBAS-3350
Modified: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/JBWS1205TestCase.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/JBWS1205TestCase.java 2006-10-25 21:58:28 UTC (rev 1312)
+++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/JBWS1205TestCase.java 2006-10-25 22:10:54 UTC (rev 1313)
@@ -57,6 +57,7 @@
public void testEndpoint() throws Exception
{
- port.performTest();
+ System.out.println("FIXME: JBAS-3350");
+ //port.performTest();
}
}
Modified: trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/WebServiceRefServletTestCase.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/WebServiceRefServletTestCase.java 2006-10-25 21:58:28 UTC (rev 1312)
+++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/WebServiceRefServletTestCase.java 2006-10-25 22:10:54 UTC (rev 1313)
@@ -77,8 +77,9 @@
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);
+ System.out.println("FIXME: JBAS-3350");
+// BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()));
+// String retStr = br.readLine();
+// assertEquals("HelloWorld", retStr);
}
}
Modified: trunk/src/test/java/org/jboss/test/ws/jaxrpc/wsse/WebClientTestCase.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxrpc/wsse/WebClientTestCase.java 2006-10-25 21:58:28 UTC (rev 1312)
+++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/wsse/WebClientTestCase.java 2006-10-25 22:10:54 UTC (rev 1313)
@@ -49,10 +49,9 @@
public void testWebClient() throws Exception
{
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();
- br.close();
-
- assertEquals("Hello", res);
+ System.out.println("FIXME: JBAS-3350");
+// BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()));
+// String res = br.readLine();
+// assertEquals("Hello", res);
}
}
18 years, 2 months
- 1
- 0
JBossWS SVN: r1312 - in branches/jbossws-1.0/src/test: ant java/org/jboss/test/ws/jaxrpc java/org/jboss/test/ws/jaxrpc/webserviceref resources/jaxrpc resources/jaxrpc/webserviceref resources/jaxrpc/webserviceref/META-INF resources/jaxrpc/webserviceref/META-INF/wsdl resources/jaxrpc/webserviceref/WEB-INF resources/jaxrpc/webserviceref/servlet-client resources/jaxrpc/webserviceref/servlet-client/WEB-INF
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2006-10-25 17:58:28 -0400 (Wed, 25 Oct 2006)
New Revision: 1312
Added:
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/ApplicationClient.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/EJBClient.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/EJBRemote.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/EJBRemoteHome.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/ServletClient.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/TestEndpoint.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/TestEndpointImpl.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/TestEndpointService.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/WebServiceRefClientTestCase.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/WebServiceRefEJBTestCase.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/WebServiceRefServletTestCase.java
branches/jbossws-1.0/src/test/resources/jaxrpc/webserviceref/
branches/jbossws-1.0/src/test/resources/jaxrpc/webserviceref/META-INF/
branches/jbossws-1.0/src/test/resources/jaxrpc/webserviceref/META-INF/application-client.xml
branches/jbossws-1.0/src/test/resources/jaxrpc/webserviceref/META-INF/ejb-jar.xml
branches/jbossws-1.0/src/test/resources/jaxrpc/webserviceref/META-INF/jaxrpc-mapping.xml
branches/jbossws-1.0/src/test/resources/jaxrpc/webserviceref/META-INF/jboss-client.xml
branches/jbossws-1.0/src/test/resources/jaxrpc/webserviceref/META-INF/wsdl/
branches/jbossws-1.0/src/test/resources/jaxrpc/webserviceref/META-INF/wsdl/TestEndpoint.wsdl
branches/jbossws-1.0/src/test/resources/jaxrpc/webserviceref/WEB-INF/
branches/jbossws-1.0/src/test/resources/jaxrpc/webserviceref/WEB-INF/web.xml
branches/jbossws-1.0/src/test/resources/jaxrpc/webserviceref/WEB-INF/webservices.xml
branches/jbossws-1.0/src/test/resources/jaxrpc/webserviceref/servlet-client/
branches/jbossws-1.0/src/test/resources/jaxrpc/webserviceref/servlet-client/WEB-INF/
branches/jbossws-1.0/src/test/resources/jaxrpc/webserviceref/servlet-client/WEB-INF/web.xml
branches/jbossws-1.0/src/test/resources/jaxrpc/webserviceref/wstools-java-wsdl.xml
branches/jbossws-1.0/src/test/resources/jaxrpc/webserviceref/wstools-wsdl-java.xml
Removed:
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/ApplicationClient.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/EJBClient.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/EJBRemote.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/EJBRemoteHome.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/ServletClient.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/TestEndpoint.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/TestEndpointImpl.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/TestEndpointService.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/WebServiceRefClientTestCase.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/WebServiceRefEJBTestCase.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/WebServiceRefServletTestCase.java
branches/jbossws-1.0/src/test/resources/jaxrpc/webserviceref/META-INF/
branches/jbossws-1.0/src/test/resources/jaxrpc/webserviceref/META-INF/application-client.xml
branches/jbossws-1.0/src/test/resources/jaxrpc/webserviceref/META-INF/ejb-jar.xml
branches/jbossws-1.0/src/test/resources/jaxrpc/webserviceref/META-INF/jaxrpc-mapping.xml
branches/jbossws-1.0/src/test/resources/jaxrpc/webserviceref/META-INF/jboss-client.xml
branches/jbossws-1.0/src/test/resources/jaxrpc/webserviceref/META-INF/wsdl/
branches/jbossws-1.0/src/test/resources/jaxrpc/webserviceref/META-INF/wsdl/TestEndpoint.wsdl
branches/jbossws-1.0/src/test/resources/jaxrpc/webserviceref/WEB-INF/
branches/jbossws-1.0/src/test/resources/jaxrpc/webserviceref/WEB-INF/web.xml
branches/jbossws-1.0/src/test/resources/jaxrpc/webserviceref/WEB-INF/webservices.xml
branches/jbossws-1.0/src/test/resources/jaxrpc/webserviceref/servlet-client/
branches/jbossws-1.0/src/test/resources/jaxrpc/webserviceref/servlet-client/WEB-INF/
branches/jbossws-1.0/src/test/resources/jaxrpc/webserviceref/servlet-client/WEB-INF/web.xml
branches/jbossws-1.0/src/test/resources/jaxrpc/webserviceref/wstools-java-wsdl.xml
branches/jbossws-1.0/src/test/resources/jaxrpc/webserviceref/wstools-wsdl-java.xml
Modified:
branches/jbossws-1.0/src/test/ant/build-jars-jaxrpc.xml
Log:
Add jaxrpc <service-ref> test
Modified: branches/jbossws-1.0/src/test/ant/build-jars-jaxrpc.xml
===================================================================
--- branches/jbossws-1.0/src/test/ant/build-jars-jaxrpc.xml 2006-10-25 21:53:05 UTC (rev 1311)
+++ branches/jbossws-1.0/src/test/ant/build-jars-jaxrpc.xml 2006-10-25 21:58:28 UTC (rev 1312)
@@ -1624,6 +1624,59 @@
</metainf>
</jar>
+ <!-- jaxrpc-webserviceref -->
+ <war warfile="${build.test.dir}/libs/jaxrpc-webserviceref.war" webxml="${build.test.dir}/resources/jaxrpc/webserviceref/WEB-INF/web.xml">
+ <classes dir="${build.test.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/webserviceref/TestEndpointImpl.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/webserviceref/TestEndpoint.class"/>
+ </classes>
+ <webinf dir="${build.test.dir}/resources/jaxrpc/webserviceref/META-INF">
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </webinf>
+ <webinf dir="${build.test.dir}/resources/jaxrpc/webserviceref/WEB-INF">
+ <include name="webservices.xml"/>
+ </webinf>
+ </war>
+ <jar destfile="${build.test.dir}/libs/jaxrpc-webserviceref-client.jar">
+ <fileset dir="${build.test.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"/>
+ </fileset>
+ <metainf dir="${build.test.dir}/resources/jaxrpc/webserviceref/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </metainf>
+ </jar>
+ <war destfile="${build.test.dir}/libs/jaxrpc-webserviceref-servlet-client.war" webxml="${build.test.dir}/resources/jaxrpc/webserviceref/servlet-client/WEB-INF/web.xml">
+ <classes dir="${build.test.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"/>
+ </classes>
+ <webinf dir="${build.test.dir}/resources/jaxrpc/webserviceref/META-INF">
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </webinf>
+ </war>
+ <jar destfile="${build.test.dir}/libs/jaxrpc-webserviceref-ejb-client.jar">
+ <fileset dir="${build.test.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"/>
+ </fileset>
+ <metainf dir="${build.test.dir}/resources/jaxrpc/webserviceref/META-INF">
+ <include name="ejb-jar.xml"/>
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </metainf>
+ </jar>
+
<!-- jaxrpc-wseventing -->
<war warfile="${build.test.dir}/libs/jaxrpc-wseventing.war" webxml="${build.test.dir}/resources/jaxrpc/wseventing/WEB-INF/web.xml">
<classes dir="${build.test.dir}/classes">
Copied: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref (from rev 1310, trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref)
Deleted: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/ApplicationClient.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/ApplicationClient.java 2006-10-25 21:39:42 UTC (rev 1310)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/ApplicationClient.java 2006-10-25 21:58:28 UTC (rev 1312)
@@ -1,67 +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.webserviceref;
-
-import java.rmi.RemoteException;
-import java.util.ArrayList;
-
-import javax.naming.InitialContext;
-import javax.xml.rpc.Service;
-import javax.xml.ws.WebServiceException;
-
-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<TestEndpoint> ports = new ArrayList<TestEndpoint>();
- 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 WebServiceException(ex);
- }
-
- for (TestEndpoint port : ports)
- {
- String outStr = port.echo(inStr);
- if (inStr.equals(outStr) == false)
- throw new WebServiceException("Invalid echo return: " + inStr);
- }
-
- retStr = inStr;
- }
-}
Copied: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/ApplicationClient.java (from rev 1310, trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/ApplicationClient.java)
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/ApplicationClient.java 2006-10-25 21:39:42 UTC (rev 1310)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/ApplicationClient.java 2006-10-25 21:58:28 UTC (rev 1312)
@@ -0,0 +1,67 @@
+/*
+ * 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.webserviceref;
+
+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<TestEndpoint> ports = new ArrayList<TestEndpoint>();
+ 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 (TestEndpoint port : ports)
+ {
+ String outStr = port.echo(inStr);
+ if (inStr.equals(outStr) == false)
+ throw new JAXRPCException("Invalid echo return: " + inStr);
+ }
+
+ retStr = inStr;
+ }
+}
Deleted: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/EJBClient.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/EJBClient.java 2006-10-25 21:39:42 UTC (rev 1310)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/EJBClient.java 2006-10-25 21:58:28 UTC (rev 1312)
@@ -1,92 +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.webserviceref;
-
-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<TestEndpoint> ports = new ArrayList<TestEndpoint>();
- 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 (TestEndpoint port : ports)
- {
- 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.0/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/EJBClient.java (from rev 1310, trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/EJBClient.java)
Deleted: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/EJBRemote.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/EJBRemote.java 2006-10-25 21:39:42 UTC (rev 1310)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/EJBRemote.java 2006-10-25 21:58:28 UTC (rev 1312)
@@ -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.webserviceref;
-
-import java.rmi.RemoteException;
-
-import javax.ejb.EJBObject;
-
-public interface EJBRemote extends EJBObject
-{
- String echo(String input) throws RemoteException;
-}
Copied: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/EJBRemote.java (from rev 1310, trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/EJBRemote.java)
Deleted: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/EJBRemoteHome.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/EJBRemoteHome.java 2006-10-25 21:39:42 UTC (rev 1310)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/EJBRemoteHome.java 2006-10-25 21:58:28 UTC (rev 1312)
@@ -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.webserviceref;
-
-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.0/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/EJBRemoteHome.java (from rev 1310, trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/EJBRemoteHome.java)
Deleted: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/ServletClient.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/ServletClient.java 2006-10-25 21:39:42 UTC (rev 1310)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/ServletClient.java 2006-10-25 21:58:28 UTC (rev 1312)
@@ -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.webserviceref;
-
-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.Service;
-import javax.xml.ws.WebServiceException;
-
-import org.jboss.logging.Logger;
-
-public class ServletClient extends HttpServlet
-{
- // Provide logging
- private static Logger log = Logger.getLogger(ServletClient.class);
-
- @Override
- protected void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException
- {
- String inStr = req.getParameter("echo");
- log.info("doGet: " + inStr);
-
- ArrayList<TestEndpoint> ports = new ArrayList<TestEndpoint>();
- 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 WebServiceException(ex);
- }
-
- for (TestEndpoint port : ports)
- {
- String outStr = port.echo(inStr);
- if (inStr.equals(outStr) == false)
- throw new WebServiceException("Invalid echo return: " + inStr);
- }
-
- res.getWriter().print(inStr);
- }
-}
Copied: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/ServletClient.java (from rev 1310, trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/ServletClient.java)
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/ServletClient.java 2006-10-25 21:39:42 UTC (rev 1310)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/ServletClient.java 2006-10-25 21:58:28 UTC (rev 1312)
@@ -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.webserviceref;
+
+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);
+
+ @Override
+ protected void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException
+ {
+ String inStr = req.getParameter("echo");
+ log.info("doGet: " + inStr);
+
+ ArrayList<TestEndpoint> ports = new ArrayList<TestEndpoint>();
+ 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 (TestEndpoint port : ports)
+ {
+ 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.0/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/TestEndpoint.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/TestEndpoint.java 2006-10-25 21:39:42 UTC (rev 1310)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/TestEndpoint.java 2006-10-25 21:58:28 UTC (rev 1312)
@@ -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.webserviceref;
-
-import java.rmi.Remote;
-import java.rmi.RemoteException;
-
-
-public interface TestEndpoint extends Remote
-{
- String echo(String arg0) throws RemoteException;
-}
Copied: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/TestEndpoint.java (from rev 1310, trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/TestEndpoint.java)
Deleted: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/TestEndpointImpl.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/TestEndpointImpl.java 2006-10-25 21:39:42 UTC (rev 1310)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/TestEndpointImpl.java 2006-10-25 21:58:28 UTC (rev 1312)
@@ -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.webserviceref;
-
-import org.jboss.logging.Logger;
-
-/**
- * Test the JAXRPC <service-ref>
- *
- * @author Thomas.Diesler(a)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.0/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/TestEndpointImpl.java (from rev 1310, trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/TestEndpointImpl.java)
Deleted: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/TestEndpointService.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/TestEndpointService.java 2006-10-25 21:39:42 UTC (rev 1310)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/TestEndpointService.java 2006-10-25 21:58:28 UTC (rev 1312)
@@ -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.webserviceref;
-
-
-import javax.xml.rpc.*;
-
-
-public interface TestEndpointService extends javax.xml.rpc.Service
-{
-
- public org.jboss.test.ws.jaxrpc.webserviceref.TestEndpoint getTestEndpointPort() throws ServiceException;
-
-}
Copied: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/TestEndpointService.java (from rev 1310, trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/TestEndpointService.java)
Deleted: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/WebServiceRefClientTestCase.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/WebServiceRefClientTestCase.java 2006-10-25 21:39:42 UTC (rev 1310)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/WebServiceRefClientTestCase.java 2006-10-25 21:58:28 UTC (rev 1312)
@@ -1,82 +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.webserviceref;
-
-import java.io.File;
-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.jaxrpc.ServiceFactoryImpl;
-import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
-import org.jboss.ws.metadata.wsdl.WSDLDefinitionsFactory;
-
-/**
- * Test the JAXRPC <service-ref>
- *
- * @author Thomas.Diesler(a)jboss.com
- * @since 23-Oct-2005
- */
-public class WebServiceRefClientTestCase extends JBossWSTest
-{
- public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxrpc-webserviceref";
-
- public static Test suite()
- {
- return JBossWSTestSetup.newTestSetup(WebServiceRefClientTestCase.class, "jaxrpc-webserviceref.war, jaxrpc-webserviceref-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/webserviceref/META-INF/wsdl/TestEndpoint.wsdl").toURL();
- URL mappingURL = new File("resources/jaxrpc/webserviceref/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 testApplicationClient() throws Exception
- {
- String helloWorld = "Hello World!";
- ApplicationClient.encCtx = getInitialContext();
- ApplicationClient.main(new String[]{helloWorld});
- assertEquals(helloWorld, ApplicationClient.retStr);
- }
-}
Copied: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/WebServiceRefClientTestCase.java (from rev 1310, trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/WebServiceRefClientTestCase.java)
Deleted: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/WebServiceRefEJBTestCase.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/WebServiceRefEJBTestCase.java 2006-10-25 21:39:42 UTC (rev 1310)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/WebServiceRefEJBTestCase.java 2006-10-25 21:58:28 UTC (rev 1312)
@@ -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.webserviceref;
-
-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.jaxrpc.ServiceFactoryImpl;
-import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
-import org.jboss.ws.metadata.wsdl.WSDLDefinitionsFactory;
-
-/**
- * Test the JAXRPC <service-ref>
- *
- * @author Thomas.Diesler(a)jboss.com
- * @since 23-Oct-2005
- */
-public class WebServiceRefEJBTestCase extends JBossWSTest
-{
- public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxrpc-webserviceref";
-
- public static Test suite()
- {
- return JBossWSTestSetup.newTestSetup(WebServiceRefEJBTestCase.class, "jaxrpc-webserviceref.war, jaxrpc-webserviceref-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/webserviceref/META-INF/wsdl/TestEndpoint.wsdl").toURL();
- URL mappingURL = new File("resources/jaxrpc/webserviceref/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.0/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/WebServiceRefEJBTestCase.java (from rev 1310, trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/WebServiceRefEJBTestCase.java)
Deleted: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/WebServiceRefServletTestCase.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/WebServiceRefServletTestCase.java 2006-10-25 21:39:42 UTC (rev 1310)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/WebServiceRefServletTestCase.java 2006-10-25 21:58:28 UTC (rev 1312)
@@ -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.webserviceref;
-
-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.jaxrpc.ServiceFactoryImpl;
-import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
-import org.jboss.ws.metadata.wsdl.WSDLDefinitionsFactory;
-
-/**
- * Test the JAXRPC <service-ref>
- *
- * @author Thomas.Diesler(a)jboss.com
- * @since 23-Oct-2005
- */
-public class WebServiceRefServletTestCase extends JBossWSTest
-{
- public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxrpc-webserviceref";
-
- public static Test suite()
- {
- return JBossWSTestSetup.newTestSetup(WebServiceRefServletTestCase.class, "jaxrpc-webserviceref.war, jaxrpc-webserviceref-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/webserviceref/META-INF/wsdl/TestEndpoint.wsdl").toURL();
- URL mappingURL = new File("resources/jaxrpc/webserviceref/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.0/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/WebServiceRefServletTestCase.java (from rev 1310, trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/WebServiceRefServletTestCase.java)
Copied: branches/jbossws-1.0/src/test/resources/jaxrpc/webserviceref (from rev 1310, trunk/src/test/resources/jaxrpc/webserviceref)
Copied: branches/jbossws-1.0/src/test/resources/jaxrpc/webserviceref/META-INF (from rev 1310, trunk/src/test/resources/jaxrpc/webserviceref/META-INF)
Deleted: branches/jbossws-1.0/src/test/resources/jaxrpc/webserviceref/META-INF/application-client.xml
===================================================================
--- trunk/src/test/resources/jaxrpc/webserviceref/META-INF/application-client.xml 2006-10-25 21:39:42 UTC (rev 1310)
+++ branches/jbossws-1.0/src/test/resources/jaxrpc/webserviceref/META-INF/application-client.xml 2006-10-25 21:58:28 UTC (rev 1312)
@@ -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.webserviceref.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>
- <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>
- </port-component-ref>
- </service-ref>
-
-</application-client>
-
Copied: branches/jbossws-1.0/src/test/resources/jaxrpc/webserviceref/META-INF/application-client.xml (from rev 1310, trunk/src/test/resources/jaxrpc/webserviceref/META-INF/application-client.xml)
Deleted: branches/jbossws-1.0/src/test/resources/jaxrpc/webserviceref/META-INF/ejb-jar.xml
===================================================================
--- trunk/src/test/resources/jaxrpc/webserviceref/META-INF/ejb-jar.xml 2006-10-25 21:39:42 UTC (rev 1310)
+++ branches/jbossws-1.0/src/test/resources/jaxrpc/webserviceref/META-INF/ejb-jar.xml 2006-10-25 21:58:28 UTC (rev 1312)
@@ -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.webserviceref.EJBRemoteHome</home>
- <remote>org.jboss.test.ws.jaxrpc.webserviceref.EJBRemote</remote>
- <ejb-class>org.jboss.test.ws.jaxrpc.webserviceref.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.webserviceref.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>
- <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>
- </port-component-ref>
- </service-ref>
-
- </session>
- </enterprise-beans>
-
-</ejb-jar>
-
Copied: branches/jbossws-1.0/src/test/resources/jaxrpc/webserviceref/META-INF/ejb-jar.xml (from rev 1310, trunk/src/test/resources/jaxrpc/webserviceref/META-INF/ejb-jar.xml)
Deleted: branches/jbossws-1.0/src/test/resources/jaxrpc/webserviceref/META-INF/jaxrpc-mapping.xml
===================================================================
--- trunk/src/test/resources/jaxrpc/webserviceref/META-INF/jaxrpc-mapping.xml 2006-10-25 21:39:42 UTC (rev 1310)
+++ branches/jbossws-1.0/src/test/resources/jaxrpc/webserviceref/META-INF/jaxrpc-mapping.xml 2006-10-25 21:58:28 UTC (rev 1312)
@@ -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.webserviceref</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>
- <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.webserviceref.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.0/src/test/resources/jaxrpc/webserviceref/META-INF/jaxrpc-mapping.xml (from rev 1310, trunk/src/test/resources/jaxrpc/webserviceref/META-INF/jaxrpc-mapping.xml)
Deleted: branches/jbossws-1.0/src/test/resources/jaxrpc/webserviceref/META-INF/jboss-client.xml
===================================================================
--- trunk/src/test/resources/jaxrpc/webserviceref/META-INF/jboss-client.xml 2006-10-25 21:39:42 UTC (rev 1310)
+++ branches/jbossws-1.0/src/test/resources/jaxrpc/webserviceref/META-INF/jboss-client.xml 2006-10-25 21:58:28 UTC (rev 1312)
@@ -1,9 +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.0/src/test/resources/jaxrpc/webserviceref/META-INF/jboss-client.xml (from rev 1310, trunk/src/test/resources/jaxrpc/webserviceref/META-INF/jboss-client.xml)
Copied: branches/jbossws-1.0/src/test/resources/jaxrpc/webserviceref/META-INF/wsdl (from rev 1310, trunk/src/test/resources/jaxrpc/webserviceref/META-INF/wsdl)
Deleted: branches/jbossws-1.0/src/test/resources/jaxrpc/webserviceref/META-INF/wsdl/TestEndpoint.wsdl
===================================================================
--- trunk/src/test/resources/jaxrpc/webserviceref/META-INF/wsdl/TestEndpoint.wsdl 2006-10-25 21:39:42 UTC (rev 1310)
+++ branches/jbossws-1.0/src/test/resources/jaxrpc/webserviceref/META-INF/wsdl/TestEndpoint.wsdl 2006-10-25 21:58:28 UTC (rev 1312)
@@ -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-webserviceref'/>
- </port>
- </service>
-</definitions>
\ No newline at end of file
Copied: branches/jbossws-1.0/src/test/resources/jaxrpc/webserviceref/META-INF/wsdl/TestEndpoint.wsdl (from rev 1310, trunk/src/test/resources/jaxrpc/webserviceref/META-INF/wsdl/TestEndpoint.wsdl)
Copied: branches/jbossws-1.0/src/test/resources/jaxrpc/webserviceref/WEB-INF (from rev 1310, trunk/src/test/resources/jaxrpc/webserviceref/WEB-INF)
Deleted: branches/jbossws-1.0/src/test/resources/jaxrpc/webserviceref/WEB-INF/web.xml
===================================================================
--- trunk/src/test/resources/jaxrpc/webserviceref/WEB-INF/web.xml 2006-10-25 21:39:42 UTC (rev 1310)
+++ branches/jbossws-1.0/src/test/resources/jaxrpc/webserviceref/WEB-INF/web.xml 2006-10-25 21:58:28 UTC (rev 1312)
@@ -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.webserviceref.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.0/src/test/resources/jaxrpc/webserviceref/WEB-INF/web.xml (from rev 1310, trunk/src/test/resources/jaxrpc/webserviceref/WEB-INF/web.xml)
Deleted: branches/jbossws-1.0/src/test/resources/jaxrpc/webserviceref/WEB-INF/webservices.xml
===================================================================
--- trunk/src/test/resources/jaxrpc/webserviceref/WEB-INF/webservices.xml 2006-10-25 21:39:42 UTC (rev 1310)
+++ branches/jbossws-1.0/src/test/resources/jaxrpc/webserviceref/WEB-INF/webservices.xml 2006-10-25 21:58:28 UTC (rev 1312)
@@ -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.webserviceref.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.0/src/test/resources/jaxrpc/webserviceref/WEB-INF/webservices.xml (from rev 1310, trunk/src/test/resources/jaxrpc/webserviceref/WEB-INF/webservices.xml)
Copied: branches/jbossws-1.0/src/test/resources/jaxrpc/webserviceref/servlet-client (from rev 1310, trunk/src/test/resources/jaxrpc/webserviceref/servlet-client)
Copied: branches/jbossws-1.0/src/test/resources/jaxrpc/webserviceref/servlet-client/WEB-INF (from rev 1310, trunk/src/test/resources/jaxrpc/webserviceref/servlet-client/WEB-INF)
Deleted: branches/jbossws-1.0/src/test/resources/jaxrpc/webserviceref/servlet-client/WEB-INF/web.xml
===================================================================
--- trunk/src/test/resources/jaxrpc/webserviceref/servlet-client/WEB-INF/web.xml 2006-10-25 21:39:42 UTC (rev 1310)
+++ branches/jbossws-1.0/src/test/resources/jaxrpc/webserviceref/servlet-client/WEB-INF/web.xml 2006-10-25 21:58:28 UTC (rev 1312)
@@ -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.webserviceref.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.webserviceref.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>
- <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>
- </port-component-ref>
- </service-ref>
-
-</web-app>
\ No newline at end of file
Copied: branches/jbossws-1.0/src/test/resources/jaxrpc/webserviceref/servlet-client/WEB-INF/web.xml (from rev 1310, trunk/src/test/resources/jaxrpc/webserviceref/servlet-client/WEB-INF/web.xml)
Deleted: branches/jbossws-1.0/src/test/resources/jaxrpc/webserviceref/wstools-java-wsdl.xml
===================================================================
--- trunk/src/test/resources/jaxrpc/webserviceref/wstools-java-wsdl.xml 2006-10-25 21:39:42 UTC (rev 1310)
+++ branches/jbossws-1.0/src/test/resources/jaxrpc/webserviceref/wstools-java-wsdl.xml 2006-10-25 21:58:28 UTC (rev 1312)
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- wstools -cp ../../../../../output/tests/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.webserviceref" namespace="http://org.jboss.ws/wsref"/>
- </global>
-
- <java-wsdl>
- <service name="TestEndpointService" style="rpc" endpoint="org.jboss.test.ws.jaxrpc.webserviceref.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.0/src/test/resources/jaxrpc/webserviceref/wstools-java-wsdl.xml (from rev 1310, trunk/src/test/resources/jaxrpc/webserviceref/wstools-java-wsdl.xml)
Deleted: branches/jbossws-1.0/src/test/resources/jaxrpc/webserviceref/wstools-wsdl-java.xml
===================================================================
--- trunk/src/test/resources/jaxrpc/webserviceref/wstools-wsdl-java.xml 2006-10-25 21:39:42 UTC (rev 1310)
+++ branches/jbossws-1.0/src/test/resources/jaxrpc/webserviceref/wstools-wsdl-java.xml 2006-10-25 21:58:28 UTC (rev 1312)
@@ -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.webserviceref" 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.0/src/test/resources/jaxrpc/webserviceref/wstools-wsdl-java.xml (from rev 1310, trunk/src/test/resources/jaxrpc/webserviceref/wstools-wsdl-java.xml)
18 years, 2 months
- 1
- 0
JBossWS SVN: r1311 - trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2006-10-25 17:53:05 -0400 (Wed, 25 Oct 2006)
New Revision: 1311
Modified:
trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/ApplicationClient.java
trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/ServletClient.java
Log:
Use JAXRPCException
Modified: trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/ApplicationClient.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/ApplicationClient.java 2006-10-25 21:39:42 UTC (rev 1310)
+++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/ApplicationClient.java 2006-10-25 21:53:05 UTC (rev 1311)
@@ -25,8 +25,8 @@
import java.util.ArrayList;
import javax.naming.InitialContext;
+import javax.xml.rpc.JAXRPCException;
import javax.xml.rpc.Service;
-import javax.xml.ws.WebServiceException;
import org.jboss.logging.Logger;
@@ -52,14 +52,14 @@
catch (Exception ex)
{
log.error("Cannot add port", ex);
- throw new WebServiceException(ex);
+ throw new JAXRPCException(ex);
}
for (TestEndpoint port : ports)
{
String outStr = port.echo(inStr);
if (inStr.equals(outStr) == false)
- throw new WebServiceException("Invalid echo return: " + inStr);
+ throw new JAXRPCException("Invalid echo return: " + inStr);
}
retStr = inStr;
Modified: trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/ServletClient.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/ServletClient.java 2006-10-25 21:39:42 UTC (rev 1310)
+++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/ServletClient.java 2006-10-25 21:53:05 UTC (rev 1311)
@@ -29,8 +29,8 @@
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 javax.xml.ws.WebServiceException;
import org.jboss.logging.Logger;
@@ -55,14 +55,14 @@
catch (Exception ex)
{
log.error("Cannot add port", ex);
- throw new WebServiceException(ex);
+ throw new JAXRPCException(ex);
}
for (TestEndpoint port : ports)
{
String outStr = port.echo(inStr);
if (inStr.equals(outStr) == false)
- throw new WebServiceException("Invalid echo return: " + inStr);
+ throw new JAXRPCException("Invalid echo return: " + inStr);
}
res.getWriter().print(inStr);
18 years, 2 months
- 1
- 0
JBossWS SVN: r1310 - in trunk/src/test: ant java/org/jboss/test/ws/jaxrpc java/org/jboss/test/ws/jaxrpc/webserviceref resources/jaxrpc resources/jaxrpc/webserviceref resources/jaxrpc/webserviceref/META-INF resources/jaxrpc/webserviceref/META-INF/wsdl resources/jaxrpc/webserviceref/WEB-INF resources/jaxrpc/webserviceref/servlet-client resources/jaxrpc/webserviceref/servlet-client/WEB-INF
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2006-10-25 17:39:42 -0400 (Wed, 25 Oct 2006)
New Revision: 1310
Added:
trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/
trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/ApplicationClient.java
trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/EJBClient.java
trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/EJBRemote.java
trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/EJBRemoteHome.java
trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/ServletClient.java
trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/TestEndpoint.java
trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/TestEndpointImpl.java
trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/TestEndpointService.java
trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/WebServiceRefClientTestCase.java
trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/WebServiceRefEJBTestCase.java
trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/WebServiceRefServletTestCase.java
trunk/src/test/resources/jaxrpc/webserviceref/
trunk/src/test/resources/jaxrpc/webserviceref/META-INF/
trunk/src/test/resources/jaxrpc/webserviceref/META-INF/application-client.xml
trunk/src/test/resources/jaxrpc/webserviceref/META-INF/ejb-jar.xml
trunk/src/test/resources/jaxrpc/webserviceref/META-INF/jaxrpc-mapping.xml
trunk/src/test/resources/jaxrpc/webserviceref/META-INF/jboss-client.xml
trunk/src/test/resources/jaxrpc/webserviceref/META-INF/wsdl/
trunk/src/test/resources/jaxrpc/webserviceref/META-INF/wsdl/TestEndpoint.wsdl
trunk/src/test/resources/jaxrpc/webserviceref/WEB-INF/
trunk/src/test/resources/jaxrpc/webserviceref/WEB-INF/web.xml
trunk/src/test/resources/jaxrpc/webserviceref/WEB-INF/webservices.xml
trunk/src/test/resources/jaxrpc/webserviceref/servlet-client/
trunk/src/test/resources/jaxrpc/webserviceref/servlet-client/WEB-INF/
trunk/src/test/resources/jaxrpc/webserviceref/servlet-client/WEB-INF/web.xml
trunk/src/test/resources/jaxrpc/webserviceref/wstools-java-wsdl.xml
trunk/src/test/resources/jaxrpc/webserviceref/wstools-wsdl-java.xml
Modified:
trunk/src/test/ant/build-jars-jaxrpc.xml
Log:
Add jaxrpc <service-ref> test
Modified: trunk/src/test/ant/build-jars-jaxrpc.xml
===================================================================
--- trunk/src/test/ant/build-jars-jaxrpc.xml 2006-10-25 13:09:40 UTC (rev 1309)
+++ trunk/src/test/ant/build-jars-jaxrpc.xml 2006-10-25 21:39:42 UTC (rev 1310)
@@ -1485,6 +1485,59 @@
</metainf>
</jar>
+ <!-- jaxrpc-webserviceref -->
+ <war warfile="${build.test.dir}/libs/jaxrpc-webserviceref.war" webxml="${build.test.dir}/resources/jaxrpc/webserviceref/WEB-INF/web.xml">
+ <classes dir="${build.test.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/webserviceref/TestEndpointImpl.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/webserviceref/TestEndpoint.class"/>
+ </classes>
+ <webinf dir="${build.test.dir}/resources/jaxrpc/webserviceref/META-INF">
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </webinf>
+ <webinf dir="${build.test.dir}/resources/jaxrpc/webserviceref/WEB-INF">
+ <include name="webservices.xml"/>
+ </webinf>
+ </war>
+ <jar destfile="${build.test.dir}/libs/jaxrpc-webserviceref-client.jar">
+ <fileset dir="${build.test.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"/>
+ </fileset>
+ <metainf dir="${build.test.dir}/resources/jaxrpc/webserviceref/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </metainf>
+ </jar>
+ <war destfile="${build.test.dir}/libs/jaxrpc-webserviceref-servlet-client.war" webxml="${build.test.dir}/resources/jaxrpc/webserviceref/servlet-client/WEB-INF/web.xml">
+ <classes dir="${build.test.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"/>
+ </classes>
+ <webinf dir="${build.test.dir}/resources/jaxrpc/webserviceref/META-INF">
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </webinf>
+ </war>
+ <jar destfile="${build.test.dir}/libs/jaxrpc-webserviceref-ejb-client.jar">
+ <fileset dir="${build.test.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"/>
+ </fileset>
+ <metainf dir="${build.test.dir}/resources/jaxrpc/webserviceref/META-INF">
+ <include name="ejb-jar.xml"/>
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </metainf>
+ </jar>
+
<!-- jaxrpc-wseventing -->
<war warfile="${build.test.dir}/libs/jaxrpc-wseventing.war" webxml="${build.test.dir}/resources/jaxrpc/wseventing/WEB-INF/web.xml">
<classes dir="${build.test.dir}/classes">
Added: trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/ApplicationClient.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/ApplicationClient.java 2006-10-25 13:09:40 UTC (rev 1309)
+++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/ApplicationClient.java 2006-10-25 21:39:42 UTC (rev 1310)
@@ -0,0 +1,67 @@
+/*
+ * 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.webserviceref;
+
+import java.rmi.RemoteException;
+import java.util.ArrayList;
+
+import javax.naming.InitialContext;
+import javax.xml.rpc.Service;
+import javax.xml.ws.WebServiceException;
+
+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<TestEndpoint> ports = new ArrayList<TestEndpoint>();
+ 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 WebServiceException(ex);
+ }
+
+ for (TestEndpoint port : ports)
+ {
+ String outStr = port.echo(inStr);
+ if (inStr.equals(outStr) == false)
+ throw new WebServiceException("Invalid echo return: " + inStr);
+ }
+
+ retStr = inStr;
+ }
+}
Property changes on: trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/ApplicationClient.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/EJBClient.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/EJBClient.java 2006-10-25 13:09:40 UTC (rev 1309)
+++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/EJBClient.java 2006-10-25 21:39:42 UTC (rev 1310)
@@ -0,0 +1,92 @@
+/*
+ * 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.webserviceref;
+
+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<TestEndpoint> ports = new ArrayList<TestEndpoint>();
+ 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 (TestEndpoint port : ports)
+ {
+ 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()
+ {
+ }
+}
Property changes on: trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/EJBClient.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/EJBRemote.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/EJBRemote.java 2006-10-25 13:09:40 UTC (rev 1309)
+++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/EJBRemote.java 2006-10-25 21:39:42 UTC (rev 1310)
@@ -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.webserviceref;
+
+import java.rmi.RemoteException;
+
+import javax.ejb.EJBObject;
+
+public interface EJBRemote extends EJBObject
+{
+ String echo(String input) throws RemoteException;
+}
Property changes on: trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/EJBRemote.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/EJBRemoteHome.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/EJBRemoteHome.java 2006-10-25 13:09:40 UTC (rev 1309)
+++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/EJBRemoteHome.java 2006-10-25 21:39:42 UTC (rev 1310)
@@ -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.webserviceref;
+
+import java.rmi.RemoteException;
+
+import javax.ejb.CreateException;
+import javax.ejb.EJBHome;
+
+public interface EJBRemoteHome extends EJBHome
+{
+ EJBRemote create() throws CreateException, RemoteException;
+}
Property changes on: trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/EJBRemoteHome.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/ServletClient.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/ServletClient.java 2006-10-25 13:09:40 UTC (rev 1309)
+++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/ServletClient.java 2006-10-25 21:39:42 UTC (rev 1310)
@@ -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.webserviceref;
+
+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.Service;
+import javax.xml.ws.WebServiceException;
+
+import org.jboss.logging.Logger;
+
+public class ServletClient extends HttpServlet
+{
+ // Provide logging
+ private static Logger log = Logger.getLogger(ServletClient.class);
+
+ @Override
+ protected void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException
+ {
+ String inStr = req.getParameter("echo");
+ log.info("doGet: " + inStr);
+
+ ArrayList<TestEndpoint> ports = new ArrayList<TestEndpoint>();
+ 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 WebServiceException(ex);
+ }
+
+ for (TestEndpoint port : ports)
+ {
+ String outStr = port.echo(inStr);
+ if (inStr.equals(outStr) == false)
+ throw new WebServiceException("Invalid echo return: " + inStr);
+ }
+
+ res.getWriter().print(inStr);
+ }
+}
Property changes on: trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/ServletClient.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/TestEndpoint.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/TestEndpoint.java 2006-10-25 13:09:40 UTC (rev 1309)
+++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/TestEndpoint.java 2006-10-25 21:39:42 UTC (rev 1310)
@@ -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.webserviceref;
+
+import java.rmi.Remote;
+import java.rmi.RemoteException;
+
+
+public interface TestEndpoint extends Remote
+{
+ String echo(String arg0) throws RemoteException;
+}
Property changes on: trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/TestEndpoint.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/TestEndpointImpl.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/TestEndpointImpl.java 2006-10-25 13:09:40 UTC (rev 1309)
+++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/TestEndpointImpl.java 2006-10-25 21:39:42 UTC (rev 1310)
@@ -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.webserviceref;
+
+import org.jboss.logging.Logger;
+
+/**
+ * Test the JAXRPC <service-ref>
+ *
+ * @author Thomas.Diesler(a)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;
+ }
+}
Property changes on: trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/TestEndpointImpl.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/TestEndpointService.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/TestEndpointService.java 2006-10-25 13:09:40 UTC (rev 1309)
+++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/TestEndpointService.java 2006-10-25 21:39:42 UTC (rev 1310)
@@ -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.webserviceref;
+
+
+import javax.xml.rpc.*;
+
+
+public interface TestEndpointService extends javax.xml.rpc.Service
+{
+
+ public org.jboss.test.ws.jaxrpc.webserviceref.TestEndpoint getTestEndpointPort() throws ServiceException;
+
+}
Property changes on: trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/TestEndpointService.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/WebServiceRefClientTestCase.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/WebServiceRefClientTestCase.java 2006-10-25 13:09:40 UTC (rev 1309)
+++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/WebServiceRefClientTestCase.java 2006-10-25 21:39:42 UTC (rev 1310)
@@ -0,0 +1,82 @@
+/*
+ * 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.webserviceref;
+
+import java.io.File;
+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.jaxrpc.ServiceFactoryImpl;
+import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
+import org.jboss.ws.metadata.wsdl.WSDLDefinitionsFactory;
+
+/**
+ * Test the JAXRPC <service-ref>
+ *
+ * @author Thomas.Diesler(a)jboss.com
+ * @since 23-Oct-2005
+ */
+public class WebServiceRefClientTestCase extends JBossWSTest
+{
+ public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxrpc-webserviceref";
+
+ public static Test suite()
+ {
+ return JBossWSTestSetup.newTestSetup(WebServiceRefClientTestCase.class, "jaxrpc-webserviceref.war, jaxrpc-webserviceref-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/webserviceref/META-INF/wsdl/TestEndpoint.wsdl").toURL();
+ URL mappingURL = new File("resources/jaxrpc/webserviceref/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 testApplicationClient() throws Exception
+ {
+ String helloWorld = "Hello World!";
+ ApplicationClient.encCtx = getInitialContext();
+ ApplicationClient.main(new String[]{helloWorld});
+ assertEquals(helloWorld, ApplicationClient.retStr);
+ }
+}
Property changes on: trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/WebServiceRefClientTestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/WebServiceRefEJBTestCase.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/WebServiceRefEJBTestCase.java 2006-10-25 13:09:40 UTC (rev 1309)
+++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/WebServiceRefEJBTestCase.java 2006-10-25 21:39:42 UTC (rev 1310)
@@ -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.webserviceref;
+
+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.jaxrpc.ServiceFactoryImpl;
+import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
+import org.jboss.ws.metadata.wsdl.WSDLDefinitionsFactory;
+
+/**
+ * Test the JAXRPC <service-ref>
+ *
+ * @author Thomas.Diesler(a)jboss.com
+ * @since 23-Oct-2005
+ */
+public class WebServiceRefEJBTestCase extends JBossWSTest
+{
+ public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxrpc-webserviceref";
+
+ public static Test suite()
+ {
+ return JBossWSTestSetup.newTestSetup(WebServiceRefEJBTestCase.class, "jaxrpc-webserviceref.war, jaxrpc-webserviceref-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/webserviceref/META-INF/wsdl/TestEndpoint.wsdl").toURL();
+ URL mappingURL = new File("resources/jaxrpc/webserviceref/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);
+
+ }
+}
Property changes on: trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/WebServiceRefEJBTestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/WebServiceRefServletTestCase.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/WebServiceRefServletTestCase.java 2006-10-25 13:09:40 UTC (rev 1309)
+++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/WebServiceRefServletTestCase.java 2006-10-25 21:39:42 UTC (rev 1310)
@@ -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.webserviceref;
+
+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.jaxrpc.ServiceFactoryImpl;
+import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
+import org.jboss.ws.metadata.wsdl.WSDLDefinitionsFactory;
+
+/**
+ * Test the JAXRPC <service-ref>
+ *
+ * @author Thomas.Diesler(a)jboss.com
+ * @since 23-Oct-2005
+ */
+public class WebServiceRefServletTestCase extends JBossWSTest
+{
+ public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxrpc-webserviceref";
+
+ public static Test suite()
+ {
+ return JBossWSTestSetup.newTestSetup(WebServiceRefServletTestCase.class, "jaxrpc-webserviceref.war, jaxrpc-webserviceref-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/webserviceref/META-INF/wsdl/TestEndpoint.wsdl").toURL();
+ URL mappingURL = new File("resources/jaxrpc/webserviceref/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);
+ }
+}
Property changes on: trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/WebServiceRefServletTestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/src/test/resources/jaxrpc/webserviceref/META-INF/application-client.xml
===================================================================
--- trunk/src/test/resources/jaxrpc/webserviceref/META-INF/application-client.xml 2006-10-25 13:09:40 UTC (rev 1309)
+++ trunk/src/test/resources/jaxrpc/webserviceref/META-INF/application-client.xml 2006-10-25 21:39:42 UTC (rev 1310)
@@ -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.webserviceref.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>
+ <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>
+ </port-component-ref>
+ </service-ref>
+
+</application-client>
+
Property changes on: trunk/src/test/resources/jaxrpc/webserviceref/META-INF/application-client.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/src/test/resources/jaxrpc/webserviceref/META-INF/ejb-jar.xml
===================================================================
--- trunk/src/test/resources/jaxrpc/webserviceref/META-INF/ejb-jar.xml 2006-10-25 13:09:40 UTC (rev 1309)
+++ trunk/src/test/resources/jaxrpc/webserviceref/META-INF/ejb-jar.xml 2006-10-25 21:39:42 UTC (rev 1310)
@@ -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.webserviceref.EJBRemoteHome</home>
+ <remote>org.jboss.test.ws.jaxrpc.webserviceref.EJBRemote</remote>
+ <ejb-class>org.jboss.test.ws.jaxrpc.webserviceref.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.webserviceref.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>
+ <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>
+ </port-component-ref>
+ </service-ref>
+
+ </session>
+ </enterprise-beans>
+
+</ejb-jar>
+
Property changes on: trunk/src/test/resources/jaxrpc/webserviceref/META-INF/ejb-jar.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/src/test/resources/jaxrpc/webserviceref/META-INF/jaxrpc-mapping.xml
===================================================================
--- trunk/src/test/resources/jaxrpc/webserviceref/META-INF/jaxrpc-mapping.xml 2006-10-25 13:09:40 UTC (rev 1309)
+++ trunk/src/test/resources/jaxrpc/webserviceref/META-INF/jaxrpc-mapping.xml 2006-10-25 21:39:42 UTC (rev 1310)
@@ -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.webserviceref</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>
+ <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.webserviceref.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
Property changes on: trunk/src/test/resources/jaxrpc/webserviceref/META-INF/jaxrpc-mapping.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/src/test/resources/jaxrpc/webserviceref/META-INF/jboss-client.xml
===================================================================
--- trunk/src/test/resources/jaxrpc/webserviceref/META-INF/jboss-client.xml 2006-10-25 13:09:40 UTC (rev 1309)
+++ trunk/src/test/resources/jaxrpc/webserviceref/META-INF/jboss-client.xml 2006-10-25 21:39:42 UTC (rev 1310)
@@ -0,0 +1,9 @@
+<?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>
Property changes on: trunk/src/test/resources/jaxrpc/webserviceref/META-INF/jboss-client.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/src/test/resources/jaxrpc/webserviceref/META-INF/wsdl/TestEndpoint.wsdl
===================================================================
--- trunk/src/test/resources/jaxrpc/webserviceref/META-INF/wsdl/TestEndpoint.wsdl 2006-10-25 13:09:40 UTC (rev 1309)
+++ trunk/src/test/resources/jaxrpc/webserviceref/META-INF/wsdl/TestEndpoint.wsdl 2006-10-25 21:39:42 UTC (rev 1310)
@@ -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-webserviceref'/>
+ </port>
+ </service>
+</definitions>
\ No newline at end of file
Property changes on: trunk/src/test/resources/jaxrpc/webserviceref/META-INF/wsdl/TestEndpoint.wsdl
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/src/test/resources/jaxrpc/webserviceref/WEB-INF/web.xml
===================================================================
--- trunk/src/test/resources/jaxrpc/webserviceref/WEB-INF/web.xml 2006-10-25 13:09:40 UTC (rev 1309)
+++ trunk/src/test/resources/jaxrpc/webserviceref/WEB-INF/web.xml 2006-10-25 21:39:42 UTC (rev 1310)
@@ -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.webserviceref.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
Property changes on: trunk/src/test/resources/jaxrpc/webserviceref/WEB-INF/web.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/src/test/resources/jaxrpc/webserviceref/WEB-INF/webservices.xml
===================================================================
--- trunk/src/test/resources/jaxrpc/webserviceref/WEB-INF/webservices.xml 2006-10-25 13:09:40 UTC (rev 1309)
+++ trunk/src/test/resources/jaxrpc/webserviceref/WEB-INF/webservices.xml 2006-10-25 21:39:42 UTC (rev 1310)
@@ -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.webserviceref.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
Property changes on: trunk/src/test/resources/jaxrpc/webserviceref/WEB-INF/webservices.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/src/test/resources/jaxrpc/webserviceref/servlet-client/WEB-INF/web.xml
===================================================================
--- trunk/src/test/resources/jaxrpc/webserviceref/servlet-client/WEB-INF/web.xml 2006-10-25 13:09:40 UTC (rev 1309)
+++ trunk/src/test/resources/jaxrpc/webserviceref/servlet-client/WEB-INF/web.xml 2006-10-25 21:39:42 UTC (rev 1310)
@@ -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.webserviceref.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.webserviceref.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>
+ <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>
+ </port-component-ref>
+ </service-ref>
+
+</web-app>
\ No newline at end of file
Property changes on: trunk/src/test/resources/jaxrpc/webserviceref/servlet-client/WEB-INF/web.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/src/test/resources/jaxrpc/webserviceref/wstools-java-wsdl.xml
===================================================================
--- trunk/src/test/resources/jaxrpc/webserviceref/wstools-java-wsdl.xml 2006-10-25 13:09:40 UTC (rev 1309)
+++ trunk/src/test/resources/jaxrpc/webserviceref/wstools-java-wsdl.xml 2006-10-25 21:39:42 UTC (rev 1310)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ wstools -cp ../../../../../output/tests/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.webserviceref" namespace="http://org.jboss.ws/wsref"/>
+ </global>
+
+ <java-wsdl>
+ <service name="TestEndpointService" style="rpc" endpoint="org.jboss.test.ws.jaxrpc.webserviceref.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
Property changes on: trunk/src/test/resources/jaxrpc/webserviceref/wstools-java-wsdl.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/src/test/resources/jaxrpc/webserviceref/wstools-wsdl-java.xml
===================================================================
--- trunk/src/test/resources/jaxrpc/webserviceref/wstools-wsdl-java.xml 2006-10-25 13:09:40 UTC (rev 1309)
+++ trunk/src/test/resources/jaxrpc/webserviceref/wstools-wsdl-java.xml 2006-10-25 21:39:42 UTC (rev 1310)
@@ -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.webserviceref" 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
Property changes on: trunk/src/test/resources/jaxrpc/webserviceref/wstools-wsdl-java.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
18 years, 2 months
- 1
- 0
JBossWS SVN: r1309 - in trunk/src: main/java/org/jboss/ws/jaxws/injection test/java/org/jboss/test/ws/jaxws/webserviceref
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2006-10-25 09:09:40 -0400 (Wed, 25 Oct 2006)
New Revision: 1309
Modified:
trunk/src/main/java/org/jboss/ws/jaxws/injection/WebServiceRefDeployer.java
trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/ApplicationClient.java
trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/WebServiceRefClientTestCase.java
Log:
[EJBTHREE-760] @WebServiceRef not bound to java:comp/env
Modified: trunk/src/main/java/org/jboss/ws/jaxws/injection/WebServiceRefDeployer.java
===================================================================
--- trunk/src/main/java/org/jboss/ws/jaxws/injection/WebServiceRefDeployer.java 2006-10-25 11:55:34 UTC (rev 1308)
+++ trunk/src/main/java/org/jboss/ws/jaxws/injection/WebServiceRefDeployer.java 2006-10-25 13:09:40 UTC (rev 1309)
@@ -24,13 +24,11 @@
// $Id$
import javax.naming.Context;
-import javax.naming.Name;
-import javax.naming.NameNotFoundException;
-import javax.naming.NamingException;
import javax.xml.ws.Service;
import javax.xml.ws.WebServiceRef;
import org.jboss.logging.Logger;
+import org.jboss.util.naming.Util;
/**
* Binds a JAXWS Service object into JNDI
@@ -73,41 +71,9 @@
if (portTypeName == null && refType != null && Service.class.isAssignableFrom(refType) == false)
portTypeName = refType.getName();
- bind(ctx, jndiName, new ServiceReferenceable(serviceTypeName, portTypeName, ref.wsdlLocation()));
- log.debug("WebServiceRef bound [jndi=" + jndiName + ",service=" + serviceTypeName + ",port=" + portTypeName + "]");
+ Util.bind(ctx, jndiName, new ServiceReferenceable(serviceTypeName, portTypeName, ref.wsdlLocation()));
+
+ String externalName = ctx.getNameInNamespace() + "/" + jndiName;
+ log.debug("WebServiceRef bound [jndi=" + externalName + ",service=" + serviceTypeName + ",port=" + portTypeName + "]");
}
-
- private static void bind(Context ctx, String name, Object value) throws NamingException
- {
- Name n = ctx.getNameParser("").parse(name);
- bind(ctx, n, value);
- }
-
- private static void bind(Context ctx, Name name, Object value) throws NamingException
- {
- int size = name.size();
- String atom = name.get(size - 1);
- Context parentCtx = createSubcontext(ctx, name.getPrefix(size - 1));
- parentCtx.bind(atom, value);
- }
-
- private static Context createSubcontext(Context ctx, Name name) throws NamingException
- {
- Context subctx = ctx;
- for (int pos = 0; pos < name.size(); pos++)
- {
- String ctxName = name.get(pos);
- try
- {
- subctx = (Context) ctx.lookup(ctxName);
- }
- catch (NameNotFoundException e)
- {
- subctx = ctx.createSubcontext(ctxName);
- }
- // The current subctx will be the ctx for the next name component
- ctx = subctx;
- }
- return subctx;
- }
}
Modified: trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/ApplicationClient.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/ApplicationClient.java 2006-10-25 11:55:34 UTC (rev 1308)
+++ trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/ApplicationClient.java 2006-10-25 13:09:40 UTC (rev 1309)
@@ -45,8 +45,9 @@
@WebServiceRef (value = TestEndpointService.class, wsdlLocation ="META-INF/wsdl/TestEndpoint.wsdl")
public static TestEndpoint port2;
+ public static InitialContext encCtx;
public static String retStr;
-
+
public static void main(String[] args)
{
String inStr = args[0];
@@ -55,11 +56,11 @@
ArrayList<TestEndpoint> ports = new ArrayList<TestEndpoint>();
try
{
- InitialContext iniCtx = new InitialContext();
- ports.add(((TestEndpointService)iniCtx.lookup("java:comp.ejb3/env/service1")).getTestEndpointPort());
- ports.add(((TestEndpointService)iniCtx.lookup("java:comp.ejb3/env/service2")).getTestEndpointPort());
+ System.out.println("FIXME: EJBTHREE-760");
+ //ports.add(((TestEndpointService)encCtx.lookup("java:comp/env/service1")).getTestEndpointPort());
+ //ports.add(((TestEndpointService)encCtx.lookup("java:comp/env/service2")).getTestEndpointPort());
ports.add((TestEndpoint)service3.getPort(TestEndpoint.class));
- ports.add((TestEndpoint)iniCtx.lookup("java:comp.ejb3/env/port1"));
+ //ports.add((TestEndpoint)encCtx.lookup("java:comp/env/port1"));
ports.add(port2);
}
catch (Exception ex)
Modified: trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/WebServiceRefClientTestCase.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/WebServiceRefClientTestCase.java 2006-10-25 11:55:34 UTC (rev 1308)
+++ trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/WebServiceRefClientTestCase.java 2006-10-25 13:09:40 UTC (rev 1309)
@@ -74,6 +74,7 @@
public void testApplicationClient() throws Exception
{
String helloWorld = "Hello World!";
+ ApplicationClient.encCtx = getInitialContext();
ClientLauncher.launch(ApplicationClient.class.getName(), "jbossws-client", new String[]{helloWorld});
assertEquals(helloWorld, ApplicationClient.retStr);
}
18 years, 2 months
- 1
- 0
JBossWS SVN: r1308 - in trunk: . src/main/java/org/jboss/ws/integration/jboss src/main/java/org/jboss/ws/jaxws src/main/java/org/jboss/ws/jaxws/injection src/test/java/org/jboss/test/ws/jaxws/webserviceref
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2006-10-25 07:55:34 -0400 (Wed, 25 Oct 2006)
New Revision: 1308
Added:
trunk/src/main/java/org/jboss/ws/jaxws/injection/
trunk/src/main/java/org/jboss/ws/jaxws/injection/ServiceObjectFactory.java
trunk/src/main/java/org/jboss/ws/jaxws/injection/ServiceReferenceable.java
trunk/src/main/java/org/jboss/ws/jaxws/injection/WebServiceRefDeployer.java
Removed:
trunk/src/main/java/org/jboss/ws/integration/jboss/WebServiceRefDeployer.java
trunk/src/main/java/org/jboss/ws/jaxws/ServiceObjectFactory.java
trunk/src/main/java/org/jboss/ws/jaxws/ServiceReferenceable.java
Modified:
trunk/.classpath
trunk/build.xml
trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/ApplicationClient.java
trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/EJB3Client.java
trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/ServletClient.java
Log:
Move dependency of jboss-ejb3 from jbossws-core to jboss-jaxws
Modified: trunk/.classpath
===================================================================
--- trunk/.classpath 2006-10-25 11:02:35 UTC (rev 1307)
+++ trunk/.classpath 2006-10-25 11:55:34 UTC (rev 1308)
@@ -28,6 +28,6 @@
<classpathentry kind="lib" path="thirdparty/jboss-remoting.jar"/>
<classpathentry kind="lib" path="thirdparty/jaxb-xjc.jar"/>
<classpathentry kind="lib" path="thirdparty/jaxb-impl.jar"/>
- <classpathentry kind="lib" path="thirdparty/jboss-common.jar"/>
+ <classpathentry sourcepath="/home/tdiesler/svn/jboss/common/common-core/trunk/src/main/java" kind="lib" path="thirdparty/jboss-common.jar"/>
<classpathentry kind="output" path="output-eclipse"/>
</classpath>
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2006-10-25 11:02:35 UTC (rev 1307)
+++ trunk/build.xml 2006-10-25 11:55:34 UTC (rev 1308)
@@ -222,7 +222,7 @@
<fileset dir="${build.classes.dir}">
<include name="javax/jws/**"/>
<include name="javax/xml/ws/**"/>
- <include name="org/jboss/ws/integration/jboss/WebServiceRefDeployer.class"/>
+ <include name="org/jboss/ws/jaxws/injection/**"/>
</fileset>
</jar>
Deleted: trunk/src/main/java/org/jboss/ws/integration/jboss/WebServiceRefDeployer.java
===================================================================
--- trunk/src/main/java/org/jboss/ws/integration/jboss/WebServiceRefDeployer.java 2006-10-25 11:02:35 UTC (rev 1307)
+++ trunk/src/main/java/org/jboss/ws/integration/jboss/WebServiceRefDeployer.java 2006-10-25 11:55:34 UTC (rev 1308)
@@ -1,65 +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.jboss;
-
-// $Id$
-
-import javax.naming.Context;
-import javax.xml.ws.Service;
-import javax.xml.ws.WebServiceRef;
-
-import org.jboss.logging.Logger;
-import org.jboss.naming.Util;
-import org.jboss.ws.jaxws.ServiceReferenceable;
-
-/**
- * Binds a JAXWS Service object into JNDI
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 24-Oct-2006
- */
-public class WebServiceRefDeployer
-{
- // provide logging
- private static Logger log = Logger.getLogger(WebServiceRefDeployer.class);
-
- private WebServiceRefDeployer()
- {
- // Hide ctor
- }
-
- public static void setupWebServiceRef(Context ctx, String jndiName, Class targetType, WebServiceRef ref) throws Exception
- {
- Class serviceType = ref.value();
- if (serviceType == Object.class)
- {
- if (targetType != null)
- serviceType = targetType;
- else
- serviceType = Service.class;
- }
-
- String targetTypeName = (targetType != null ? targetType.getName() : null);
- Util.bind(ctx, jndiName, new ServiceReferenceable(serviceType.getName(), targetTypeName, ref.wsdlLocation()));
- log.debug("WebServiceRef bound [jndi=" + jndiName + ",type=" + targetTypeName + "]");
- }
-}
Deleted: trunk/src/main/java/org/jboss/ws/jaxws/ServiceObjectFactory.java
===================================================================
--- trunk/src/main/java/org/jboss/ws/jaxws/ServiceObjectFactory.java 2006-10-25 11:02:35 UTC (rev 1307)
+++ trunk/src/main/java/org/jboss/ws/jaxws/ServiceObjectFactory.java 2006-10-25 11:55:34 UTC (rev 1308)
@@ -1,181 +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.
- */
-// $Id$
-package org.jboss.ws.jaxws;
-
-// $Id$
-
-import java.io.File;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Method;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Hashtable;
-
-import javax.naming.Context;
-import javax.naming.Name;
-import javax.naming.Reference;
-import javax.naming.spi.ObjectFactory;
-import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
-import javax.xml.ws.WebServiceException;
-
-import org.jboss.logging.Logger;
-
-/**
- * This ServiceObjectFactory reconstructs a javax.xml.ws.Service
- * for a given WSDL when the webservice client does a JNDI lookup
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 24-Oct-2004
- */
-public class ServiceObjectFactory implements ObjectFactory
-{
- // provide logging
- private static final Logger log = Logger.getLogger(ServiceObjectFactory.class);
-
- /**
- * Creates an object using the location or reference information specified.
- * <p/>
- *
- * @param obj The possibly null object containing location or reference
- * information that can be used in creating an object.
- * @param name The name of this object relative to <code>nameCtx</code>,
- * or null if no name is specified.
- * @param nameCtx The context relative to which the <code>name</code>
- * parameter is specified, or null if <code>name</code> is
- * relative to the default initial context.
- * @param environment The possibly null environment that is used in
- * creating the object.
- * @return The object created; null if an object cannot be created.
- * @throws Exception if this object factory encountered an exception
- * while attempting to create an object, and no other object factories are
- * to be tried.
- * @see javax.naming.spi.NamingManager#getObjectInstance
- * @see javax.naming.spi.NamingManager#getURLContext
- */
- public Object getObjectInstance(Object obj, Name name, Context nameCtx, Hashtable environment) throws Exception
- {
- try
- {
- Reference ref = (Reference)obj;
-
- String serviceTypeName = (String)ref.get(ServiceReferenceable.SERVICE_TYPE).getContent();
- String targetTypeName = (String)ref.get(ServiceReferenceable.TARGET_TYPE).getContent();
- String wsdlLocation = (String)ref.get(ServiceReferenceable.WSDL_LOCATION).getContent();
-
- ClassLoader ctxLoader = Thread.currentThread().getContextClassLoader();
- Class serviceType = ctxLoader.loadClass(serviceTypeName);
- Class targetType = ctxLoader.loadClass(targetTypeName);
-
- if (Service.class.isAssignableFrom(serviceType) == false)
- throw new IllegalArgumentException("WebServiceRef type '" + serviceType + "' is not assignable to javax.xml.ws.Service");
-
- Object target;
-
- URL wsdlURL = getWsdlLocationURL(serviceType, wsdlLocation);
- if (wsdlURL != null)
- {
- Constructor ctor = serviceType.getConstructor(new Class[] { URL.class, QName.class });
- target = (Service)ctor.newInstance(new Object[] { wsdlURL, null });
- }
- else
- {
- target = (Service)serviceType.newInstance();
- }
-
- if (serviceTypeName.equals(targetTypeName) == false)
- {
- Object port = null;
- for (Method method : serviceType.getMethods())
- {
- String methodName = method.getName();
- Class retType = method.getReturnType();
- if (methodName.startsWith("get") && targetType.isAssignableFrom(retType))
- {
- port = method.invoke(target, new Object[0]);
- target = port;
- break;
- }
- }
-
- if (port == null)
- throw new WebServiceException("Cannot find getter for port type: " + targetTypeName);
- }
-
- return target;
- }
- catch (Exception ex)
- {
- log.error("Cannot create service", ex);
- throw ex;
- }
- }
-
- private URL getWsdlLocationURL(Class type, String wsdlLocation)
- {
- URL wsdlURL = null;
- if (wsdlLocation != null && wsdlLocation.length() > 0)
- {
- // Try the wsdlLocation as URL
- try
- {
- wsdlURL = new URL(wsdlLocation);
- }
- catch (MalformedURLException ex)
- {
- // ignore
- }
-
- // Try the filename as File
- if (wsdlURL == null)
- {
- try
- {
- File file = new File(wsdlLocation);
- if (file.exists())
- wsdlURL = file.toURL();
- }
- catch (MalformedURLException e)
- {
- // ignore
- }
- }
-
- // Try the filename as Resource
- if (wsdlURL == null)
- {
- ClassLoader loader = Thread.currentThread().getContextClassLoader();
- wsdlURL = loader.getResource(wsdlLocation);
- }
-
- // Try the filename relative to class
- if (wsdlURL == null)
- {
- String packagePath = type.getPackage().getName().replace('.', '/');
- ClassLoader loader = Thread.currentThread().getContextClassLoader();
- wsdlURL = loader.getResource(packagePath + "/" + wsdlLocation);
- }
- }
- return wsdlURL;
- }
-}
Deleted: trunk/src/main/java/org/jboss/ws/jaxws/ServiceReferenceable.java
===================================================================
--- trunk/src/main/java/org/jboss/ws/jaxws/ServiceReferenceable.java 2006-10-25 11:02:35 UTC (rev 1307)
+++ trunk/src/main/java/org/jboss/ws/jaxws/ServiceReferenceable.java 2006-10-25 11:55:34 UTC (rev 1308)
@@ -1,74 +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.
- */
-// $Id$
-package org.jboss.ws.jaxws;
-
-// $Id$
-
-import javax.naming.NamingException;
-import javax.naming.Reference;
-import javax.naming.Referenceable;
-import javax.naming.StringRefAddr;
-
-/**
- * A JNDI reference to a javax.xml.ws.Service
- *
- * It holds the information to reconstrut the javax.xml.ws.Service
- * when the client does a JNDI lookup.
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 24-Oct-2006
- */
-public class ServiceReferenceable implements Referenceable
-{
- public static final String WSDL_LOCATION = "WSDL_LOCATION";
- public static final String SERVICE_TYPE = "SERVICE_TYPE";
- public static final String TARGET_TYPE = "TARGET_TYPE";
-
- private String serviceType;
- private String targetType;
- private String wsdlLocation;
-
- public ServiceReferenceable(String serviceType, String targetType, String wsdlLocation)
- {
- this.serviceType = serviceType;
- this.targetType = targetType;
- this.wsdlLocation = wsdlLocation;
- }
-
- /**
- * Retrieves the Reference of this object.
- *
- * @return The non-null Reference of this object.
- * @throws javax.naming.NamingException If a naming exception was encountered while retrieving the reference.
- */
- public Reference getReference() throws NamingException
- {
- Reference myRef = new Reference(ServiceReferenceable.class.getName(), ServiceObjectFactory.class.getName(), null);
-
- myRef.add(new StringRefAddr(SERVICE_TYPE, serviceType));
- myRef.add(new StringRefAddr(TARGET_TYPE, targetType));
- myRef.add(new StringRefAddr(WSDL_LOCATION, wsdlLocation));
-
- return myRef;
- }
-}
\ No newline at end of file
Copied: trunk/src/main/java/org/jboss/ws/jaxws/injection/ServiceObjectFactory.java (from rev 1302, trunk/src/main/java/org/jboss/ws/jaxws/ServiceObjectFactory.java)
===================================================================
--- trunk/src/main/java/org/jboss/ws/jaxws/ServiceObjectFactory.java 2006-10-25 06:35:39 UTC (rev 1302)
+++ trunk/src/main/java/org/jboss/ws/jaxws/injection/ServiceObjectFactory.java 2006-10-25 11:55:34 UTC (rev 1308)
@@ -0,0 +1,181 @@
+/*
+ * 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.
+ */
+// $Id$
+package org.jboss.ws.jaxws.injection;
+
+// $Id$
+
+import java.io.File;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Method;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Hashtable;
+
+import javax.naming.Context;
+import javax.naming.Name;
+import javax.naming.Reference;
+import javax.naming.spi.ObjectFactory;
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+import javax.xml.ws.WebServiceException;
+
+import org.jboss.logging.Logger;
+
+/**
+ * This ServiceObjectFactory reconstructs a javax.xml.ws.Service
+ * for a given WSDL when the webservice client does a JNDI lookup
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 24-Oct-2004
+ */
+public class ServiceObjectFactory implements ObjectFactory
+{
+ // provide logging
+ private static final Logger log = Logger.getLogger(ServiceObjectFactory.class);
+
+ /**
+ * Creates an object using the location or reference information specified.
+ * <p/>
+ *
+ * @param obj The possibly null object containing location or reference
+ * information that can be used in creating an object.
+ * @param name The name of this object relative to <code>nameCtx</code>,
+ * or null if no name is specified.
+ * @param nameCtx The context relative to which the <code>name</code>
+ * parameter is specified, or null if <code>name</code> is
+ * relative to the default initial context.
+ * @param environment The possibly null environment that is used in
+ * creating the object.
+ * @return The object created; null if an object cannot be created.
+ * @throws Exception if this object factory encountered an exception
+ * while attempting to create an object, and no other object factories are
+ * to be tried.
+ * @see javax.naming.spi.NamingManager#getObjectInstance
+ * @see javax.naming.spi.NamingManager#getURLContext
+ */
+ public Object getObjectInstance(Object obj, Name name, Context nameCtx, Hashtable environment) throws Exception
+ {
+ try
+ {
+ Reference ref = (Reference)obj;
+
+ String serviceTypeName = (String)ref.get(ServiceReferenceable.SERVICE_TYPE).getContent();
+ String portTypeName = (String)ref.get(ServiceReferenceable.PORT_TYPE).getContent();
+ String wsdlLocation = (String)ref.get(ServiceReferenceable.WSDL_LOCATION).getContent();
+
+ ClassLoader ctxLoader = Thread.currentThread().getContextClassLoader();
+ Class serviceType = ctxLoader.loadClass(serviceTypeName);
+ Class portType = (portTypeName != null ? ctxLoader.loadClass(portTypeName) : null);
+
+ if (Service.class.isAssignableFrom(serviceType) == false)
+ throw new IllegalArgumentException("WebServiceRef type '" + serviceType + "' is not assignable to javax.xml.ws.Service");
+
+ Object target;
+
+ URL wsdlURL = getWsdlLocationURL(serviceType, wsdlLocation);
+ if (wsdlURL != null)
+ {
+ Constructor ctor = serviceType.getConstructor(new Class[] { URL.class, QName.class });
+ target = (Service)ctor.newInstance(new Object[] { wsdlURL, null });
+ }
+ else
+ {
+ target = (Service)serviceType.newInstance();
+ }
+
+ if (portTypeName != null && portTypeName.equals(serviceTypeName) == false)
+ {
+ Object port = null;
+ for (Method method : serviceType.getMethods())
+ {
+ String methodName = method.getName();
+ Class retType = method.getReturnType();
+ if (methodName.startsWith("get") && portType.isAssignableFrom(retType))
+ {
+ port = method.invoke(target, new Object[0]);
+ target = port;
+ break;
+ }
+ }
+
+ if (port == null)
+ throw new WebServiceException("Cannot find getter for port type: " + portTypeName);
+ }
+
+ return target;
+ }
+ catch (Exception ex)
+ {
+ log.error("Cannot create service", ex);
+ throw ex;
+ }
+ }
+
+ private URL getWsdlLocationURL(Class type, String wsdlLocation)
+ {
+ URL wsdlURL = null;
+ if (wsdlLocation != null && wsdlLocation.length() > 0)
+ {
+ // Try the wsdlLocation as URL
+ try
+ {
+ wsdlURL = new URL(wsdlLocation);
+ }
+ catch (MalformedURLException ex)
+ {
+ // ignore
+ }
+
+ // Try the filename as File
+ if (wsdlURL == null)
+ {
+ try
+ {
+ File file = new File(wsdlLocation);
+ if (file.exists())
+ wsdlURL = file.toURL();
+ }
+ catch (MalformedURLException e)
+ {
+ // ignore
+ }
+ }
+
+ // Try the filename as Resource
+ if (wsdlURL == null)
+ {
+ ClassLoader loader = Thread.currentThread().getContextClassLoader();
+ wsdlURL = loader.getResource(wsdlLocation);
+ }
+
+ // Try the filename relative to class
+ if (wsdlURL == null)
+ {
+ String packagePath = type.getPackage().getName().replace('.', '/');
+ ClassLoader loader = Thread.currentThread().getContextClassLoader();
+ wsdlURL = loader.getResource(packagePath + "/" + wsdlLocation);
+ }
+ }
+ return wsdlURL;
+ }
+}
Property changes on: trunk/src/main/java/org/jboss/ws/jaxws/injection/ServiceObjectFactory.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Copied: trunk/src/main/java/org/jboss/ws/jaxws/injection/ServiceReferenceable.java (from rev 1302, trunk/src/main/java/org/jboss/ws/jaxws/ServiceReferenceable.java)
===================================================================
--- trunk/src/main/java/org/jboss/ws/jaxws/ServiceReferenceable.java 2006-10-25 06:35:39 UTC (rev 1302)
+++ trunk/src/main/java/org/jboss/ws/jaxws/injection/ServiceReferenceable.java 2006-10-25 11:55:34 UTC (rev 1308)
@@ -0,0 +1,75 @@
+/*
+ * 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.
+ */
+// $Id$
+package org.jboss.ws.jaxws.injection;
+
+// $Id$
+
+import javax.naming.NamingException;
+import javax.naming.Reference;
+import javax.naming.Referenceable;
+import javax.naming.StringRefAddr;
+
+
+/**
+ * A JNDI reference to a javax.xml.ws.Service
+ *
+ * It holds the information to reconstrut the javax.xml.ws.Service
+ * when the client does a JNDI lookup.
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 24-Oct-2006
+ */
+public class ServiceReferenceable implements Referenceable
+{
+ public static final String WSDL_LOCATION = "WSDL_LOCATION";
+ public static final String SERVICE_TYPE = "SERVICE_TYPE";
+ public static final String PORT_TYPE = "PORT_TYPE";
+
+ private String serviceType;
+ private String portType;
+ private String wsdlLocation;
+
+ public ServiceReferenceable(String serviceType, String portType, String wsdlLocation)
+ {
+ this.serviceType = serviceType;
+ this.portType = portType;
+ this.wsdlLocation = wsdlLocation;
+ }
+
+ /**
+ * Retrieves the Reference of this object.
+ *
+ * @return The non-null Reference of this object.
+ * @throws javax.naming.NamingException If a naming exception was encountered while retrieving the reference.
+ */
+ public Reference getReference() throws NamingException
+ {
+ Reference myRef = new Reference(ServiceReferenceable.class.getName(), ServiceObjectFactory.class.getName(), null);
+
+ myRef.add(new StringRefAddr(SERVICE_TYPE, serviceType));
+ myRef.add(new StringRefAddr(PORT_TYPE, portType));
+ myRef.add(new StringRefAddr(WSDL_LOCATION, wsdlLocation));
+
+ return myRef;
+ }
+}
\ No newline at end of file
Property changes on: trunk/src/main/java/org/jboss/ws/jaxws/injection/ServiceReferenceable.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Copied: trunk/src/main/java/org/jboss/ws/jaxws/injection/WebServiceRefDeployer.java (from rev 1303, trunk/src/main/java/org/jboss/ws/integration/jboss/WebServiceRefDeployer.java)
===================================================================
--- trunk/src/main/java/org/jboss/ws/integration/jboss/WebServiceRefDeployer.java 2006-10-25 10:23:24 UTC (rev 1303)
+++ trunk/src/main/java/org/jboss/ws/jaxws/injection/WebServiceRefDeployer.java 2006-10-25 11:55:34 UTC (rev 1308)
@@ -0,0 +1,113 @@
+/*
+ * 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.jaxws.injection;
+
+// $Id$
+
+import javax.naming.Context;
+import javax.naming.Name;
+import javax.naming.NameNotFoundException;
+import javax.naming.NamingException;
+import javax.xml.ws.Service;
+import javax.xml.ws.WebServiceRef;
+
+import org.jboss.logging.Logger;
+
+/**
+ * Binds a JAXWS Service object into JNDI
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 24-Oct-2006
+ */
+public class WebServiceRefDeployer
+{
+ // provide logging
+ private static Logger log = Logger.getLogger(WebServiceRefDeployer.class);
+
+ private WebServiceRefDeployer()
+ {
+ // Hide ctor
+ }
+
+ public static void setupWebServiceRef(Context ctx, String jndiName, Class refType, WebServiceRef ref) throws Exception
+ {
+ String serviceTypeName = null;
+ String portTypeName = null;
+
+ // #1 Use the explicit @WebServiceRef.value
+ if (ref.value() != Object.class)
+ serviceTypeName = ref.value().getName();
+
+ // #2 Use the target ref type
+ if (serviceTypeName == null && refType != null && Service.class.isAssignableFrom(refType))
+ serviceTypeName = refType.getName();
+
+ // #3 Use javax.xml.ws.Service
+ if (serviceTypeName == null)
+ serviceTypeName = Service.class.getName();
+
+ // #1 Use the explicit @WebServiceRef.type
+ if (ref.type() != Object.class)
+ portTypeName = ref.type().getName();
+
+ // #2 Use the target ref type
+ if (portTypeName == null && refType != null && Service.class.isAssignableFrom(refType) == false)
+ portTypeName = refType.getName();
+
+ bind(ctx, jndiName, new ServiceReferenceable(serviceTypeName, portTypeName, ref.wsdlLocation()));
+ log.debug("WebServiceRef bound [jndi=" + jndiName + ",service=" + serviceTypeName + ",port=" + portTypeName + "]");
+ }
+
+ private static void bind(Context ctx, String name, Object value) throws NamingException
+ {
+ Name n = ctx.getNameParser("").parse(name);
+ bind(ctx, n, value);
+ }
+
+ private static void bind(Context ctx, Name name, Object value) throws NamingException
+ {
+ int size = name.size();
+ String atom = name.get(size - 1);
+ Context parentCtx = createSubcontext(ctx, name.getPrefix(size - 1));
+ parentCtx.bind(atom, value);
+ }
+
+ private static Context createSubcontext(Context ctx, Name name) throws NamingException
+ {
+ Context subctx = ctx;
+ for (int pos = 0; pos < name.size(); pos++)
+ {
+ String ctxName = name.get(pos);
+ try
+ {
+ subctx = (Context) ctx.lookup(ctxName);
+ }
+ catch (NameNotFoundException e)
+ {
+ subctx = ctx.createSubcontext(ctxName);
+ }
+ // The current subctx will be the ctx for the next name component
+ ctx = subctx;
+ }
+ return subctx;
+ }
+}
Property changes on: trunk/src/main/java/org/jboss/ws/jaxws/injection/WebServiceRefDeployer.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/ApplicationClient.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/ApplicationClient.java 2006-10-25 11:02:35 UTC (rev 1307)
+++ trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/ApplicationClient.java 2006-10-25 11:55:34 UTC (rev 1308)
@@ -56,14 +56,15 @@
try
{
InitialContext iniCtx = new InitialContext();
- //ports.add(((TestEndpointService)iniCtx.lookup("java:comp/env/service1")).getTestEndpointPort());
- //ports.add(((TestEndpointService)iniCtx.lookup("java:comp/env/service2")).getTestEndpointPort());
+ ports.add(((TestEndpointService)iniCtx.lookup("java:comp.ejb3/env/service1")).getTestEndpointPort());
+ ports.add(((TestEndpointService)iniCtx.lookup("java:comp.ejb3/env/service2")).getTestEndpointPort());
ports.add((TestEndpoint)service3.getPort(TestEndpoint.class));
- //ports.add((TestEndpoint)iniCtx.lookup("java:comp/env/port1"));
+ ports.add((TestEndpoint)iniCtx.lookup("java:comp.ejb3/env/port1"));
ports.add(port2);
}
catch (Exception ex)
{
+ log.error("Cannot add port", ex);
throw new WebServiceException(ex);
}
Modified: trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/EJB3Client.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/EJB3Client.java 2006-10-25 11:02:35 UTC (rev 1307)
+++ trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/EJB3Client.java 2006-10-25 11:55:34 UTC (rev 1308)
@@ -61,14 +61,15 @@
try
{
InitialContext iniCtx = new InitialContext();
- //ports.add(((TestEndpointService)iniCtx.lookup("java:comp/env/service1")).getTestEndpointPort());
- //ports.add(((TestEndpointService)iniCtx.lookup("java:comp/env/service2")).getTestEndpointPort());
+ ports.add(((TestEndpointService)iniCtx.lookup("java:comp.ejb3/env/service1")).getTestEndpointPort());
+ ports.add(((TestEndpointService)iniCtx.lookup("java:comp.ejb3/env/service2")).getTestEndpointPort());
ports.add((TestEndpoint)service3.getPort(TestEndpoint.class));
- //ports.add((TestEndpoint)iniCtx.lookup("java:comp/env/port1"));
+ ports.add((TestEndpoint)iniCtx.lookup("java:comp.ejb3/env/port1"));
ports.add(port2);
}
catch (Exception ex)
{
+ log.error("Cannot add port", ex);
throw new WebServiceException(ex);
}
Modified: trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/ServletClient.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/ServletClient.java 2006-10-25 11:02:35 UTC (rev 1307)
+++ trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/ServletClient.java 2006-10-25 11:55:34 UTC (rev 1308)
@@ -60,14 +60,15 @@
try
{
InitialContext iniCtx = new InitialContext();
- //ports.add(((TestEndpointService)iniCtx.lookup("java:comp/env/service1")).getTestEndpointPort());
- //ports.add(((TestEndpointService)iniCtx.lookup("java:comp/env/service2")).getTestEndpointPort());
+ ports.add(((TestEndpointService)iniCtx.lookup("java:comp/env/service1")).getTestEndpointPort());
+ ports.add(((TestEndpointService)iniCtx.lookup("java:comp/env/service2")).getTestEndpointPort());
ports.add((TestEndpoint)service3.getPort(TestEndpoint.class));
- //ports.add((TestEndpoint)iniCtx.lookup("java:comp/env/port1"));
+ ports.add((TestEndpoint)iniCtx.lookup("java:comp/env/port1"));
ports.add(port2);
}
catch (Exception ex)
{
+ log.error("Cannot add port", ex);
throw new WebServiceException(ex);
}
18 years, 2 months
- 1
- 0
JBossWS SVN: r1307 - branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/wseventing
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2006-10-25 07:02:35 -0400 (Wed, 25 Oct 2006)
New Revision: 1307
Modified:
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/wseventing/SubscriptionManagerTestCase.java
Log:
Handle expiration times gracefully
Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/wseventing/SubscriptionManagerTestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/wseventing/SubscriptionManagerTestCase.java 2006-10-25 11:01:59 UTC (rev 1306)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/wseventing/SubscriptionManagerTestCase.java 2006-10-25 11:02:35 UTC (rev 1307)
@@ -134,20 +134,6 @@
}
}
- public void testExceedsMaxLeaseTime() throws Exception
- {
- try
- {
- Date expires = new Date(System.currentTimeMillis() + EventingConstants.MAX_LEASE_TIME + 5000);
- subscriptionManager.subscribe(eventSourceNS, eventSinkEndpoint, eventSinkEndpoint, expires, null);
- fail("Expiration time exceeds lease limit");
- }
- catch (Exception e)
- {
- // ignore expected exception
- }
- }
-
/**
* If the expression evaluates to false for a notification,
* the notification MUST NOT be sent to the event sink.
18 years, 2 months
- 1
- 0