February 2012 - jbossws-commits - Jboss List Archives

by jbossws-commits＠lists.jboss.org

Author: klape Date: 2012-02-24 00:07:09 -0500 (Fri, 24 Feb 2012) New Revision: 15721 Added: common/tags/jbossws-common-1.1.0.SP8_JBPAPP-8026/ Log: creating one-off branch

12 years, 3 months

1
0
0 / 0

JBossWS SVN: r15720 - in stack/cxf/branches/jbossws-cxf-4.0.x: modules/testsuite and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: ropalka Date: 2012-02-23 10:14:07 -0500 (Thu, 23 Feb 2012) New Revision: 15720 Modified: stack/cxf/branches/jbossws-cxf-4.0.x/ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/pom.xml Log: Merged revisions 15719 via svnmerge from https://svn.jboss.org/repos/jbossws/stack/cxf/trunk ....... r15719 | ropalka | 2012-02-23 16:11:49 +0100 (Thu, 23 Feb 2012) | 1 line [JBWS-3444] reviewed and enabled shared appclient tests ....... Property changes on: stack/cxf/branches/jbossws-cxf-4.0.x ___________________________________________________________________ Modified: svnmerge-integrated - https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:1-15635,15658,15668,1... + https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:1-15635,15658,15668,1... Modified: svn:mergeinfo - /stack/cxf/branches/asoldano:14032-14050,14068 /stack/cxf/trunk:15658,15668,15675,15682,15695-15697,15708,15711,15713 + /stack/cxf/branches/asoldano:14032-14050,14068 /stack/cxf/trunk:15658,15668,15675,15682,15695-15697,15708,15711,15713,15719 Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/pom.xml 2012-02-23 15:11:49 UTC (rev 15719) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/pom.xml 2012-02-23 15:14:07 UTC (rev 15720) @@ -1289,8 +1289,6 @@ <configuration> <testExcludes> <exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude> -  - <exclude>org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefClientTestCase*</exclude> </testExcludes> </configuration> <goals> @@ -1343,19 +1341,12 @@   -  - <exclude>org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefClientTestCase*</exclude> -  <exclude>org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationCustomFileTestCase*</exclude>  <exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude> -  - <exclude>org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefClientTestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefClientTestCase*</exclude> -  <exclude>org/jboss/test/ws/jaxrpc/samples/secureejb/**</exclude>

12 years, 3 months

1
0
0 / 0

JBossWS SVN: r15719 - stack/cxf/trunk/modules/testsuite.

by jbossws-commits＠lists.jboss.org

