jbossws-commits March 2007

jbossws-commits@lists.jboss.org

1 participants
254 discussions

JBossWS SVN: r2489 - in trunk: build/ant-import and 5 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-03-01 09:52:17 -0500 (Thu, 01 Mar 2007) New Revision: 2489 Added: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/ServiceRefClientTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/ServiceRefEJBTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/ServiceRefServletTestCase.java Removed: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/WebServiceRefClientTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/WebServiceRefEJBTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/WebServiceRefServletTestCase.java Modified: trunk/build/ant-import/build-thirdparty.xml trunk/build/etc/jbossws-component-info.xml trunk/build/etc/jbossws-component-info14.xml trunk/build/version.properties trunk/jbossws-core/src/main/resources/samples/ant-import/build-thirdparty.xml trunk/jbossws-core/src/main/resources/samples/build.xml trunk/jbossws-core/src/main/resources/samples/version.properties trunk/jbossws-tests/build.xml Log: svn merge -r2456:2480 https://svn.jboss.org/repos/jbossws/branches/jbossws-1.2.0 Add jaxen to thirdparty because jbpm-bpel.sar doe not include it any more jbpm-bpel=1.1.0.Beta4 Avoid CCE Service.create failure Exclude interop tests from jboss50 Exclude jaxrpc/wsse tests from jboss50 Modified: trunk/build/ant-import/build-thirdparty.xml =================================================================== --- trunk/build/ant-import/build-thirdparty.xml 2007-03-01 10:26:36 UTC (rev 2488) +++ trunk/build/ant-import/build-thirdparty.xml 2007-03-01 14:52:17 UTC (rev 2489) @@ -11,7 +11,7 @@  -<project default="init-thirdparty" name="JBossWS-Thirdparty"> +<project default="thirdparty" name="JBossWS-Thirdparty">   @@ -39,6 +39,7 @@ <get src="${jboss.repository}/hibernate/${hibernate}/lib/hibernate3.jar" dest="${thirdparty.dir}/hibernate3.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/ibm-wsdl4j/${ibm-wsdl4j}/lib/wsdl4j.jar" dest="${thirdparty.dir}/wsdl4j.jar" usetimestamp="true" verbose="true"/>  + <get src="${jboss.repository}/jaxen/${jaxen}/lib/jaxen.jar" dest="${thirdparty.dir}/jaxen.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/javassist/${javassist}/lib/javassist.jar" dest="${thirdparty.dir}/javassist.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/backport-concurrent/${jboss-backport-concurrent}/lib/jboss-backport-concurrent.jar" dest="${thirdparty.dir}/jboss-backport-concurrent.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/common/${jboss-common}/lib/jboss-common.jar" dest="${thirdparty.dir}/jboss-common.jar" usetimestamp="true" verbose="true"/> Modified: trunk/build/etc/jbossws-component-info.xml =================================================================== --- trunk/build/etc/jbossws-component-info.xml 2007-03-01 10:26:36 UTC (rev 2488) +++ trunk/build/etc/jbossws-component-info.xml 2007-03-01 14:52:17 UTC (rev 2489) @@ -15,13 +15,18 @@ <import componentref="apache-xmlsec"> <compatible version="@apache-xmlsec@"/> + <compatible version="@apache-xmlsec@-brew"/> </import> <import componentref="ibm-wsdl4j"> <compatible version="@ibm-wsdl4j@"/> </import> <import componentref="javassist"> <compatible version="@javassist@"/> + <compatible version="@javassist@-brew"/> </import> + <import componentref="jbpm/bpel"> + <compatible version="@jbpm-bpel@"/> + </import> <import componentref="jboss/jbossxb"> <compatible version="@jboss-jbossxb@"/> </import> Modified: trunk/build/etc/jbossws-component-info14.xml =================================================================== --- trunk/build/etc/jbossws-component-info14.xml 2007-03-01 10:26:36 UTC (rev 2488) +++ trunk/build/etc/jbossws-component-info14.xml 2007-03-01 14:52:17 UTC (rev 2489) @@ -19,6 +19,9 @@ <import componentref="javassist"> <compatible version="@javassist@"/> </import> + <import componentref="jbpm/bpel"> + <compatible version="@jbpm-bpel@"/> + </import> <import componentref="jboss/jbossretro"> <compatible version="@jboss-jbossretro@"/> </import> Modified: trunk/build/version.properties =================================================================== --- trunk/build/version.properties 2007-03-01 10:26:36 UTC (rev 2488) +++ trunk/build/version.properties 2007-03-01 14:52:17 UTC (rev 2489) @@ -33,6 +33,7 @@ dom4j=1.6.1 gnu-getopt=1.0.10 hibernate=3.2.1.GA +jaxen=1.1-beta-10 jboss-backport-concurrent=2.1.0.GA jboss-common=1.0.3.GA jboss-common-logging-log4j=2.0.2.GA @@ -44,7 +45,7 @@ jboss-vfs=2.0.0.Beta2 jbossas-core-libs=4.0.5.GA jbossws-wsconsume=2.0.0 -jbpm-bpel=1.1.Beta3 +jbpm-bpel=1.1.0.Beta4 junit=3.8.1 oswego-concurrent=1.3.4 qdox=1.4 Modified: trunk/jbossws-core/src/main/resources/samples/ant-import/build-thirdparty.xml =================================================================== --- trunk/jbossws-core/src/main/resources/samples/ant-import/build-thirdparty.xml 2007-03-01 10:26:36 UTC (rev 2488) +++ trunk/jbossws-core/src/main/resources/samples/ant-import/build-thirdparty.xml 2007-03-01 14:52:17 UTC (rev 2489) @@ -30,6 +30,7 @@ <get src="${jboss.repository}/dom4j/${dom4j}/lib/dom4j.jar" dest="${thirdparty.dir}/dom4j.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/ibm-wsdl4j/${ibm-wsdl4j}/lib/wsdl4j.jar" dest="${thirdparty.dir}/wsdl4j.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/javassist/${javassist}/lib/javassist.jar" dest="${thirdparty.dir}/javassist.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jaxen/${jaxen}/lib/jaxen.jar" dest="${thirdparty.dir}/jaxen.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/common/${jboss-common}/lib/jboss-common.jar" dest="${thirdparty.dir}/jboss-common.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/common-logging-log4j/${jboss-common-logging-log4j}/lib/jboss-logging-log4j.jar" dest="${thirdparty.dir}/jboss-logging-log4j.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/common-logging-spi/${jboss-common-logging-spi}/lib/jboss-logging-spi.jar" dest="${thirdparty.dir}/jboss-logging-spi.jar" usetimestamp="true" verbose="true"/> Modified: trunk/jbossws-core/src/main/resources/samples/build.xml =================================================================== --- trunk/jbossws-core/src/main/resources/samples/build.xml 2007-03-01 10:26:36 UTC (rev 2488) +++ trunk/jbossws-core/src/main/resources/samples/build.xml 2007-03-01 14:52:17 UTC (rev 2489) @@ -213,6 +213,7 @@ <pathelement location="${thirdparty.dir}/commons-collections.jar"/> <pathelement location="${thirdparty.dir}/commons-logging.jar"/> <pathelement location="${thirdparty.dir}/dom4j.jar"/> + <pathelement location="${thirdparty.dir}/jaxen.jar"/> <pathelement location="${thirdparty.dir}/wsdl4j.jar"/> <pathelement location="${thirdparty.dir}/jboss-logging-log4j.jar"/> <!-- Modified: trunk/jbossws-core/src/main/resources/samples/version.properties =================================================================== --- trunk/jbossws-core/src/main/resources/samples/version.properties 2007-03-01 10:26:36 UTC (rev 2488) +++ trunk/jbossws-core/src/main/resources/samples/version.properties 2007-03-01 14:52:17 UTC (rev 2489) @@ -8,6 +8,7 @@ dom4j=@dom4j@ ibm-wsdl4j=@ibm-wsdl4j@ javassist=@javassist@ +jaxen=@jaxen@ jbpm-bpel=@jbpm-bpel@ jboss-common=@jboss-common@ jboss-common-logging-log4j=@jboss-common-logging-log4j@ Modified: trunk/jbossws-tests/build.xml =================================================================== --- trunk/jbossws-tests/build.xml 2007-03-01 10:26:36 UTC (rev 2488) +++ trunk/jbossws-tests/build.xml 2007-03-01 14:52:17 UTC (rev 2489) @@ -217,10 +217,10 @@ <pathelement location="${thirdparty.dir}/jbpm-bpel/jbpm-bpel.jar" /> <pathelement location="${thirdparty.dir}/jbpm-bpel/jbpm-jpdl.jar" /> <pathelement location="${thirdparty.dir}/jbpm-bpel/commons-lang.jar" /> - <pathelement location="${thirdparty.dir}/jbpm-bpel/jaxen.jar" /> <pathelement location="${thirdparty.dir}/commons-collections.jar"/> <pathelement location="${thirdparty.dir}/commons-logging.jar"/> <pathelement location="${thirdparty.dir}/dom4j.jar"/> + <pathelement location="${thirdparty.dir}/jaxen.jar"/> <pathelement location="${thirdparty.dir}/wsdl4j.jar"/> <pathelement location="${thirdparty.dir}/jboss-logging-log4j.jar"/> <!-- Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/ServiceRefClientTestCase.java (from rev 2480, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/ServiceRefClientTestCase.java) =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/ServiceRefClientTestCase.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/ServiceRefClientTestCase.java 2007-03-01 14:52:17 UTC (rev 2489) @@ -0,0 +1,104 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxrpc.serviceref; + +import java.io.File; +import java.net.MalformedURLException; +import java.net.URL; + +import javax.xml.namespace.QName; +import javax.xml.rpc.Service; +import javax.xml.rpc.ServiceException; +import javax.xml.rpc.ServiceFactory; + +import junit.framework.Test; + +import org.jboss.test.ws.JBossWSTest; +import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl; +import org.jboss.ws.metadata.wsdl.WSDLDefinitions; +import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; + +/** + * Test the JAXRPC <service-ref> + * + * @author Thomas.Diesler(a)jboss.com + * @since 23-Oct-2005 + */ +public class ServiceRefClientTestCase extends JBossWSTest +{ + public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxrpc-serviceref"; + + public static Test suite() + { + return JBossWSTestSetup.newTestSetup(ServiceRefClientTestCase.class, "jaxrpc-serviceref.war, jaxrpc-serviceref-client.jar"); + } + + public void testWSDLAccess() throws MalformedURLException + { + URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); + WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); + WSDLDefinitions wsdlDefinitions = factory.parse(wsdlURL); + assertNotNull(wsdlDefinitions); + } + + public void testDynamicProxy() throws Exception + { + URL wsdlURL = new File("resources/jaxrpc/serviceref/META-INF/wsdl/TestEndpoint.wsdl").toURL(); + URL mappingURL = new File("resources/jaxrpc/serviceref/META-INF/jaxrpc-mapping.xml").toURL(); + QName qname = new QName("http://org.jboss.ws/wsref", "TestEndpointService"); + Service service = new ServiceFactoryImpl().createService(wsdlURL, qname, mappingURL); + TestEndpoint port = (TestEndpoint)service.getPort(TestEndpoint.class); + + String helloWorld = "Hello World!"; + Object retObj = port.echo(helloWorld); + assertEquals(helloWorld, retObj); + } + + public void testDynamicProxyNeg() throws Exception + { + URL wsdlURL = new File("resources/jaxrpc/serviceref/META-INF/wsdl/TestEndpoint.wsdl").toURL(); + QName qname = new QName("http://org.jboss.ws/wsref", "TestEndpointService"); + Service service = ServiceFactory.newInstance().createService(wsdlURL, qname); + try + { + TestEndpoint port = (TestEndpoint)service.getPort(java.rmi.activation.Activator.class); + fail("Expected ServiceException, but got: " + port); + } + catch (ServiceException ex) + { + // this is tested by the CTS + } + catch (Exception ex) + { + fail("Expected ServiceException, but got: " + ex); + } + } + + public void testApplicationClient() throws Exception + { + String helloWorld = "Hello World!"; + ApplicationClient.encCtx = getInitialContext(); + ApplicationClient.main(new String[] { helloWorld }); + assertEquals(helloWorld, ApplicationClient.retStr); + } +} Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/ServiceRefEJBTestCase.java (from rev 2480, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/ServiceRefEJBTestCase.java) =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/ServiceRefEJBTestCase.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/ServiceRefEJBTestCase.java 2007-03-01 14:52:17 UTC (rev 2489) @@ -0,0 +1,87 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxrpc.serviceref; + +import java.io.File; +import java.net.MalformedURLException; +import java.net.URL; + +import javax.naming.InitialContext; +import javax.xml.namespace.QName; +import javax.xml.rpc.Service; + +import junit.framework.Test; + +import org.jboss.test.ws.JBossWSTest; +import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl; +import org.jboss.ws.metadata.wsdl.WSDLDefinitions; +import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; + +/** + * Test the JAXRPC <service-ref> + * + * @author Thomas.Diesler(a)jboss.com + * @since 23-Oct-2005 + */ +public class ServiceRefEJBTestCase extends JBossWSTest +{ + public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxrpc-serviceref"; + + public static Test suite() + { + return JBossWSTestSetup.newTestSetup(ServiceRefEJBTestCase.class, "jaxrpc-serviceref.war, jaxrpc-serviceref-ejb-client.jar"); + } + + public void testWSDLAccess() throws MalformedURLException + { + URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); + WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); + WSDLDefinitions wsdlDefinitions = factory.parse(wsdlURL); + assertNotNull(wsdlDefinitions); + } + + public void testDynamicProxy() throws Exception + { + URL wsdlURL = new File("resources/jaxrpc/serviceref/META-INF/wsdl/TestEndpoint.wsdl").toURL(); + URL mappingURL = new File("resources/jaxrpc/serviceref/META-INF/jaxrpc-mapping.xml").toURL(); + QName qname = new QName("http://org.jboss.ws/wsref", "TestEndpointService"); + Service service = new ServiceFactoryImpl().createService(wsdlURL, qname, mappingURL); + TestEndpoint port = (TestEndpoint)service.getPort(TestEndpoint.class); + + String helloWorld = "Hello World!"; + Object retObj = port.echo(helloWorld); + assertEquals(helloWorld, retObj); + } + + public void testEJBClient() throws Exception + { + InitialContext iniCtx = getInitialContext(); + EJBRemoteHome ejbHome = (EJBRemoteHome)iniCtx.lookup("/ejb/EJBClient"); + EJBRemote ejbRemote = ejbHome.create(); + + String helloWorld = "Hello World!"; + Object retObj = ejbRemote.echo(helloWorld); + assertEquals(helloWorld, retObj); + + } +} Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/ServiceRefServletTestCase.java (from rev 2480, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/ServiceRefServletTestCase.java) =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/ServiceRefServletTestCase.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/ServiceRefServletTestCase.java 2007-03-01 14:52:17 UTC (rev 2489) @@ -0,0 +1,84 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxrpc.serviceref; + +import java.io.BufferedReader; +import java.io.File; +import java.io.InputStreamReader; +import java.net.MalformedURLException; +import java.net.URL; + +import javax.xml.namespace.QName; +import javax.xml.rpc.Service; + +import junit.framework.Test; + +import org.jboss.test.ws.JBossWSTest; +import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl; +import org.jboss.ws.metadata.wsdl.WSDLDefinitions; +import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; + +/** + * Test the JAXRPC <service-ref> + * + * @author Thomas.Diesler(a)jboss.com + * @since 23-Oct-2005 + */ +public class ServiceRefServletTestCase extends JBossWSTest +{ + public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxrpc-serviceref"; + + public static Test suite() + { + return JBossWSTestSetup.newTestSetup(ServiceRefServletTestCase.class, "jaxrpc-serviceref.war, jaxrpc-serviceref-servlet-client.war"); + } + + public void testWSDLAccess() throws MalformedURLException + { + URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); + WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); + WSDLDefinitions wsdlDefinitions = factory.parse(wsdlURL); + assertNotNull(wsdlDefinitions); + } + + public void testDynamicProxy() throws Exception + { + URL wsdlURL = new File("resources/jaxrpc/serviceref/META-INF/wsdl/TestEndpoint.wsdl").toURL(); + URL mappingURL = new File("resources/jaxrpc/serviceref/META-INF/jaxrpc-mapping.xml").toURL(); + QName qname = new QName("http://org.jboss.ws/wsref", "TestEndpointService"); + Service service = new ServiceFactoryImpl().createService(wsdlURL, qname, mappingURL); + TestEndpoint port = (TestEndpoint)service.getPort(TestEndpoint.class); + + String helloWorld = "Hello World!"; + Object retObj = port.echo(helloWorld); + assertEquals(helloWorld, retObj); + } + + public void testServletClient() throws Exception + { + URL url = new URL(TARGET_ENDPOINT_ADDRESS + "-servlet-client?echo=HelloWorld"); + BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream())); + String retStr = br.readLine(); + assertEquals("HelloWorld", retStr); + } +} Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/WebServiceRefClientTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/WebServiceRefClientTestCase.java 2007-03-01 10:26:36 UTC (rev 2488) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/WebServiceRefClientTestCase.java 2007-03-01 14:52:17 UTC (rev 2489) @@ -1,104 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.jaxrpc.serviceref; - -import java.io.File; -import java.net.MalformedURLException; -import java.net.URL; - -import javax.xml.namespace.QName; -import javax.xml.rpc.Service; -import javax.xml.rpc.ServiceException; -import javax.xml.rpc.ServiceFactory; - -import junit.framework.Test; - -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; -import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl; -import org.jboss.ws.metadata.wsdl.WSDLDefinitions; -import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; - -/** - * Test the JAXRPC <service-ref> - * - * @author Thomas.Diesler(a)jboss.com - * @since 23-Oct-2005 - */ -public class WebServiceRefClientTestCase extends JBossWSTest -{ - public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxrpc-serviceref"; - - public static Test suite() - { - return JBossWSTestSetup.newTestSetup(WebServiceRefClientTestCase.class, "jaxrpc-serviceref.war, jaxrpc-serviceref-client.jar"); - } - - public void testWSDLAccess() throws MalformedURLException - { - URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); - WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); - WSDLDefinitions wsdlDefinitions = factory.parse(wsdlURL); - assertNotNull(wsdlDefinitions); - } - - public void testDynamicProxy() throws Exception - { - URL wsdlURL = new File("resources/jaxrpc/serviceref/META-INF/wsdl/TestEndpoint.wsdl").toURL(); - URL mappingURL = new File("resources/jaxrpc/serviceref/META-INF/jaxrpc-mapping.xml").toURL(); - QName qname = new QName("http://org.jboss.ws/wsref", "TestEndpointService"); - Service service = new ServiceFactoryImpl().createService(wsdlURL, qname, mappingURL); - TestEndpoint port = (TestEndpoint)service.getPort(TestEndpoint.class); - - String helloWorld = "Hello World!"; - Object retObj = port.echo(helloWorld); - assertEquals(helloWorld, retObj); - } - - public void testDynamicProxyNeg() throws Exception - { - URL wsdlURL = new File("resources/jaxrpc/serviceref/META-INF/wsdl/TestEndpoint.wsdl").toURL(); - QName qname = new QName("http://org.jboss.ws/wsref", "TestEndpointService"); - Service service = ServiceFactory.newInstance().createService(wsdlURL, qname); - try - { - TestEndpoint port = (TestEndpoint)service.getPort(java.rmi.activation.Activator.class); - fail("Expected ServiceException, but got: " + port); - } - catch (ServiceException ex) - { - // this is tested by the CTS - } - catch (Exception ex) - { - fail("Expected ServiceException, but got: " + ex); - } - } - - public void testApplicationClient() throws Exception - { - String helloWorld = "Hello World!"; - ApplicationClient.encCtx = getInitialContext(); - ApplicationClient.main(new String[] { helloWorld }); - assertEquals(helloWorld, ApplicationClient.retStr); - } -} Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/WebServiceRefEJBTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/WebServiceRefEJBTestCase.java 2007-03-01 10:26:36 UTC (rev 2488) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/WebServiceRefEJBTestCase.java 2007-03-01 14:52:17 UTC (rev 2489) @@ -1,87 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.jaxrpc.serviceref; - -import java.io.File; -import java.net.MalformedURLException; -import java.net.URL; - -import javax.naming.InitialContext; -import javax.xml.namespace.QName; -import javax.xml.rpc.Service; - -import junit.framework.Test; - -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; -import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl; -import org.jboss.ws.metadata.wsdl.WSDLDefinitions; -import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; - -/** - * Test the JAXRPC <service-ref> - * - * @author Thomas.Diesler(a)jboss.com - * @since 23-Oct-2005 - */ -public class WebServiceRefEJBTestCase extends JBossWSTest -{ - public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxrpc-serviceref"; - - public static Test suite() - { - return JBossWSTestSetup.newTestSetup(WebServiceRefEJBTestCase.class, "jaxrpc-serviceref.war, jaxrpc-serviceref-ejb-client.jar"); - } - - public void testWSDLAccess() throws MalformedURLException - { - URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); - WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); - WSDLDefinitions wsdlDefinitions = factory.parse(wsdlURL); - assertNotNull(wsdlDefinitions); - } - - public void testDynamicProxy() throws Exception - { - URL wsdlURL = new File("resources/jaxrpc/serviceref/META-INF/wsdl/TestEndpoint.wsdl").toURL(); - URL mappingURL = new File("resources/jaxrpc/serviceref/META-INF/jaxrpc-mapping.xml").toURL(); - QName qname = new QName("http://org.jboss.ws/wsref", "TestEndpointService"); - Service service = new ServiceFactoryImpl().createService(wsdlURL, qname, mappingURL); - TestEndpoint port = (TestEndpoint)service.getPort(TestEndpoint.class); - - String helloWorld = "Hello World!"; - Object retObj = port.echo(helloWorld); - assertEquals(helloWorld, retObj); - } - - public void testEJBClient() throws Exception - { - InitialContext iniCtx = getInitialContext(); - EJBRemoteHome ejbHome = (EJBRemoteHome)iniCtx.lookup("/ejb/EJBClient"); - EJBRemote ejbRemote = ejbHome.create(); - - String helloWorld = "Hello World!"; - Object retObj = ejbRemote.echo(helloWorld); - assertEquals(helloWorld, retObj); - - } -} Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/WebServiceRefServletTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/WebServiceRefServletTestCase.java 2007-03-01 10:26:36 UTC (rev 2488) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/WebServiceRefServletTestCase.java 2007-03-01 14:52:17 UTC (rev 2489) @@ -1,84 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.jaxrpc.serviceref; - -import java.io.BufferedReader; -import java.io.File; -import java.io.InputStreamReader; -import java.net.MalformedURLException; -import java.net.URL; - -import javax.xml.namespace.QName; -import javax.xml.rpc.Service; - -import junit.framework.Test; - -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; -import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl; -import org.jboss.ws.metadata.wsdl.WSDLDefinitions; -import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; - -/** - * Test the JAXRPC <service-ref> - * - * @author Thomas.Diesler(a)jboss.com - * @since 23-Oct-2005 - */ -public class WebServiceRefServletTestCase extends JBossWSTest -{ - public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxrpc-serviceref"; - - public static Test suite() - { - return JBossWSTestSetup.newTestSetup(WebServiceRefServletTestCase.class, "jaxrpc-serviceref.war, jaxrpc-serviceref-servlet-client.war"); - } - - public void testWSDLAccess() throws MalformedURLException - { - URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); - WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); - WSDLDefinitions wsdlDefinitions = factory.parse(wsdlURL); - assertNotNull(wsdlDefinitions); - } - - public void testDynamicProxy() throws Exception - { - URL wsdlURL = new File("resources/jaxrpc/serviceref/META-INF/wsdl/TestEndpoint.wsdl").toURL(); - URL mappingURL = new File("resources/jaxrpc/serviceref/META-INF/jaxrpc-mapping.xml").toURL(); - QName qname = new QName("http://org.jboss.ws/wsref", "TestEndpointService"); - Service service = new ServiceFactoryImpl().createService(wsdlURL, qname, mappingURL); - TestEndpoint port = (TestEndpoint)service.getPort(TestEndpoint.class); - - String helloWorld = "Hello World!"; - Object retObj = port.echo(helloWorld); - assertEquals(helloWorld, retObj); - } - - public void testServletClient() throws Exception - { - URL url = new URL(TARGET_ENDPOINT_ADDRESS + "-servlet-client?echo=HelloWorld"); - BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream())); - String retStr = br.readLine(); - assertEquals("HelloWorld", retStr); - } -}

