Author: thomas.diesler(a)jboss.com Date: 2007-01-31 10:40:31 -0500 (Wed, 31 Jan 2007) New Revision: 2217 Modified: branches/jbossws-1.2.0/integration-jboss40/build.xml branches/jbossws-1.2.0/integration-jboss42/build.xml branches/jbossws-1.2.0/integration-jboss50/build.xml branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/JBossXBSerializer.java branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/CallImpl.java branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceFactoryImpl.java branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceImpl.java branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceObjectFactory.java branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/j2ee/UnifiedPortComponentRefMetaData.java branches/jbossws-1.2.0/jbossws-tests/build.xml branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1011/JBWS1011TestCase.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1427/JBWS1427TestCase.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/DocEJBTestCase.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcDIIConfiguredCallTestCase.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcDIIUnconfiguredCallTestCase.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcEJBTestCase.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcProxyTestCase.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/secureejb/SecureEJBTestCase.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/wsbpel/JbpmBpelTestSetup.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/webserviceref/WebServiceRefEJBTestCase.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsse/UsernameTestCase.java branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/wsse/username/META-INF/jboss-client.xml Log: Support <service-ref> call properties for jaxrpc Deploy bpel.sar a part of the bpel test setup Enable EJB-2.1 deployments for jboss50 Modified: branches/jbossws-1.2.0/integration-jboss40/build.xml =================================================================== --- branches/jbossws-1.2.0/integration-jboss40/build.xml 2007-01-31 14:16:44 UTC (rev 2216) +++ branches/jbossws-1.2.0/integration-jboss40/build.xml 2007-01-31 15:40:31 UTC (rev 2217) @@ -319,8 +319,6 @@ <delete dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> <mkdir dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> <unjar dest="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="${jboss40.output.lib.dir}/jbossws40.sar"/> - <!-- Deploy the BPEL sar --> - <copy file="${thirdparty.dir}/jbpm-bpel.sar" todir="${jboss40.home}/server/${jboss.server.instance}/deploy"/> <!-- The JBossAS testsuite references jbosswsfrom thirdparty --> <copy todir="${jboss40.home}/../../../thirdparty/jboss/jbossws/lib" overwrite="true"> <fileset dir="${core.output.lib.dir}"> @@ -362,8 +360,6 @@ <delete dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws14.sar"/> <mkdir dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws14.sar"/> <unjar dest="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws14.sar" src="${jboss40.output.lib.dir}/jbossws40-jdk14.sar"/> - <!-- Deploy the BPEL sar --> - <copy file="${thirdparty.dir}/jbpm-bpel.sar" todir="${jboss40.home}/server/${jboss.server.instance}/deploy"/> <!-- The JBossAS testsuite references jbosswsfrom thirdparty --> <copy todir="${jboss40.home}/../../../thirdparty/jboss/jbossws/lib" overwrite="true"> <fileset dir="${jboss40.output.lib.dir}"> Modified: branches/jbossws-1.2.0/integration-jboss42/build.xml =================================================================== --- branches/jbossws-1.2.0/integration-jboss42/build.xml 2007-01-31 14:16:44 UTC (rev 2216) +++ branches/jbossws-1.2.0/integration-jboss42/build.xml 2007-01-31 15:40:31 UTC (rev 2217) @@ -49,6 +49,7 @@ <javac srcdir="${jboss42.java.dir}" sourcepath="" destdir="${jboss42.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}" deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}"> <include name="org/jboss/ws/integration/jboss42/**"/> + <exclude name="org/jboss/ws/integration/jboss42/*EJB3.java"/> <classpath refid="jboss42.integration.classpath"/> <classpath path="${core.output.classes14.dir}"/> <classpath path="${core.output.classes.dir}"/> @@ -153,8 +154,6 @@ <delete dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> <mkdir dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> <unjar dest="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="${jboss42.output.lib.dir}/jbossws42.sar"/> - <!-- Deploy the BPEL sar --> - <copy file="${thirdparty.dir}/jbpm-bpel.sar" todir="${jboss42.home}/server/${jboss.server.instance}/deploy"/> <!-- The JBossAS testsuite references jbosswsfrom thirdparty --> <copy todir="${jboss42.home}/../../../thirdparty/jboss/jbossws/lib" overwrite="true"> <fileset dir="${core.output.lib.dir}"> Modified: branches/jbossws-1.2.0/integration-jboss50/build.xml =================================================================== --- branches/jbossws-1.2.0/integration-jboss50/build.xml 2007-01-31 14:16:44 UTC (rev 2216) +++ branches/jbossws-1.2.0/integration-jboss50/build.xml 2007-01-31 15:40:31 UTC (rev 2217) @@ -162,8 +162,6 @@ <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> <unjar dest="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="${jboss50.output.lib.dir}/jbossws50.sar"/> - <!-- deploy the BPEL sar --> - <copy file="${thirdparty.dir}/jbpm-bpel.sar" todir="${jboss50.home}/server/${jboss.server.instance}/deploy"/> <!-- The JBossAS testsuite references jbosswsfrom thirdparty --> <copy todir="${jboss50.home}/../../../thirdparty/jboss/jbossws/lib" overwrite="true"> <fileset dir="${core.output.lib.dir}"> Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/JBossXBSerializer.java =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/JBossXBSerializer.java 2007-01-31 14:16:44 UTC (rev 2216) +++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/JBossXBSerializer.java 2007-01-31 15:40:31 UTC (rev 2217) @@ -33,7 +33,6 @@ import org.jboss.ws.core.jaxrpc.binding.jbossxb.JBossXBConstants; import org.jboss.ws.core.jaxrpc.binding.jbossxb.JBossXBMarshaller; import org.jboss.ws.core.jaxrpc.binding.jbossxb.JBossXBMarshallerImpl; -import org.jboss.ws.core.jaxrpc.binding.jbossxb.XercesXSMarshallerImpl; import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping; import org.w3c.dom.NamedNodeMap; Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/CallImpl.java =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/CallImpl.java 2007-01-31 14:16:44 UTC (rev 2216) +++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/CallImpl.java 2007-01-31 15:40:31 UTC (rev 2217) @@ -447,10 +447,12 @@ { if (null == name) throw new JAXRPCException("Unsupported property: " + name); + // CTS: com/sun/ts/tests/jaxrpc/api/javax_xml_rpc/Call/Client.java#SetGetPropertyTest2 if (name.startsWith("javax.xml.rpc") && standardProperties.contains(name) == false) throw new JAXRPCException("Unsupported property: " + name); + log.debug("setProperty: [name=" + name + ",value=" + value + "]"); properties.put(name, value); } Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceFactoryImpl.java =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceFactoryImpl.java 2007-01-31 14:16:44 UTC (rev 2216) +++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceFactoryImpl.java 2007-01-31 15:40:31 UTC (rev 2217) @@ -106,7 +106,7 @@ */ public Service createService(QName serviceName) throws ServiceException { - return new ServiceImpl(serviceName); + return new ServiceImpl(serviceName, null); } /** @@ -154,7 +154,7 @@ */ public Service createService(URL wsdlURL, QName serviceName, URL mappingURL, URL securityURL) throws ServiceException { - ServiceImpl service = new ServiceImpl(serviceName, wsdlURL, mappingURL, securityURL); + ServiceImpl service = new ServiceImpl(serviceName, wsdlURL, mappingURL, securityURL, null); return service; } } Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceImpl.java =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceImpl.java 2007-01-31 14:16:44 UTC (rev 2216) +++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceImpl.java 2007-01-31 15:40:31 UTC (rev 2217) @@ -27,10 +27,12 @@ import java.net.URL; import java.rmi.Remote; import java.util.ArrayList; +import java.util.Enumeration; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; import java.util.List; +import java.util.Properties; import java.util.Set; import javax.xml.namespace.QName; @@ -45,6 +47,7 @@ import org.jboss.logging.Logger; import org.jboss.ws.core.StubExt; import org.jboss.ws.metadata.builder.jaxrpc.JAXRPCClientMetaDataBuilder; +import org.jboss.ws.metadata.j2ee.UnifiedPortComponentRefMetaData; import org.jboss.ws.metadata.j2ee.UnifiedServiceRefMetaData; import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping; import org.jboss.ws.metadata.umdm.EndpointMetaData; @@ -77,9 +80,10 @@ // The service meta data that is associated with this JAXRPC Service private ServiceMetaData serviceMetaData; - // The optional WSDL location private URL wsdlLocation; + // The <service-ref> meta data + private UnifiedServiceRefMetaData usrMetaData; // The handler registry private HandlerRegistryImpl handlerRegistry; @@ -87,8 +91,9 @@ /** * Construct a Service without WSDL meta data */ - ServiceImpl(QName serviceName) + ServiceImpl(QName serviceName, UnifiedServiceRefMetaData usrMetaData) { + this.usrMetaData = usrMetaData; UnifiedMetaData wsMetaData = new UnifiedMetaData(new ResourceLoaderAdapter()); serviceMetaData = new ServiceMetaData(wsMetaData, serviceName); handlerRegistry = new HandlerRegistryImpl(serviceMetaData); @@ -97,9 +102,10 @@ /** * Construct a Service that has access to some WSDL meta data */ - ServiceImpl(QName serviceName, URL wsdlURL, URL mappingURL, URL securityURL) + ServiceImpl(QName serviceName, URL wsdlURL, URL mappingURL, URL securityURL, UnifiedServiceRefMetaData usrMetaData) { this.wsdlLocation = wsdlURL; + this.usrMetaData = usrMetaData; JAXRPCClientMetaDataBuilder builder = new JAXRPCClientMetaDataBuilder(); ClassLoader ctxClassLoader = Thread.currentThread().getContextClassLoader(); @@ -111,14 +117,15 @@ /** * Construct a Service that has access to some WSDL meta data */ - ServiceImpl(QName serviceName, URL wsdlURL, JavaWsdlMapping mappingURL, WSSecurityConfiguration securityConfig, UnifiedServiceRefMetaData serviceRefMetaData) + ServiceImpl(QName serviceName, URL wsdlURL, JavaWsdlMapping mappingURL, WSSecurityConfiguration securityConfig, UnifiedServiceRefMetaData usrMetaData) { this.wsdlLocation = wsdlURL; + this.usrMetaData = usrMetaData; + JAXRPCClientMetaDataBuilder builder = new JAXRPCClientMetaDataBuilder(); - ClassLoader ctxClassLoader = Thread.currentThread().getContextClassLoader(); - - serviceMetaData = builder.buildMetaData(serviceName, wsdlURL, mappingURL, securityConfig, serviceRefMetaData, ctxClassLoader); + + serviceMetaData = builder.buildMetaData(serviceName, wsdlURL, mappingURL, securityConfig, usrMetaData, ctxClassLoader); handlerRegistry = new HandlerRegistryImpl(serviceMetaData); } @@ -160,7 +167,9 @@ { String nsURI = portName.getNamespaceURI(); serviceMetaData.assertTargetNamespace(nsURI); - return new CallImpl(this, portName, null); + CallImpl call = new CallImpl(this, portName, null); + initCallProperties(call, null); + return call; } /** @@ -180,7 +189,9 @@ String nsURI = portName.getNamespaceURI(); serviceMetaData.assertTargetNamespace(nsURI); QName opName = new QName(nsURI, operationName); - return new CallImpl(this, portName, opName); + CallImpl call = new CallImpl(this, portName, opName); + initCallProperties(call, null); + return call; } /** @@ -199,7 +210,9 @@ { serviceMetaData.assertTargetNamespace(portName.getNamespaceURI()); serviceMetaData.assertTargetNamespace(opName.getNamespaceURI()); - return new CallImpl(this, portName, opName); + CallImpl call = new CallImpl(this, portName, opName); + initCallProperties(call, null); + return call; } /** @@ -213,7 +226,9 @@ */ public Call createCall() throws ServiceException { - return new CallImpl(this); + CallImpl call = new CallImpl(this); + initCallProperties(call, null); + return call; } /** @@ -392,6 +407,7 @@ private Remote createProxy(Class seiClass, EndpointMetaData epMetaData) throws Exception { CallImpl call = new CallImpl(this, epMetaData); + initCallProperties(call, seiClass.getName()); PortProxy handler = new PortProxy(call); ClassLoader cl = epMetaData.getClassLoader(); @@ -400,6 +416,47 @@ return proxy; } + private void initCallProperties(CallImpl call, String seiName) + { + // nothing to do + if (usrMetaData == null) + return; + + // General properties + Properties callProps = usrMetaData.getCallProperties(); + if (callProps != null) + { + Enumeration<?> names = callProps.propertyNames(); + while (names.hasMoreElements()) + { + String name = (String)names.nextElement(); + String value = callProps.getProperty(name); + call.setProperty(name, value); + } + } + + if (seiName != null) + { + for (UnifiedPortComponentRefMetaData upcRef : usrMetaData.getPortComponentRefs()) + { + if (seiName.equals(upcRef.getServiceEndpointInterface())) + { + callProps = upcRef.getCallProperties(); + if (callProps != null) + { + Enumeration<?> names = callProps.propertyNames(); + while (names.hasMoreElements()) + { + String name = (String)names.nextElement(); + String value = callProps.getProperty(name); + call.setProperty(name, value); + } + } + } + } + } + } + /** * Get the handler chain for the given endpoint name, maybe null. */ Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceObjectFactory.java =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceObjectFactory.java 2007-01-31 14:16:44 UTC (rev 2216) +++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceObjectFactory.java 2007-01-31 15:40:31 UTC (rev 2217) @@ -102,13 +102,13 @@ Reference ref = (Reference)obj; // Unmarshall the ServiceRefMetaData - UnifiedServiceRefMetaData serviceRefMetaData = null; + UnifiedServiceRefMetaData usrMetaData = null; RefAddr metaRefAddr = ref.get(ServiceReferenceable.SERVICE_REF_META_DATA); ByteArrayInputStream bais = new ByteArrayInputStream((byte[])metaRefAddr.getContent()); try { ObjectInputStream ois = new ObjectInputStream(bais); - serviceRefMetaData = (UnifiedServiceRefMetaData)ois.readObject(); + usrMetaData = (UnifiedServiceRefMetaData)ois.readObject(); ois.close(); } catch (IOException ex) @@ -137,25 +137,25 @@ } ServiceImpl jaxrpcService = null; - URL wsdlLocation = serviceRefMetaData.getWsdlLocation(); + URL wsdlLocation = usrMetaData.getWsdlLocation(); if (wsdlLocation != null) { log.debug("Create jaxrpc service from wsdl"); // Create the actual service object - QName serviceName = serviceRefMetaData.getServiceQName(); - JavaWsdlMapping javaWsdlMapping = (JavaWsdlMapping)serviceRefMetaData.getJavaWsdlMapping(); - jaxrpcService = new ServiceImpl(serviceName, wsdlLocation, javaWsdlMapping, securityConfig, serviceRefMetaData); + QName serviceName = usrMetaData.getServiceQName(); + JavaWsdlMapping javaWsdlMapping = (JavaWsdlMapping)usrMetaData.getJavaWsdlMapping(); + jaxrpcService = new ServiceImpl(serviceName, wsdlLocation, javaWsdlMapping, securityConfig, usrMetaData); } else { log.debug("Create jaxrpc service with no wsdl"); - jaxrpcService = new ServiceImpl(new QName(Constants.NS_JBOSSWS_URI, "AnonymousService")); + jaxrpcService = new ServiceImpl(new QName(Constants.NS_JBOSSWS_URI, "AnonymousService"), usrMetaData); } // Set any service level properties ServiceMetaData serviceMetaData = jaxrpcService.getServiceMetaData(); - serviceMetaData.setProperties(serviceRefMetaData.getCallProperties()); + serviceMetaData.setProperties(usrMetaData.getCallProperties()); // The web service client using a port-component-link, the contet is the URL to // the PortComponentLinkServlet that will return the actual endpoint address @@ -211,12 +211,12 @@ // load the service interface class ClassLoader contextCL = Thread.currentThread().getContextClassLoader(); - Class siClass = contextCL.loadClass(serviceRefMetaData.getServiceInterface()); + Class siClass = contextCL.loadClass(usrMetaData.getServiceInterface()); if (Service.class.isAssignableFrom(siClass) == false) throw new JAXRPCException("The service interface does not implement javax.xml.rpc.Service: " + siClass.getName()); // load all service endpoint interface classes - UnifiedPortComponentRefMetaData[] pcrArray = serviceRefMetaData.getPortComponentRefs(); + UnifiedPortComponentRefMetaData[] pcrArray = usrMetaData.getPortComponentRefs(); for (int i = 0; i < pcrArray.length; i++) { UnifiedPortComponentRefMetaData pcr = pcrArray[i]; Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java 2007-01-31 14:16:44 UTC (rev 2216) +++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java 2007-01-31 15:40:31 UTC (rev 2217) @@ -100,7 +100,7 @@ /** Build from WSDL and jaxrpc-mapping.xml */ public ServiceMetaData buildMetaData(QName serviceQName, URL wsdlURL, JavaWsdlMapping javaWsdlMapping, WSSecurityConfiguration securityConfig, - UnifiedServiceRefMetaData serviceRefMetaData, ClassLoader loader) + UnifiedServiceRefMetaData usrMetaData, ClassLoader loader) { log.debug("START buildMetaData: [service=" + serviceQName + "]"); try @@ -119,9 +119,9 @@ if (javaWsdlMapping != null) { URL mappingURL = new URL(Constants.NS_JBOSSWS_URI + "/dummy-mapping-file"); - if (serviceRefMetaData != null && serviceRefMetaData.getMappingLocation() != null) + if (usrMetaData != null && usrMetaData.getMappingLocation() != null) { - mappingURL = serviceRefMetaData.getMappingLocation(); + mappingURL = usrMetaData.getMappingLocation(); } wsMetaData.addMappingDefinition(mappingURL.toExternalForm(), javaWsdlMapping); serviceMetaData.setMappingLocation(mappingURL); @@ -133,7 +133,7 @@ setupSecurity(securityConfig, wsMetaData.getRootFile()); } - buildMetaDataInternal(serviceMetaData, wsdlDefinitions, javaWsdlMapping, serviceRefMetaData); + buildMetaDataInternal(serviceMetaData, wsdlDefinitions, javaWsdlMapping, usrMetaData); // eagerly initialize wsMetaData.eagerInitialize(); Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/j2ee/UnifiedPortComponentRefMetaData.java =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/j2ee/UnifiedPortComponentRefMetaData.java 2007-01-31 14:16:44 UTC (rev 2216) +++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/j2ee/UnifiedPortComponentRefMetaData.java 2007-01-31 15:40:31 UTC (rev 2217) @@ -40,8 +40,7 @@ private String serviceEndpointInterface; // The optional <port-component-link> element private String portComponentLink; - - /** Arbitrary proxy properties given by <call-property> */ + // Arbitrary proxy properties given by <call-property> private Properties callProperties; public String getPortComponentLink() Modified: branches/jbossws-1.2.0/jbossws-tests/build.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/build.xml 2007-01-31 14:16:44 UTC (rev 2216) +++ branches/jbossws-1.2.0/jbossws-tests/build.xml 2007-01-31 15:40:31 UTC (rev 2217) @@ -111,7 +111,7 @@ <available property="installer.setup" file="jboss-ejb3-client.jar"/> <mkdir dir="${tests.output.dir}/log"/> - <touch file="${tests.output.dir}/logtest.log"/> + <touch file="${tests.output.dir}/log/test.log"/> <tstamp> <format property="build.id" pattern="yyyyMMddHHmm"/> @@ -217,9 +217,11 @@ <pathelement location="${thirdparty.dir}/commons-logging.jar"/> <pathelement location="${thirdparty.dir}/dom4j.jar"/> <pathelement location="${thirdparty.dir}/wsdl4j.jar"/> - <pathelement location="${tests.etc.dir}"/> <!-- log4j.xml --> + <pathelement location="${thirdparty.dir}/jboss-logging-log4j.jar"/> + <!-- <pathelement location="${thirdparty.dir}/log4j.jar"/> - <pathelement location="${thirdparty.dir}/jboss-logging-log4j.jar"/> + <pathelement location="${tests.etc.dir}"/> + --> </path> </target> @@ -306,12 +308,14 @@ --> <target name="generate-sources" depends="compile" description="Generate the deployment resources."> <!-- create jbpm process archives --> - <mkdir dir="${tests.output.dir}/libs"/> + <mkdir dir="${tests.output.dir}/libs"/> <zip destfile="${tests.output.dir}/libs/jaxrpc-samples-wsbpel-hello-process.zip"> <fileset dir="${tests.resources.dir}/jaxrpc/samples/wsbpel/hello/bpel" /> </zip> + <!-- Copy the BPEL sar --> + <copy file="${thirdparty.dir}/jbpm-bpel.sar" todir="${tests.output.dir}/libs"/> - <!-- generate wsdl binding and service definitions for bpel processes --> + <!-- generate wsdl binding and service definitions for bpel processes --> <taskdef name="servicegen" classname="org.jbpm.bpel.ant.ServiceGeneratorTask"> <classpath refid="jbpm.bpel.classpath"/> </taskdef> @@ -319,7 +323,7 @@ outputdir="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF/wsdl" bindingfile="hello-binding-.wsdl" servicefile="hello-service.wsdl" /> - <!-- generate mapping artifacts --> + <!-- generate mapping artifacts --> <taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools"> <classpath refid="core.classpath"/> <classpath location="${jbossws.client.jar}"/> Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1011/JBWS1011TestCase.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1011/JBWS1011TestCase.java 2007-01-31 14:16:44 UTC (rev 2216) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1011/JBWS1011TestCase.java 2007-01-31 15:40:31 UTC (rev 2217) @@ -60,12 +60,6 @@ public void testCall() throws Exception { - if (isTargetJBoss50()) - { - System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); - return; - } - String response = port.echoString("Hello"); assertEquals("Hello", response); } Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1427/JBWS1427TestCase.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1427/JBWS1427TestCase.java 2007-01-31 14:16:44 UTC (rev 2216) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1427/JBWS1427TestCase.java 2007-01-31 15:40:31 UTC (rev 2217) @@ -72,12 +72,6 @@ public final void testWsdlParser() throws Exception { - if (isTargetJBoss50()) - { - System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); - return; - } - WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); File wsdlFile = new File("resources/jaxrpc/jbws1427/META-INF/wsdl/ProcessClaim.wsdl"); assertTrue("File exists: " + wsdlFile, wsdlFile.exists()); @@ -87,12 +81,6 @@ public final void testEndpointAccess() throws Exception { - if (isTargetJBoss50()) - { - System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); - return; - } - Message inObj = new Message("Kermit", new Integer(100)); Message retObj = port.processClaim(inObj); assertEquals(inObj, retObj); Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/DocEJBTestCase.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/DocEJBTestCase.java 2007-01-31 14:16:44 UTC (rev 2216) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/DocEJBTestCase.java 2007-01-31 15:40:31 UTC (rev 2217) @@ -58,12 +58,6 @@ public void testEchoString() throws Exception { - if (isTargetJBoss50()) - { - System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); - return; - } - String hello = "Hello"; String world = "world!"; Object retObj = endpoint.echoString(hello, world); @@ -72,12 +66,6 @@ public void testEchoSimpleUserType() throws Exception { - if (isTargetJBoss50()) - { - System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); - return; - } - String hello = "Hello"; SimpleUserType userType = new SimpleUserType(1, 2); Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcDIIConfiguredCallTestCase.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcDIIConfiguredCallTestCase.java 2007-01-31 14:16:44 UTC (rev 2216) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcDIIConfiguredCallTestCase.java 2007-01-31 15:40:31 UTC (rev 2217) @@ -73,12 +73,6 @@ public void testEchoString() throws Exception { - if (isTargetJBoss50()) - { - System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); - return; - } - QName operationName = new QName(TARGET_NAMESPACE, "echoString"); call.setOperationName(operationName); assertFalse(call.isParameterAndReturnSpecRequired(operationName)); @@ -97,12 +91,6 @@ public void testEchoSimpleUserType() throws Exception { - if (isTargetJBoss50()) - { - System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); - return; - } - QName operationName = new QName(TARGET_NAMESPACE, "echoSimpleUserType"); call.setOperationName(operationName); Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcDIIUnconfiguredCallTestCase.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcDIIUnconfiguredCallTestCase.java 2007-01-31 14:16:44 UTC (rev 2216) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcDIIUnconfiguredCallTestCase.java 2007-01-31 15:40:31 UTC (rev 2217) @@ -65,12 +65,6 @@ call.setTargetEndpointAddress(TARGET_ENDPOINT_ADDRESS); - if (isTargetJBoss50()) - { - System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); - return; - } - String hello = "Hello"; String world = "world!"; Object retObj = call.invoke(new Object[]{hello, world}); @@ -96,12 +90,6 @@ call.setTargetEndpointAddress(TARGET_ENDPOINT_ADDRESS); - if (isTargetJBoss50()) - { - System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); - return; - } - String hello = "Hello"; SimpleUserType userType = new SimpleUserType(1, 2); Object retObj = call.invoke(new Object[]{hello, userType}); Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcEJBTestCase.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcEJBTestCase.java 2007-01-31 14:16:44 UTC (rev 2216) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcEJBTestCase.java 2007-01-31 15:40:31 UTC (rev 2217) @@ -61,12 +61,6 @@ String hello = "Hello"; String world = "world!"; - if (isTargetJBoss50()) - { - System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); - return; - } - Object retObj = port.echoString(hello, world); assertEquals(hello + world, retObj); } @@ -76,12 +70,6 @@ String hello = "Hello"; SimpleUserType userType = new SimpleUserType(1, 2); - if (isTargetJBoss50()) - { - System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); - return; - } - Object retObj = port.echoSimpleUserType(hello, userType); assertEquals(userType, retObj); } Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcProxyTestCase.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcProxyTestCase.java 2007-01-31 14:16:44 UTC (rev 2216) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcProxyTestCase.java 2007-01-31 15:40:31 UTC (rev 2217) @@ -73,12 +73,6 @@ String hello = "Hello"; String world = "world!"; - if (isTargetJBoss50()) - { - System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); - return; - } - Object retObj = port.echoString(hello, world); assertEquals(hello + world, retObj); } @@ -88,12 +82,6 @@ String hello = "Hello"; SimpleUserType userType = new SimpleUserType(1, 2); - if (isTargetJBoss50()) - { - System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); - return; - } - Object retObj = port.echoSimpleUserType(hello, userType); assertEquals(userType, retObj); } Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/secureejb/SecureEJBTestCase.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/secureejb/SecureEJBTestCase.java 2007-01-31 14:16:44 UTC (rev 2216) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/secureejb/SecureEJBTestCase.java 2007-01-31 15:40:31 UTC (rev 2217) @@ -63,12 +63,6 @@ */ public void testRoleSecuredSLSB() throws Exception { - if (isTargetJBoss50()) - { - System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); - return; - } - InitialContext iniCtx = getInitialContext(); OrganizationHome home = (OrganizationHome)iniCtx.lookup("ejb/RoleSecuredSLSB"); @@ -94,12 +88,6 @@ */ public void testBasicSecuredSLSB() throws Exception { - if (isTargetJBoss50()) - { - System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); - return; - } - InitialContext iniCtx = getInitialContext(); OrganizationHome home = (OrganizationHome)iniCtx.lookup("ejb/BasicSecuredSLSB"); @@ -110,12 +98,6 @@ public void testBasicSecuredServiceAccess() throws Exception { - if (isTargetJBoss50()) - { - System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); - return; - } - InitialContext iniCtx = getInitialContext(); Service service = (Service)iniCtx.lookup("java:comp/env/service/BasicSecured"); QName portName = new QName("http://org.jboss.ws/samples/secureejb", "BasicSecuredPort"); @@ -141,12 +123,6 @@ public void testRoleSecuredServiceAccess() throws Exception { - if (isTargetJBoss50()) - { - System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); - return; - } - InitialContext iniCtx = getInitialContext(); Service service = (Service)iniCtx.lookup("java:comp/env/service/RoleSecured"); QName portName = new QName("http://org.jboss.ws/samples/secureejb", "RoleSecuredPort"); @@ -172,12 +148,6 @@ public void testConfidentialServiceAccess() throws Exception { - if (isTargetJBoss50()) - { - System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); - return; - } - InitialContext iniCtx = getInitialContext(); Service service = (Service)iniCtx.lookup("java:comp/env/service/ConfidentialSecured"); QName portName = new QName("http://org.jboss.ws/samples/secureejb", "ConfidentialPort"); @@ -192,8 +162,8 @@ { stub._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8080/jaxrpc-samples-ejb/ConfidentialSecured"); port.getContactInfo("mafia"); - System.out.println("FIXME: JBAS-3595"); - //fail("Security exception expected"); + System.out.println("FIXME: [JBAS-3595] - Tomcat allows http access with transport guarantie CONFIDENTIAL"); + fail("Security exception expected"); } catch (RemoteException ignore) { Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/wsbpel/JbpmBpelTestSetup.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/wsbpel/JbpmBpelTestSetup.java 2007-01-31 14:16:44 UTC (rev 2216) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/wsbpel/JbpmBpelTestSetup.java 2007-01-31 15:40:31 UTC (rev 2217) @@ -47,6 +47,8 @@ protected void setUp() throws Exception { + new JBossWSTestHelper().deploy("jbpm-bpel.sar"); + for (int i = 0; i < processFiles.length; i++) { String processFileName = processFiles[i]; @@ -59,6 +61,12 @@ deploy(processFile); } } + + @Override + protected void tearDown() throws Exception + { + new JBossWSTestHelper().undeploy("jbpm-bpel.sar"); + } public static void deploy(File processFile) throws Exception { Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/webserviceref/WebServiceRefEJBTestCase.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/webserviceref/WebServiceRefEJBTestCase.java 2007-01-31 14:16:44 UTC (rev 2216) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/webserviceref/WebServiceRefEJBTestCase.java 2007-01-31 15:40:31 UTC (rev 2217) @@ -62,12 +62,6 @@ public void testDynamicProxy() throws Exception { - if (isTargetJBoss50()) - { - System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); - return; - } - 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"); @@ -81,12 +75,6 @@ public void testEJBClient() throws Exception { - if (isTargetJBoss50()) - { - System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); - return; - } - InitialContext iniCtx = getInitialContext(); EJBRemoteHome ejbHome = (EJBRemoteHome)iniCtx.lookup("/ejb/EJBClient"); EJBRemote ejbRemote = ejbHome.create(); Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsse/UsernameTestCase.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsse/UsernameTestCase.java 2007-01-31 14:16:44 UTC (rev 2216) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsse/UsernameTestCase.java 2007-01-31 15:40:31 UTC (rev 2217) @@ -57,8 +57,6 @@ InitialContext iniCtx = getInitialContext(); Service service = (Service)iniCtx.lookup("java:comp/env/service/TestServiceEJB"); port = (JaxRpcTestService)service.getPort(JaxRpcTestService.class); - ((Stub)port)._setProperty(Stub.USERNAME_PROPERTY, "kermit"); - ((Stub)port)._setProperty(Stub.PASSWORD_PROPERTY, "thefrog"); } Properties props = System.getProperties(); @@ -72,12 +70,6 @@ public void testEchoString() throws Exception { - if (isTargetJBoss50()) - { - System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); - return; - } - String hello = "Hello"; String world = "world!"; Object retObj = port.echoString(hello, world); @@ -86,12 +78,6 @@ public void testEchoSimpleUserType() throws Exception { - if (isTargetJBoss50()) - { - System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); - return; - } - String hello = "Hello"; SimpleUserType userType = new SimpleUserType(1, 2); Object retObj = port.echoSimpleUserType(hello, userType); @@ -100,12 +86,6 @@ public void testEchoStringNoUsername() throws Exception { - if (isTargetJBoss50()) - { - System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); - return; - } - String hello = "Hello"; String world = "world!"; Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/wsse/username/META-INF/jboss-client.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/wsse/username/META-INF/jboss-client.xml 2007-01-31 14:16:44 UTC (rev 2216) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/wsse/username/META-INF/jboss-client.xml 2007-01-31 15:40:31 UTC (rev 2217) @@ -8,6 +8,17 @@ <service-ref> <service-ref-name>service/TestServiceEJB</service-ref-name> <config-name>Standard WSSecurity Client</config-name> + <port-component-ref> + <service-endpoint-interface>org.jboss.test.ws.jaxrpc.wsse.JaxRpcTestService</service-endpoint-interface> + <call-property> + <prop-name>javax.xml.rpc.security.auth.username</prop-name> + <prop-value>kermit</prop-value> + </call-property> + <call-property> + <prop-name>javax.xml.rpc.security.auth.password</prop-name> + <prop-value>thefrog</prop-value> + </call-property> + </port-component-ref> <wsdl-override>http://@jbosstest.host.name@:8080/jaxrpc-wsse-username?wsdl</wsdl-override> </service-ref>