Author: ropalka Date: 2012-02-23 10:11:49 -0500 (Thu, 23 Feb 2012) New Revision: 15719 Modified: stack/cxf/trunk/modules/testsuite/pom.xml Log: [JBWS-3444] reviewed and enabled shared appclient tests Modified: stack/cxf/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/pom.xml 2012-02-23 15:08:01 UTC (rev 15718) +++ stack/cxf/trunk/modules/testsuite/pom.xml 2012-02-23 15:11:49 UTC (rev 15719) @@ -1292,8 +1292,6 @@ <configuration> <testExcludes> <exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude> -  - <exclude>org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefClientTestCase*</exclude> </testExcludes> </configuration> <goals> @@ -1346,19 +1344,12 @@   -  - <exclude>org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefClientTestCase*</exclude> -  <exclude>org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationCustomFileTestCase*</exclude>  <exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude> -  - <exclude>org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefClientTestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefClientTestCase*</exclude> -  <exclude>org/jboss/test/ws/jaxrpc/samples/secureejb/**</exclude>

12 years, 3 months

1
0
0 / 0

JBossWS SVN: r15718 - in shared-testsuite/trunk/testsuite/src/test: java/org/jboss/test/ws/jaxrpc/samples/serviceref and 4 other directories.

by jbossws-commits＠lists.jboss.org

Author: ropalka Date: 2012-02-23 10:08:01 -0500 (Thu, 23 Feb 2012) New Revision: 15718 Removed: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ApplicationClient.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/EndpointClientTwo.java shared-testsuite/trunk/testsuite/src/test/resources/jaxrpc/samples/serviceref/META-INF/jboss-client.xml shared-testsuite/trunk/testsuite/src/test/resources/jaxws/samples/serviceref/META-INF/jboss-client.xml Modified: shared-testsuite/trunk/testsuite/src/test/ant-import/build-samples-jaxrpc.xml shared-testsuite/trunk/testsuite/src/test/ant-import/build-samples-jaxws.xml shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefClientTestCase.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/serviceref/EndpointImpl.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/serviceref/EndpointService.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefClientTestCase.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/EndpointClientOne.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefClientTestCase.java shared-testsuite/trunk/testsuite/src/test/resources/jaxrpc/samples/serviceref/META-INF/application-client.xml shared-testsuite/trunk/testsuite/src/test/resources/jaxws/samples/serviceref/META-INF/application-client.xml Log: [JBWS-3444] reviewed and enabled shared appclient tests Modified: shared-testsuite/trunk/testsuite/src/test/ant-import/build-samples-jaxrpc.xml =================================================================== --- shared-testsuite/trunk/testsuite/src/test/ant-import/build-samples-jaxrpc.xml 2012-02-23 15:05:38 UTC (rev 15717) +++ shared-testsuite/trunk/testsuite/src/test/ant-import/build-samples-jaxrpc.xml 2012-02-23 15:08:01 UTC (rev 15718) @@ -449,19 +449,27 @@ <include name="webservices.xml"/> </webinf> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-samples-serviceref-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-samples-serviceref-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/samples/serviceref/ApplicationClient.class"/> <include name="org/jboss/test/ws/jaxrpc/samples/serviceref/TestEndpointService.class"/> <include name="org/jboss/test/ws/jaxrpc/samples/serviceref/TestEndpoint.class"/> </fileset> + <manifest> + <attribute name="main-class" value="org.jboss.ws.common.appclient.AppclientKiller"/> + <attribute name="Dependencies" value="org.jboss.ws.common"/> + </manifest> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/serviceref/META-INF"> <include name="application-client.xml"/> - <include name="jboss-client.xml"/> <include name="jaxrpc-mapping.xml"/> <include name="wsdl/**"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-samples-serviceref-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-samples-serviceref-appclient.jar"/> + </fileset> + </jar> <war destfile="${tests.output.dir}/test-libs/jaxrpc-samples-serviceref-servlet-client.war" webxml="${tests.output.dir}/test-resources/jaxrpc/samples/serviceref/servlet-client/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes"> Modified: shared-testsuite/trunk/testsuite/src/test/ant-import/build-samples-jaxws.xml =================================================================== --- shared-testsuite/trunk/testsuite/src/test/ant-import/build-samples-jaxws.xml 2012-02-23 15:05:38 UTC (rev 15717) +++ shared-testsuite/trunk/testsuite/src/test/ant-import/build-samples-jaxws.xml 2012-02-23 15:08:01 UTC (rev 15718) @@ -281,18 +281,26 @@ <include name="org/jboss/test/ws/jaxws/samples/serviceref/EndpointService.class"/> </classes> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxws-samples-serviceref-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxws-samples-serviceref-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/samples/serviceref/ApplicationClient.class"/> <include name="org/jboss/test/ws/jaxws/samples/serviceref/EndpointService.class"/> <include name="org/jboss/test/ws/jaxws/samples/serviceref/Endpoint.class"/> </fileset> + <manifest> + <attribute name="main-class" value="org.jboss.ws.common.appclient.AppclientKiller"/> + <attribute name="Dependencies" value="org.jboss.ws.common"/> + </manifest> <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/serviceref/META-INF"> <include name="application-client.xml"/> - <include name="jboss-client.xml"/> <include name="wsdl/**"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxws-samples-serviceref-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxws-samples-serviceref-appclient.jar"/> + </fileset> + </jar> <war destfile="${tests.output.dir}/test-libs/jaxws-samples-serviceref-servlet-client.war" webxml="${tests.output.dir}/test-resources/jaxws/samples/serviceref/servlet-client/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/samples/serviceref/ServletClient.class"/> @@ -424,7 +432,7 @@ <include name="org/jboss/test/ws/jaxws/samples/webserviceref/EndpointImpl.class"/> </classes> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxws-samples-webserviceref-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxws-samples-webserviceref-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/samples/webserviceref/EndpointClientOne.class"/> <include name="org/jboss/test/ws/jaxws/samples/webserviceref/EndpointService.class"/> @@ -439,6 +447,11 @@ <attribute name="main-class" value="org.jboss.test.ws.jaxws.samples.webserviceref.EndpointClientOne"/> </manifest> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxws-samples-webserviceref-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxws-samples-webserviceref-appclient.jar"/> + </fileset> + </jar> <war destfile="${tests.output.dir}/test-libs/jaxws-samples-webserviceref-servlet-client.war" webxml="${tests.output.dir}/test-resources/jaxws/samples/webserviceref/WEB-INF-client/web.xml"> <classes dir="${tests.output.dir}/test-classes"> Deleted: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ApplicationClient.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ApplicationClient.java 2012-02-23 15:05:38 UTC (rev 15717) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ApplicationClient.java 2012-02-23 15:08:01 UTC (rev 15718) @@ -1,68 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file 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.samples.serviceref; - -import java.rmi.RemoteException; -import java.util.ArrayList; - -import javax.naming.InitialContext; -import javax.xml.rpc.JAXRPCException; -import javax.xml.rpc.Service; - -import org.jboss.logging.Logger; - -public class ApplicationClient -{ - // Provide logging - private static Logger log = Logger.getLogger(ApplicationClient.class); - - public static InitialContext encCtx; - public static String retStr; - - public static void main(String[] args) throws RemoteException - { - String inStr = args[0]; - log.info("echo: " + inStr); - - ArrayList ports = new ArrayList(); - try - { - ports.add((TestEndpoint)((Service)encCtx.lookup("java:comp/env/service1")).getPort(TestEndpoint.class)); - ports.add(((TestEndpointService)encCtx.lookup("java:comp/env/service2")).getTestEndpointPort()); - } - catch (Exception ex) - { - log.error("Cannot add port", ex); - throw new JAXRPCException(ex); - } - - for (int i = 0; i < ports.size(); i++) - { - TestEndpoint port = (TestEndpoint)ports.get(i); - String outStr = port.echo(inStr); - if (inStr.equals(outStr) == false) - throw new JAXRPCException("Invalid echo return: " + inStr); - } - - retStr = inStr; - } -} Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefClientTestCase.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefClientTestCase.java 2012-02-23 15:05:38 UTC (rev 15717) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefClientTestCase.java 2012-02-23 15:08:01 UTC (rev 15718) @@ -23,6 +23,7 @@ import java.net.URL; +import javax.naming.InitialContext; import javax.xml.namespace.QName; import javax.xml.rpc.Service; import javax.xml.rpc.ServiceException; @@ -37,7 +38,7 @@ * Test the JAXRPC <service-ref> * * @author Thomas.Diesler(a)jboss.com - * @since 23-Oct-2005 + * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> */ public class ServiceRefClientTestCase extends JBossWSTest { @@ -45,7 +46,7 @@ public static Test suite() { - return new JBossWSTestSetup(ServiceRefClientTestCase.class, "jaxrpc-samples-serviceref.war, jaxrpc-samples-serviceref-client.jar"); + return new JBossWSTestSetup(ServiceRefClientTestCase.class, "jaxrpc-samples-serviceref.war, jaxrpc-samples-serviceref-appclient.ear#jaxrpc-samples-serviceref-appclient.jar"); } public void testDynamicProxyNeg() throws Exception @@ -70,9 +71,13 @@ public void testApplicationClient() throws Exception { - String helloWorld = "Hello World!"; - ApplicationClient.encCtx = getInitialContext(); - ApplicationClient.main(new String[] { helloWorld }); - assertEquals(helloWorld, ApplicationClient.retStr); + final InitialContext ctx = getAppclientInitialContext(); + final TestEndpoint port1 = (TestEndpoint)((Service)ctx.lookup("java:service1")).getPort(TestEndpoint.class); + final TestEndpoint port2 = ((TestEndpointService)ctx.lookup("java:service2")).getTestEndpointPort(); + final String msg = "Hello World!"; + + assertEquals(msg, port1.echo(msg)); + assertEquals(msg, port2.echo(msg)); } + } Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/serviceref/EndpointImpl.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/serviceref/EndpointImpl.java 2012-02-23 15:05:38 UTC (rev 15717) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/serviceref/EndpointImpl.java 2012-02-23 15:08:01 UTC (rev 15718) @@ -34,7 +34,7 @@ * @since 12-Mar-2007 */ -@WebService (name = "Endpoint") +@WebService (name = "Endpoint", serviceName = "EndpointService") @SOAPBinding(style = SOAPBinding.Style.RPC) public class EndpointImpl { Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/serviceref/EndpointService.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/serviceref/EndpointService.java 2012-02-23 15:05:38 UTC (rev 15717) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/serviceref/EndpointService.java 2012-02-23 15:08:01 UTC (rev 15718) @@ -21,6 +21,7 @@ */ package org.jboss.test.ws.jaxws.samples.serviceref; +import java.io.Serializable; import java.net.MalformedURLException; import java.net.URL; import javax.xml.namespace.QName; @@ -28,7 +29,6 @@ import javax.xml.ws.WebEndpoint; import javax.xml.ws.WebServiceClient; - /** * JBossWS Generated Source * @@ -43,15 +43,16 @@ */ @WebServiceClient(name = "EndpointService", targetNamespace = "http://serviceref.samples.jaxws.ws.test.jboss.org/", wsdlLocation = "http://tddell:8080/jaxws-samples-serviceref?wsdl") public class EndpointService - extends Service + extends Service implements Serializable { - private final static URL TESTENDPOINTSERVICE_WSDL_LOCATION; + private static final long serialVersionUID = 1L; + private final static URL TESTENDPOINTSERVICE_WSDL_LOCATION; static { URL url = null; try { - url = new URL("http://tddell:8080/jaxws-samples-serviceref?wsdl"); + url = new URL("http://localhost:8080/jaxws-samples-serviceref?wsdl"); } catch (MalformedURLException e) { e.printStackTrace(); } Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefClientTestCase.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefClientTestCase.java 2012-02-23 15:05:38 UTC (rev 15717) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefClientTestCase.java 2012-02-23 15:08:01 UTC (rev 15718) @@ -39,7 +39,7 @@ * Test the JAXWS <service-ref> * * @author Thomas.Diesler(a)jboss.com - * @author <a href="mailto:richard.opalka@jboss.org">Richard Opalka</a> + * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> */ public class ServiceRefClientTestCase extends JBossWSTest { @@ -47,7 +47,7 @@ public static Test suite() { - String archives = "jaxws-samples-serviceref.war,jaxws-samples-serviceref-client.jar"; + String archives = "jaxws-samples-serviceref.war,jaxws-samples-serviceref-appclient.ear#jaxws-samples-serviceref-appclient.jar"; return new JBossWSTestSetup(ServiceRefClientTestCase.class, archives); } @@ -73,8 +73,8 @@ public void testApplicationClient() throws Exception { - InitialContext iniCtx = getInitialContext("jbossws-client"); - Service service = (Service) iniCtx.lookup("java:comp/env/service2"); + InitialContext iniCtx = getAppclientInitialContext(); + Service service = (Service) iniCtx.lookup("java:service2"); Endpoint port = service.getPort(Endpoint.class); assertNotNull(port); Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/EndpointClientOne.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/EndpointClientOne.java 2012-02-23 15:05:38 UTC (rev 15717) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/EndpointClientOne.java 2012-02-23 15:08:01 UTC (rev 15718) @@ -138,11 +138,14 @@ throw new WebServiceException(ex); } + System.out.println("TEST START"); for (Endpoint port : ports) { + System.out.println("Testing: " + port); String outStr = port.echo(inStr); if (inStr.equals(outStr) == false) throw new WebServiceException("Invalid echo return: " + inStr); } + System.out.println("TEST END"); } } Deleted: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/EndpointClientTwo.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/EndpointClientTwo.java 2012-02-23 15:05:38 UTC (rev 15717) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/EndpointClientTwo.java 2012-02-23 15:08:01 UTC (rev 15718) @@ -1,214 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file 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.jaxws.samples.webserviceref; - -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.util.HashMap; -import java.util.Map; - -import javax.naming.InitialContext; -import javax.xml.ws.BindingProvider; -import javax.xml.ws.Service; -import javax.xml.ws.WebServiceRef; -import javax.xml.ws.WebServiceRefs; - -import org.jboss.logging.Logger; -import org.jboss.test.ws.jaxws.samples.webserviceref.Endpoint; -import org.jboss.test.ws.jaxws.samples.webserviceref.EndpointService; - -// Test on type -@WebServiceRef(name = "Service1", type = EndpointService.class) -// Test multiple on type -@WebServiceRefs -( - { - @WebServiceRef(name = "Service2", type = EndpointService.class), - @WebServiceRef(name = "Port1", type = Endpoint.class) - } -) -public class EndpointClientTwo -{ - // provide logging - private static final Logger log = Logger.getLogger(EndpointClientTwo.class); - - // Test on field - @WebServiceRef(name = "Service3") - static Service service3; - - // Test on field - @WebServiceRef(name = "Service4") - static EndpointService service4; - - // Test on field - @WebServiceRef(name = "Port2") - static Endpoint port2; - - // Test on field - @WebServiceRef(name = "Port3") - static Endpoint port3; - - static InitialContext iniCtx; - static Map<String, String> testResult = new HashMap<String, String>(); - - public static void main(String[] args) throws Exception - { - String testName = args[0]; - EndpointClientTwo client = new EndpointClientTwo(); - Method method = EndpointClientTwo.class.getMethod(testName, new Class[] { String.class }); - try - { - String retStr = (String)method.invoke(client, testName); - testResult.put(testName, retStr); - } - catch (InvocationTargetException ex) - { - log.error("Invocation error", ex); - testResult.put(testName, ex.getTargetException().toString()); - } - catch (Exception ex) - { - log.error("Error", ex); - testResult.put(testName, ex.toString()); - } - } - - /** - * Customize service-class-name, service-qname - */ - public String testService1(String reqStr) throws Exception - { - EndpointService service = (EndpointService)iniCtx.lookup("java:comp/env/Service1"); - Endpoint port = service.getEndpointPort(); - return port.echo(reqStr); - } - - /** - * Customize config-name, config-file - */ - public String testService2(String reqStr) throws Exception - { - Service service = (Service)iniCtx.lookup("java:comp/env/Service2"); - - Endpoint port = service.getPort(Endpoint.class); - //verifyConfig((ConfigProvider)port); - - return port.echo(reqStr); - } - - /** - * Customize service-class-name, service-qname - */ - public String testService3(String reqStr) throws Exception - { - Endpoint port = ((EndpointService)service3).getEndpointPort(); - String resStr1 = port.echo(reqStr); - - EndpointService service = (EndpointService)iniCtx.lookup("java:comp/env/Service3"); - port = service.getEndpointPort(); - - String resStr2 = port.echo(reqStr); - - return resStr1 + resStr2; - } - - /** - * Customize config-name, config-file - */ - public String testService4(String reqStr) throws Exception - { - Endpoint port = service4.getEndpointPort(); - String resStr1 = port.echo(reqStr); - //verifyConfig((ConfigProvider)port); - - EndpointService service = (EndpointService)iniCtx.lookup("java:comp/env/Service4"); - port = service.getEndpointPort(); - //verifyConfig((ConfigProvider)port); - - String resStr2 = port.echo(reqStr); - - return resStr1 + resStr2; - } - - /** - * Customize port-info: port-qname, config-name, config-file - */ - public String testPort1(String reqStr) throws Exception - { - Endpoint port = (Endpoint)iniCtx.lookup("java:comp/env/Port1"); - //verifyConfig((ConfigProvider)port); - - return port.echo(reqStr); - } - - /** - * Customize port-info: service-endpoint-interface, config-name, config-file - */ - public String testPort2(String reqStr) throws Exception - { - //verifyConfig((ConfigProvider)port2); - String resStr1 = port2.echo(reqStr); - - Endpoint port = (Endpoint)iniCtx.lookup("java:comp/env/Port2"); - //verifyConfig((ConfigProvider)port); - - String resStr2 = port.echo(reqStr); - - return resStr1 + resStr2; - } - - /** - * Customize port-info: service-endpoint-interface, port-qname, stub-property - */ - public String testPort3(String reqStr) throws Exception - { - String resStr1 = port3.echo(reqStr); - - BindingProvider bp = (BindingProvider)port3; - verifyProperties(bp.getRequestContext()); - - Endpoint port = (Endpoint)iniCtx.lookup("java:comp/env/Port3"); - String resStr2 = port.echo(reqStr); - - return resStr1 + resStr2; - } - - private void verifyProperties(Map<String, Object> ctx) - { - String username = (String)ctx.get(BindingProvider.USERNAME_PROPERTY); - if ("kermit".equals(username) == false) - throw new RuntimeException("Invalid username: " + username); - - String password = (String)ctx.get(BindingProvider.PASSWORD_PROPERTY); - if ("thefrog".equals(password) == false) - throw new RuntimeException("Invalid password: " + password); - } - - /*private void verifyConfig(ConfigProvider cp) - { - if ("Custom Client".equals(cp.getConfigName()) == false) - throw new RuntimeException("Invalid config name: " + cp.getConfigName()); - - if ("META-INF/jbossws-client-config.xml".equals(cp.getConfigFile()) == false) - throw new RuntimeException("Invalid config file: " + cp.getConfigFile()); - } */ -} Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefClientTestCase.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefClientTestCase.java 2012-02-23 15:05:38 UTC (rev 15717) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefClientTestCase.java 2012-02-23 15:08:01 UTC (rev 15718) @@ -21,6 +21,8 @@ */ package org.jboss.test.ws.jaxws.samples.webserviceref; +import java.io.ByteArrayOutputStream; +import java.io.OutputStream; import java.net.URL; import javax.xml.namespace.QName; @@ -28,8 +30,8 @@ import junit.framework.Test; -import org.jboss.ejb3.client.ClientLauncher; import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; import org.jboss.wsf.test.JBossWSTestSetup; /** @@ -44,7 +46,7 @@ public static Test suite() { - return new JBossWSTestSetup(WebServiceRefClientTestCase.class, "jaxws-samples-webserviceref.war, jaxws-samples-webserviceref-client.jar"); + return new JBossWSTestSetup(WebServiceRefClientTestCase.class, "jaxws-samples-webserviceref.war"); } public void testGeneratedService() throws Exception @@ -74,7 +76,13 @@ public void testApplicationClient() throws Throwable { - String helloWorld = "Hello World!"; - new ClientLauncher().launch(EndpointClientOne.class.getName(), "jbossws-client", new String[] { helloWorld }); + final String appclientArg = "Hello World!"; + final OutputStream appclientOS = new ByteArrayOutputStream(); + final Process appclientProcess = JBossWSTestHelper.deployAppclient("jaxws-samples-webserviceref-appclient.ear#jaxws-samples-webserviceref-appclient.jar", appclientOS, appclientArg); + appclientProcess.waitFor(); + final String appclientLog = appclientOS.toString(); + assertTrue(!appclientLog.contains("Invalid echo return")); + assertTrue(appclientLog.contains("TEST START")); + assertTrue(appclientLog.contains("TEST END")); } } Modified: shared-testsuite/trunk/testsuite/src/test/resources/jaxrpc/samples/serviceref/META-INF/application-client.xml =================================================================== --- shared-testsuite/trunk/testsuite/src/test/resources/jaxrpc/samples/serviceref/META-INF/application-client.xml 2012-02-23 15:05:38 UTC (rev 15717) +++ shared-testsuite/trunk/testsuite/src/test/resources/jaxrpc/samples/serviceref/META-INF/application-client.xml 2012-02-23 15:08:01 UTC (rev 15718) @@ -8,7 +8,7 @@ <display-name>JAXRPC simple tests</display-name> <service-ref> - <service-ref-name>service1</service-ref-name> + <service-ref-name>java:jboss/exported/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> @@ -18,7 +18,7 @@ </service-ref> <service-ref> - <service-ref-name>service2</service-ref-name> + <service-ref-name>java:jboss/exported/service2</service-ref-name> <service-interface>org.jboss.test.ws.jaxrpc.samples.serviceref.TestEndpointService</service-interface> <wsdl-file>META-INF/wsdl/TestEndpoint.wsdl</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> Deleted: shared-testsuite/trunk/testsuite/src/test/resources/jaxrpc/samples/serviceref/META-INF/jboss-client.xml =================================================================== --- shared-testsuite/trunk/testsuite/src/test/resources/jaxrpc/samples/serviceref/META-INF/jboss-client.xml 2012-02-23 15:05:38 UTC (rev 15717) +++ shared-testsuite/trunk/testsuite/src/test/resources/jaxrpc/samples/serviceref/META-INF/jboss-client.xml 2012-02-23 15:08:01 UTC (rev 15718) @@ -1,7 +0,0 @@ -<?xml version='1.0' encoding='UTF-8' ?> - -<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> - -<jboss-client> - <jndi-name>jbossws-client</jndi-name> -</jboss-client> Modified: shared-testsuite/trunk/testsuite/src/test/resources/jaxws/samples/serviceref/META-INF/application-client.xml =================================================================== --- shared-testsuite/trunk/testsuite/src/test/resources/jaxws/samples/serviceref/META-INF/application-client.xml 2012-02-23 15:05:38 UTC (rev 15717) +++ shared-testsuite/trunk/testsuite/src/test/resources/jaxws/samples/serviceref/META-INF/application-client.xml 2012-02-23 15:08:01 UTC (rev 15718) @@ -5,16 +5,16 @@ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/application-client_5.xsd"> <display-name>jaxws simple tests</display-name> - + <service-ref> - <service-ref-name>service1</service-ref-name> + <service-ref-name>java:jboss/exported/service1</service-ref-name> <service-interface>javax.xml.ws.Service</service-interface> <wsdl-file>META-INF/wsdl/Endpoint.wsdl</wsdl-file> <service-qname xmlns:ns1="http://serviceref.samples.jaxws.ws.test.jboss.org/">ns1:EndpointService</service-qname> </service-ref> <service-ref> - <service-ref-name>service2</service-ref-name> + <service-ref-name>java:jboss/exported/service2</service-ref-name> <service-interface>org.jboss.test.ws.jaxws.samples.serviceref.EndpointService</service-interface> <wsdl-file>META-INF/wsdl/Endpoint.wsdl</wsdl-file> <service-qname xmlns:ns1="http://serviceref.samples.jaxws.ws.test.jboss.org/">ns1:EndpointService</service-qname> Deleted: shared-testsuite/trunk/testsuite/src/test/resources/jaxws/samples/serviceref/META-INF/jboss-client.xml =================================================================== --- shared-testsuite/trunk/testsuite/src/test/resources/jaxws/samples/serviceref/META-INF/jboss-client.xml 2012-02-23 15:05:38 UTC (rev 15717) +++ shared-testsuite/trunk/testsuite/src/test/resources/jaxws/samples/serviceref/META-INF/jboss-client.xml 2012-02-23 15:08:01 UTC (rev 15718) @@ -1,14 +0,0 @@ -<?xml version='1.0' encoding='UTF-8' ?> -<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 5.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_5_0.dtd"> - -<jboss-client> - <jndi-name>jbossws-client</jndi-name> - -  -</jboss-client>

12 years, 3 months

1
0
0 / 0

JBossWS SVN: r15717 - shared-testsuite/trunk/src/main/java/org/jboss/wsf/test.

by jbossws-commits＠lists.jboss.org

Author: ropalka Date: 2012-02-23 10:05:38 -0500 (Thu, 23 Feb 2012) New Revision: 15717 Modified: shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestSetup.java Log: [JBWS-3435] update appclient launcher to return associated process + allow tests to specify output stream & params for appclient Modified: shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java =================================================================== --- shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2012-02-23 13:55:50 UTC (rev 15716) +++ shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2012-02-23 15:05:38 UTC (rev 15717) @@ -24,6 +24,7 @@ import java.io.ByteArrayOutputStream; import java.io.File; import java.io.IOException; +import java.io.OutputStream; import java.net.Inet6Address; import java.net.InetAddress; import java.net.MalformedURLException; @@ -42,7 +43,6 @@ import org.jboss.logging.Logger; import org.jboss.ws.common.concurrent.CopyJob; -import org.jboss.ws.common.io.NullOutputStream; import org.jboss.ws.common.io.TeeOutputStream; import org.jboss.wsf.spi.SPIProvider; import org.jboss.wsf.spi.SPIProviderResolver; @@ -115,7 +115,7 @@ /** Deploy the given archive to the appclient. * Archive name is always in form archive.ear#appclient.jar */ - public static void deployAppclient(final String archive) throws Exception + public static Process deployAppclient(final String archive, final OutputStream appclientOS, final String appclientArg) throws Exception { if (DEPLOY_PROCESS_ENABLED) { @@ -126,10 +126,17 @@ final String appclientFullName = getArchiveFile(earName).getParent() + FS + archive; final String touchFile = JBOSS_HOME + FS + "bin" + FS + appclientName + ".kill"; final ByteArrayOutputStream baos = new ByteArrayOutputStream(); - appclientProcess = new ProcessBuilder().command(appclientScript, appclientFullName, touchFile) - .start(); - CopyJob inputStreamJob = new CopyJob(appclientProcess.getInputStream(), new TeeOutputStream(baos, System.out)); - CopyJob errorStreamJob = new CopyJob(appclientProcess.getErrorStream(), System.err); + if (appclientOS == null) + { + appclientProcess = new ProcessBuilder().command(appclientScript, appclientFullName, touchFile).start(); + } + else + { + appclientProcess = new ProcessBuilder().command(appclientScript, appclientFullName, appclientArg).start(); + } + final CopyJob inputStreamJob = new CopyJob(appclientProcess.getInputStream(), + appclientOS == null ? new TeeOutputStream(baos, System.out) : new TeeOutputStream(baos, System.out, appclientOS)); + final CopyJob errorStreamJob = new CopyJob(appclientProcess.getErrorStream(), System.err); // unfortunately the following threads are needed because of Windows behavior System.out.println("Appclient output stream:"); new Thread(inputStreamJob).start(); @@ -146,6 +153,7 @@ } System.out.println("appclient started"); } + return appclientProcess; } /** Undeploy the given archive from the appclient Modified: shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestSetup.java =================================================================== --- shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestSetup.java 2012-02-23 13:55:50 UTC (rev 15716) +++ shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestSetup.java 2012-02-23 15:05:38 UTC (rev 15717) @@ -22,6 +22,7 @@ package org.jboss.wsf.test; import java.io.File; +import java.io.OutputStream; import java.net.MalformedURLException; import java.net.URL; import java.net.URLClassLoader; @@ -56,6 +57,8 @@ private static final String JBOSSWS_SEC_DOMAIN = "JBossWS"; private String[] archives = new String[0]; + private OutputStream appclientOutputStream; + private String appclientArg; private ClassLoader originalClassLoader; private Map<String, Map<String, String>> securityDomains = new HashMap<String, Map<String,String>>(); private boolean defaultSecurityDomainRequirement = false; @@ -66,6 +69,13 @@ getArchiveArray(archiveList); } + public JBossWSTestSetup(Class<?> testClass, String archiveList, OutputStream appclientOutputStream) + { + super(new TestSuite(testClass)); + getArchiveArray(archiveList); + this.appclientOutputStream = appclientOutputStream; + } + public JBossWSTestSetup(Class<?> testClass, String archiveList, boolean requiresDefaultSecurityDomain) { this(testClass, archiveList); @@ -165,7 +175,7 @@ { URL archiveURL = getArchiveURL(archive.substring(archive.indexOf('#') + 1)); clientJars.add(archiveURL); - JBossWSTestHelper.deployAppclient(archive); + JBossWSTestHelper.deployAppclient(archive, appclientOutputStream, appclientArg); } else if (archive.endsWith("-client.jar")) {

12 years, 3 months

1
0
0 / 0

JBossWS SVN: r15716 - in stack/native/branches/jbossws-native-4.0.x: modules/testsuite/src/test/resources/jboss710 and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: ropalka Date: 2012-02-23 08:55:50 -0500 (Thu, 23 Feb 2012) New Revision: 15716 Modified: stack/native/branches/jbossws-native-4.0.x/ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/src/test/resources/jboss710/appclient.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/src/test/resources/jboss711/appclient.xml Log: Merged revisions 15714 via svnmerge from https://svn.jboss.org/repos/jbossws/stack/native/trunk ....... r15714 | ropalka | 2012-02-23 14:50:29 +0100 (Thu, 23 Feb 2012) | 1 line [JBWS-3435] increase port numbers - to don't collide with standalone-full.xml ....... Property changes on: stack/native/branches/jbossws-native-4.0.x ___________________________________________________________________ Modified: svnmerge-integrated - https://svn.jboss.org/repos/jbossws/stack/native/trunk:1-15651,15653-1567... + https://svn.jboss.org/repos/jbossws/stack/native/trunk:1-15651,15653-1567... Modified: svn:mergeinfo - /stack/native/branches/asoldano:14057,14069 /stack/native/branches/ropalka:13836-13879 /stack/native/trunk:15653,15670-15677,15686,15696,15707 + /stack/native/branches/asoldano:14057,14069 /stack/native/branches/ropalka:13836-13879 /stack/native/trunk:15653,15670-15677,15686,15696,15707,15714 Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/src/test/resources/jboss710/appclient.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/src/test/resources/jboss710/appclient.xml 2012-02-23 13:53:20 UTC (rev 15715) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/src/test/resources/jboss710/appclient.xml 2012-02-23 13:55:50 UTC (rev 15716) @@ -158,11 +158,11 @@ </interfaces> <socket-binding-group name="standard-sockets" default-interface="public"> - <socket-binding name="jacorb" port="3528"/> - <socket-binding name="jacorb-ssl" port="3529"/> + <socket-binding name="jacorb" port="13528"/> + <socket-binding name="jacorb-ssl" port="13529"/> <socket-binding name="remoting" port="4448"/> - <socket-binding name="txn-recovery-environment" port="4712"/> - <socket-binding name="txn-status-manager" port="4713"/> + <socket-binding name="txn-recovery-environment" port="14712"/> + <socket-binding name="txn-status-manager" port="14713"/> </socket-binding-group> </server> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/src/test/resources/jboss711/appclient.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/src/test/resources/jboss711/appclient.xml 2012-02-23 13:53:20 UTC (rev 15715) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/src/test/resources/jboss711/appclient.xml 2012-02-23 13:55:50 UTC (rev 15716) @@ -158,11 +158,11 @@ </interfaces> <socket-binding-group name="standard-sockets" default-interface="public"> - <socket-binding name="jacorb" port="3528"/> - <socket-binding name="jacorb-ssl" port="3529"/> + <socket-binding name="jacorb" port="13528"/> + <socket-binding name="jacorb-ssl" port="13529"/> <socket-binding name="remoting" port="4448"/> - <socket-binding name="txn-recovery-environment" port="4712"/> - <socket-binding name="txn-status-manager" port="4713"/> + <socket-binding name="txn-recovery-environment" port="14712"/> + <socket-binding name="txn-status-manager" port="14713"/> </socket-binding-group> </server>

12 years, 3 months

1
0
0 / 0

JBossWS SVN: r15715 - in stack/cxf/branches/jbossws-cxf-4.0.x: modules/testsuite/src/test/resources/jboss710 and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: ropalka Date: 2012-02-23 08:53:20 -0500 (Thu, 23 Feb 2012) New Revision: 15715 Modified: stack/cxf/branches/jbossws-cxf-4.0.x/ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/src/test/resources/jboss710/appclient.xml stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/src/test/resources/jboss711/appclient.xml Log: Merged revisions 15713 via svnmerge from https://svn.jboss.org/repos/jbossws/stack/cxf/trunk ....... r15713 | ropalka | 2012-02-23 14:49:01 +0100 (Thu, 23 Feb 2012) | 1 line [JBWS-3435] increase port numbers - to don't collide with standalone-full.xml ....... Property changes on: stack/cxf/branches/jbossws-cxf-4.0.x ___________________________________________________________________ Modified: svnmerge-integrated - https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:1-15635,15658,15668,1... + https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:1-15635,15658,15668,1... Modified: svn:mergeinfo - /stack/cxf/branches/asoldano:14032-14050,14068 /stack/cxf/trunk:15658,15668,15675,15682,15695-15697,15708,15711 + /stack/cxf/branches/asoldano:14032-14050,14068 /stack/cxf/trunk:15658,15668,15675,15682,15695-15697,15708,15711,15713 Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/src/test/resources/jboss710/appclient.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/src/test/resources/jboss710/appclient.xml 2012-02-23 13:50:29 UTC (rev 15714) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/src/test/resources/jboss710/appclient.xml 2012-02-23 13:53:20 UTC (rev 15715) @@ -158,11 +158,11 @@ </interfaces> <socket-binding-group name="standard-sockets" default-interface="public"> - <socket-binding name="jacorb" port="3528"/> - <socket-binding name="jacorb-ssl" port="3529"/> + <socket-binding name="jacorb" port="13528"/> + <socket-binding name="jacorb-ssl" port="13529"/> <socket-binding name="remoting" port="4448"/> - <socket-binding name="txn-recovery-environment" port="4712"/> - <socket-binding name="txn-status-manager" port="4713"/> + <socket-binding name="txn-recovery-environment" port="14712"/> + <socket-binding name="txn-status-manager" port="14713"/> </socket-binding-group> </server> Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/src/test/resources/jboss711/appclient.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/src/test/resources/jboss711/appclient.xml 2012-02-23 13:50:29 UTC (rev 15714) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/src/test/resources/jboss711/appclient.xml 2012-02-23 13:53:20 UTC (rev 15715) @@ -158,11 +158,11 @@ </interfaces> <socket-binding-group name="standard-sockets" default-interface="public"> - <socket-binding name="jacorb" port="3528"/> - <socket-binding name="jacorb-ssl" port="3529"/> + <socket-binding name="jacorb" port="13528"/> + <socket-binding name="jacorb-ssl" port="13529"/> <socket-binding name="remoting" port="4448"/> - <socket-binding name="txn-recovery-environment" port="4712"/> - <socket-binding name="txn-status-manager" port="4713"/> + <socket-binding name="txn-recovery-environment" port="14712"/> + <socket-binding name="txn-status-manager" port="14713"/> </socket-binding-group> </server>

12 years, 3 months

1
0
0 / 0

JBossWS SVN: r15714 - in stack/native/trunk/modules/testsuite/src/test/resources: jboss711 and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: ropalka Date: 2012-02-23 08:50:29 -0500 (Thu, 23 Feb 2012) New Revision: 15714 Modified: stack/native/trunk/modules/testsuite/src/test/resources/jboss710/appclient.xml stack/native/trunk/modules/testsuite/src/test/resources/jboss711/appclient.xml Log: [JBWS-3435] increase port numbers - to don't collide with standalone-full.xml Modified: stack/native/trunk/modules/testsuite/src/test/resources/jboss710/appclient.xml =================================================================== --- stack/native/trunk/modules/testsuite/src/test/resources/jboss710/appclient.xml 2012-02-23 13:49:01 UTC (rev 15713) +++ stack/native/trunk/modules/testsuite/src/test/resources/jboss710/appclient.xml 2012-02-23 13:50:29 UTC (rev 15714) @@ -158,11 +158,11 @@ </interfaces> <socket-binding-group name="standard-sockets" default-interface="public"> - <socket-binding name="jacorb" port="3528"/> - <socket-binding name="jacorb-ssl" port="3529"/> + <socket-binding name="jacorb" port="13528"/> + <socket-binding name="jacorb-ssl" port="13529"/> <socket-binding name="remoting" port="4448"/> - <socket-binding name="txn-recovery-environment" port="4712"/> - <socket-binding name="txn-status-manager" port="4713"/> + <socket-binding name="txn-recovery-environment" port="14712"/> + <socket-binding name="txn-status-manager" port="14713"/> </socket-binding-group> </server> Modified: stack/native/trunk/modules/testsuite/src/test/resources/jboss711/appclient.xml =================================================================== --- stack/native/trunk/modules/testsuite/src/test/resources/jboss711/appclient.xml 2012-02-23 13:49:01 UTC (rev 15713) +++ stack/native/trunk/modules/testsuite/src/test/resources/jboss711/appclient.xml 2012-02-23 13:50:29 UTC (rev 15714) @@ -158,11 +158,11 @@ </interfaces> <socket-binding-group name="standard-sockets" default-interface="public"> - <socket-binding name="jacorb" port="3528"/> - <socket-binding name="jacorb-ssl" port="3529"/> + <socket-binding name="jacorb" port="13528"/> + <socket-binding name="jacorb-ssl" port="13529"/> <socket-binding name="remoting" port="4448"/> - <socket-binding name="txn-recovery-environment" port="4712"/> - <socket-binding name="txn-status-manager" port="4713"/> + <socket-binding name="txn-recovery-environment" port="14712"/> + <socket-binding name="txn-status-manager" port="14713"/> </socket-binding-group> </server>

12 years, 3 months

1
0
0 / 0

JBossWS SVN: r15713 - in stack/cxf/trunk/modules/testsuite/src/test/resources: jboss711 and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: ropalka Date: 2012-02-23 08:49:01 -0500 (Thu, 23 Feb 2012) New Revision: 15713 Modified: stack/cxf/trunk/modules/testsuite/src/test/resources/jboss710/appclient.xml stack/cxf/trunk/modules/testsuite/src/test/resources/jboss711/appclient.xml Log: [JBWS-3435] increase port numbers - to don't collide with standalone-full.xml Modified: stack/cxf/trunk/modules/testsuite/src/test/resources/jboss710/appclient.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/src/test/resources/jboss710/appclient.xml 2012-02-23 12:58:36 UTC (rev 15712) +++ stack/cxf/trunk/modules/testsuite/src/test/resources/jboss710/appclient.xml 2012-02-23 13:49:01 UTC (rev 15713) @@ -158,11 +158,11 @@ </interfaces> <socket-binding-group name="standard-sockets" default-interface="public"> - <socket-binding name="jacorb" port="3528"/> - <socket-binding name="jacorb-ssl" port="3529"/> + <socket-binding name="jacorb" port="13528"/> + <socket-binding name="jacorb-ssl" port="13529"/> <socket-binding name="remoting" port="4448"/> - <socket-binding name="txn-recovery-environment" port="4712"/> - <socket-binding name="txn-status-manager" port="4713"/> + <socket-binding name="txn-recovery-environment" port="14712"/> + <socket-binding name="txn-status-manager" port="14713"/> </socket-binding-group> </server> Modified: stack/cxf/trunk/modules/testsuite/src/test/resources/jboss711/appclient.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/src/test/resources/jboss711/appclient.xml 2012-02-23 12:58:36 UTC (rev 15712) +++ stack/cxf/trunk/modules/testsuite/src/test/resources/jboss711/appclient.xml 2012-02-23 13:49:01 UTC (rev 15713) @@ -158,11 +158,11 @@ </interfaces> <socket-binding-group name="standard-sockets" default-interface="public"> - <socket-binding name="jacorb" port="3528"/> - <socket-binding name="jacorb-ssl" port="3529"/> + <socket-binding name="jacorb" port="13528"/> + <socket-binding name="jacorb-ssl" port="13529"/> <socket-binding name="remoting" port="4448"/> - <socket-binding name="txn-recovery-environment" port="4712"/> - <socket-binding name="txn-status-manager" port="4713"/> + <socket-binding name="txn-recovery-environment" port="14712"/> + <socket-binding name="txn-status-manager" port="14713"/> </socket-binding-group> </server>

12 years, 3 months

1
0
0 / 0

JBossWS SVN: r15712 - in stack/cxf/branches/jbossws-cxf-4.0.x: modules/testsuite and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: ropalka Date: 2012-02-23 07:58:36 -0500 (Thu, 23 Feb 2012) New Revision: 15712 Modified: stack/cxf/branches/jbossws-cxf-4.0.x/ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/pom.xml Log: Merged revisions 15711 via svnmerge from https://svn.jboss.org/repos/jbossws/stack/cxf/trunk ....... r15711 | ropalka | 2012-02-23 13:56:22 +0100 (Thu, 23 Feb 2012) | 1 line reorder jbossws-native-core jars - first should be the override ....... Property changes on: stack/cxf/branches/jbossws-cxf-4.0.x ___________________________________________________________________ Modified: svnmerge-integrated - https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:1-15635,15658,15668,1... + https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:1-15635,15658,15668,1... Modified: svn:mergeinfo - /stack/cxf/branches/asoldano:14032-14050,14068 /stack/cxf/trunk:15658,15668,15675,15682,15695-15697,15708 + /stack/cxf/branches/asoldano:14032-14050,14068 /stack/cxf/trunk:15658,15668,15675,15682,15695-15697,15708,15711 Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/pom.xml 2012-02-23 12:56:22 UTC (rev 15711) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/pom.xml 2012-02-23 12:58:36 UTC (rev 15712) @@ -1084,10 +1084,10 @@  <additionalClasspathElements>  +  + <additionalClasspathElement>${jboss.home}/modules/org/jboss/ws/native/jbossws-native-core/main/jbossws-native-core.jar</additionalClasspathElement>  <additionalClasspathElement>${jboss.home}/modules/org/jboss/ws/native/jbossws-native-core/main/jbossws-native-core-4.0.1.GA.jar</additionalClasspathElement> -  - <additionalClasspathElement>${jboss.home}/modules/org/jboss/ws/native/jbossws-native-core/main/jbossws-native-core.jar</additionalClasspathElement>  <additionalClasspathElement>${jboss.home}/modules/org/jboss/ws/native/jbossws-native-core/main/${jbossws-native-core.filename}</additionalClasspathElement> </additionalClasspathElements> @@ -1306,10 +1306,10 @@  <additionalClasspathElements>  +  + <additionalClasspathElement>${jboss.home}/modules/org/jboss/ws/native/jbossws-native-core/main/jbossws-native-core.jar</additionalClasspathElement>  <additionalClasspathElement>${jboss.home}/modules/org/jboss/ws/native/jbossws-native-core/main/jbossws-native-core-4.0.1.GA.jar</additionalClasspathElement> -  - <additionalClasspathElement>${jboss.home}/modules/org/jboss/ws/native/jbossws-native-core/main/jbossws-native-core.jar</additionalClasspathElement>  <additionalClasspathElement>${jboss.home}/modules/org/jboss/ws/native/jbossws-native-core/main/${jbossws-native-core.filename}</additionalClasspathElement> </additionalClasspathElements>

12 years, 3 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits February 2012