17 years, 2 months

1
0
0 / 0

JBossWS SVN: r2488 - tags/jbossws-1.2.0.GA/build/ant-import.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-03-01 05:26:36 -0500 (Thu, 01 Mar 2007) New Revision: 2488 Modified: tags/jbossws-1.2.0.GA/build/ant-import/build-release.xml Log: Include jbossws-wsconsume-impl.jar Modified: tags/jbossws-1.2.0.GA/build/ant-import/build-release.xml =================================================================== --- tags/jbossws-1.2.0.GA/build/ant-import/build-release.xml 2007-03-01 02:29:01 UTC (rev 2487) +++ tags/jbossws-1.2.0.GA/build/ant-import/build-release.xml 2007-03-01 10:26:36 UTC (rev 2488) @@ -192,6 +192,9 @@ <include name="jboss-jaxws.jar"/> <include name="jboss-saaj.jar"/> </fileset> + <fileset dir="${thirdparty.dir}"> + <include name="jbossws-wsconsume-impl.jar"/> + </fileset> </copy> <mkdir dir="${build.bin.dist}/lib/jboss-jdk15/jbossws50.sar"/> <unzip dest="${build.bin.dist}/lib/jboss-jdk15/jbossws50.sar" src="${jboss50.output.lib.dir}/jbossws50.sar"/>

17 years, 2 months

1
0
0 / 0

JBossWS SVN: r2487 - trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws.

by jbossws-commits＠lists.jboss.org

Author: jason.greene(a)jboss.com Date: 2007-02-28 21:29:01 -0500 (Wed, 28 Feb 2007) New Revision: 2487 Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBSerializer.java Log: Fix CTS regression that was introduced in change 2253. Also add all caps comment to hopefully prevent the code from being removed again This obviates the change in 2294 which only solved one side-effect Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBSerializer.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBSerializer.java 2007-03-01 02:26:47 UTC (rev 2486) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBSerializer.java 2007-03-01 02:29:01 UTC (rev 2487) @@ -71,7 +71,7 @@ Result result = null; try { - Class javaType = deriveType(value); + Class javaType = deriveType(value, xmlType, serContext.getTypeMapping()); JAXBContextCache contextCache = JAXBContextCache.getContextCache(); JAXBContext jaxbContext = contextCache.getInstance(javaType); @@ -95,19 +95,17 @@ return result; } - - private Class deriveType(Object value) + + private Class deriveType(Object value, QName xmlType, TypeMappingImpl typeMapping) throws BindingException { - // It needs to be a valid JAXB type - // Therefore we don't need to look into our TypeMapping - Class javaType = value.getClass(); + // DO NOT REMOVE TYPE MAPPING CODE!!! + // We must pass the base type to JAXB so that xsi:type is serialized + List<Class> possibleJavaTypes = typeMapping.getJavaTypes(xmlType); + for(Class type : possibleJavaTypes) + if(JavaUtils.isAssignableFrom(type, value.getClass())) + return type; - // Filter known interface types - // Implementation classes will cause JAXB to fail - if (XMLGregorianCalendar.class.isAssignableFrom(javaType)) - javaType = XMLGregorianCalendar.class; - - return javaType; + throw new BindingException("Unable to resolve target java type"); } // 4.21 Conformance (Marshalling failure): If an error occurs when using the supplied JAXBContext to marshall

17 years, 2 months

1
0
0 / 0

JBossWS SVN: r2486 - in tags/jbossws-1.2.0.GA: jbossws-core/src/main/resources/dist and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-02-28 21:26:47 -0500 (Wed, 28 Feb 2007) New Revision: 2486 Modified: tags/jbossws-1.2.0.GA/build/ant-import/build-release.xml tags/jbossws-1.2.0.GA/jbossws-core/src/main/resources/dist/Install.txt tags/jbossws-1.2.0.GA/jbossws-core/src/main/resources/dist/ReleaseNotes.txt Log: Update references to wiki Modified: tags/jbossws-1.2.0.GA/build/ant-import/build-release.xml =================================================================== --- tags/jbossws-1.2.0.GA/build/ant-import/build-release.xml 2007-02-28 23:20:57 UTC (rev 2485) +++ tags/jbossws-1.2.0.GA/build/ant-import/build-release.xml 2007-03-01 02:26:47 UTC (rev 2486) @@ -25,13 +25,13 @@ <echo message="* 1) Create SVN tag: jbossws-${version.id}"/> <echo message="* 2) Update portal-content/project.xml"/> <echo message="* 3) Update portal-content/counter.xml"/> - <echo message="* 4) Update news in portal-content/freezone/projectDescription.xml"/> + <echo message="* 4) Update news in portal-content/freezone/projectDescription.html"/> <echo message="* 5) Verify release notes and install instructions"/> <echo message="* 6) Publish the interop endpoints (ant -f jboss-tests/build.xml publish-interop-endpoints)"/> <echo message="* 7) Commit the portal-content"/> <echo message="* 8) Commit the repository jars"/> <echo message="* 9) Write a sticky post on the user forum"/> - <echo message="* 10) Release the jbossws-${version.id} version in JIRA"/> + <echo message="* 10) Release the jbossws-${version.id} version in JIRA"/> <echo message="* 11) Post a message to jbossws-announce(a)lists.jboss.org"/> <echo message="* 12) Post a message to thecore(a)jboss.org"/> <echo message="*"/> @@ -110,12 +110,13 @@ <property name="portal.userguide" value="${portal.freezone}/user-guide"/> <property name="portal.downloads" value="${jbossws.portal.content}/downloads"/> -  +   <copy todir="${portal.downloads}" overwrite="true"> @@ -174,13 +175,14 @@  <copy todir="${build.bin.dist}" file="${build.output.dir}/jbossws-${version.id}-api.zip" overwrite="true"/> -  +   <copy todir="${build.bin.dist}/lib/jboss-jdk15" overwrite="true"> Modified: tags/jbossws-1.2.0.GA/jbossws-core/src/main/resources/dist/Install.txt =================================================================== --- tags/jbossws-1.2.0.GA/jbossws-core/src/main/resources/dist/Install.txt 2007-02-28 23:20:57 UTC (rev 2485) +++ tags/jbossws-1.2.0.GA/jbossws-core/src/main/resources/dist/Install.txt 2007-03-01 02:26:47 UTC (rev 2486) @@ -14,10 +14,9 @@ 1.) Copy lib/jbossws-client.jar to $JBOSS_HOME/client/ 2.) Unzip lib/jbossws.sar to $JBOSS_HOME/server/default/deploy/ -3.) Replacing jboss-xml-binding.jar -You need to manually replace the jboss-xml-binding.jar in the $JBOSS_HOME/client and $JBOSS_HOME/lib directories. -The compatible release can be found here: http://repository.jboss.com/jboss/jbossxb/1.0.0.CR7 +Please consult the wiki for detailed up to date install instructions +http://labs.jboss.com/portal/jbossws/ After the jbossws.sar is deployed you should be able to access JBossWS under http://localhost:8080/jbossws Modified: tags/jbossws-1.2.0.GA/jbossws-core/src/main/resources/dist/ReleaseNotes.txt =================================================================== --- tags/jbossws-1.2.0.GA/jbossws-core/src/main/resources/dist/ReleaseNotes.txt 2007-02-28 23:20:57 UTC (rev 2485) +++ tags/jbossws-1.2.0.GA/jbossws-core/src/main/resources/dist/ReleaseNotes.txt 2007-03-01 02:26:47 UTC (rev 2486) @@ -7,7 +7,7 @@ Release Notes ============= -The UserGuide can be found in the docs directory and is usally a good starting point +The UserGuide accessible from http://labs.jboss.com/portal/jbossws is usally a good starting point A list of examples that accompany the UserGuide can be found in the samples If you have any questions, please post to the JBossWS User Forum

17 years, 2 months

1
0
0 / 0

← Newer
1
...
23
24
25
26
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits March 2007