March 2012 - jbossws-commits - Jboss List Archives

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

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2012-03-14 10:17:35 -0400 (Wed, 14 Mar 2012) New Revision: 15940 Modified: stack/cxf/branches/jbossws-cxf-4.0.x/ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/pom.xml Log: [JBPAPP-8454] JBossWS appclient and SOAP-over-JMS tests final cleanup Merged revisions 15936 via svnmerge from https://svn.jboss.org/repos/jbossws/stack/cxf/trunk ....... r15936 | ropalka | 2012-03-14 14:12:38 +0100 (Wed, 14 Mar 2012) | 1 line [JBWS-3435] finalizing appclient integration ....... 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,15674-15675,15682,15695-15697,15708,15711,15713,15719,15723-15730,15738,15743,15748,15750-15751,15754-15757,15765-15766,15768,15773,15780-15781,15784,15794,15806-15808,15824,15835,15837-15857,15859,15866,15879-15881,15886-15889,15896,15900-15920 + /stack/cxf/branches/asoldano:14032-14050,14068 /stack/cxf/trunk:15658,15668,15674-15675,15682,15695-15697,15708,15711,15713,15719,15723-15730,15738,15743,15748,15750-15751,15754-15757,15765-15766,15768,15773,15780-15781,15784,15794,15806-15808,15824,15835,15837-15857,15859,15866,15879-15881,15886-15889,15896,15900-15920,15936 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-03-14 14:09:33 UTC (rev 15939) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/pom.xml 2012-03-14 14:17:35 UTC (rev 15940) @@ -386,9 +386,13 @@ </property> <property> <name>log4j.output.dir</name> - <value>${project.build.directory}</value> + <value>${log4j.output.dir}</value> </property> <property> + <name>appclient.output.dir</name> + <value>${appclient.output.dir}</value> + </property> + <property> <name>org.jboss.ws.testsuite.securityDomain.users.propfile</name> <value>${project.build.directory}/test-classes/jbossws-users.properties</value> </property>

14 years, 1 month

1
0
0 / 0

JBossWS SVN: r15939 - in stack/cxf/branches/jbossws-cxf-4.0.x: etc and 11 other directories.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2012-03-14 10:09:33 -0400 (Wed, 14 Mar 2012) New Revision: 15939 Added: stack/cxf/branches/jbossws-cxf-4.0.x/etc/ stack/cxf/branches/jbossws-cxf-4.0.x/etc/application-roles.properties stack/cxf/branches/jbossws-cxf-4.0.x/etc/application-users.properties stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/src/test/resources/jboss711/appclient-ws.xml Removed: stack/cxf/branches/jbossws-cxf-4.0.x/etc/application-roles.properties stack/cxf/branches/jbossws-cxf-4.0.x/etc/application-users.properties stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/src/test/resources/jboss711/appclient.xml Modified: stack/cxf/branches/jbossws-cxf-4.0.x/ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/scripts/cxf-jars-jaxws.xml stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/etc/appclient.jndi.properties stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/DeploymentTestServlet.java stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/HelloWorldImpl.java stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/JMSEndpointAPITestCase.java stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/JMSEndpointOnlyDeploymentTestCase.java stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/TestServlet.java stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/DeploymentTestServlet.java stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/HelloWorldImpl.java stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/JMSHTTPEndpointDeploymentTestCase.java stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms/META-INF-as7/wsdl/HelloWorldService.wsdl stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms_http/WEB-INF/wsdl/HelloWorldService.wsdl stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/etc/appclient.jndi.properties stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/pom.xml stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/shared-tests/pom.xml stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/shared-tests/src/test/etc/appclient.jndi.properties Log: [JBPAPP-8454] JBossWS appclient and SOAP-over-JMS tests final cleanup Merged revisions 15900,15902-15903,15907,15913-15914,15916,15920 via svnmerge from https://svn.jboss.org/repos/jbossws/stack/cxf/trunk ....... r15900 | alessio.soldano(a)jboss.com | 2012-03-08 13:14:52 +0100 (Thu, 08 Mar 2012) | 2 lines [JBWS-3454] Refactoring / enhancing SOAP-over-JMS integration tests; test user setup (guest/pass w/ guest role) required ....... r15902 | alessio.soldano(a)jboss.com | 2012-03-08 17:28:47 +0100 (Thu, 08 Mar 2012) | 2 lines [JBWS-3454] Adding test user properties, cleaning up testcases, adding hornetq dependencies (test scope) ....... r15903 | alessio.soldano(a)jboss.com | 2012-03-08 17:47:24 +0100 (Thu, 08 Mar 2012) | 2 lines [JBWS-3454] Restoring fixme for AS 7.0.x only (remote JNDI not supported there) and fixing 710 dependencies ....... r15907 | alessio.soldano(a)jboss.com | 2012-03-09 08:39:41 +0100 (Fri, 09 Mar 2012) | 2 lines [JBWS-3435] Move to jboss remote naming 1.0.2.Final ....... r15913 | ropalka | 2012-03-12 13:16:49 +0100 (Mon, 12 Mar 2012) | 1 line [JBWS-3435] start only services that are really needed for WS tests ....... r15914 | ropalka | 2012-03-12 13:17:14 +0100 (Mon, 12 Mar 2012) | 1 line [JBWS-3435] configure thread pool bounds to be minimalistic ....... r15916 | ropalka | 2012-03-12 15:02:21 +0100 (Mon, 12 Mar 2012) | 1 line [JBWS-3452] do not log appclient boot messages to console ....... r15920 | ropalka | 2012-03-12 15:45:11 +0100 (Mon, 12 Mar 2012) | 1 line [JBWS-3451] use custom appclient-ws.xml config, do not override provided default one ....... 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,15674-15675,15682,15695-15697,15708,15711,15713,15719,15723-15730,15738,15743,15748,15750-15751,15754-15757,15765-15766,15768,15773,15780-15781,15784,15794,15806-15808,15824,15835,15837-15857,15859,15866,15879-15881,15886-15889,15896 + /stack/cxf/branches/asoldano:14032-14050,14068 /stack/cxf/trunk:15658,15668,15674-15675,15682,15695-15697,15708,15711,15713,15719,15723-15730,15738,15743,15748,15750-15751,15754-15757,15765-15766,15768,15773,15780-15781,15784,15794,15806-15808,15824,15835,15837-15857,15859,15866,15879-15881,15886-15889,15896,15900-15920 Deleted: stack/cxf/branches/jbossws-cxf-4.0.x/etc/application-roles.properties =================================================================== --- stack/cxf/trunk/etc/application-roles.properties 2012-03-12 14:45:11 UTC (rev 15920) +++ stack/cxf/branches/jbossws-cxf-4.0.x/etc/application-roles.properties 2012-03-14 14:09:33 UTC (rev 15939) @@ -1 +0,0 @@ -kermit=guest Copied: stack/cxf/branches/jbossws-cxf-4.0.x/etc/application-roles.properties (from rev 15920, stack/cxf/trunk/etc/application-roles.properties) =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/etc/application-roles.properties (rev 0) +++ stack/cxf/branches/jbossws-cxf-4.0.x/etc/application-roles.properties 2012-03-14 14:09:33 UTC (rev 15939) @@ -0,0 +1 @@ +kermit=guest Deleted: stack/cxf/branches/jbossws-cxf-4.0.x/etc/application-users.properties =================================================================== --- stack/cxf/trunk/etc/application-users.properties 2012-03-12 14:45:11 UTC (rev 15920) +++ stack/cxf/branches/jbossws-cxf-4.0.x/etc/application-users.properties 2012-03-14 14:09:33 UTC (rev 15939) @@ -1 +0,0 @@ -kermit=0491092837b7e5aef6f270a3b85f8336 Copied: stack/cxf/branches/jbossws-cxf-4.0.x/etc/application-users.properties (from rev 15920, stack/cxf/trunk/etc/application-users.properties) =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/etc/application-users.properties (rev 0) +++ stack/cxf/branches/jbossws-cxf-4.0.x/etc/application-users.properties 2012-03-14 14:09:33 UTC (rev 15939) @@ -0,0 +1 @@ +kermit=0491092837b7e5aef6f270a3b85f8336 Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/scripts/cxf-jars-jaxws.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/scripts/cxf-jars-jaxws.xml 2012-03-14 13:53:43 UTC (rev 15938) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/scripts/cxf-jars-jaxws.xml 2012-03-14 14:09:33 UTC (rev 15939) @@ -129,17 +129,7 @@ </manifest> </war> -  - <jar destfile="${tests.output.dir}/test-libs/jaxws-cxf-jms-api-as7-client.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/cxf/jms/HelloWorld*.class"/> - </fileset> - <metainf dir="${tests.output.dir}/test-resources/jaxws/cxf/jms/META-INF-as7"> - <include name="wsdl/**/*" /> - </metainf> - </jar> - -  +  <jar destfile="${tests.output.dir}/test-libs/jaxws-cxf-jms-only-deployment.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/cxf/jms/HelloWorld*.class"/> @@ -152,7 +142,7 @@ </manifest> </jar> -  +  <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-jms-http-deployment.war" webxml="${tests.output.dir}/test-resources/jaxws/cxf/jms_http/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/cxf/jms_http/HelloWorld*.class"/> @@ -166,7 +156,7 @@ </manifest> </war> -  +  <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-jms-only-deployment-test-servlet.war" needxmlfile='false'> <classes dir="${tests.output.dir}/test-classes"> @@ -181,7 +171,7 @@ </manifest> </war> -  +  <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-jms-http-deployment-test-servlet.war" needxmlfile='false'> <classes dir="${tests.output.dir}/test-classes"> Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/etc/appclient.jndi.properties =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/etc/appclient.jndi.properties 2012-03-14 13:53:43 UTC (rev 15938) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/etc/appclient.jndi.properties 2012-03-14 14:09:33 UTC (rev 15939) @@ -3,3 +3,5 @@ java.naming.provider.url=remote://@jboss.bind.address@:4448 jboss.naming.client.connect.options.org.xnio.Options.SASL_POLICY_NOPLAINTEXT=false jboss.naming.client.security.callback.handler.class=org.jboss.wsf.test.CallbackHandler +jboss.naming.client.endpoint.create.options.org.xnio.Options.WORKER_TASK_CORE_THREADS=1 +jboss.naming.client.endpoint.create.options.org.xnio.Options.WORKER_TASK_MAX_THREADS=4 Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/DeploymentTestServlet.java =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/DeploymentTestServlet.java 2012-03-14 13:53:43 UTC (rev 15938) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/DeploymentTestServlet.java 2012-03-14 14:09:33 UTC (rev 15939) @@ -1,6 +1,6 @@ /* * JBoss, Home of Professional Open Source. - * Copyright 2011, Red Hat Middleware LLC, and individual contributors + * Copyright 2012, 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. * @@ -52,7 +52,8 @@ BusFactory.setThreadDefaultBus(bus); try { - QName serviceName = new QName("http://org.jboss.ws/jaxws/cxf/jms", "HelloWorldService"); + //HelloWorldServiceLocal service references local connection factory (for in-VM use) + QName serviceName = new QName("http://org.jboss.ws/jaxws/cxf/jms", "HelloWorldServiceLocal"); Service service = Service.create(wsdlUrl, serviceName); //JMS test Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/HelloWorldImpl.java =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/HelloWorldImpl.java 2012-03-14 13:53:43 UTC (rev 15938) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/HelloWorldImpl.java 2012-03-14 14:09:33 UTC (rev 15939) @@ -26,7 +26,7 @@ @WebService ( portName = "HelloWorldImplPort", - serviceName = "HelloWorldService", + serviceName = "HelloWorldServiceLocal", wsdlLocation = "META-INF/wsdl/HelloWorldService.wsdl", endpointInterface = "org.jboss.test.ws.jaxws.cxf.jms.HelloWorld", targetNamespace = "http://org.jboss.ws/jaxws/cxf/jms" Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/JMSEndpointAPITestCase.java =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/JMSEndpointAPITestCase.java 2012-03-14 13:53:43 UTC (rev 15938) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/JMSEndpointAPITestCase.java 2012-03-14 14:09:33 UTC (rev 15939) @@ -1,6 +1,6 @@ /* * JBoss, Home of Professional Open Source. - * Copyright 2011, Red Hat Middleware LLC, and individual contributors + * Copyright 2012, 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. * @@ -25,10 +25,6 @@ import java.io.InputStreamReader; import java.net.URL; -import javax.xml.namespace.QName; -import javax.xml.ws.Endpoint; -import javax.xml.ws.Service; - import junit.framework.Test; import org.jboss.wsf.test.JBossWSCXFTestSetup; @@ -44,7 +40,7 @@ { public static Test suite() { - return new JBossWSCXFTestSetup(JMSEndpointAPITestCase.class, "jaxws-cxf-jms-api-as7-client.jar,jaxws-cxf-jms-api-as7.war"); + return new JBossWSCXFTestSetup(JMSEndpointAPITestCase.class, "jaxws-cxf-jms-api-as7.war"); } public void testServerSide() throws Exception @@ -54,26 +50,4 @@ assertEquals("true", br.readLine()); } - public void testClientSide() throws Exception - { - if (isTargetJBoss7()) { - System.out.println("FIXME: can't lookup ConnectionFactory, remote JNDI binding not available yet on AS7"); - return; - } - URL wsdlUrl = Thread.currentThread().getContextClassLoader().getResource("META-INF/wsdl/HelloWorldService.wsdl"); - Object implementor = new HelloWorldImpl(); - Endpoint ep = Endpoint.publish("jms:queue:testQueue", implementor); - try - { - QName serviceName = new QName("http://org.jboss.ws/jaxws/cxf/jms", "HelloWorldService"); - - Service service = Service.create(wsdlUrl, serviceName); - HelloWorld proxy = (HelloWorld) service.getPort(new QName("http://org.jboss.ws/jaxws/cxf/jms", "HelloWorldImplPort"), HelloWorld.class); - assertEquals("Hi", proxy.echo("Hi")); - } - finally - { - ep.stop(); - } - } } Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/JMSEndpointOnlyDeploymentTestCase.java =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/JMSEndpointOnlyDeploymentTestCase.java 2012-03-14 13:53:43 UTC (rev 15938) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/JMSEndpointOnlyDeploymentTestCase.java 2012-03-14 14:09:33 UTC (rev 15939) @@ -1,6 +1,6 @@ /* * JBoss, Home of Professional Open Source. - * Copyright 2011, Red Hat Middleware LLC, and individual contributors + * Copyright 2012, 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. * @@ -24,14 +24,32 @@ import java.io.BufferedReader; import java.io.InputStreamReader; import java.net.URL; +import java.util.Properties; +import javax.jms.Message; +import javax.jms.MessageListener; +import javax.jms.Queue; +import javax.jms.QueueConnection; +import javax.jms.QueueConnectionFactory; +import javax.jms.QueueReceiver; +import javax.jms.QueueSender; +import javax.jms.QueueSession; +import javax.jms.Session; +import javax.jms.TextMessage; +import javax.naming.Context; +import javax.naming.InitialContext; import javax.xml.namespace.QName; import javax.xml.ws.Service; import junit.framework.Test; +import org.apache.cxf.frontend.ClientProxy; +import org.apache.cxf.transport.jms.JMSConduit; +import org.apache.cxf.transport.jms.JNDIConfiguration; +import org.jboss.ws.common.DOMUtils; import org.jboss.wsf.test.JBossWSCXFTestSetup; import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; /** * Test case for deploying an archive with a JMS (SOAP-over-JMS 1.0) endpoint only @@ -41,6 +59,8 @@ */ public class JMSEndpointOnlyDeploymentTestCase extends JBossWSTest { + private static boolean waitForResponse; + public static Test suite() { return new JBossWSCXFTestSetup(JMSEndpointOnlyDeploymentTestCase.class, "jaxws-cxf-jms-only-deployment-test-servlet.war,jaxws-cxf-jms-only-deployment.jar"); @@ -55,16 +75,133 @@ public void testJMSEndpointClientSide() throws Exception { - if (isTargetJBoss7()) - { - System.out.println("FIXME: can't lookup ConnectionFactory, remote JNDI binding not available yet on AS7"); + if (isTargetJBoss70()) { + System.out.println("FIXME: can't lookup remote ConnectionFactory, remote JNDI binding not available yet on AS 7.0.x"); return; } - URL wsdlUrl = Thread.currentThread().getContextClassLoader().getResource("META-INF/wsdl/HelloWorldService.wsdl"); + URL wsdlUrl = getResourceURL("jaxws/cxf/jms/META-INF-as7/wsdl/HelloWorldService.wsdl"); QName serviceName = new QName("http://org.jboss.ws/jaxws/cxf/jms", "HelloWorldService"); Service service = Service.create(wsdlUrl, serviceName); HelloWorld proxy = (HelloWorld) service.getPort(new QName("http://org.jboss.ws/jaxws/cxf/jms", "HelloWorldImplPort"), HelloWorld.class); - assertEquals("Hi", proxy.echo("Hi")); + setupProxy(proxy); + try { + assertEquals("Hi", proxy.echo("Hi")); + } catch (Exception e) { + rethrowAndHandleAuthWarning(e); + } } + + public void testMessagingClient() throws Exception + { + if (isTargetJBoss70()) { + System.out.println("FIXME: can't lookup remote ConnectionFactory, remote JNDI binding not available yet on AS 7.0.x"); + return; + } + + String reqMessage = + "<soap:Envelope xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\">" + + " <soap:Body>" + + " <ns2:echo xmlns:ns2=\"http://org.jboss.ws/jaxws/cxf/jms\">" + + " <arg0>Hi</arg0>" + + " </ns2:echo>" + + " </soap:Body>" + + "</soap:Envelope>"; + + String resMessage = + "<soap:Envelope xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\">" + + " <soap:Body>" + + " <ns2:echoResponse xmlns:ns2=\"http://org.jboss.ws/jaxws/cxf/jms\">" + + " <return>Hi</return>" + + " </ns2:echoResponse>" + + " </soap:Body>" + + "</soap:Envelope>"; + + Properties env = new Properties(); + env.put(Context.INITIAL_CONTEXT_FACTORY, "org.jboss.naming.remote.client.InitialContextFactory"); + env.put(Context.PROVIDER_URL, "remote://" + getServerHost() + ":4447"); + env.put(Context.SECURITY_PRINCIPAL, JBossWSTestHelper.getTestUsername()); + env.put(Context.SECURITY_CREDENTIALS, JBossWSTestHelper.getTestPassword()); + InitialContext context = null; + try { + context = new InitialContext(env); + } catch (Exception e) { + rethrowAndHandleAuthWarning(e); + } + QueueConnectionFactory connectionFactory = (QueueConnectionFactory)context.lookup("jms/RemoteConnectionFactory"); + Queue reqQueue = (Queue)context.lookup("jms/queue/test"); + Queue resQueue = (Queue)context.lookup("jms/queue/test"); + + QueueConnection con = connectionFactory.createQueueConnection(JBossWSTestHelper.getTestUsername(), JBossWSTestHelper.getTestPassword()); + QueueSession session = con.createQueueSession(false, Session.AUTO_ACKNOWLEDGE); + QueueReceiver receiver = session.createReceiver(resQueue); + ResponseListener responseListener = new ResponseListener(); + receiver.setMessageListener(responseListener); + con.start(); + + TextMessage message = session.createTextMessage(reqMessage); + message.setJMSReplyTo(resQueue); + message.setStringProperty("SOAPJMS_contentType", "text/xml"); + message.setStringProperty("SOAPJMS_requestURI", "jms:queue:testQueue"); + + waitForResponse = true; + + QueueSender sender = session.createSender(reqQueue); + sender.send(message); + sender.close(); + + int timeout = 30000; + while (waitForResponse && timeout > 0) + { + Thread.sleep(100); + timeout -= 100; + } + + assertNotNull("Expected response message", responseListener.resMessage); + assertEquals(DOMUtils.parse(resMessage), DOMUtils.parse(responseListener.resMessage)); + + sender.close(); + receiver.close(); + con.stop(); + session.close(); + con.close(); + } + + public static class ResponseListener implements MessageListener + { + public String resMessage; + + public void onMessage(Message msg) + { + TextMessage textMessage = (TextMessage)msg; + try + { + resMessage = textMessage.getText(); + waitForResponse = false; + } + catch (Throwable t) + { + t.printStackTrace(); + } + } + } + + private void setupProxy(HelloWorld proxy) { + JMSConduit conduit = (JMSConduit)ClientProxy.getClient(proxy).getConduit(); + JNDIConfiguration jndiConfig = conduit.getJmsConfig().getJndiConfig(); + jndiConfig.setConnectionUserName(JBossWSTestHelper.getTestUsername()); + jndiConfig.setConnectionPassword(JBossWSTestHelper.getTestPassword()); + Properties props = conduit.getJmsConfig().getJndiTemplate().getEnvironment(); + props.put(Context.SECURITY_PRINCIPAL, JBossWSTestHelper.getTestUsername()); + props.put(Context.SECURITY_CREDENTIALS, JBossWSTestHelper.getTestPassword()); + } + + private static void rethrowAndHandleAuthWarning(Exception e) throws Exception { + final String msg = "Authentication failed"; + if (e.getMessage().contains(msg) || e.getCause().getMessage().contains(msg)) { + System.out.println("This test requires an user with 'guest' role to be available on the application server; " + + "please ensure that then specify user and password using -Dtest.username=\"foo\" -Dtest.password=\"bar\"."); + } + throw e; + } } Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/TestServlet.java =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/TestServlet.java 2012-03-14 13:53:43 UTC (rev 15938) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/TestServlet.java 2012-03-14 14:09:33 UTC (rev 15939) @@ -56,7 +56,8 @@ Endpoint ep = Endpoint.publish("jms:queue:testQueue", implementor); try { - QName serviceName = new QName("http://org.jboss.ws/jaxws/cxf/jms", "HelloWorldService"); + //use HelloWorldServiceLocal service which has local connection factory references (we're running on the same JVM here) + QName serviceName = new QName("http://org.jboss.ws/jaxws/cxf/jms", "HelloWorldServiceLocal"); Service service = Service.create(wsdlUrl, serviceName); HelloWorld proxy = (HelloWorld) service.getPort(new QName("http://org.jboss.ws/jaxws/cxf/jms", "HelloWorldImplPort"), HelloWorld.class); Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/DeploymentTestServlet.java =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/DeploymentTestServlet.java 2012-03-14 13:53:43 UTC (rev 15938) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/DeploymentTestServlet.java 2012-03-14 14:09:33 UTC (rev 15939) @@ -52,11 +52,12 @@ BusFactory.setThreadDefaultBus(bus); try { - QName serviceName = new QName("http://org.jboss.ws/jaxws/cxf/jms", "HelloWorldService"); - Service service = Service.create(wsdlUrl, serviceName); + Service service = Service.create(wsdlUrl, new QName("http://org.jboss.ws/jaxws/cxf/jms", "HelloWorldService")); + //HelloWorldServiceLocal service references local connection factory (for in-VM use) + Service serviceLocal = Service.create(wsdlUrl, new QName("http://org.jboss.ws/jaxws/cxf/jms", "HelloWorldServiceLocal")); //JMS test - HelloWorld proxy = (HelloWorld) service.getPort(new QName("http://org.jboss.ws/jaxws/cxf/jms", "HelloWorldImplPort"), HelloWorld.class); + HelloWorld proxy = (HelloWorld) serviceLocal.getPort(new QName("http://org.jboss.ws/jaxws/cxf/jms", "HelloWorldImplPort"), HelloWorld.class); result = "Hi".equals(proxy.echo("Hi")); //HTTP test HelloWorld httpProxy = (HelloWorld) service.getPort(new QName("http://org.jboss.ws/jaxws/cxf/jms", "HttpHelloWorldImplPort"), HelloWorld.class); Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/HelloWorldImpl.java =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/HelloWorldImpl.java 2012-03-14 13:53:43 UTC (rev 15938) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/HelloWorldImpl.java 2012-03-14 14:09:33 UTC (rev 15939) @@ -26,7 +26,7 @@ @WebService ( portName = "HelloWorldImplPort", - serviceName = "HelloWorldService", + serviceName = "HelloWorldServiceLocal", wsdlLocation = "WEB-INF/wsdl/HelloWorldService.wsdl", endpointInterface = "org.jboss.test.ws.jaxws.cxf.jms_http.HelloWorld", targetNamespace = "http://org.jboss.ws/jaxws/cxf/jms" Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/JMSHTTPEndpointDeploymentTestCase.java =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/JMSHTTPEndpointDeploymentTestCase.java 2012-03-14 13:53:43 UTC (rev 15938) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/JMSHTTPEndpointDeploymentTestCase.java 2012-03-14 14:09:33 UTC (rev 15939) @@ -24,14 +24,21 @@ import java.io.BufferedReader; import java.io.InputStreamReader; import java.net.URL; +import java.util.Properties; +import javax.naming.Context; import javax.xml.namespace.QName; import javax.xml.ws.Service; import junit.framework.Test; +import org.apache.cxf.frontend.ClientProxy; +import org.apache.cxf.transport.jms.JMSConduit; +import org.apache.cxf.transport.jms.JNDIConfiguration; +import org.jboss.test.ws.jaxws.cxf.jms.HelloWorld; import org.jboss.wsf.test.JBossWSCXFTestSetup; import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; /** * Test case for deploying an archive with a JMS (SOAP-over-JMS 1.0) and a HTTP endpoints @@ -55,17 +62,26 @@ public void testJMSEndpointClientSide() throws Exception { - if (isTargetJBoss7()) - { - System.out.println("FIXME: can't lookup ConnectionFactory, remote JNDI binding not available yet on AS7"); + if (isTargetJBoss70()) { + System.out.println("FIXME: can't lookup remote ConnectionFactory, remote JNDI binding not available yet on AS 7.0.x"); return; } - URL wsdlUrl = Thread.currentThread().getContextClassLoader().getResource("META-INF/wsdl/HelloWorldService.wsdl"); + + URL wsdlUrl = getResourceURL("jaxws/cxf/jms_http/WEB-INF/wsdl/HelloWorldService.wsdl"); QName serviceName = new QName("http://org.jboss.ws/jaxws/cxf/jms", "HelloWorldService"); Service service = Service.create(wsdlUrl, serviceName); HelloWorld proxy = (HelloWorld) service.getPort(new QName("http://org.jboss.ws/jaxws/cxf/jms", "HelloWorldImplPort"), HelloWorld.class); - assertEquals("Hi", proxy.echo("Hi")); + setupProxy(proxy); + try { + assertEquals("Hi", proxy.echo("Hi")); + } catch (Exception e) { + if (e.getMessage().contains("Authentication failed")) { + System.out.println("This test requires an user with 'guest' role to be available on the application server; " + + "please ensure that then specify user and password using -Dtest.username=\"foo\" -Dtest.password=\"bar\"."); + } + throw e; + } } public void testHTTPEndpointClientSide() throws Exception @@ -77,4 +93,14 @@ HelloWorld proxy = (HelloWorld) service.getPort(new QName("http://org.jboss.ws/jaxws/cxf/jms", "HttpHelloWorldImplPort"), HelloWorld.class); assertEquals("(http) Hi", proxy.echo("Hi")); } + + private void setupProxy(HelloWorld proxy) { + JMSConduit conduit = (JMSConduit)ClientProxy.getClient(proxy).getConduit(); + JNDIConfiguration jndiConfig = conduit.getJmsConfig().getJndiConfig(); + jndiConfig.setConnectionUserName(JBossWSTestHelper.getTestUsername()); + jndiConfig.setConnectionPassword(JBossWSTestHelper.getTestPassword()); + Properties props = conduit.getJmsConfig().getJndiTemplate().getEnvironment(); + props.put(Context.SECURITY_PRINCIPAL, JBossWSTestHelper.getTestUsername()); + props.put(Context.SECURITY_CREDENTIALS, JBossWSTestHelper.getTestPassword()); + } } Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms/META-INF-as7/wsdl/HelloWorldService.wsdl =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms/META-INF-as7/wsdl/HelloWorldService.wsdl 2012-03-14 13:53:43 UTC (rev 15938) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms/META-INF-as7/wsdl/HelloWorldService.wsdl 2012-03-14 14:09:33 UTC (rev 15939) @@ -63,6 +63,17 @@ </wsdl:operation> </wsdl:binding> <wsdl:service name="HelloWorldService"> + <soapjms:jndiConnectionFactoryName>java:jms/RemoteConnectionFactory</soapjms:jndiConnectionFactoryName> + <soapjms:jndiInitialContextFactory>org.jboss.naming.remote.client.InitialContextFactory</soapjms:jndiInitialContextFactory> + <soapjms:jndiURL>remote://localhost:4447</soapjms:jndiURL> + <wsdl:port binding="tns:HelloWorldServiceSoapBinding" name="HelloWorldImplPort"> + <soap:address location="jms:queue:testQueue"/> + </wsdl:port> + <wsdl:port binding="tns:HttpHelloWorldServiceSoapBinding" name="HttpHelloWorldImplPort"> + <soap:address location="http://host:port"/> + </wsdl:port> + </wsdl:service> + <wsdl:service name="HelloWorldServiceLocal"> <soapjms:jndiConnectionFactoryName>java:/ConnectionFactory</soapjms:jndiConnectionFactoryName> <wsdl:port binding="tns:HelloWorldServiceSoapBinding" name="HelloWorldImplPort"> <soap:address location="jms:queue:testQueue"/> Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms_http/WEB-INF/wsdl/HelloWorldService.wsdl =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms_http/WEB-INF/wsdl/HelloWorldService.wsdl 2012-03-14 13:53:43 UTC (rev 15938) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms_http/WEB-INF/wsdl/HelloWorldService.wsdl 2012-03-14 14:09:33 UTC (rev 15939) @@ -63,7 +63,9 @@ </wsdl:operation> </wsdl:binding> <wsdl:service name="HelloWorldService"> - <soapjms:jndiConnectionFactoryName>java:/ConnectionFactory</soapjms:jndiConnectionFactoryName> + <soapjms:jndiConnectionFactoryName>java:jms/RemoteConnectionFactory</soapjms:jndiConnectionFactoryName> + <soapjms:jndiInitialContextFactory>org.jboss.naming.remote.client.InitialContextFactory</soapjms:jndiInitialContextFactory> + <soapjms:jndiURL>remote://localhost:4447</soapjms:jndiURL> <wsdl:port binding="tns:HelloWorldServiceSoapBinding" name="HelloWorldImplPort"> <soap:address location="jms:queue:testQueue"/> </wsdl:port> @@ -71,4 +73,10 @@ <soap:address location="http://localhost:8080/jaxws-cxf-jms-http-deployment"/> </wsdl:port> </wsdl:service> + <wsdl:service name="HelloWorldServiceLocal"> + <soapjms:jndiConnectionFactoryName>java:/ConnectionFactory</soapjms:jndiConnectionFactoryName> + <wsdl:port binding="tns:HelloWorldServiceSoapBinding" name="HelloWorldImplPort"> + <soap:address location="jms:queue:testQueue"/> + </wsdl:port> + </wsdl:service> </wsdl:definitions> \ No newline at end of file Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/etc/appclient.jndi.properties =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/etc/appclient.jndi.properties 2012-03-14 13:53:43 UTC (rev 15938) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/etc/appclient.jndi.properties 2012-03-14 14:09:33 UTC (rev 15939) @@ -3,3 +3,5 @@ java.naming.provider.url=remote://@jboss.bind.address@:4448 jboss.naming.client.connect.options.org.xnio.Options.SASL_POLICY_NOPLAINTEXT=false jboss.naming.client.security.callback.handler.class=org.jboss.wsf.test.CallbackHandler +jboss.naming.client.endpoint.create.options.org.xnio.Options.WORKER_TASK_CORE_THREADS=1 +jboss.naming.client.endpoint.create.options.org.xnio.Options.WORKER_TASK_MAX_THREADS=4 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-03-14 13:53:43 UTC (rev 15938) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/pom.xml 2012-03-14 14:09:33 UTC (rev 15939) @@ -27,6 +27,7 @@ <org.littleshoot.littleproxy.version>0.4</org.littleshoot.littleproxy.version> <org.slf4j.version>1.6.1</org.slf4j.version> <log4j.output.dir>${project.build.directory}</log4j.output.dir> + <appclient.output.dir>${project.build.directory}/appclient-logs</appclient.output.dir> </properties>  @@ -283,9 +284,13 @@ </property> <property> <name>log4j.output.dir</name> - <value>${project.build.directory}</value> + <value>${log4j.output.dir}</value> </property> <property> + <name>appclient.output.dir</name> + <value>${appclient.output.dir}</value> + </property> + <property> <name>org.jboss.ws.testsuite.securityDomain.users.propfile</name> <value>${project.build.directory}/test-classes/jbossws-users.properties</value> </property> @@ -330,6 +335,14 @@ <value>${test.resources.directory}</value> </property> <property> + <name>test.username</name> + <value>${test.username}</value> + </property> + <property> + <name>test.password</name> + <value>${test.password}</value> + </property> + <property> <name>wsdl.publish.location</name> <value>${wsdl.publish.location}</value> </property> @@ -1036,6 +1049,18 @@ <version>3.2.1.GA</version> <scope>test</scope> </dependency> + <dependency> + <groupId>org.hornetq</groupId> + <artifactId>hornetq-jms</artifactId> + <version>2.2.11.Final</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.hornetq</groupId> + <artifactId>hornetq-core</artifactId> + <version>2.2.11.Final</version> + <scope>test</scope> + </dependency> </dependencies> <build> <plugins> @@ -1156,7 +1181,7 @@ <dependency> <groupId>org.jboss</groupId> <artifactId>jboss-remote-naming</artifactId> - <version>1.0.1.Final</version> + <version>1.0.2.Final</version> </dependency> <dependency> <groupId>javax.mail</groupId> @@ -1260,6 +1285,18 @@ <version>3.2.2.GA</version> <scope>test</scope> </dependency> + <dependency> + <groupId>org.hornetq</groupId> + <artifactId>hornetq-jms</artifactId> + <version>2.2.11.Final</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.hornetq</groupId> + <artifactId>hornetq-core</artifactId> + <version>2.2.11.Final</version> + <scope>test</scope> + </dependency> </dependencies> <build> <plugins> Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/shared-tests/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/shared-tests/pom.xml 2012-03-14 13:53:43 UTC (rev 15938) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/shared-tests/pom.xml 2012-03-14 14:09:33 UTC (rev 15939) @@ -141,8 +141,8 @@ <configuration> <tasks> <copy - file="${project.parent.build.directory}/../src/test/resources/${jbossws.integration.target}/appclient.xml" - tofile="${jboss.home}/appclient/configuration/appclient.xml" + file="${project.parent.build.directory}/../src/test/resources/${jbossws.integration.target}/appclient-ws.xml" + tofile="${jboss.home}/appclient/configuration/appclient-ws.xml" failonerror="false" verbose="true" overwrite="true" Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/shared-tests/src/test/etc/appclient.jndi.properties =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/shared-tests/src/test/etc/appclient.jndi.properties 2012-03-14 13:53:43 UTC (rev 15938) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/shared-tests/src/test/etc/appclient.jndi.properties 2012-03-14 14:09:33 UTC (rev 15939) @@ -3,3 +3,5 @@ java.naming.provider.url=remote://@jboss.bind.address@:4448 jboss.naming.client.connect.options.org.xnio.Options.SASL_POLICY_NOPLAINTEXT=false jboss.naming.client.security.callback.handler.class=org.jboss.wsf.test.CallbackHandler +jboss.naming.client.endpoint.create.options.org.xnio.Options.WORKER_TASK_CORE_THREADS=1 +jboss.naming.client.endpoint.create.options.org.xnio.Options.WORKER_TASK_MAX_THREADS=4 Copied: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/src/test/resources/jboss711/appclient-ws.xml (from rev 15920, stack/cxf/trunk/modules/testsuite/src/test/resources/jboss711/appclient-ws.xml) =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/src/test/resources/jboss711/appclient-ws.xml (rev 0) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/src/test/resources/jboss711/appclient-ws.xml 2012-03-14 14:09:33 UTC (rev 15939) @@ -0,0 +1,115 @@ + + +<server xmlns="urn:jboss:domain:1.2"> + + <extensions> + <extension module="org.jboss.as.connector"/> + <extension module="org.jboss.as.ee"/> + <extension module="org.jboss.as.ejb3"/> + <extension module="org.jboss.as.logging"/> + <extension module="org.jboss.as.naming"/> + <extension module="org.jboss.as.remoting"/> + <extension module="org.jboss.as.security"/> + <extension module="org.jboss.as.webservices"/> + </extensions> + + <profile> + <subsystem xmlns="urn:jboss:domain:logging:1.1"> + <console-handler name="CONSOLE"> + <level name="INFO"/> + <formatter> + <pattern-formatter pattern="%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/> + </formatter> + </console-handler> + + <periodic-rotating-file-handler name="FILE"> + <level name="INFO"/> + <formatter> + <pattern-formatter pattern="%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/> + </formatter> + <file relative-to="jboss.server.log.dir" path="appclient.log"/> + <suffix value=".yyyy-MM-dd"/> + <append value="true"/> + </periodic-rotating-file-handler> + + <logger category="com.arjuna"> + <level name="WARN"/> + </logger> + <logger category="sun.rmi"> + <level name="WARN"/> + </logger> + <logger category="jacorb"> + <level name="WARN"/> + </logger> +  + <logger category="jacorb.config"> + <level name="ERROR"/> + </logger> + + <root-logger> + <level name="INFO"/> + <handlers> + <handler name="CONSOLE"/> + <handler name="FILE"/> + </handlers> + </root-logger> + </subsystem> + <subsystem xmlns="urn:jboss:domain:ee:1.0"/> + <subsystem xmlns="urn:jboss:domain:ejb3:1.2" /> + <subsystem xmlns="urn:jboss:domain:naming:1.0"/> + <subsystem xmlns="urn:jboss:domain:security:1.0"> + <security-domains> + <security-domain name="other" cache-type="default"> + <authentication> + <login-module code="UsersRoles" flag="required"/> + </authentication> + </security-domain> + <security-domain name="jboss-web-policy" cache-type="default"> + <authorization> + <policy-module code="Delegating" flag="required"/> + </authorization> + </security-domain> + <security-domain name="jboss-ejb-policy" cache-type="default"> + <authorization> + <policy-module code="Delegating" flag="required"/> + </authorization> + </security-domain> + </security-domains> + </subsystem> + <subsystem xmlns="urn:jboss:domain:remoting:1.1"> + <connector name="remoting-connector" socket-binding="remoting"/> + </subsystem> + <subsystem xmlns="urn:jboss:domain:webservices:1.1"/> + </profile> + + <interfaces> + <interface name="public"> + <inet-address value="${jboss.bind.address:127.0.0.1}"/> + </interface> + </interfaces> + + <socket-binding-group name="standard-sockets" default-interface="public"> + <socket-binding name="remoting" port="4448"/> + </socket-binding-group> + +</server> Deleted: 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-03-14 13:53:43 UTC (rev 15938) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/src/test/resources/jboss711/appclient.xml 2012-03-14 14:09:33 UTC (rev 15939) @@ -1,168 +0,0 @@ - - -<server xmlns="urn:jboss:domain:1.2"> - - <extensions> - <extension module="org.jboss.as.connector"/> - <extension module="org.jboss.as.ee"/> - <extension module="org.jboss.as.ejb3"/> - <extension module="org.jboss.as.jacorb"/> - <extension module="org.jboss.as.jaxr"/> - <extension module="org.jboss.as.jpa"/> - <extension module="org.jboss.as.logging"/> - <extension module="org.jboss.as.naming"/> - <extension module="org.jboss.as.remoting"/> - <extension module="org.jboss.as.security"/> - <extension module="org.jboss.as.transactions"/> - <extension module="org.jboss.as.webservices"/> - </extensions> - - <profile> - <subsystem xmlns="urn:jboss:domain:logging:1.1"> - <console-handler name="CONSOLE"> - <level name="INFO"/> - <formatter> - <pattern-formatter pattern="%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/> - </formatter> - </console-handler> - - <periodic-rotating-file-handler name="FILE"> - <level name="INFO"/> - <formatter> - <pattern-formatter pattern="%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/> - </formatter> - <file relative-to="jboss.server.log.dir" path="appclient.log"/> - <suffix value=".yyyy-MM-dd"/> - <append value="true"/> - </periodic-rotating-file-handler> - - <logger category="com.arjuna"> - <level name="WARN"/> - </logger> - <logger category="sun.rmi"> - <level name="WARN"/> - </logger> - <logger category="jacorb"> - <level name="WARN"/> - </logger> -  - <logger category="jacorb.config"> - <level name="ERROR"/> - </logger> - - <root-logger> - <level name="INFO"/> - <handlers> - <handler name="CONSOLE"/> - <handler name="FILE"/> - </handlers> - </root-logger> - </subsystem> - <subsystem xmlns="urn:jboss:domain:datasources:1.0"> - <datasources> - <datasource jndi-name="java:jboss/datasources/ExampleDS" enabled="false" use-java-context="true" - pool-name="java:jboss/datasources/ExampleDS"> - <connection-url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1</connection-url> - <driver>h2</driver> - <pool></pool> - <security> - <user-name>sa</user-name> - <password>sa</password> - </security> - </datasource> - <drivers> - <driver name="h2" module="com.h2database.h2"> - <xa-datasource-class>org.h2.jdbcx.JdbcDataSource</xa-datasource-class> - </driver> - </drivers> - </datasources> - </subsystem> - <subsystem xmlns="urn:jboss:domain:ee:1.0"/> - <subsystem xmlns="urn:jboss:domain:ejb3:1.2" /> - <subsystem xmlns="urn:jboss:domain:jacorb:1.0"> - <orb name="JBoss" print-version="off" giop-minor-version="2"> - <connection max-managed-buf-size="24" outbuf-cache-timeout="-1"/> - <naming root-context="JBoss/Naming/root" export-corbaloc="on"/> - </orb> - <poa monitoring="off" queue-wait="off"> - <request-processors pool-size="2" max-threads="8"/> - </poa> - <interop sun="on" chunk-custom-rmi-valuetypes="on" strict-check-on-tc-creation="off"/> - </subsystem> - <subsystem xmlns="urn:jboss:domain:jpa:1.0"> - <jpa default-datasource=""/> - </subsystem> - <subsystem xmlns="urn:jboss:domain:naming:1.0"/> - <subsystem xmlns="urn:jboss:domain:security:1.0"> - <security-domains> - <security-domain name="other" cache-type="default"> - <authentication> - <login-module code="UsersRoles" flag="required"/> - </authentication> - </security-domain> - <security-domain name="jboss-web-policy" cache-type="default"> - <authorization> - <policy-module code="Delegating" flag="required"/> - </authorization> - </security-domain> - <security-domain name="jboss-ejb-policy" cache-type="default"> - <authorization> - <policy-module code="Delegating" flag="required"/> - </authorization> - </security-domain> - </security-domains> - </subsystem> - <subsystem xmlns="urn:jboss:domain:jaxr:1.0"> - <connection-factory jndi-name="java:jboss/jaxr/ConnectionFactory"/> - <juddi-server publish-url="http://localhost:8080/juddi/publish" query-url="http://localhost:8080/juddi/query"/> - </subsystem> - <subsystem xmlns="urn:jboss:domain:remoting:1.1"> - <connector name="remoting-connector" socket-binding="remoting"/> - </subsystem> - <subsystem xmlns="urn:jboss:domain:transactions:1.0"> - <recovery-environment socket-binding="txn-recovery-environment" status-socket-binding="txn-status-manager"/> - <core-environment> - <process-id> - <uuid/> - </process-id> - </core-environment> - <coordinator-environment default-timeout="300"/> - </subsystem> - <subsystem xmlns="urn:jboss:domain:webservices:1.1"/> - </profile> - - <interfaces> - <interface name="public"> - <inet-address value="${jboss.bind.address:127.0.0.1}"/> - </interface> - </interfaces> - - <socket-binding-group name="standard-sockets" default-interface="public"> - <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="14712"/> - <socket-binding name="txn-status-manager" port="14713"/> - </socket-binding-group> - -</server>

14 years, 1 month

1
0
0 / 0

JBossWS SVN: r15938 - in stack/cxf/branches/jbossws-cxf-4.0.x: modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2012-03-14 09:53:43 -0400 (Wed, 14 Mar 2012) New Revision: 15938 Modified: stack/cxf/branches/jbossws-cxf-4.0.x/ stack/cxf/branches/jbossws-cxf-4.0.x/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSBusFactory.java Log: [JBPAPP-8346] CXF module does not find optional Spring dependencies Merged revisions 15889 via svnmerge from https://svn.jboss.org/repos/jbossws/stack/cxf/trunk ....... r15889 | alessio.soldano(a)jboss.com | 2012-03-06 16:49:28 +0100 (Tue, 06 Mar 2012) | 2 lines [JBWS-3453] Extend Spring availability check to JBossWSBusFactory defining classloader ....... 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,15674-15675,15682,15695-15697,15708,15711,15713,15719,15723-15730,15738,15743,15748,15750-15751,15754-15757,15765-15766,15768,15773,15780-15781,15784,15794,15806-15808,15824,15835,15837-15857,15859,15866,15879-15881,15886-15888,15896 + /stack/cxf/branches/asoldano:14032-14050,14068 /stack/cxf/trunk:15658,15668,15674-15675,15682,15695-15697,15708,15711,15713,15719,15723-15730,15738,15743,15748,15750-15751,15754-15757,15765-15766,15768,15773,15780-15781,15784,15794,15806-15808,15824,15835,15837-15857,15859,15866,15879-15881,15886-15889,15896 Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSBusFactory.java =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSBusFactory.java 2012-03-14 13:49:28 UTC (rev 15937) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSBusFactory.java 2012-03-14 13:53:43 UTC (rev 15938) @@ -49,7 +49,7 @@ @Override public Bus createBus() { - if (SpringUtils.isSpringAvailable()) + if (isSpringAvailable()) { return getSpringBusFactory().createBus(); } @@ -59,6 +59,13 @@ } } + private boolean isSpringAvailable() { + // Spring is available iff: + // 1) TCCL has Spring classes + // 2) the SpringBusFactory has already been loaded or the defining classloader can load that + return (SpringUtils.isSpringAvailable() && (springBusFactory != null || SpringUtils.isSpringAvailable(this.getClass().getClassLoader()))); + } + /** JBossWSSpringBusFactory methods **/ public Bus createBus(String cfgFile) {

14 years, 1 month

1
0
0 / 0

JBossWS SVN: r15937 - stack/cxf/branches/jbossws-cxf-4.0.x.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2012-03-14 09:49:28 -0400 (Wed, 14 Mar 2012) New Revision: 15937 Modified: stack/cxf/branches/jbossws-cxf-4.0.x/ Log: Blocked revisions 15884,15898-15899 via svnmerge ....... r15884 | alessio.soldano(a)jboss.com | 2012-03-06 15:08:37 +0100 (Tue, 06 Mar 2012) | 2 lines [JBWS-3448] Move to Apache CXF 2.5.3-SNAPSHOT (including removing GCM algorithm suite integration code, as that's already included in CXF 2.5.3) ....... r15898 | alessio.soldano(a)jboss.com | 2012-03-08 10:00:57 +0100 (Thu, 08 Mar 2012) | 2 lines [JBWS-3454] Adding Spring-aware ServerBeanCustomizer and providing initial server side JMSConfiguration customization ....... r15899 | alessio.soldano(a)jboss.com | 2012-03-08 12:04:08 +0100 (Thu, 08 Mar 2012) | 2 lines [JBWS-3454] Rollbacking previous commit (svn merge -r 15989:15897) ....... Property changes on: stack/cxf/branches/jbossws-cxf-4.0.x ___________________________________________________________________ Modified: svnmerge-blocked - https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:15645-15648,15650,156... + https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:15645-15648,15650,156...

14 years, 1 month

1
0
0 / 0

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

by jbossws-commits＠lists.jboss.org

Author: ropalka Date: 2012-03-14 09:12:38 -0400 (Wed, 14 Mar 2012) New Revision: 15936 Modified: stack/cxf/trunk/modules/testsuite/pom.xml Log: [JBWS-3435] finalizing appclient integration Modified: stack/cxf/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/pom.xml 2012-03-13 15:44:42 UTC (rev 15935) +++ stack/cxf/trunk/modules/testsuite/pom.xml 2012-03-14 13:12:38 UTC (rev 15936) @@ -386,9 +386,13 @@ </property> <property> <name>log4j.output.dir</name> - <value>${project.build.directory}</value> + <value>${log4j.output.dir}</value> </property> <property> + <name>appclient.output.dir</name> + <value>${appclient.output.dir}</value> + </property> + <property> <name>org.jboss.ws.testsuite.securityDomain.users.propfile</name> <value>${project.build.directory}/test-classes/jbossws-users.properties</value> </property>

14 years, 1 month

1
0
0 / 0

JBossWS SVN: r15935 - in hudson/trunk: hudson-home and 18 other directories.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2012-03-13 11:44:42 -0400 (Tue, 13 Mar 2012) New Revision: 15935 Added: hudson/trunk/hudson-home/jobs/AS-7.1.2/ hudson/trunk/hudson-home/jobs/AS-7.1.2/config.xml hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-7.1.2-SPRING-SUN-JDK-6/ hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-7.1.2-SPRING-SUN-JDK-6/config.xml hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-7.1.2-SUN-JDK-6/ hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-7.1.2-SUN-JDK-6/config.xml hudson/trunk/hudson-home/jobs/CXF-CORE-AS-7.1.2-SPRING-SUN-JDK-6/ hudson/trunk/hudson-home/jobs/CXF-CORE-AS-7.1.2-SPRING-SUN-JDK-6/config.xml hudson/trunk/hudson-home/jobs/CXF-CORE-AS-7.1.2-SUN-JDK-6/ hudson/trunk/hudson-home/jobs/CXF-CORE-AS-7.1.2-SUN-JDK-6/config.xml hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-7.1.2-SPRING-SUN-JDK-6/ hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-7.1.2-SPRING-SUN-JDK-6/config.xml hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-7.1.2-SUN-JDK-6/ hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-7.1.2-SUN-JDK-6/config.xml hudson/trunk/hudson-home/jobs/NATIVE-BINDIST-AS-7.1.2-SUN-JDK-6/ hudson/trunk/hudson-home/jobs/NATIVE-BINDIST-AS-7.1.2-SUN-JDK-6/config.xml hudson/trunk/hudson-home/jobs/NATIVE-CORE-AS-7.1.2-SUN-JDK-6/ hudson/trunk/hudson-home/jobs/NATIVE-CORE-AS-7.1.2-SUN-JDK-6/config.xml hudson/trunk/hudson-home/jobs/NATIVE-SRCDIST-AS-7.1.2-SUN-JDK-6/ hudson/trunk/hudson-home/jobs/NATIVE-SRCDIST-AS-7.1.2-SUN-JDK-6/config.xml Removed: hudson/trunk/hudson-home/jobs/AS-7.0.1/ hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-7.0.1-SPRING-SUN-JDK-6/ hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-7.0.1-SUN-JDK-6/ hudson/trunk/hudson-home/jobs/CXF-CORE-AS-7.0.1-SPRING-SUN-JDK-6/ hudson/trunk/hudson-home/jobs/CXF-CORE-AS-7.0.1-SUN-JDK-6/ hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-7.0.1-SPRING-SUN-JDK-6/ hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-7.0.1-SUN-JDK-6/ hudson/trunk/hudson-home/jobs/NATIVE-BINDIST-AS-7.0.1-SUN-JDK-6/ hudson/trunk/hudson-home/jobs/NATIVE-CORE-AS-7.0.1-SUN-JDK-6/ hudson/trunk/hudson-home/jobs/NATIVE-SRCDIST-AS-7.0.1-SUN-JDK-6/ Modified: hudson/trunk/ant.properties.example hudson/trunk/hudson-home/config.xml hudson/trunk/hudson-home/jobs/AS-7.1.1/config.xml hudson/trunk/hudson-home/jobs/AS-ALL/config.xml hudson/trunk/hudson-home/jobs/AS-LIGHT/config.xml hudson/trunk/hudson-home/jobs/CXF-ALL/config.xml hudson/trunk/hudson-home/jobs/CXF-LIGHT/config.xml hudson/trunk/hudson-home/jobs/NATIVE-ALL/config.xml hudson/trunk/hudson-home/jobs/NATIVE-LIGHT/config.xml Log: Updating jobs after 711 release Modified: hudson/trunk/ant.properties.example =================================================================== --- hudson/trunk/ant.properties.example 2012-03-13 15:13:23 UTC (rev 15934) +++ hudson/trunk/ant.properties.example 2012-03-13 15:44:42 UTC (rev 15935) @@ -20,10 +20,6 @@ hudson.native.url=http://anonsvn.jboss.org/repos/jbossws/stack/native/trunk hudson.cxf.url=http://anonsvn.jboss.org/repos/jbossws/stack/cxf/trunk -hudson.jboss701.url=https://github.com/jbossas/jboss-as -hudson.jboss701.build=jboss-as-7.0.1.Final -hudson.jboss701.rev=7.0.1.Final - hudson.jboss702.url=https://github.com/jbossas/jboss-as hudson.jboss702.build=jboss-as-7.0.2.Final hudson.jboss702.rev=7.0.2.Final @@ -33,9 +29,13 @@ hudson.jboss710.rev=7.1.0.Final hudson.jboss711.url=https://github.com/jbossas/jboss-as -hudson.jboss711.build=jboss-as-7.1.1.Final-SNAPSHOT -hudson.jboss711.rev=master +hudson.jboss711.build=jboss-as-7.1.1.Final +hudson.jboss711.rev=7.1.1.Final +hudson.jboss712.url=https://github.com/jbossas/jboss-as +hudson.jboss712.build=jboss-as-7.1.2.Final-SNAPSHOT +hudson.jboss712.rev=master + hudson.mail.recipients= hudson.smtp.host=localhost Modified: hudson/trunk/hudson-home/config.xml =================================================================== --- hudson/trunk/hudson-home/config.xml 2012-03-13 15:13:23 UTC (rev 15934) +++ hudson/trunk/hudson-home/config.xml 2012-03-13 15:44:42 UTC (rev 15935) @@ -36,10 +36,10 @@ <tr><th align=left>JBossWS Native:</th><td>@hudson.native.url@</td></tr> <tr><th align=left>JBossWS CXF:</th><td>@hudson.cxf.url@</td></tr> <tr><td colspan=2></td></tr> - <tr><th align=left>@hudson.jboss701.build@</th><td>-r(a)hudson.jboss701.rev@ @hudson.jboss701.url@</td></tr> <tr><th align=left>@hudson.jboss702.build@</th><td>-r(a)hudson.jboss702.rev@ @hudson.jboss702.url@</td></tr> <tr><th align=left>@hudson.jboss710.build@</th><td>-r(a)hudson.jboss710.rev@ @hudson.jboss710.url@</td></tr> <tr><th align=left>@hudson.jboss711.build@</th><td>-r(a)hudson.jboss711.rev@ @hudson.jboss711.url@</td></tr> + <tr><th align=left>@hudson.jboss712.build@</th><td>-r(a)hudson.jboss712.rev@ @hudson.jboss712.url@</td></tr> <tr><td colspan=2></td></tr> </table> ]]> @@ -56,10 +56,10 @@ <no-comparator/> <string>AS-ALL</string> <string>AS-LIGHT</string> - <string>AS-7.0.1</string> <string>AS-7.0.2</string> <string>AS-7.1.0</string> <string>AS-7.1.1</string> + <string>AS-7.1.2</string> </jobNames> <name>AS Builds</name> <description> @@ -76,18 +76,18 @@ <no-comparator/> <string>NATIVE-ALL</string> <string>NATIVE-LIGHT</string> - <string>NATIVE-CORE-AS-7.0.1-SUN-JDK-6</string> <string>NATIVE-CORE-AS-7.0.2-SUN-JDK-6</string> <string>NATIVE-CORE-AS-7.1.0-SUN-JDK-6</string> <string>NATIVE-CORE-AS-7.1.1-SUN-JDK-6</string> - <string>NATIVE-BINDIST-AS-7.0.1-SUN-JDK-6</string> + <string>NATIVE-CORE-AS-7.1.2-SUN-JDK-6</string> <string>NATIVE-BINDIST-AS-7.0.2-SUN-JDK-6</string> <string>NATIVE-BINDIST-AS-7.1.0-SUN-JDK-6</string> <string>NATIVE-BINDIST-AS-7.1.1-SUN-JDK-6</string> - <string>NATIVE-SRCDIST-AS-7.0.1-SUN-JDK-6</string> + <string>NATIVE-BINDIST-AS-7.1.2-SUN-JDK-6</string> <string>NATIVE-SRCDIST-AS-7.0.2-SUN-JDK-6</string> <string>NATIVE-SRCDIST-AS-7.1.0-SUN-JDK-6</string> <string>NATIVE-SRCDIST-AS-7.1.1-SUN-JDK-6</string> + <string>NATIVE-SRCDIST-AS-7.1.2-SUN-JDK-6</string> </jobNames> <name>Native Tests</name> <description> @@ -106,30 +106,30 @@ <no-comparator/> <string>CXF-ALL</string> <string>CXF-LIGHT</string> - <string>CXF-CORE-AS-7.0.1-SUN-JDK-6</string> <string>CXF-CORE-AS-7.0.2-SUN-JDK-6</string> <string>CXF-CORE-AS-7.1.0-SUN-JDK-6</string> <string>CXF-CORE-AS-7.1.1-SUN-JDK-6</string> - <string>CXF-CORE-AS-7.0.1-SPRING-SUN-JDK-6</string> + <string>CXF-CORE-AS-7.1.2-SUN-JDK-6</string> <string>CXF-CORE-AS-7.0.2-SPRING-SUN-JDK-6</string> <string>CXF-CORE-AS-7.1.0-SPRING-SUN-JDK-6</string> <string>CXF-CORE-AS-7.1.1-SPRING-SUN-JDK-6</string> - <string>CXF-BINDIST-AS-7.0.1-SUN-JDK-6</string> + <string>CXF-CORE-AS-7.1.2-SPRING-SUN-JDK-6</string> <string>CXF-BINDIST-AS-7.0.2-SUN-JDK-6</string> <string>CXF-BINDIST-AS-7.1.0-SUN-JDK-6</string> <string>CXF-BINDIST-AS-7.1.1-SUN-JDK-6</string> - <string>CXF-BINDIST-AS-7.0.1-SPRING-SUN-JDK-6</string> + <string>CXF-BINDIST-AS-7.1.2-SUN-JDK-6</string> <string>CXF-BINDIST-AS-7.0.2-SPRING-SUN-JDK-6</string> <string>CXF-BINDIST-AS-7.1.0-SPRING-SUN-JDK-6</string> <string>CXF-BINDIST-AS-7.1.1-SPRING-SUN-JDK-6</string> - <string>CXF-SRCDIST-AS-7.0.1-SUN-JDK-6</string> + <string>CXF-BINDIST-AS-7.1.2-SPRING-SUN-JDK-6</string> <string>CXF-SRCDIST-AS-7.0.2-SUN-JDK-6</string> <string>CXF-SRCDIST-AS-7.1.0-SUN-JDK-6</string> <string>CXF-SRCDIST-AS-7.1.1-SUN-JDK-6</string> - <string>CXF-SRCDIST-AS-7.0.1-SPRING-SUN-JDK-6</string> + <string>CXF-SRCDIST-AS-7.1.2-SUN-JDK-6</string> <string>CXF-SRCDIST-AS-7.0.2-SPRING-SUN-JDK-6</string> <string>CXF-SRCDIST-AS-7.1.0-SPRING-SUN-JDK-6</string> <string>CXF-SRCDIST-AS-7.1.1-SPRING-SUN-JDK-6</string> + <string>CXF-SRCDIST-AS-7.1.2-SPRING-SUN-JDK-6</string> </jobNames> <name>CXF Tests</name> <description> @@ -147,31 +147,31 @@ <jobNames class="tree-set"> <no-comparator/> <string>CXF-LIGHT</string> - <string>CXF-CORE-AS-7.0.1-SUN-JDK-6</string> <string>CXF-CORE-AS-7.0.2-SUN-JDK-6</string> <string>CXF-CORE-AS-7.1.0-SUN-JDK-6</string> <string>CXF-CORE-AS-7.1.1-SUN-JDK-6</string> - <string>CXF-CORE-AS-7.0.1-SPRING-SUN-JDK-6</string> + <string>CXF-CORE-AS-7.1.2-SUN-JDK-6</string> <string>CXF-CORE-AS-7.0.2-SPRING-SUN-JDK-6</string> <string>CXF-CORE-AS-7.1.0-SPRING-SUN-JDK-6</string> <string>CXF-CORE-AS-7.1.1-SPRING-SUN-JDK-6</string> - <string>CXF-BINDIST-AS-7.0.1-SUN-JDK-6</string> + <string>CXF-CORE-AS-7.1.2-SPRING-SUN-JDK-6</string> <string>CXF-BINDIST-AS-7.0.2-SUN-JDK-6</string> <string>CXF-BINDIST-AS-7.1.0-SUN-JDK-6</string> <string>CXF-BINDIST-AS-7.1.1-SUN-JDK-6</string> - <string>CXF-BINDIST-AS-7.0.1-SPRING-SUN-JDK-6</string> + <string>CXF-BINDIST-AS-7.1.2-SUN-JDK-6</string> <string>CXF-BINDIST-AS-7.0.2-SPRING-SUN-JDK-6</string> <string>CXF-BINDIST-AS-7.1.0-SPRING-SUN-JDK-6</string> <string>CXF-BINDIST-AS-7.1.1-SPRING-SUN-JDK-6</string> + <string>CXF-BINDIST-AS-7.1.2-SPRING-SUN-JDK-6</string> <string>NATIVE-LIGHT</string> - <string>NATIVE-CORE-AS-7.0.1-SUN-JDK-6</string> <string>NATIVE-CORE-AS-7.0.2-SUN-JDK-6</string> <string>NATIVE-CORE-AS-7.1.0-SUN-JDK-6</string> <string>NATIVE-CORE-AS-7.1.1-SUN-JDK-6</string> - <string>NATIVE-BINDIST-AS-7.0.1-SUN-JDK-6</string> + <string>NATIVE-CORE-AS-7.1.2-SUN-JDK-6</string> <string>NATIVE-BINDIST-AS-7.0.2-SUN-JDK-6</string> <string>NATIVE-BINDIST-AS-7.1.0-SUN-JDK-6</string> <string>NATIVE-BINDIST-AS-7.1.1-SUN-JDK-6</string> + <string>NATIVE-BINDIST-AS-7.1.2-SUN-JDK-6</string> </jobNames> <name>Working Days Tests</name> <description> Modified: hudson/trunk/hudson-home/jobs/AS-7.1.1/config.xml =================================================================== --- hudson/trunk/hudson-home/jobs/AS-7.1.1/config.xml 2012-03-13 15:13:23 UTC (rev 15934) +++ hudson/trunk/hudson-home/jobs/AS-7.1.1/config.xml 2012-03-13 15:44:42 UTC (rev 15935) @@ -44,7 +44,7 @@ <buildChooser class="hudson.plugins.git.util.DefaultBuildChooser"/> <gitTool>Default</gitTool> <browser class="hudson.plugins.git.browser.GithubWeb"> - <url>@hudson.jboss710.url@</url> + <url>@hudson.jboss711.url@</url> </browser> <submoduleCfg class="list"/> <relativeTargetDir></relativeTargetDir> Added: hudson/trunk/hudson-home/jobs/AS-7.1.2/config.xml =================================================================== --- hudson/trunk/hudson-home/jobs/AS-7.1.2/config.xml (rev 0) +++ hudson/trunk/hudson-home/jobs/AS-7.1.2/config.xml 2012-03-13 15:44:42 UTC (rev 15935) @@ -0,0 +1,75 @@ +<?xml version='1.0' encoding='UTF-8'?> +<project> + <actions/> + <description>Builds JBoss AS 7.1.2</description> + <logRotator> + <daysToKeep>-1</daysToKeep> + <numToKeep>20</numToKeep> + <artifactDaysToKeep>-1</artifactDaysToKeep> + <artifactNumToKeep>-1</artifactNumToKeep> + </logRotator> + <keepDependencies>false</keepDependencies> + <properties/> + <scm class="hudson.plugins.git.GitSCM"> + <configVersion>1</configVersion> + <remoteRepositories> + <org.spearce.jgit.transport.RemoteConfig> + <string>origin</string> + <int>5</int> + <string>fetch</string> + <string>+refs/heads/*:refs/remotes/origin/*</string> + <string>receivepack</string> + <string>git-upload-pack</string> + <string>uploadpack</string> + <string>git-upload-pack</string> + <string>url</string> + <string>@hudson.jboss712.url@.git</string> + <string>tagopt</string> + <string></string> + </org.spearce.jgit.transport.RemoteConfig> + </remoteRepositories> + <branches> + <hudson.plugins.git.BranchSpec> + <name>@hudson.jboss712.rev@</name> + </hudson.plugins.git.BranchSpec> + </branches> + <localBranch></localBranch> + <mergeOptions/> + <recursiveSubmodules>false</recursiveSubmodules> + <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations> + <authorOrCommitter>false</authorOrCommitter> + <clean>false</clean> + <wipeOutWorkspace>false</wipeOutWorkspace> + <pruneBranches>false</pruneBranches> + <buildChooser class="hudson.plugins.git.util.DefaultBuildChooser"/> + <gitTool>Default</gitTool> + <browser class="hudson.plugins.git.browser.GithubWeb"> + <url>@hudson.jboss712.url@</url> + </browser> + <submoduleCfg class="list"/> + <relativeTargetDir></relativeTargetDir> + <excludedRegions></excludedRegions> + <excludedUsers></excludedUsers> + </scm> + <canRoam>true</canRoam> + <disabled>false</disabled> + <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding> + <triggers class="vector"/> + <concurrentBuild>false</concurrentBuild> + <builders> + <hudson.tasks.Shell> + <command>MAVEN_OPTS="-Xmx1024m -Xms512m -XX:MaxPermSize=128m" +export MAVEN_OPTS + +./build.sh clean install -Dskip-download-sources -U -B</command> + </hudson.tasks.Shell> + </builders> + <publishers> + <hudson.tasks.Mailer> + <recipients></recipients> + <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> + <sendToIndividuals>false</sendToIndividuals> + </hudson.tasks.Mailer> + </publishers> + <buildWrappers/> +</project> Modified: hudson/trunk/hudson-home/jobs/AS-ALL/config.xml =================================================================== --- hudson/trunk/hudson-home/jobs/AS-ALL/config.xml 2012-03-13 15:13:23 UTC (rev 15934) +++ hudson/trunk/hudson-home/jobs/AS-ALL/config.xml 2012-03-13 15:44:42 UTC (rev 15935) @@ -3,7 +3,7 @@ <builders class="vector"/> <publishers class="vector"> <hudson.tasks.BuildTrigger> - <childProjects>AS-7.0.1, AS-7.0.2, AS-7.1.0, AS-7.1.1</childProjects> + <childProjects>AS-7.0.2, AS-7.1.0, AS-7.1.1, AS-7.1.2</childProjects> <threshold> <name>UNSTABLE</name> <ordinal>1</ordinal> Modified: hudson/trunk/hudson-home/jobs/AS-LIGHT/config.xml =================================================================== --- hudson/trunk/hudson-home/jobs/AS-LIGHT/config.xml 2012-03-13 15:13:23 UTC (rev 15934) +++ hudson/trunk/hudson-home/jobs/AS-LIGHT/config.xml 2012-03-13 15:44:42 UTC (rev 15935) @@ -3,7 +3,7 @@ <builders class="vector"/> <publishers class="vector"> <hudson.tasks.BuildTrigger> - <childProjects>AS-7.1.1</childProjects> + <childProjects>AS-7.1.2</childProjects> <threshold> <name>UNSTABLE</name> <ordinal>1</ordinal> Modified: hudson/trunk/hudson-home/jobs/CXF-ALL/config.xml =================================================================== --- hudson/trunk/hudson-home/jobs/CXF-ALL/config.xml 2012-03-13 15:13:23 UTC (rev 15934) +++ hudson/trunk/hudson-home/jobs/CXF-ALL/config.xml 2012-03-13 15:44:42 UTC (rev 15935) @@ -4,53 +4,53 @@ <publishers class="vector"> <hudson.tasks.BuildTrigger> <childProjects> -CXF-CORE-AS-7.0.1-SUN-JDK-6 +CXF-CORE-AS-7.0.2-SUN-JDK-6 -, CXF-CORE-AS-7.0.2-SUN-JDK-6 - -, CXF-CORE-AS-7.0.1-SPRING-SUN-JDK-6 - , CXF-CORE-AS-7.0.2-SPRING-SUN-JDK-6 , CXF-CORE-AS-7.1.0-SUN-JDK-6 , CXF-CORE-AS-7.1.1-SUN-JDK-6 +, CXF-CORE-AS-7.1.2-SUN-JDK-6 + , CXF-CORE-AS-7.1.0-SPRING-SUN-JDK-6 , CXF-CORE-AS-7.1.1-SPRING-SUN-JDK-6 -, CXF-BINDIST-AS-7.0.1-SUN-JDK-6 +, CXF-CORE-AS-7.1.2-SPRING-SUN-JDK-6 , CXF-BINDIST-AS-7.0.2-SUN-JDK-6 -, CXF-BINDIST-AS-7.0.1-SPRING-SUN-JDK-6 - , CXF-BINDIST-AS-7.0.2-SPRING-SUN-JDK-6 , CXF-BINDIST-AS-7.1.0-SUN-JDK-6 , CXF-BINDIST-AS-7.1.1-SUN-JDK-6 +, CXF-BINDIST-AS-7.1.2-SUN-JDK-6 + , CXF-BINDIST-AS-7.1.0-SPRING-SUN-JDK-6 , CXF-BINDIST-AS-7.1.1-SPRING-SUN-JDK-6 -, CXF-SRCDIST-AS-7.0.1-SUN-JDK-6 +, CXF-BINDIST-AS-7.1.2-SPRING-SUN-JDK-6 , CXF-SRCDIST-AS-7.0.2-SUN-JDK-6 -, CXF-SRCDIST-AS-7.0.1-SPRING-SUN-JDK-6 - , CXF-SRCDIST-AS-7.0.2-SPRING-SUN-JDK-6 , CXF-SRCDIST-AS-7.1.0-SUN-JDK-6 , CXF-SRCDIST-AS-7.1.1-SUN-JDK-6 +, CXF-SRCDIST-AS-7.1.2-SUN-JDK-6 + , CXF-SRCDIST-AS-7.1.0-SPRING-SUN-JDK-6 , CXF-SRCDIST-AS-7.1.1-SPRING-SUN-JDK-6 + +, CXF-SRCDIST-AS-7.1.2-SPRING-SUN-JDK-6 </childProjects> <threshold> <name>UNSTABLE</name> Added: hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-7.1.2-SPRING-SUN-JDK-6/config.xml =================================================================== --- hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-7.1.2-SPRING-SUN-JDK-6/config.xml (rev 0) +++ hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-7.1.2-SPRING-SUN-JDK-6/config.xml 2012-03-13 15:44:42 UTC (rev 15935) @@ -0,0 +1,74 @@ +<?xml version='1.0' encoding='UTF-8'?> +<project> + <builders class="vector"> + <hudson.tasks.Shell> + <command> +# +# Module settings +# +MODULE=CXF-BINDIST-AS-7.1.2-SPRING-SUN-JDK-6 + +WORKSPACE=`pwd` +STACK_ID=cxf +JAVA_HOME=(a)java.home.sun.jdk6@ +SCRIPTS_DIR=$WORKSPACE/hudson-scripts +STACK_DIR=$WORKSPACE/stack-cxf +TEST_OPTS= +JBOSS_TARGET=jboss712 +JBOSS_BIND_ADDRESS=(a)jboss.bind.address@ +JBOSS_INSTANCE=@hudson.home@/jobs/AS-7.1.2/workspace/build/target/(a)hudson.jboss712.build@ + +# +# load test functions +# +. $SCRIPTS_DIR/jbossws-qa.sh + +# +# execute binary distribution tests +# +binaryDistributionTestWithSpring + +</command> + </hudson.tasks.Shell> + </builders> + <publishers class="vector"> + <hudson.tasks.junit.JUnitResultArchiver> + <testResults>stack-cxf/target/jbossws-cxf-bin-dist/output/test-reports/TEST-*.xml</testResults> + </hudson.tasks.junit.JUnitResultArchiver> + <hudson.tasks.Mailer> + <recipients>@hudson.mail.recipients@</recipients> + <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> + <sendToIndividuals>true</sendToIndividuals> + </hudson.tasks.Mailer> + </publishers> + <buildWrappers class="vector"/> + <scm class="hudson.scm.SubversionSCM"> + <locations> + <hudson.scm.SubversionSCM-ModuleLocation> + <remote>@jbossws.hudson.url@/scripts</remote> + <local>hudson-scripts</local> + </hudson.scm.SubversionSCM-ModuleLocation> + <hudson.scm.SubversionSCM-ModuleLocation> + <remote>@hudson.cxf.url@</remote> + <local>stack-cxf</local> + </hudson.scm.SubversionSCM-ModuleLocation> + </locations> + <useUpdate>true</useUpdate> + <browser class="hudson.scm.browsers.FishEyeSVN"> + <url>http://fisheye.jboss.com/browse/JBossWS/</url> + <rootModule></rootModule> + </browser> + </scm> + <canRoam>true</canRoam> + <disabled>false</disabled> + <enableRemoteTrigger>false</enableRemoteTrigger> + <triggers class="vector"/> + <logRotator> + <daysToKeep>14</daysToKeep> + <numToKeep>-1</numToKeep> + </logRotator> + <keepDependencies>false</keepDependencies> + <properties/> + <description>Build and test jbossws-cxf-(a)version.id@ binary distribution against AS-7.1.2 with SpringFramework libraries available and Sun JDK 6</description> + <actions class="vector"/> +</project> Added: hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-7.1.2-SUN-JDK-6/config.xml =================================================================== --- hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-7.1.2-SUN-JDK-6/config.xml (rev 0) +++ hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-7.1.2-SUN-JDK-6/config.xml 2012-03-13 15:44:42 UTC (rev 15935) @@ -0,0 +1,74 @@ +<?xml version='1.0' encoding='UTF-8'?> +<project> + <builders class="vector"> + <hudson.tasks.Shell> + <command> +# +# Module settings +# +MODULE=CXF-BINDIST-AS-7.1.2-SUN-JDK-6 + +WORKSPACE=`pwd` +STACK_ID=cxf +JAVA_HOME=(a)java.home.sun.jdk6@ +SCRIPTS_DIR=$WORKSPACE/hudson-scripts +STACK_DIR=$WORKSPACE/stack-cxf +TEST_OPTS= +JBOSS_TARGET=jboss712 +JBOSS_BIND_ADDRESS=(a)jboss.bind.address@ +JBOSS_INSTANCE=@hudson.home@/jobs/AS-7.1.2/workspace/build/target/(a)hudson.jboss712.build@ + +# +# load test functions +# +. $SCRIPTS_DIR/jbossws-qa.sh + +# +# execute binary distribution tests +# +binaryDistributionTest + +</command> + </hudson.tasks.Shell> + </builders> + <publishers class="vector"> + <hudson.tasks.junit.JUnitResultArchiver> + <testResults>stack-cxf/target/jbossws-cxf-bin-dist/output/test-reports/TEST-*.xml</testResults> + </hudson.tasks.junit.JUnitResultArchiver> + <hudson.tasks.Mailer> + <recipients>@hudson.mail.recipients@</recipients> + <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> + <sendToIndividuals>true</sendToIndividuals> + </hudson.tasks.Mailer> + </publishers> + <buildWrappers class="vector"/> + <scm class="hudson.scm.SubversionSCM"> + <locations> + <hudson.scm.SubversionSCM-ModuleLocation> + <remote>@jbossws.hudson.url@/scripts</remote> + <local>hudson-scripts</local> + </hudson.scm.SubversionSCM-ModuleLocation> + <hudson.scm.SubversionSCM-ModuleLocation> + <remote>@hudson.cxf.url@</remote> + <local>stack-cxf</local> + </hudson.scm.SubversionSCM-ModuleLocation> + </locations> + <useUpdate>true</useUpdate> + <browser class="hudson.scm.browsers.FishEyeSVN"> + <url>http://fisheye.jboss.com/browse/JBossWS/</url> + <rootModule></rootModule> + </browser> + </scm> + <canRoam>true</canRoam> + <disabled>false</disabled> + <enableRemoteTrigger>false</enableRemoteTrigger> + <triggers class="vector"/> + <logRotator> + <daysToKeep>14</daysToKeep> + <numToKeep>-1</numToKeep> + </logRotator> + <keepDependencies>false</keepDependencies> + <properties/> + <description>Build and test jbossws-cxf-(a)version.id@ binary distribution against AS-7.1.2 with Sun JDK 6</description> + <actions class="vector"/> +</project> Added: hudson/trunk/hudson-home/jobs/CXF-CORE-AS-7.1.2-SPRING-SUN-JDK-6/config.xml =================================================================== --- hudson/trunk/hudson-home/jobs/CXF-CORE-AS-7.1.2-SPRING-SUN-JDK-6/config.xml (rev 0) +++ hudson/trunk/hudson-home/jobs/CXF-CORE-AS-7.1.2-SPRING-SUN-JDK-6/config.xml 2012-03-13 15:44:42 UTC (rev 15935) @@ -0,0 +1,74 @@ +<?xml version='1.0' encoding='UTF-8'?> +<project> + <builders class="vector"> + <hudson.tasks.Shell> + <command> +# +# Module settings +# +MODULE=CXF-CORE-AS-7.1.2-SPRING-SUN-JDK-6 + +WORKSPACE=`pwd` +STACK_ID=cxf +JAVA_HOME=(a)java.home.sun.jdk6@ +SCRIPTS_DIR=$WORKSPACE/hudson-scripts +STACK_DIR=$WORKSPACE/stack-cxf +TEST_OPTS= +JBOSS_TARGET=jboss712 +JBOSS_BIND_ADDRESS=(a)jboss.bind.address@ +JBOSS_INSTANCE=@hudson.home@/jobs/AS-7.1.2/workspace/build/target/(a)hudson.jboss712.build@ + +# +# load test functions +# +. $SCRIPTS_DIR/jbossws-qa.sh + +# +# execute core tests +# +coreTestWithSpring + +</command> + </hudson.tasks.Shell> + </builders> + <publishers class="vector"> + <hudson.tasks.junit.JUnitResultArchiver> + <testResults>stack-cxf/**/target/surefire-reports/*.xml</testResults> + </hudson.tasks.junit.JUnitResultArchiver> + <hudson.tasks.Mailer> + <recipients>@hudson.mail.recipients@</recipients> + <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> + <sendToIndividuals>true</sendToIndividuals> + </hudson.tasks.Mailer> + </publishers> + <buildWrappers class="vector"/> + <scm class="hudson.scm.SubversionSCM"> + <locations> + <hudson.scm.SubversionSCM-ModuleLocation> + <remote>@jbossws.hudson.url@/scripts</remote> + <local>hudson-scripts</local> + </hudson.scm.SubversionSCM-ModuleLocation> + <hudson.scm.SubversionSCM-ModuleLocation> + <remote>@hudson.cxf.url@</remote> + <local>stack-cxf</local> + </hudson.scm.SubversionSCM-ModuleLocation> + </locations> + <useUpdate>true</useUpdate> + <browser class="hudson.scm.browsers.FishEyeSVN"> + <url>http://fisheye.jboss.com/browse/JBossWS/</url> + <rootModule></rootModule> + </browser> + </scm> + <canRoam>true</canRoam> + <disabled>false</disabled> + <enableRemoteTrigger>false</enableRemoteTrigger> + <triggers class="vector"/> + <logRotator> + <daysToKeep>14</daysToKeep> + <numToKeep>-1</numToKeep> + </logRotator> + <keepDependencies>false</keepDependencies> + <properties/> + <description>Build and test jbossws-cxf-(a)version.id@ against @hudson.jboss712.build@ with SpringFramework libraires available and Sun JDK 6</description> + <actions class="vector"/> +</project> Added: hudson/trunk/hudson-home/jobs/CXF-CORE-AS-7.1.2-SUN-JDK-6/config.xml =================================================================== --- hudson/trunk/hudson-home/jobs/CXF-CORE-AS-7.1.2-SUN-JDK-6/config.xml (rev 0) +++ hudson/trunk/hudson-home/jobs/CXF-CORE-AS-7.1.2-SUN-JDK-6/config.xml 2012-03-13 15:44:42 UTC (rev 15935) @@ -0,0 +1,74 @@ +<?xml version='1.0' encoding='UTF-8'?> +<project> + <builders class="vector"> + <hudson.tasks.Shell> + <command> +# +# Module settings +# +MODULE=CXF-CORE-AS-7.1.2-SUN-JDK-6 + +WORKSPACE=`pwd` +STACK_ID=cxf +JAVA_HOME=(a)java.home.sun.jdk6@ +SCRIPTS_DIR=$WORKSPACE/hudson-scripts +STACK_DIR=$WORKSPACE/stack-cxf +TEST_OPTS= +JBOSS_TARGET=jboss712 +JBOSS_BIND_ADDRESS=(a)jboss.bind.address@ +JBOSS_INSTANCE=@hudson.home@/jobs/AS-7.1.2/workspace/build/target/(a)hudson.jboss712.build@ + +# +# load test functions +# +. $SCRIPTS_DIR/jbossws-qa.sh + +# +# execute core tests +# +coreTest + +</command> + </hudson.tasks.Shell> + </builders> + <publishers class="vector"> + <hudson.tasks.junit.JUnitResultArchiver> + <testResults>stack-cxf/**/target/surefire-reports/*.xml</testResults> + </hudson.tasks.junit.JUnitResultArchiver> + <hudson.tasks.Mailer> + <recipients>@hudson.mail.recipients@</recipients> + <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> + <sendToIndividuals>true</sendToIndividuals> + </hudson.tasks.Mailer> + </publishers> + <buildWrappers class="vector"/> + <scm class="hudson.scm.SubversionSCM"> + <locations> + <hudson.scm.SubversionSCM-ModuleLocation> + <remote>@jbossws.hudson.url@/scripts</remote> + <local>hudson-scripts</local> + </hudson.scm.SubversionSCM-ModuleLocation> + <hudson.scm.SubversionSCM-ModuleLocation> + <remote>@hudson.cxf.url@</remote> + <local>stack-cxf</local> + </hudson.scm.SubversionSCM-ModuleLocation> + </locations> + <useUpdate>true</useUpdate> + <browser class="hudson.scm.browsers.FishEyeSVN"> + <url>http://fisheye.jboss.com/browse/JBossWS/</url> + <rootModule></rootModule> + </browser> + </scm> + <canRoam>true</canRoam> + <disabled>false</disabled> + <enableRemoteTrigger>false</enableRemoteTrigger> + <triggers class="vector"/> + <logRotator> + <daysToKeep>14</daysToKeep> + <numToKeep>-1</numToKeep> + </logRotator> + <keepDependencies>false</keepDependencies> + <properties/> + <description>Build and test jbossws-cxf-(a)version.id@ against @hudson.jboss712.build@ with Sun JDK 6</description> + <actions class="vector"/> +</project> Modified: hudson/trunk/hudson-home/jobs/CXF-LIGHT/config.xml =================================================================== --- hudson/trunk/hudson-home/jobs/CXF-LIGHT/config.xml 2012-03-13 15:13:23 UTC (rev 15934) +++ hudson/trunk/hudson-home/jobs/CXF-LIGHT/config.xml 2012-03-13 15:44:42 UTC (rev 15935) @@ -4,12 +4,8 @@ <publishers class="vector"> <hudson.tasks.BuildTrigger> <childProjects> -CXF-CORE-AS-7.0.1-SUN-JDK-6 +CXF-CORE-AS-7.0.2-SUN-JDK-6 -, CXF-CORE-AS-7.0.1-SPRING-SUN-JDK-6 - -, CXF-CORE-AS-7.0.2-SUN-JDK-6 - , CXF-CORE-AS-7.0.2-SPRING-SUN-JDK-6 , CXF-CORE-AS-7.1.0-SUN-JDK-6 @@ -20,9 +16,9 @@ , CXF-CORE-AS-7.1.1-SPRING-SUN-JDK-6 -, CXF-BINDIST-AS-7.0.1-SUN-JDK-6 +, CXF-CORE-AS-7.1.2-SUN-JDK-6 -, CXF-BINDIST-AS-7.0.1-SPRING-SUN-JDK-6 +, CXF-CORE-AS-7.1.2-SPRING-SUN-JDK-6 , CXF-BINDIST-AS-7.0.2-SUN-JDK-6 @@ -35,6 +31,10 @@ , CXF-BINDIST-AS-7.1.1-SUN-JDK-6 , CXF-BINDIST-AS-7.1.1-SPRING-SUN-JDK-6 + +, CXF-BINDIST-AS-7.1.2-SUN-JDK-6 + +, CXF-BINDIST-AS-7.1.2-SPRING-SUN-JDK-6 </childProjects> <threshold> <name>UNSTABLE</name> Added: hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-7.1.2-SPRING-SUN-JDK-6/config.xml =================================================================== --- hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-7.1.2-SPRING-SUN-JDK-6/config.xml (rev 0) +++ hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-7.1.2-SPRING-SUN-JDK-6/config.xml 2012-03-13 15:44:42 UTC (rev 15935) @@ -0,0 +1,74 @@ +<?xml version='1.0' encoding='UTF-8'?> +<project> + <builders class="vector"> + <hudson.tasks.Shell> + <command> +# +# Module settings +# +MODULE=CXF-SRCDIST-AS-7.1.2-SPRING-SUN-JDK-6 + +WORKSPACE=`pwd` +STACK_ID=cxf +JAVA_HOME=(a)java.home.sun.jdk6@ +SCRIPTS_DIR=$WORKSPACE/hudson-scripts +STACK_DIR=$WORKSPACE/stack-cxf +TEST_OPTS= +JBOSS_TARGET=jboss712 +JBOSS_BIND_ADDRESS=(a)jboss.bind.address@ +JBOSS_INSTANCE=@hudson.home@/jobs/AS-7.1.2/workspace/build/target/(a)hudson.jboss712.build@ + +# +# load test functions +# +. $SCRIPTS_DIR/jbossws-qa.sh + +# +# execute source distribution tests +# +sourceDistributionTestWithSpring + +</command> + </hudson.tasks.Shell> + </builders> + <publishers class="vector"> + <hudson.tasks.junit.JUnitResultArchiver> + <testResults>stack-cxf/target/jbossws-cxf-src-dist/modules/testsuite/**/target/surefire-reports/TEST-*.xml</testResults> + </hudson.tasks.junit.JUnitResultArchiver> + <hudson.tasks.Mailer> + <recipients>@hudson.mail.recipients@</recipients> + <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> + <sendToIndividuals>true</sendToIndividuals> + </hudson.tasks.Mailer> + </publishers> + <buildWrappers class="vector"/> + <scm class="hudson.scm.SubversionSCM"> + <locations> + <hudson.scm.SubversionSCM-ModuleLocation> + <remote>@jbossws.hudson.url@/scripts</remote> + <local>hudson-scripts</local> + </hudson.scm.SubversionSCM-ModuleLocation> + <hudson.scm.SubversionSCM-ModuleLocation> + <remote>@hudson.cxf.url@</remote> + <local>stack-cxf</local> + </hudson.scm.SubversionSCM-ModuleLocation> + </locations> + <useUpdate>true</useUpdate> + <browser class="hudson.scm.browsers.FishEyeSVN"> + <url>http://fisheye.jboss.com/browse/JBossWS/</url> + <rootModule></rootModule> + </browser> + </scm> + <canRoam>true</canRoam> + <disabled>false</disabled> + <enableRemoteTrigger>false</enableRemoteTrigger> + <triggers class="vector"/> + <logRotator> + <daysToKeep>14</daysToKeep> + <numToKeep>-1</numToKeep> + </logRotator> + <keepDependencies>false</keepDependencies> + <properties/> + <description>Build and test jbossws-cxf-(a)version.id@ source distribution against AS-7.1.2 with SpringFramework libraries available and Sun JDK 6</description> + <actions class="vector"/> +</project> Added: hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-7.1.2-SUN-JDK-6/config.xml =================================================================== --- hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-7.1.2-SUN-JDK-6/config.xml (rev 0) +++ hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-7.1.2-SUN-JDK-6/config.xml 2012-03-13 15:44:42 UTC (rev 15935) @@ -0,0 +1,74 @@ +<?xml version='1.0' encoding='UTF-8'?> +<project> + <builders class="vector"> + <hudson.tasks.Shell> + <command> +# +# Module settings +# +MODULE=CXF-SRCDIST-AS-7.1.2-SUN-JDK-6 + +WORKSPACE=`pwd` +STACK_ID=cxf +JAVA_HOME=(a)java.home.sun.jdk6@ +SCRIPTS_DIR=$WORKSPACE/hudson-scripts +STACK_DIR=$WORKSPACE/stack-cxf +TEST_OPTS= +JBOSS_TARGET=jboss712 +JBOSS_BIND_ADDRESS=(a)jboss.bind.address@ +JBOSS_INSTANCE=@hudson.home@/jobs/AS-7.1.2/workspace/build/target/(a)hudson.jboss712.build@ + +# +# load test functions +# +. $SCRIPTS_DIR/jbossws-qa.sh + +# +# execute source distribution tests +# +sourceDistributionTest + +</command> + </hudson.tasks.Shell> + </builders> + <publishers class="vector"> + <hudson.tasks.junit.JUnitResultArchiver> + <testResults>stack-cxf/target/jbossws-cxf-src-dist/modules/testsuite/**/target/surefire-reports/TEST-*.xml</testResults> + </hudson.tasks.junit.JUnitResultArchiver> + <hudson.tasks.Mailer> + <recipients>@hudson.mail.recipients@</recipients> + <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> + <sendToIndividuals>true</sendToIndividuals> + </hudson.tasks.Mailer> + </publishers> + <buildWrappers class="vector"/> + <scm class="hudson.scm.SubversionSCM"> + <locations> + <hudson.scm.SubversionSCM-ModuleLocation> + <remote>@jbossws.hudson.url@/scripts</remote> + <local>hudson-scripts</local> + </hudson.scm.SubversionSCM-ModuleLocation> + <hudson.scm.SubversionSCM-ModuleLocation> + <remote>@hudson.cxf.url@</remote> + <local>stack-cxf</local> + </hudson.scm.SubversionSCM-ModuleLocation> + </locations> + <useUpdate>true</useUpdate> + <browser class="hudson.scm.browsers.FishEyeSVN"> + <url>http://fisheye.jboss.com/browse/JBossWS/</url> + <rootModule></rootModule> + </browser> + </scm> + <canRoam>true</canRoam> + <disabled>false</disabled> + <enableRemoteTrigger>false</enableRemoteTrigger> + <triggers class="vector"/> + <logRotator> + <daysToKeep>14</daysToKeep> + <numToKeep>-1</numToKeep> + </logRotator> + <keepDependencies>false</keepDependencies> + <properties/> + <description>Build and test jbossws-cxf-(a)version.id@ source distribution against AS-7.1.2 with Sun JDK 6</description> + <actions class="vector"/> +</project> Modified: hudson/trunk/hudson-home/jobs/NATIVE-ALL/config.xml =================================================================== --- hudson/trunk/hudson-home/jobs/NATIVE-ALL/config.xml 2012-03-13 15:13:23 UTC (rev 15934) +++ hudson/trunk/hudson-home/jobs/NATIVE-ALL/config.xml 2012-03-13 15:44:42 UTC (rev 15935) @@ -4,14 +4,8 @@ <publishers class="vector"> <hudson.tasks.BuildTrigger> <childProjects> -NATIVE-CORE-AS-7.0.1-SUN-JDK-6 +NATIVE-CORE-AS-7.0.2-SUN-JDK-6 -, NATIVE-BINDIST-AS-7.0.1-SUN-JDK-6 - -, NATIVE-SRCDIST-AS-7.0.1-SUN-JDK-6 - -, NATIVE-CORE-AS-7.0.2-SUN-JDK-6 - , NATIVE-BINDIST-AS-7.0.2-SUN-JDK-6 , NATIVE-SRCDIST-AS-7.0.2-SUN-JDK-6 @@ -27,6 +21,12 @@ , NATIVE-BINDIST-AS-7.1.1-SUN-JDK-6 , NATIVE-SRCDIST-AS-7.1.1-SUN-JDK-6 + +, NATIVE-CORE-AS-7.1.2-SUN-JDK-6 + +, NATIVE-BINDIST-AS-7.1.2-SUN-JDK-6 + +, NATIVE-SRCDIST-AS-7.1.2-SUN-JDK-6 </childProjects> <threshold> <name>UNSTABLE</name> Added: hudson/trunk/hudson-home/jobs/NATIVE-BINDIST-AS-7.1.2-SUN-JDK-6/config.xml =================================================================== --- hudson/trunk/hudson-home/jobs/NATIVE-BINDIST-AS-7.1.2-SUN-JDK-6/config.xml (rev 0) +++ hudson/trunk/hudson-home/jobs/NATIVE-BINDIST-AS-7.1.2-SUN-JDK-6/config.xml 2012-03-13 15:44:42 UTC (rev 15935) @@ -0,0 +1,74 @@ +<?xml version='1.0' encoding='UTF-8'?> +<project> + <builders class="vector"> + <hudson.tasks.Shell> + <command> +# +# Module settings +# +MODULE=NATIVE-BINDIST-AS-7.1.2-SUN-JDK-6 + +WORKSPACE=`pwd` +STACK_ID=native +JAVA_HOME=(a)java.home.sun.jdk6@ +SCRIPTS_DIR=$WORKSPACE/hudson-scripts +STACK_DIR=$WORKSPACE/stack-native +TEST_OPTS= +JBOSS_TARGET=jboss712 +JBOSS_BIND_ADDRESS=(a)jboss.bind.address@ +JBOSS_INSTANCE=@hudson.home@/jobs/AS-7.1.2/workspace/build/target/(a)hudson.jboss712.build@ + +# +# load test functions +# +. $SCRIPTS_DIR/jbossws-qa.sh + +# +# execute binary distribution tests +# +binaryDistributionTest + +</command> + </hudson.tasks.Shell> + </builders> + <publishers class="vector"> + <hudson.tasks.junit.JUnitResultArchiver> + <testResults>stack-native/target/jbossws-native-bin-dist/output/test-reports/TEST-*.xml</testResults> + </hudson.tasks.junit.JUnitResultArchiver> + <hudson.tasks.Mailer> + <recipients>@hudson.mail.recipients@</recipients> + <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> + <sendToIndividuals>true</sendToIndividuals> + </hudson.tasks.Mailer> + </publishers> + <buildWrappers class="vector"/> + <scm class="hudson.scm.SubversionSCM"> + <locations> + <hudson.scm.SubversionSCM-ModuleLocation> + <remote>@jbossws.hudson.url@/scripts</remote> + <local>hudson-scripts</local> + </hudson.scm.SubversionSCM-ModuleLocation> + <hudson.scm.SubversionSCM-ModuleLocation> + <remote>@hudson.native.url@</remote> + <local>stack-native</local> + </hudson.scm.SubversionSCM-ModuleLocation> + </locations> + <useUpdate>true</useUpdate> + <browser class="hudson.scm.browsers.FishEyeSVN"> + <url>http://fisheye.jboss.com/browse/JBossWS/</url> + <rootModule></rootModule> + </browser> + </scm> + <canRoam>true</canRoam> + <disabled>false</disabled> + <enableRemoteTrigger>false</enableRemoteTrigger> + <triggers class="vector"/> + <logRotator> + <daysToKeep>14</daysToKeep> + <numToKeep>-1</numToKeep> + </logRotator> + <keepDependencies>false</keepDependencies> + <properties/> + <description>Build and test jbossws-native-(a)version.id@ binary distribution against AS-7.1.2 with Sun JDK 6</description> + <actions class="vector"/> +</project> Added: hudson/trunk/hudson-home/jobs/NATIVE-CORE-AS-7.1.2-SUN-JDK-6/config.xml =================================================================== --- hudson/trunk/hudson-home/jobs/NATIVE-CORE-AS-7.1.2-SUN-JDK-6/config.xml (rev 0) +++ hudson/trunk/hudson-home/jobs/NATIVE-CORE-AS-7.1.2-SUN-JDK-6/config.xml 2012-03-13 15:44:42 UTC (rev 15935) @@ -0,0 +1,74 @@ +<?xml version='1.0' encoding='UTF-8'?> +<project> + <builders class="vector"> + <hudson.tasks.Shell> + <command> +# +# Module settings +# +MODULE=NATIVE-CORE-AS-7.1.2-SUN-JDK-6 + +WORKSPACE=`pwd` +STACK_ID=native +JAVA_HOME=(a)java.home.sun.jdk6@ +SCRIPTS_DIR=$WORKSPACE/hudson-scripts +STACK_DIR=$WORKSPACE/stack-native +TEST_OPTS="-Dinterop=true" +JBOSS_TARGET=jboss712 +JBOSS_BIND_ADDRESS=(a)jboss.bind.address@ +JBOSS_INSTANCE=@hudson.home@/jobs/AS-7.1.2/workspace/build/target/(a)hudson.jboss712.build@ + +# +# load test functions +# +. $SCRIPTS_DIR/jbossws-qa.sh + +# +# execute core tests +# +coreTest + +</command> + </hudson.tasks.Shell> + </builders> + <publishers class="vector"> + <hudson.tasks.junit.JUnitResultArchiver> + <testResults>stack-native/**/target/surefire-reports/*.xml</testResults> + </hudson.tasks.junit.JUnitResultArchiver> + <hudson.tasks.Mailer> + <recipients>@hudson.mail.recipients@</recipients> + <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> + <sendToIndividuals>true</sendToIndividuals> + </hudson.tasks.Mailer> + </publishers> + <buildWrappers class="vector"/> + <scm class="hudson.scm.SubversionSCM"> + <locations> + <hudson.scm.SubversionSCM-ModuleLocation> + <remote>@jbossws.hudson.url@/scripts</remote> + <local>hudson-scripts</local> + </hudson.scm.SubversionSCM-ModuleLocation> + <hudson.scm.SubversionSCM-ModuleLocation> + <remote>@hudson.native.url@</remote> + <local>stack-native</local> + </hudson.scm.SubversionSCM-ModuleLocation> + </locations> + <useUpdate>true</useUpdate> + <browser class="hudson.scm.browsers.FishEyeSVN"> + <url>http://fisheye.jboss.com/browse/JBossWS/</url> + <rootModule></rootModule> + </browser> + </scm> + <canRoam>true</canRoam> + <disabled>false</disabled> + <enableRemoteTrigger>false</enableRemoteTrigger> + <triggers class="vector"/> + <logRotator> + <daysToKeep>14</daysToKeep> + <numToKeep>-1</numToKeep> + </logRotator> + <keepDependencies>false</keepDependencies> + <properties/> + <description>Build and test jbossws-native-(a)version.id@ against @hudson.jboss712.build@ with Sun JDK 6</description> + <actions class="vector"/> +</project> Modified: hudson/trunk/hudson-home/jobs/NATIVE-LIGHT/config.xml =================================================================== --- hudson/trunk/hudson-home/jobs/NATIVE-LIGHT/config.xml 2012-03-13 15:13:23 UTC (rev 15934) +++ hudson/trunk/hudson-home/jobs/NATIVE-LIGHT/config.xml 2012-03-13 15:44:42 UTC (rev 15935) @@ -4,12 +4,8 @@ <publishers class="vector"> <hudson.tasks.BuildTrigger> <childProjects> -NATIVE-CORE-AS-7.0.1-SUN-JDK-6 +NATIVE-CORE-AS-7.0.2-SUN-JDK-6 -, NATIVE-BINDIST-AS-7.0.1-SUN-JDK-6 - -, NATIVE-CORE-AS-7.0.2-SUN-JDK-6 - , NATIVE-BINDIST-AS-7.0.2-SUN-JDK-6 , NATIVE-CORE-AS-7.1.0-SUN-JDK-6 @@ -19,6 +15,10 @@ , NATIVE-CORE-AS-7.1.1-SUN-JDK-6 , NATIVE-BINDIST-AS-7.1.1-SUN-JDK-6 + +, NATIVE-CORE-AS-7.1.2-SUN-JDK-6 + +, NATIVE-BINDIST-AS-7.1.2-SUN-JDK-6 </childProjects> <threshold> <name>UNSTABLE</name> Added: hudson/trunk/hudson-home/jobs/NATIVE-SRCDIST-AS-7.1.2-SUN-JDK-6/config.xml =================================================================== --- hudson/trunk/hudson-home/jobs/NATIVE-SRCDIST-AS-7.1.2-SUN-JDK-6/config.xml (rev 0) +++ hudson/trunk/hudson-home/jobs/NATIVE-SRCDIST-AS-7.1.2-SUN-JDK-6/config.xml 2012-03-13 15:44:42 UTC (rev 15935) @@ -0,0 +1,74 @@ +<?xml version='1.0' encoding='UTF-8'?> +<project> + <builders class="vector"> + <hudson.tasks.Shell> + <command> +# +# Module settings +# +MODULE=NATIVE-SRCDIST-AS-7.1.2-SUN-JDK-6 + +WORKSPACE=`pwd` +STACK_ID=native +JAVA_HOME=(a)java.home.sun.jdk6@ +SCRIPTS_DIR=$WORKSPACE/hudson-scripts +STACK_DIR=$WORKSPACE/stack-native +TEST_OPTS= +JBOSS_TARGET=jboss712 +JBOSS_BIND_ADDRESS=(a)jboss.bind.address@ +JBOSS_INSTANCE=@hudson.home@/jobs/AS-7.1.2/workspace/build/target/(a)hudson.jboss712.build@ + +# +# load test functions +# +. $SCRIPTS_DIR/jbossws-qa.sh + +# +# execute source distribution tests +# +sourceDistributionTest + +</command> + </hudson.tasks.Shell> + </builders> + <publishers class="vector"> + <hudson.tasks.junit.JUnitResultArchiver> + <testResults>stack-native/target/jbossws-native-src-dist/modules/testsuite/**/target/surefire-reports/TEST-*.xml</testResults> + </hudson.tasks.junit.JUnitResultArchiver> + <hudson.tasks.Mailer> + <recipients>@hudson.mail.recipients@</recipients> + <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> + <sendToIndividuals>true</sendToIndividuals> + </hudson.tasks.Mailer> + </publishers> + <buildWrappers class="vector"/> + <scm class="hudson.scm.SubversionSCM"> + <locations> + <hudson.scm.SubversionSCM-ModuleLocation> + <remote>@jbossws.hudson.url@/scripts</remote> + <local>hudson-scripts</local> + </hudson.scm.SubversionSCM-ModuleLocation> + <hudson.scm.SubversionSCM-ModuleLocation> + <remote>@hudson.native.url@</remote> + <local>stack-native</local> + </hudson.scm.SubversionSCM-ModuleLocation> + </locations> + <useUpdate>true</useUpdate> + <browser class="hudson.scm.browsers.FishEyeSVN"> + <url>http://fisheye.jboss.com/browse/JBossWS/</url> + <rootModule></rootModule> + </browser> + </scm> + <canRoam>true</canRoam> + <disabled>false</disabled> + <enableRemoteTrigger>false</enableRemoteTrigger> + <triggers class="vector"/> + <logRotator> + <daysToKeep>14</daysToKeep> + <numToKeep>-1</numToKeep> + </logRotator> + <keepDependencies>false</keepDependencies> + <properties/> + <description>Build and test jbossws-native-(a)version.id@ source distribution against AS-7.1.2 with Sun JDK 6</description> + <actions class="vector"/> +</project>

14 years, 1 month

1
0
0 / 0

JBossWS SVN: r15934 - in stack/native/trunk: modules/core/src/main/scripts and 6 other directories.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2012-03-13 11:13:23 -0400 (Tue, 13 Mar 2012) New Revision: 15934 Added: stack/native/trunk/modules/testsuite/src/test/resources/jboss712/ stack/native/trunk/modules/testsuite/src/test/resources/jboss712/appclient-ws.xml Modified: stack/native/trunk/build.xml stack/native/trunk/modules/core/src/main/scripts/antrun-beans-config.xml stack/native/trunk/modules/dist/pom.xml stack/native/trunk/modules/dist/src/main/distro/Install.txt stack/native/trunk/modules/dist/src/main/distro/ant.properties.example stack/native/trunk/modules/dist/src/main/distro/build-deploy.xml stack/native/trunk/modules/dist/src/main/distro/build-setup.xml stack/native/trunk/modules/dist/src/main/distro/build.xml stack/native/trunk/modules/resources/pom.xml stack/native/trunk/modules/testsuite/pom.xml stack/native/trunk/pom.xml Log: Adding jboss711 target container, removing 701 Modified: stack/native/trunk/build.xml =================================================================== --- stack/native/trunk/build.xml 2012-03-13 13:52:29 UTC (rev 15933) +++ stack/native/trunk/build.xml 2012-03-13 15:13:23 UTC (rev 15934) @@ -65,9 +65,6 @@ <arg value="help:effective-settings"/> </exec> <xmlproperty file="${dist.output.dir}/effective-settings.xml" keeproot="false"/> - <condition property="jboss701.home" value="${profiles.profile.properties.jboss701.home}"> - <isset property="profiles.profile.properties.jboss701.home"/> - </condition> <condition property="jboss702.home" value="${profiles.profile.properties.jboss702.home}"> <isset property="profiles.profile.properties.jboss702.home"/> </condition> @@ -77,14 +74,14 @@ <condition property="jboss711.home" value="${profiles.profile.properties.jboss711.home}"> <isset property="profiles.profile.properties.jboss711.home"/> </condition> + <condition property="jboss712.home" value="${profiles.profile.properties.jboss712.home}"> + <isset property="profiles.profile.properties.jboss712.home"/> + </condition> - <fail message="jboss home not set, use jboss701.home=value, jboss702.home=value, jboss710.home=value or jboss711.home=value to set"> + <fail message="jboss home not set, use jboss702.home=value, jboss710.home=value, jboss711.home=value or jboss712.home=value to set"> <condition> <and> <not> - <isset property="jboss701.home"/> - </not> - <not> <isset property="jboss702.home"/> </not> <not> @@ -93,15 +90,18 @@ <not> <isset property="jboss711.home"/> </not> + <not> + <isset property="jboss712.home"/> + </not> </and> </condition> </fail> <echo/> - <echo message="jboss701.home=${jboss701.home}"/> <echo message="jboss702.home=${jboss702.home}"/> <echo message="jboss710.home=${jboss710.home}"/> <echo message="jboss711.home=${jboss711.home}"/> + <echo message="jboss712.home=${jboss712.home}"/> </target> <target name="init" depends="mvn-settings,prepare,os-init"> Modified: stack/native/trunk/modules/core/src/main/scripts/antrun-beans-config.xml =================================================================== --- stack/native/trunk/modules/core/src/main/scripts/antrun-beans-config.xml 2012-03-13 13:52:29 UTC (rev 15933) +++ stack/native/trunk/modules/core/src/main/scripts/antrun-beans-config.xml 2012-03-13 15:13:23 UTC (rev 15934) @@ -31,25 +31,24 @@ <copy file="${src.dir}/jbossws-native-config-as7.xml" - tofile="${dest.dir}/jbossws-jboss701/jbossws.beans/META-INF/stack-specific-deployment-aspects.xml" + tofile="${dest.dir}/jbossws-jboss702/jbossws.beans/META-INF/stack-specific-deployment-aspects.xml" /> <copy file="${src.dir}/jbossws-native-config-as7.xml" - tofile="${dest.dir}/jbossws-jboss702/jbossws.beans/META-INF/stack-specific-deployment-aspects.xml" + tofile="${dest.dir}/jbossws-jboss710/jbossws.beans/META-INF/stack-specific-deployment-aspects.xml" /> <copy file="${src.dir}/jbossws-native-config-as7.xml" - tofile="${dest.dir}/jbossws-jboss710/jbossws.beans/META-INF/stack-specific-deployment-aspects.xml" + tofile="${dest.dir}/jbossws-jboss711/jbossws.beans/META-INF/stack-specific-deployment-aspects.xml" /> <copy file="${src.dir}/jbossws-native-config-as7.xml" - tofile="${dest.dir}/jbossws-jboss711/jbossws.beans/META-INF/stack-specific-deployment-aspects.xml" + tofile="${dest.dir}/jbossws-jboss712/jbossws.beans/META-INF/stack-specific-deployment-aspects.xml" /> - </target> </project> Modified: stack/native/trunk/modules/dist/pom.xml =================================================================== --- stack/native/trunk/modules/dist/pom.xml 2012-03-13 13:52:29 UTC (rev 15933) +++ stack/native/trunk/modules/dist/pom.xml 2012-03-13 15:13:23 UTC (rev 15934) @@ -45,28 +45,28 @@ <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native-resources</artifactId> <version>${project.version}</version> - <classifier>jboss701</classifier> + <classifier>jboss702</classifier> </dependency> <dependency> <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native-resources</artifactId> <version>${project.version}</version> - <classifier>jboss702</classifier> + <classifier>jboss710</classifier> </dependency> <dependency> <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native-resources</artifactId> <version>${project.version}</version> - <classifier>jboss710</classifier> + <classifier>jboss711</classifier> </dependency> <dependency> <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native-resources</artifactId> <version>${project.version}</version> - <classifier>jboss711</classifier> + <classifier>jboss712</classifier> </dependency> <dependency> @@ -117,7 +117,7 @@  <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss701</artifactId> + <artifactId>jbossws-jboss702</artifactId> <scope>provided</scope> <exclusions> <exclusion> @@ -133,23 +133,13 @@ <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss702</artifactId> + <artifactId>jbossws-jboss710</artifactId> <scope>provided</scope> - <exclusions> - <exclusion> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> - </exclusion> - <exclusion> - <groupId>sun-jaxb</groupId> - <artifactId>jaxb-api</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss710</artifactId> + <artifactId>jbossws-jboss711</artifactId> <scope>provided</scope> </dependency> @@ -206,11 +196,6 @@ <mkdir dir="${basedir}/target/exclude-file" /> <xslt style="${basedir}/src/main/distro/test-exclude.xsl" in="../testsuite/pom.xml" - out="${basedir}/target/exclude-file/test-excludes-jboss701.txt"> - <param name="targetName" expression="jboss701" /> - </xslt> - <xslt style="${basedir}/src/main/distro/test-exclude.xsl" - in="../testsuite/pom.xml" out="${basedir}/target/exclude-file/test-excludes-jboss702.txt"> <param name="targetName" expression="jboss702" /> </xslt> @@ -224,6 +209,11 @@ out="${basedir}/target/exclude-file/test-excludes-jboss711.txt"> <param name="targetName" expression="jboss711" /> </xslt> + <xslt style="${basedir}/src/main/distro/test-exclude.xsl" + in="../testsuite/pom.xml" + out="${basedir}/target/exclude-file/test-excludes-jboss712.txt"> + <param name="targetName" expression="jboss712" /> + </xslt> </tasks> </configuration> <goals> @@ -251,19 +241,19 @@  <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss701</artifactId> + <artifactId>jbossws-jboss702</artifactId> <classifier>tests-integration</classifier> <scope>provided</scope> </dependency> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss702</artifactId> + <artifactId>jbossws-jboss710</artifactId> <classifier>tests-integration</classifier> <scope>provided</scope> </dependency> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss710</artifactId> + <artifactId>jbossws-jboss711</artifactId> <classifier>tests-integration</classifier> <scope>provided</scope> </dependency> Modified: stack/native/trunk/modules/dist/src/main/distro/Install.txt =================================================================== --- stack/native/trunk/modules/dist/src/main/distro/Install.txt 2012-03-13 13:52:29 UTC (rev 15933) +++ stack/native/trunk/modules/dist/src/main/distro/Install.txt 2012-03-13 15:13:23 UTC (rev 15934) @@ -13,10 +13,10 @@ 2.) Modify the target container location in ant.properties 3.) Execute one of the following - ant deploy-jboss701 ant deploy-jboss702 ant deploy-jboss710 ant deploy-jboss711 + ant deploy-jboss712 4.) Execute the samples to verify your installation Modified: stack/native/trunk/modules/dist/src/main/distro/ant.properties.example =================================================================== --- stack/native/trunk/modules/dist/src/main/distro/ant.properties.example 2012-03-13 13:52:29 UTC (rev 15933) +++ stack/native/trunk/modules/dist/src/main/distro/ant.properties.example 2012-03-13 15:13:23 UTC (rev 15934) @@ -3,13 +3,13 @@ # # Optional JBoss Home -jboss701.home=(a)jboss701.home@ jboss702.home=(a)jboss702.home@ jboss710.home=(a)jboss710.home@ jboss711.home=(a)jboss711.home@ +jboss712.home=(a)jboss712.home@ -# The JBoss server under test. This can be [jboss701|jboss702|jboss710|jboss711] -jbossws.integration.target=jboss710 +# The JBoss server under test. This can be [jboss702|jboss710|jboss711|jboss712] +jbossws.integration.target=jboss711 # The JBoss settings jboss.bind.address=localhost Modified: stack/native/trunk/modules/dist/src/main/distro/build-deploy.xml =================================================================== --- stack/native/trunk/modules/dist/src/main/distro/build-deploy.xml 2012-03-13 13:52:29 UTC (rev 15933) +++ stack/native/trunk/modules/dist/src/main/distro/build-deploy.xml 2012-03-13 15:13:23 UTC (rev 15934) @@ -47,35 +47,6 @@ </target>  -  -  - - <target name="target-jboss701"> - <property name="jbossws.integration.target" value="jboss701"/> - <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/> - </target> - - <target name="deploy-jboss701" depends="undeploy-jboss701,deploy-structure-jboss70x" description="Deploy jbossws to jboss701"> - <fail message="Not available: ${jboss701.available.file}" unless="jboss701.available"/> - <copy todir="${jboss701.home}" overwrite="true" verbose="true"> - <fileset dir="${deploy.structure}"> - <exclude name="**/jboss/as/webservices/**/module.xml"/> - </fileset> - </copy> -  - <installModules targetDir="${jboss701.home}/modules"> - <fileset dir="${deploy.structure}/modules"> - <include name="**/jboss/as/webservices/**/module.xml"/> - </fileset> - </installModules> - </target> - - <target name="undeploy-jboss701" depends="target-jboss701,init" description="Remove jbossws from jboss701"> - <fail message="Not available: ${jboss701.available.file}" unless="jboss701.available"/> - <macro-undeploy-jbossws-modules targetdir="${jboss701.home}" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="true"/> - </target> - -    @@ -184,4 +155,33 @@ <macro-undeploy-jbossws-modules targetdir="${jboss711.home}" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="false"/> </target> +  +  +  + + <target name="target-jboss712"> + <property name="jbossws.integration.target" value="jboss712"/> + <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/> + </target> + + <target name="deploy-jboss712" depends="undeploy-jboss712,deploy-structure-jboss71x" description="Deploy jbossws to jboss712"> + <fail message="Not available: ${jboss712.available.file}" unless="jboss712.available"/> + <copy todir="${jboss712.home}" overwrite="true" verbose="true"> + <fileset dir="${deploy.structure}"> + <exclude name="**/jboss/as/webservices/**/module.xml"/> + </fileset> + </copy> +  + <installModules targetDir="${jboss712.home}/modules"> + <fileset dir="${deploy.structure}/modules"> + <include name="**/jboss/as/webservices/**/module.xml"/> + </fileset> + </installModules> + </target> + + <target name="undeploy-jboss712" depends="target-jboss712,init" description="Remove jbossws from jboss712"> + <fail message="Not available: ${jboss712.available.file}" unless="jboss712.available"/> + <macro-undeploy-jbossws-modules targetdir="${jboss712.home}" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="false"/> + </target> + </project> Modified: stack/native/trunk/modules/dist/src/main/distro/build-setup.xml =================================================================== --- stack/native/trunk/modules/dist/src/main/distro/build-setup.xml 2012-03-13 13:52:29 UTC (rev 15933) +++ stack/native/trunk/modules/dist/src/main/distro/build-setup.xml 2012-03-13 15:13:23 UTC (rev 15934) @@ -37,16 +37,15 @@ <property name="jboss700.modules" value="${jboss700.home}/modules"/> <property name="jboss710.modules" value="${jboss710.home}/modules"/> - <property name="jboss701.available.file" value="${jboss701.home}/jboss-modules.jar"/> <property name="jboss702.available.file" value="${jboss702.home}/jboss-modules.jar"/> <property name="jboss710.available.file" value="${jboss710.home}/jboss-modules.jar"/> <property name="jboss711.available.file" value="${jboss711.home}/jboss-modules.jar"/> + <property name="jboss712.available.file" value="${jboss712.home}/jboss-modules.jar"/> - - <available property="jboss701.available" file="${jboss701.available.file}"/> <available property="jboss702.available" file="${jboss702.available.file}"/> <available property="jboss710.available" file="${jboss710.available.file}"/> <available property="jboss711.available" file="${jboss711.available.file}"/> + <available property="jboss712.available" file="${jboss712.available.file}"/> <tstamp> <format property="build.id" pattern="yyyyMMddHHmm"/> Modified: stack/native/trunk/modules/dist/src/main/distro/build.xml =================================================================== --- stack/native/trunk/modules/dist/src/main/distro/build.xml 2012-03-13 13:52:29 UTC (rev 15933) +++ stack/native/trunk/modules/dist/src/main/distro/build.xml 2012-03-13 15:13:23 UTC (rev 15934) @@ -60,7 +60,6 @@ <condition property="jbossws.integration.jboss700" value="true"> <or> - <equals arg1="${jbossws.integration.target}" arg2="jboss701"/> <equals arg1="${jbossws.integration.target}" arg2="jboss702"/> </or> </condition> @@ -68,6 +67,7 @@ <or> <equals arg1="${jbossws.integration.target}" arg2="jboss710"/> <equals arg1="${jbossws.integration.target}" arg2="jboss711"/> + <equals arg1="${jbossws.integration.target}" arg2="jboss712"/> </or> </condition> Modified: stack/native/trunk/modules/resources/pom.xml =================================================================== --- stack/native/trunk/modules/resources/pom.xml 2012-03-13 13:52:29 UTC (rev 15933) +++ stack/native/trunk/modules/resources/pom.xml 2012-03-13 15:13:23 UTC (rev 15934) @@ -43,15 +43,6 @@ <phase>package</phase> </execution> <execution> - <id>jboss701</id> - <goals><goal>jar</goal></goals> - <phase>package</phase> - <configuration> - <classifier>jboss701</classifier> - <classesDirectory>${project.build.directory}/classes/resources/jbossws-jboss701/jbossws.beans</classesDirectory> - </configuration> - </execution> - <execution> <id>jboss702</id> <goals><goal>jar</goal></goals> <phase>package</phase> @@ -78,6 +69,15 @@ <classesDirectory>${project.build.directory}/classes/resources/jbossws-jboss711/jbossws.beans</classesDirectory> </configuration> </execution> + <execution> + <id>jboss712</id> + <goals><goal>jar</goal></goals> + <phase>package</phase> + <configuration> + <classifier>jboss712</classifier> + <classesDirectory>${project.build.directory}/classes/resources/jbossws-jboss712/jbossws.beans</classesDirectory> + </configuration> + </execution> </executions> </plugin> </plugins> Modified: stack/native/trunk/modules/testsuite/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/pom.xml 2012-03-13 13:52:29 UTC (rev 15933) +++ stack/native/trunk/modules/testsuite/pom.xml 2012-03-13 15:13:23 UTC (rev 15934) @@ -423,177 +423,7 @@ </build> </profile> -  - <profile> - <id>jboss701</id> - <properties> - <jboss.version>${jboss701.version}</jboss.version> - <jbossws.integration.target>jboss701</jbossws.integration.target> - <endorsed.dirs>${project.build.directory}/endorsed</endorsed.dirs> - </properties> - <dependencies> - <dependency> - <groupId>org.jboss.as</groupId> - <artifactId>jboss-as-webservices-tests-integration</artifactId> - <version>${jboss.version}</version> - </dependency> - <dependency> - <groupId>javax.mail</groupId> - <artifactId>mail</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.naming</groupId> - <artifactId>jnp-client</artifactId> - <version>5.0.5.Final</version> - </dependency> - <dependency> - <groupId>org.picketbox</groupId> - <artifactId>jbosssx-client</artifactId> - <version>3.0.0.CR2</version> - </dependency> - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jboss-common-core</artifactId> - </dependency> - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jbossxb</artifactId> - </dependency> -  - <dependency> - <groupId>org.jboss.ejb3</groupId> - <artifactId>jboss-ejb3-ext-api</artifactId> - <version>2.0.0-beta-1</version> - </dependency> -  - <dependency> - <groupId>apache-xalan</groupId> - <artifactId>serializer</artifactId> - <version>2.7.1.patch01-brew</version> - </dependency> - <dependency> - <groupId>apache-xalan</groupId> - <artifactId>xalan</artifactId> - <version>2.7.1.patch01-brew</version> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <compilerArgument>-Djava.endorsed.dirs=${endorsed.dirs}</compilerArgument> - </configuration> - <executions> - <execution> - <id>default-testCompile</id> - <phase>test-compile</phase> - <configuration> - <testExcludes> -  - <exclude>org/jboss/test/ws/jaxws/webserviceref/**</exclude> - <exclude>org/jboss/test/ws/jaxws/samples/webserviceref/**</exclude> - </testExcludes> - </configuration> - <goals> - <goal>testCompile</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} -Djava.endorsed.dirs=${endorsed.dirs}</argLine> - <excludes> -  - <exclude>org/jboss/test/ws/interop/nov2007/wsse/UsernameTokenHTTPSTestCase.*</exclude> - -  - <exclude>org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*</exclude> - -  - <exclude>org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.*</exclude> - -  - <exclude>org/jboss/test/ws/common/soap/SOAPConnectionTestCase.*</exclude> - - <exclude>org/jboss/test/ws/jaxws/samples/dar/**</exclude> - -  - <exclude>org/jboss/test/ws/interop/wsa/AddressingTestCase*</exclude> - -  -  -  - -  - <exclude>org/jboss/test/ws/jaxws/jbws3367/**</exclude> - -  - <exclude>org/jboss/test/ws/jaxws/jbws3276/**</exclude> - -  - <exclude>org/jboss/test/ws/jaxws/jbws2634/**</exclude> - <exclude>org/jboss/test/ws/jaxws/jbws2074/**</exclude> - <exclude>org/jboss/test/ws/jaxws/jbws3026/**</exclude> - <exclude>org/jboss/test/ws/jaxws/enventry/*JSETestCase*</exclude> - -  - <exclude>org/jboss/test/ws/jaxws/jbws2307/**</exclude> - <exclude>org/jboss/test/ws/jaxws/jbws2527/**</exclude> - <exclude>org/jboss/test/ws/jaxws/samples/advanced/retail/**</exclude> - -  - <exclude>org/jboss/test/ws/jaxws/jbws2116/**</exclude> - <exclude>org/jboss/test/ws/jaxws/jbws3182/**</exclude> - <exclude>org/jboss/test/ws/jaxws/jbws1988/UsernameAuthTestCase*</exclude> - -  - <exclude>org/jboss/test/ws/jaxws/jbws1309/**</exclude> - <exclude>org/jboss/test/ws/jaxws/jbws1813/**</exclude> - <exclude>org/jboss/test/ws/jaxws/jbws1841/**</exclude> - <exclude>org/jboss/test/ws/jaxws/jbws2241/**</exclude> - -  - <exclude>org/jboss/test/ws/jaxws/samples/webservicerefsec/**</exclude> - -  - <exclude>org/jboss/test/ws/jaxws/jbws3140/**</exclude> - -  - <exclude>org/jboss/test/ws/jaxws/webserviceref/**</exclude> - <exclude>org/jboss/test/ws/jaxws/samples/webserviceref/**</exclude> - -  - <exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude> - -  - <exclude>org/jboss/test/ws/jaxrpc/**</exclude> - <exclude>org/jboss/test/ws/benchmark/jaxrpc/**</exclude> - <exclude>org/jboss/test/ws/jaxws/jbws944/**</exclude> - <exclude>org/jboss/test/ws/jaxws/samples/serviceref/**</exclude> - <exclude>org/jboss/test/ws/jaxws/wsaddressing/replyto/**</exclude> - <exclude>org/jboss/test/ws/jaxws/jbws1581/**</exclude> - -  - <exclude>org/jboss/test/ws/publish/EndpointPublishTestCase*</exclude> - -  - <exclude>org/jboss/test/ws/jaxws/as3581/AS3581TestCase*</exclude> - - </excludes> - </configuration> - </plugin> - </plugins> - </build> - </profile> - -  @@ -1183,7 +1013,155 @@ </plugins> </build> </profile> + +  + <profile> + <id>jboss712</id> + <properties> + <jboss.version>${jboss712.version}</jboss.version> + <jbossws.integration.target>jboss712</jbossws.integration.target> + <endorsed.dirs>${project.build.directory}/endorsed</endorsed.dirs> + </properties> + <dependencies> + <dependency> + <groupId>org.jboss.as</groupId> + <artifactId>jboss-as-webservices-tests-integration</artifactId> + <version>${jboss.version}</version> + <exclusions> + <exclusion> + <groupId>org.jboss.as</groupId> + <artifactId>jboss-as-transactions</artifactId> + </exclusion> + <exclusion> + <groupId>org.jboss.remoting3</groupId> + <artifactId>jboss-remoting</artifactId> + </exclusion> + <exclusion> + <groupId>org.jboss</groupId> + <artifactId>jboss-remote-naming</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jboss-remote-naming</artifactId> + <version>1.0.2.Final</version> + </dependency> + <dependency> + <groupId>javax.mail</groupId> + <artifactId>mail</artifactId> + </dependency> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jboss-ejb-client</artifactId> + <version>1.0.4.Final</version> + <exclusions> + <exclusion> + <groupId>org.jboss.remoting3</groupId> + <artifactId>jboss-remoting</artifactId> + </exclusion> + <exclusion> + <groupId>org.jboss.xnio</groupId> + <artifactId>xnio-api</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.picketbox</groupId> + <artifactId>jbosssx-client</artifactId> + <version>3.0.0.CR2</version> + </dependency> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jboss-common-core</artifactId> + </dependency> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jbossxb</artifactId> + </dependency> +  + <dependency> + <groupId>org.jboss.ejb3</groupId> + <artifactId>jboss-ejb3-ext-api</artifactId> + <version>2.0.0-beta-1</version> + </dependency> +  + <dependency> + <groupId>apache-xalan</groupId> + <artifactId>serializer</artifactId> + <version>2.7.1.patch01-brew</version> + </dependency> + <dependency> + <groupId>apache-xalan</groupId> + <artifactId>xalan</artifactId> + <version>2.7.1.patch01-brew</version> + </dependency> + <dependency> + <groupId>org.jboss.remotingjmx</groupId> + <artifactId>remoting-jmx</artifactId> + <version>1.0.2.Final</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.remoting3</groupId> + <artifactId>jboss-remoting</artifactId> + <version>3.2.2.GA</version> + <scope>test</scope> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <compilerArgument>-Djava.endorsed.dirs=${endorsed.dirs}</compilerArgument> + </configuration> + </plugin> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} ${surefire.default-mgmt-serurity.args} -Djava.endorsed.dirs=${endorsed.dirs}</argLine> + <excludes> +  + <exclude>org/jboss/test/ws/interop/nov2007/wsse/UsernameTokenHTTPSTestCase.*</exclude> +  + <exclude>org/jboss/test/ws/common/soap/SOAPConnectionTestCase.*</exclude> + + <exclude>org/jboss/test/ws/jaxws/samples/dar/**</exclude> + +  + <exclude>org/jboss/test/ws/interop/wsa/AddressingTestCase*</exclude> + +  +  +  + +  + <exclude>org/jboss/test/ws/jaxws/jbws2116/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws3182/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws1988/UsernameAuthTestCase*</exclude> + +  + <exclude>org/jboss/test/ws/jaxrpc/jbws358/JBWS358TestCase*</exclude> + +  + <exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude> + +  + <exclude>org/jboss/test/ws/jaxrpc/jbws1179/JBWS1179TestCase*</exclude> + <exclude>org/jboss/test/ws/jaxrpc/jbws331/JBWS331TestCase*</exclude> + <exclude>org/jboss/test/ws/jaxrpc/jbws772/JBWS772TestCase*</exclude> + </excludes> + </configuration> + </plugin> + </plugins> + </build> + </profile> +  + +<server xmlns="urn:jboss:domain:1.2"> + + <extensions> + <extension module="org.jboss.as.connector"/> + <extension module="org.jboss.as.ee"/> + <extension module="org.jboss.as.ejb3"/> + <extension module="org.jboss.as.logging"/> + <extension module="org.jboss.as.naming"/> + <extension module="org.jboss.as.remoting"/> + <extension module="org.jboss.as.security"/> + <extension module="org.jboss.as.webservices"/> + </extensions> + + <profile> + <subsystem xmlns="urn:jboss:domain:logging:1.1"> + <console-handler name="CONSOLE"> + <level name="INFO"/> + <formatter> + <pattern-formatter pattern="%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/> + </formatter> + </console-handler> + + <periodic-rotating-file-handler name="FILE"> + <level name="INFO"/> + <formatter> + <pattern-formatter pattern="%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/> + </formatter> + <file relative-to="jboss.server.log.dir" path="appclient.log"/> + <suffix value=".yyyy-MM-dd"/> + <append value="true"/> + </periodic-rotating-file-handler> + + <logger category="com.arjuna"> + <level name="WARN"/> + </logger> + <logger category="sun.rmi"> + <level name="WARN"/> + </logger> + <logger category="jacorb"> + <level name="WARN"/> + </logger> +  + <logger category="jacorb.config"> + <level name="ERROR"/> + </logger> + + <root-logger> + <level name="INFO"/> + <handlers> + <handler name="CONSOLE"/> + <handler name="FILE"/> + </handlers> + </root-logger> + </subsystem> + <subsystem xmlns="urn:jboss:domain:ee:1.0"/> + <subsystem xmlns="urn:jboss:domain:ejb3:1.2" /> + <subsystem xmlns="urn:jboss:domain:naming:1.0"/> + <subsystem xmlns="urn:jboss:domain:security:1.0"> + <security-domains> + <security-domain name="other" cache-type="default"> + <authentication> + <login-module code="UsersRoles" flag="required"/> + </authentication> + </security-domain> + <security-domain name="jboss-web-policy" cache-type="default"> + <authorization> + <policy-module code="Delegating" flag="required"/> + </authorization> + </security-domain> + <security-domain name="jboss-ejb-policy" cache-type="default"> + <authorization> + <policy-module code="Delegating" flag="required"/> + </authorization> + </security-domain> + </security-domains> + </subsystem> + <subsystem xmlns="urn:jboss:domain:remoting:1.1"> + <connector name="remoting-connector" socket-binding="remoting"/> + </subsystem> + <subsystem xmlns="urn:jboss:domain:webservices:1.1"/> + </profile> + + <interfaces> + <interface name="public"> + <inet-address value="${jboss.bind.address:127.0.0.1}"/> + </interface> + </interfaces> + + <socket-binding-group name="standard-sockets" default-interface="public"> + <socket-binding name="remoting" port="4448"/> + </socket-binding-group> + +</server> Modified: stack/native/trunk/pom.xml =================================================================== --- stack/native/trunk/pom.xml 2012-03-13 13:52:29 UTC (rev 15933) +++ stack/native/trunk/pom.xml 2012-03-13 15:13:23 UTC (rev 15934) @@ -65,11 +65,13 @@ <jbossws.shared.testsuite.version>4.0.3-SNAPSHOT</jbossws.shared.testsuite.version> <jbossws.jboss701.version>4.0.1.GA</jbossws.jboss701.version> <jbossws.jboss702.version>4.0.1.GA</jbossws.jboss702.version> - <jbossws.jboss710.version>4.0.3-SNAPSHOT</jbossws.jboss710.version> + <jbossws.jboss710.version>4.0.2.GA</jbossws.jboss710.version> + <jbossws.jboss711.version>4.1.0-SNAPSHOT</jbossws.jboss711.version> <jboss701.version>7.0.1.Final</jboss701.version> <jboss702.version>7.0.2.Final</jboss702.version> <jboss710.version>7.1.0.Final</jboss710.version> - <jboss711.version>7.1.1.Final-SNAPSHOT</jboss711.version> + <jboss711.version>7.1.1.Final</jboss711.version> + <jboss712.version>7.1.2.Final-SNAPSHOT</jboss712.version> <ejb.api.version>1.0.1.Final</ejb.api.version> <ant.version>1.7.1</ant.version> <codehaus.jettison.version>1.3.1</codehaus.jettison.version> @@ -126,17 +128,6 @@ </dependency> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss701</artifactId> - <version>${jbossws.jboss701.version}</version> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss701</artifactId> - <version>${jbossws.jboss701.version}</version> - <classifier>tests-integration</classifier> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss702</artifactId> <version>${jbossws.jboss702.version}</version> </dependency> @@ -158,9 +149,20 @@ <classifier>tests-integration</classifier> </dependency> <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss711</artifactId> + <version>${jbossws.jboss711.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss711</artifactId> + <version>${jbossws.jboss711.version}</version> + <classifier>tests-integration</classifier> + </dependency> + <dependency> <groupId>org.jboss.as</groupId> <artifactId>jboss-as-webservices-tests-integration</artifactId> - <version>${jboss711.version}</version> + <version>${jboss712.version}</version> </dependency>  <dependency> @@ -557,18 +559,6 @@ </profile>  - <profile> - <id>jboss701</id> - <properties> - <jbossws.integration.target>jboss701</jbossws.integration.target> - <jboss.home>${jboss701.home}</jboss.home> - </properties> - </profile> - -  @@ -604,6 +594,17 @@ </properties> </profile> +  + <profile> + <id>jboss712</id> + <properties> + <jbossws.integration.target>jboss712</jbossws.integration.target> + <jboss.home>${jboss712.home}</jboss.home> + </properties> + </profile> <!-- Name: smoketest

14 years, 1 month

1
0
0 / 0

JBossWS SVN: r15933 - in stack/cxf/trunk: modules/dist and 6 other directories.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2012-03-13 09:52:29 -0400 (Tue, 13 Mar 2012) New Revision: 15933 Added: stack/cxf/trunk/modules/testsuite/src/test/resources/jboss712/ stack/cxf/trunk/modules/testsuite/src/test/resources/jboss712/appclient-ws.xml Modified: stack/cxf/trunk/build.xml stack/cxf/trunk/modules/dist/pom.xml stack/cxf/trunk/modules/dist/src/main/distro/Install.txt stack/cxf/trunk/modules/dist/src/main/distro/ant.properties.example stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml stack/cxf/trunk/modules/dist/src/main/distro/build-setup.xml stack/cxf/trunk/modules/dist/src/main/distro/build.xml stack/cxf/trunk/modules/resources/pom.xml stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml stack/cxf/trunk/modules/testsuite/pom.xml stack/cxf/trunk/pom.xml Log: Adding jboss711 target container, removing 701 Modified: stack/cxf/trunk/build.xml =================================================================== --- stack/cxf/trunk/build.xml 2012-03-13 13:51:15 UTC (rev 15932) +++ stack/cxf/trunk/build.xml 2012-03-13 13:52:29 UTC (rev 15933) @@ -68,9 +68,6 @@ <arg line="${maven.opts} help:effective-settings"/> </exec> <xmlproperty file="${dist.output.dir}/effective-settings.xml" keeproot="false"/> - <condition property="jboss701.home" value="${profiles.profile.properties.jboss701.home}"> - <isset property="profiles.profile.properties.jboss701.home"/> - </condition> <condition property="jboss702.home" value="${profiles.profile.properties.jboss702.home}"> <isset property="profiles.profile.properties.jboss702.home"/> </condition> @@ -80,15 +77,15 @@ <condition property="jboss711.home" value="${profiles.profile.properties.jboss711.home}"> <isset property="profiles.profile.properties.jboss711.home"/> </condition> + <condition property="jboss712.home" value="${profiles.profile.properties.jboss712.home}"> + <isset property="profiles.profile.properties.jboss712.home"/> + </condition> - <fail message="jboss home not set, use jboss701.home=value, jboss702.home=value, jboss710.home=value or jboss711.home=value to set"> + <fail message="jboss home not set, use jboss702.home=value, jboss710.home=value, jboss711.home=value or jboss712.home=value to set"> <condition> <and> <not> - <isset property="jboss701.home"/> - </not> - <not> <isset property="jboss702.home"/> </not> <not> @@ -97,15 +94,18 @@ <not> <isset property="jboss711.home"/> </not> + <not> + <isset property="jboss712.home"/> + </not> </and> </condition> </fail> <echo/> - <echo message="jboss701.home=${jboss701.home}"/> <echo message="jboss702.home=${jboss702.home}"/> <echo message="jboss710.home=${jboss710.home}"/> <echo message="jboss711.home=${jboss711.home}"/> + <echo message="jboss712.home=${jboss712.home}"/> </target> <target name="init" depends="mvn-settings,prepare,os-init"> Modified: stack/cxf/trunk/modules/dist/pom.xml =================================================================== --- stack/cxf/trunk/modules/dist/pom.xml 2012-03-13 13:51:15 UTC (rev 15932) +++ stack/cxf/trunk/modules/dist/pom.xml 2012-03-13 13:52:29 UTC (rev 15933) @@ -33,28 +33,28 @@ <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf-resources</artifactId> <version>${project.version}</version> - <classifier>jboss701</classifier> + <classifier>jboss702</classifier> </dependency> <dependency> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf-resources</artifactId> <version>${project.version}</version> - <classifier>jboss702</classifier> + <classifier>jboss710</classifier> </dependency> <dependency> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf-resources</artifactId> <version>${project.version}</version> - <classifier>jboss710</classifier> + <classifier>jboss711</classifier> </dependency> <dependency> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf-resources</artifactId> <version>${project.version}</version> - <classifier>jboss711</classifier> + <classifier>jboss712</classifier> </dependency> <dependency> @@ -146,7 +146,7 @@  <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss701</artifactId> + <artifactId>jbossws-jboss702</artifactId> <scope>provided</scope> <exclusions> <exclusion> @@ -162,23 +162,13 @@ <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss702</artifactId> + <artifactId>jbossws-jboss710</artifactId> <scope>provided</scope> - <exclusions> - <exclusion> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> - </exclusion> - <exclusion> - <groupId>sun-jaxb</groupId> - <artifactId>jaxb-api</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss710</artifactId> + <artifactId>jbossws-jboss711</artifactId> <scope>provided</scope> </dependency> @@ -232,9 +222,6 @@ <configuration> <tasks> <mkdir dir="${basedir}/target/exclude-file" /> - <xslt style="${basedir}/src/main/distro/test-exclude.xsl" in="../testsuite/pom.xml" out="${basedir}/target/exclude-file/test-excludes-jboss701.txt"> - <param name="targetName" expression="jboss701" /> - </xslt> <xslt style="${basedir}/src/main/distro/test-exclude.xsl" in="../testsuite/pom.xml" out="${basedir}/target/exclude-file/test-excludes-jboss702.txt"> <param name="targetName" expression="jboss702" /> </xslt> @@ -244,6 +231,9 @@ <xslt style="${basedir}/src/main/distro/test-exclude.xsl" in="../testsuite/pom.xml" out="${basedir}/target/exclude-file/test-excludes-jboss711.txt"> <param name="targetName" expression="jboss711" /> </xslt> + <xslt style="${basedir}/src/main/distro/test-exclude.xsl" in="../testsuite/pom.xml" out="${basedir}/target/exclude-file/test-excludes-jboss712.txt"> + <param name="targetName" expression="jboss712" /> + </xslt> </tasks> </configuration> <goals> @@ -272,19 +262,19 @@  <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss701</artifactId> + <artifactId>jbossws-jboss702</artifactId> <classifier>tests-integration</classifier> <scope>provided</scope> </dependency> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss702</artifactId> + <artifactId>jbossws-jboss710</artifactId> <classifier>tests-integration</classifier> <scope>provided</scope> </dependency> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss710</artifactId> + <artifactId>jbossws-jboss711</artifactId> <classifier>tests-integration</classifier> <scope>provided</scope> </dependency> Modified: stack/cxf/trunk/modules/dist/src/main/distro/Install.txt =================================================================== --- stack/cxf/trunk/modules/dist/src/main/distro/Install.txt 2012-03-13 13:51:15 UTC (rev 15932) +++ stack/cxf/trunk/modules/dist/src/main/distro/Install.txt 2012-03-13 13:52:29 UTC (rev 15933) @@ -13,16 +13,16 @@ 2.) Modify the target container location in ant.properties 3.) Execute one of the following - ant deploy-jboss701 ant deploy-jboss702 ant deploy-jboss710 ant deploy-jboss711 + ant deploy-jboss712 By default Spring Framework libraries are not installed to application server. In order to do that, please add the -Dspring=true property option when running the ant script: - ant -Dspring=true deploy-jboss710 + ant -Dspring=true deploy-jboss711 Please note Spring is required for advanced configuration only, whenever users want to provide their own jbossws-cxf.xml Spring configuration file. Modified: stack/cxf/trunk/modules/dist/src/main/distro/ant.properties.example =================================================================== --- stack/cxf/trunk/modules/dist/src/main/distro/ant.properties.example 2012-03-13 13:51:15 UTC (rev 15932) +++ stack/cxf/trunk/modules/dist/src/main/distro/ant.properties.example 2012-03-13 13:52:29 UTC (rev 15933) @@ -3,13 +3,13 @@ # # Optional JBoss Home -jboss701.home=(a)jboss701.home@ jboss702.home=(a)jboss702.home@ jboss710.home=(a)jboss710.home@ jboss711.home=(a)jboss711.home@ +jboss712.home=(a)jboss712.home@ -# The JBoss server under test. This can be [jboss701|jboss702|jboss710|jboss711] -jbossws.integration.target=jboss710 +# The JBoss server under test. This can be [jboss702|jboss710|jboss711|jboss712] +jbossws.integration.target=jboss711 # The JBoss settings jboss.bind.address=localhost Modified: stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml =================================================================== --- stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml 2012-03-13 13:51:15 UTC (rev 15932) +++ stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml 2012-03-13 13:52:29 UTC (rev 15933) @@ -47,35 +47,6 @@ </target>  -  -  - - <target name="target-jboss701"> - <property name="jbossws.integration.target" value="jboss701"/> - <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/> - </target> - - <target name="deploy-jboss701" depends="undeploy-jboss701,deploy-structure-jboss70x,check-spring,install-spring-module70x" description="Deploy jbossws to jboss701"> - <fail message="Not available: ${jboss701.available.file}" unless="jboss701.available"/> - <copy todir="${jboss701.home}" overwrite="true" verbose="true"> - <fileset dir="${deploy.structure}"> - <exclude name="**/jboss/as/webservices/**/module.xml"/> - </fileset> - </copy> -  - <installModules targetDir="${jboss701.home}/modules"> - <fileset dir="${deploy.structure}/modules"> - <include name="**/jboss/as/webservices/**/module.xml"/> - </fileset> - </installModules> - </target> - - <target name="undeploy-jboss701" depends="target-jboss701,init" description="Remove jbossws from jboss701"> - <fail message="Not available: ${jboss701.available.file}" unless="jboss701.available"/> - <macro-undeploy-jbossws-modules targetdir="${jboss701.home}" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="true"/> - </target> - -    @@ -185,6 +156,35 @@ </target>  +  +  + + <target name="target-jboss712"> + <property name="jbossws.integration.target" value="jboss712"/> + <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/> + </target> + + <target name="deploy-jboss712" depends="undeploy-jboss712,deploy-structure-jboss71x,check-spring,install-spring-module71x" description="Deploy jbossws to jboss712"> + <fail message="Not available: ${jboss712.available.file}" unless="jboss712.available"/> + <copy todir="${jboss712.home}" overwrite="true" verbose="true"> + <fileset dir="${deploy.structure}"> + <exclude name="**/jboss/as/webservices/**/module.xml"/> + </fileset> + </copy> +  + <installModules targetDir="${jboss712.home}/modules"> + <fileset dir="${deploy.structure}/modules"> + <include name="**/jboss/as/webservices/**/module.xml"/> + </fileset> + </installModules> + </target> + + <target name="undeploy-jboss712" depends="target-jboss712,init" description="Remove jbossws from jboss712"> + <fail message="Not available: ${jboss712.available.file}" unless="jboss712.available"/> + <macro-undeploy-jbossws-modules targetdir="${jboss712.home}" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="false"/> + </target> + +    <target name="check-spring"> Modified: stack/cxf/trunk/modules/dist/src/main/distro/build-setup.xml =================================================================== --- stack/cxf/trunk/modules/dist/src/main/distro/build-setup.xml 2012-03-13 13:51:15 UTC (rev 15932) +++ stack/cxf/trunk/modules/dist/src/main/distro/build-setup.xml 2012-03-13 13:52:29 UTC (rev 15933) @@ -36,15 +36,15 @@ <property name="jboss700.modules" value="${jboss700.home}/modules"/> <property name="jboss710.modules" value="${jboss710.home}/modules"/> - <property name="jboss701.available.file" value="${jboss701.home}/jboss-modules.jar"/> <property name="jboss702.available.file" value="${jboss702.home}/jboss-modules.jar"/> <property name="jboss710.available.file" value="${jboss710.home}/jboss-modules.jar"/> <property name="jboss711.available.file" value="${jboss711.home}/jboss-modules.jar"/> + <property name="jboss712.available.file" value="${jboss712.home}/jboss-modules.jar"/> - <available property="jboss701.available" file="${jboss701.available.file}"/> <available property="jboss702.available" file="${jboss702.available.file}"/> <available property="jboss710.available" file="${jboss710.available.file}"/> <available property="jboss711.available" file="${jboss711.available.file}"/> + <available property="jboss712.available" file="${jboss712.available.file}"/> <tstamp> <format property="build.id" pattern="yyyyMMddHHmm"/> Modified: stack/cxf/trunk/modules/dist/src/main/distro/build.xml =================================================================== --- stack/cxf/trunk/modules/dist/src/main/distro/build.xml 2012-03-13 13:51:15 UTC (rev 15932) +++ stack/cxf/trunk/modules/dist/src/main/distro/build.xml 2012-03-13 13:52:29 UTC (rev 15933) @@ -60,7 +60,6 @@ <condition property="jbossws.integration.jboss700" value="true"> <or> - <equals arg1="${jbossws.integration.target}" arg2="jboss701"/> <equals arg1="${jbossws.integration.target}" arg2="jboss702"/> </or> </condition> @@ -68,6 +67,7 @@ <or> <equals arg1="${jbossws.integration.target}" arg2="jboss710"/> <equals arg1="${jbossws.integration.target}" arg2="jboss711"/> + <equals arg1="${jbossws.integration.target}" arg2="jboss712"/> </or> </condition> Modified: stack/cxf/trunk/modules/resources/pom.xml =================================================================== --- stack/cxf/trunk/modules/resources/pom.xml 2012-03-13 13:51:15 UTC (rev 15932) +++ stack/cxf/trunk/modules/resources/pom.xml 2012-03-13 13:52:29 UTC (rev 15933) @@ -43,15 +43,6 @@ <phase>package</phase> </execution> <execution> - <id>jboss701</id> - <goals><goal>jar</goal></goals> - <phase>package</phase> - <configuration> - <classifier>jboss701</classifier> - <classesDirectory>${project.build.directory}/classes/resources/jbossws-jboss701/jbossws.beans</classesDirectory> - </configuration> - </execution> - <execution> <id>jboss702</id> <goals><goal>jar</goal></goals> <phase>package</phase> @@ -78,6 +69,15 @@ <classesDirectory>${project.build.directory}/classes/resources/jbossws-jboss711/jbossws.beans</classesDirectory> </configuration> </execution> + <execution> + <id>jboss712</id> + <goals><goal>jar</goal></goals> + <phase>package</phase> + <configuration> + <classifier>jboss712</classifier> + <classesDirectory>${project.build.directory}/classes/resources/jbossws-jboss712/jbossws.beans</classesDirectory> + </configuration> + </execution> </executions> </plugin> </plugins> Modified: stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml =================================================================== --- stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2012-03-13 13:51:15 UTC (rev 15932) +++ stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2012-03-13 13:52:29 UTC (rev 15933) @@ -31,15 +31,6 @@ <copy file="${src.dir}/jbossws-cxf-config-as7.xml" - tofile="${dest.dir}/jbossws-jboss701/jbossws.beans/META-INF/stack-specific-deployment-aspects.xml" - /> - <copy - file="${src.dir}/jbossws-jaxrpc-config-as7.xml" - tofile="${dest.dir}/jbossws-jboss701/jbossws.beans/META-INF/jaxrpc-deployment-aspects.xml" - /> - - <copy - file="${src.dir}/jbossws-cxf-config-as7.xml" tofile="${dest.dir}/jbossws-jboss702/jbossws.beans/META-INF/stack-specific-deployment-aspects.xml" /> <copy @@ -65,6 +56,15 @@ tofile="${dest.dir}/jbossws-jboss711/jbossws.beans/META-INF/jaxrpc-deployment-aspects.xml" /> + <copy + file="${src.dir}/jbossws-cxf-config-as7.xml" + tofile="${dest.dir}/jbossws-jboss712/jbossws.beans/META-INF/stack-specific-deployment-aspects.xml" + /> + <copy + file="${src.dir}/jbossws-jaxrpc-config-as7.xml" + tofile="${dest.dir}/jbossws-jboss712/jbossws.beans/META-INF/jaxrpc-deployment-aspects.xml" + /> + </target> </project> Modified: stack/cxf/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/pom.xml 2012-03-13 13:51:15 UTC (rev 15932) +++ stack/cxf/trunk/modules/testsuite/pom.xml 2012-03-13 13:52:29 UTC (rev 15933) @@ -564,17 +564,16 @@ </dependency> </dependencies> </profile> - - +  <profile> - <id>jboss701</id> + <id>jboss702</id> <properties> - <jboss.version>${jboss701.version}</jboss.version> - <jbossws.integration.target>jboss701</jbossws.integration.target> + <jboss.version>${jboss702.version}</jboss.version> + <jbossws.integration.target>jboss702</jbossws.integration.target> </properties> <dependencies> <dependency> @@ -741,38 +740,63 @@ </plugins> </build> </profile> - +  <profile> - <id>jboss702</id> + <id>jboss710</id> <properties> - <jboss.version>${jboss702.version}</jboss.version> - <jbossws.integration.target>jboss702</jbossws.integration.target> + <jboss.version>${jboss710.version}</jboss.version> + <jbossws.integration.target>jboss710</jbossws.integration.target> </properties> <dependencies> <dependency> <groupId>org.jboss.as</groupId> <artifactId>jboss-as-webservices-tests-integration</artifactId> <version>${jboss.version}</version> + <exclusions> + <exclusion> + <groupId>org.jboss.as</groupId> + <artifactId>jboss-as-transactions</artifactId> + </exclusion> + <exclusion> + <groupId>org.jboss.remoting3</groupId> + <artifactId>jboss-remoting</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>javax.mail</groupId> <artifactId>mail</artifactId> </dependency> <dependency> - <groupId>org.jboss.naming</groupId> - <artifactId>jnp-client</artifactId> - <version>5.0.5.Final</version> + <groupId>org.jboss</groupId> + <artifactId>jboss-ejb-client</artifactId> + <version>1.0.2.Final</version> + <exclusions> + <exclusion> + <groupId>org.jboss.remoting3</groupId> + <artifactId>jboss-remoting</artifactId> + </exclusion> + <exclusion> + <groupId>org.jboss.xnio</groupId> + <artifactId>xnio-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.jboss.ejb3</groupId> <artifactId>jboss-ejb3-ext-api</artifactId> - <version>2.0.0-beta-1</version> + <version>2.0.0</version> </dependency> <dependency> + <groupId>javassist</groupId> + <artifactId>javassist</artifactId> + <version>3.12.1.GA</version> + </dependency> + <dependency> <groupId>org.jboss</groupId> <artifactId>jboss-common-core</artifactId> <exclusions> @@ -782,6 +806,81 @@ </exclusion> </exclusions> </dependency> + <dependency> + <groupId>xerces</groupId> + <artifactId>xercesImpl</artifactId> + <scope>test</scope> + <exclusions> + <exclusion> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jbossxb</artifactId> + <version>${jboss.xb.version}</version> + <scope>test</scope> + <exclusions> + <exclusion> + <groupId>apache-xerces</groupId> + <artifactId>xml-apis</artifactId> + </exclusion> + <exclusion> + <groupId>apache-xerces</groupId> + <artifactId>xercesImpl</artifactId> + </exclusion> + <exclusion> + <groupId>jboss</groupId> + <artifactId>jboss-common-core</artifactId> + </exclusion> + <exclusion> + <groupId>org.jboss.logging</groupId> + <artifactId>jboss-logging-spi</artifactId> + </exclusion> + <exclusion> + <groupId>org.jboss.logging</groupId> + <artifactId>jboss-logging-log4j</artifactId> + </exclusion> + <exclusion> + <groupId>sun-jaxb</groupId> + <artifactId>jaxb-api</artifactId> + </exclusion> + <exclusion> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + </exclusion> + <exclusion> + <groupId>wutka-dtdparser</groupId> + <artifactId>dtdparser121</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.jboss.remoting3</groupId> + <artifactId>remoting-jmx</artifactId> + <version>1.0.0.Final</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.remoting3</groupId> + <artifactId>jboss-remoting</artifactId> + <version>3.2.1.GA</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.hornetq</groupId> + <artifactId>hornetq-jms</artifactId> + <version>2.2.11.Final</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.hornetq</groupId> + <artifactId>hornetq-core</artifactId> + <version>2.2.11.Final</version> + <scope>test</scope> + </dependency> </dependencies> <build> <plugins> @@ -799,11 +898,8 @@ <configuration> <testExcludes> <exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude> -  - <exclude>org/jboss/test/ws/jaxrpc/**</exclude>  - <exclude>org/jboss/test/ws/jaxws/jbws944/**</exclude> - <exclude>org/jboss/test/ws/jaxws/samples/webserviceref/**</exclude> + <exclude>org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefClientTestCase*</exclude> </testExcludes> </configuration> <goals> @@ -815,11 +911,16 @@ <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} -Djava.endorsed.dirs=${project.build.directory}/endorsed</argLine> + <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} ${surefire.default-mgmt-serurity.args} -Djava.endorsed.dirs=${project.build.directory}/endorsed</argLine>  <additionalClasspathElements> -  - <additionalClasspathElement>${jboss.home}/common/lib/jbossws-native-core.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-4.0.1.GA.jar</additionalClasspathElement> +  + <additionalClasspathElement>${jboss.home}/modules/org/jboss/ws/native/jbossws-native-core/main/${jbossws-native-core.filename}</additionalClasspathElement> </additionalClasspathElements> <excludes>  @@ -832,9 +933,6 @@  <exclude>org/jboss/test/ws/jaxws/jbws2449/**</exclude> -  - <exclude>org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*</exclude> -  <exclude>org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.*</exclude> @@ -844,73 +942,22 @@  <exclude>org/jboss/test/ws/jaxws/jbws1797/**</exclude> -  - <exclude>org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.*</exclude> +  + <exclude>org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefClientTestCase*</exclude> -  - <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustTestCase*</exclude> - -  - <exclude>org/jboss/test/ws/jaxws/jbws3367/**</exclude> - -  - <exclude>org/jboss/test/ws/jaxws/jbws3276/**</exclude> - -  - <exclude>org/jboss/test/ws/jaxws/jbws2074/**</exclude> - <exclude>org/jboss/test/ws/jaxws/jbws2634/**</exclude> - <exclude>org/jboss/test/ws/jaxws/jbws3026/**</exclude> - <exclude>org/jboss/test/ws/jaxws/enventry/*JSETestCase*</exclude> - -  - <exclude>org/jboss/test/ws/jaxws/cxf/webserviceref/WebServiceRefServletTestCase*</exclude> - <exclude>org/jboss/test/ws/jaxws/jbws2307/**</exclude> - <exclude>org/jboss/test/ws/jaxws/jbws2527/**</exclude> - <exclude>org/jboss/test/ws/jaxws/samples/advanced/retail/**</exclude> - -  - <exclude>org/jboss/test/ws/jaxws/jbws1813/**</exclude> - <exclude>org/jboss/test/ws/jaxws/jbws1841/**</exclude> - <exclude>org/jboss/test/ws/jaxws/jbws2241/**</exclude> - -  - <exclude>org/jboss/test/ws/jaxws/samples/webservicerefsec/**</exclude> - -  - <exclude>org/jboss/test/ws/jaxws/jbws3140/**</exclude> - -  - <exclude>org/jboss/test/ws/jaxws/samples/webserviceref/**</exclude> - -  - <exclude>org/jboss/test/ws/jaxrpc/**</exclude> - <exclude>org/jboss/test/ws/jaxws/jbws944/**</exclude> - <exclude>org/jboss/test/ws/jaxws/samples/serviceref/**</exclude> - <exclude>org/jboss/test/ws/jaxws/jbws1581/**</exclude> - <exclude>org/jboss/test/ws/jaxws/cxf/bus/*EJB3*</exclude> - <exclude>org/jboss/test/ws/jaxws/jbws1815/**</exclude> - -  - <exclude>org/jboss/test/ws/console/**</exclude> - -  - <exclude>org/jboss/test/ws/jaxws/jbws3034/**</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/publish/EndpointPublishTestCase*</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/jaxws/as2961/AS2961TestCase*</exclude> +  + <exclude>org/jboss/test/ws/jaxrpc/samples/secureejb/**</exclude> -  - <exclude>org/jboss/test/ws/jaxws/as3581/AS3581TestCase*</exclude> - </excludes> </configuration> </plugin> @@ -919,14 +966,14 @@ </profile>  <profile> - <id>jboss710</id> + <id>jboss711</id> <properties> - <jboss.version>${jboss710.version}</jboss.version> - <jbossws.integration.target>jboss710</jbossws.integration.target> + <jboss.version>${jboss711.version}</jboss.version> + <jbossws.integration.target>jboss711</jbossws.integration.target> </properties> <dependencies> <dependency> @@ -942,16 +989,25 @@ <groupId>org.jboss.remoting3</groupId> <artifactId>jboss-remoting</artifactId> </exclusion> + <exclusion> + <groupId>org.jboss</groupId> + <artifactId>jboss-remote-naming</artifactId> + </exclusion> </exclusions> </dependency> <dependency> + <groupId>org.jboss</groupId> + <artifactId>jboss-remote-naming</artifactId> + <version>1.0.2.Final</version> + </dependency> + <dependency> <groupId>javax.mail</groupId> <artifactId>mail</artifactId> </dependency> <dependency> <groupId>org.jboss</groupId> <artifactId>jboss-ejb-client</artifactId> - <version>1.0.2.Final</version> + <version>1.0.4.Final</version> <exclusions> <exclusion> <groupId>org.jboss.remoting3</groupId> @@ -1035,15 +1091,15 @@ </exclusions> </dependency> <dependency> - <groupId>org.jboss.remoting3</groupId> + <groupId>org.jboss.remotingjmx</groupId> <artifactId>remoting-jmx</artifactId> - <version>1.0.0.Final</version> + <version>1.0.2.Final</version> <scope>test</scope> </dependency> <dependency> <groupId>org.jboss.remoting3</groupId> <artifactId>jboss-remoting</artifactId> - <version>3.2.1.GA</version> + <version>3.2.2.GA</version> <scope>test</scope> </dependency> <dependency> @@ -1075,8 +1131,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> @@ -1094,8 +1148,8 @@   <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-4.0.2.GA.jar</additionalClasspathElement>  <additionalClasspathElement>${jboss.home}/modules/org/jboss/ws/native/jbossws-native-core/main/${jbossws-native-core.filename}</additionalClasspathElement> </additionalClasspathElements> @@ -1119,22 +1173,11 @@  <exclude>org/jboss/test/ws/jaxws/jbws1797/**</exclude> -  - <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> - </excludes> </configuration> </plugin> @@ -1143,14 +1186,14 @@ </profile>  <profile> - <id>jboss711</id> + <id>jboss712</id> <properties> - <jboss.version>${jboss711.version}</jboss.version> - <jbossws.integration.target>jboss711</jbossws.integration.target> + <jboss.version>${jboss712.version}</jboss.version> + <jbossws.integration.target>jboss712</jbossws.integration.target> </properties> <dependencies> <dependency> @@ -1325,7 +1368,7 @@   <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.2.GA.jar</additionalClasspathElement>  <additionalClasspathElement>${jboss.home}/modules/org/jboss/ws/native/jbossws-native-core/main/${jbossws-native-core.filename}</additionalClasspathElement> @@ -1361,7 +1404,7 @@ </plugins> </build> </profile> - +  + +<server xmlns="urn:jboss:domain:1.2"> + + <extensions> + <extension module="org.jboss.as.connector"/> + <extension module="org.jboss.as.ee"/> + <extension module="org.jboss.as.ejb3"/> + <extension module="org.jboss.as.logging"/> + <extension module="org.jboss.as.naming"/> + <extension module="org.jboss.as.remoting"/> + <extension module="org.jboss.as.security"/> + <extension module="org.jboss.as.webservices"/> + </extensions> + + <profile> + <subsystem xmlns="urn:jboss:domain:logging:1.1"> + <console-handler name="CONSOLE"> + <level name="INFO"/> + <formatter> + <pattern-formatter pattern="%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/> + </formatter> + </console-handler> + + <periodic-rotating-file-handler name="FILE"> + <level name="INFO"/> + <formatter> + <pattern-formatter pattern="%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/> + </formatter> + <file relative-to="jboss.server.log.dir" path="appclient.log"/> + <suffix value=".yyyy-MM-dd"/> + <append value="true"/> + </periodic-rotating-file-handler> + + <logger category="com.arjuna"> + <level name="WARN"/> + </logger> + <logger category="sun.rmi"> + <level name="WARN"/> + </logger> + <logger category="jacorb"> + <level name="WARN"/> + </logger> +  + <logger category="jacorb.config"> + <level name="ERROR"/> + </logger> + + <root-logger> + <level name="INFO"/> + <handlers> + <handler name="CONSOLE"/> + <handler name="FILE"/> + </handlers> + </root-logger> + </subsystem> + <subsystem xmlns="urn:jboss:domain:ee:1.0"/> + <subsystem xmlns="urn:jboss:domain:ejb3:1.2" /> + <subsystem xmlns="urn:jboss:domain:naming:1.0"/> + <subsystem xmlns="urn:jboss:domain:security:1.0"> + <security-domains> + <security-domain name="other" cache-type="default"> + <authentication> + <login-module code="UsersRoles" flag="required"/> + </authentication> + </security-domain> + <security-domain name="jboss-web-policy" cache-type="default"> + <authorization> + <policy-module code="Delegating" flag="required"/> + </authorization> + </security-domain> + <security-domain name="jboss-ejb-policy" cache-type="default"> + <authorization> + <policy-module code="Delegating" flag="required"/> + </authorization> + </security-domain> + </security-domains> + </subsystem> + <subsystem xmlns="urn:jboss:domain:remoting:1.1"> + <connector name="remoting-connector" socket-binding="remoting"/> + </subsystem> + <subsystem xmlns="urn:jboss:domain:webservices:1.1"/> + </profile> + + <interfaces> + <interface name="public"> + <inet-address value="${jboss.bind.address:127.0.0.1}"/> + </interface> + </interfaces> + + <socket-binding-group name="standard-sockets" default-interface="public"> + <socket-binding name="remoting" port="4448"/> + </socket-binding-group> + +</server> Modified: stack/cxf/trunk/pom.xml =================================================================== --- stack/cxf/trunk/pom.xml 2012-03-13 13:51:15 UTC (rev 15932) +++ stack/cxf/trunk/pom.xml 2012-03-13 13:52:29 UTC (rev 15933) @@ -66,11 +66,12 @@ <jbossws.shared.testsuite.version>4.0.3-SNAPSHOT</jbossws.shared.testsuite.version> <jbossws.jboss701.version>4.0.1.GA</jbossws.jboss701.version> <jbossws.jboss702.version>4.0.1.GA</jbossws.jboss702.version> - <jbossws.jboss710.version>4.0.3-SNAPSHOT</jbossws.jboss710.version> - <jboss701.version>7.0.1.Final</jboss701.version> + <jbossws.jboss710.version>4.0.2.GA</jbossws.jboss710.version> + <jbossws.jboss711.version>4.1.0-SNAPSHOT</jbossws.jboss711.version> <jboss702.version>7.0.2.Final</jboss702.version> <jboss710.version>7.1.0.Final</jboss710.version> - <jboss711.version>7.1.1.Final-SNAPSHOT</jboss711.version> + <jboss711.version>7.1.1.Final</jboss711.version> + <jboss712.version>7.1.2.Final-SNAPSHOT</jboss712.version> <ejb.api.version>1.0.1.Final</ejb.api.version> <cxf.version>2.5.3-SNAPSHOT</cxf.version> <cxf.asm.version>3.3.1</cxf.asm.version> @@ -151,17 +152,6 @@ </dependency> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss701</artifactId> - <version>${jbossws.jboss701.version}</version> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss701</artifactId> - <version>${jbossws.jboss701.version}</version> - <classifier>tests-integration</classifier> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss702</artifactId> <version>${jbossws.jboss702.version}</version> </dependency> @@ -183,9 +173,20 @@ <classifier>tests-integration</classifier> </dependency> <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss711</artifactId> + <version>${jbossws.jboss711.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss711</artifactId> + <version>${jbossws.jboss711.version}</version> + <classifier>tests-integration</classifier> + </dependency> + <dependency> <groupId>org.jboss.as</groupId> <artifactId>jboss-as-webservices-tests-integration</artifactId> - <version>${jboss711.version}</version> + <version>${jboss712.version}</version> </dependency> <dependency> <groupId>org.jboss.ws.projects</groupId> @@ -1353,18 +1354,6 @@ </profile>  - <profile> - <id>jboss701</id> - <properties> - <jbossws.integration.target>jboss701</jbossws.integration.target> - <jboss.home>${jboss701.home}</jboss.home> - </properties> - </profile> - -  @@ -1401,6 +1390,18 @@ </profile>  + <profile> + <id>jboss712</id> + <properties> + <jbossws.integration.target>jboss712</jbossws.integration.target> + <jboss.home>${jboss712.home}</jboss.home> + </properties> + </profile> + +

14 years, 1 month

1
0
0 / 0

JBossWS SVN: r15932 - shared-testsuite/trunk/testsuite/src/test/ant-import.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2012-03-13 09:51:15 -0400 (Tue, 13 Mar 2012) New Revision: 15932 Modified: shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml Log: Adding jboss712 target container Modified: shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml =================================================================== --- shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml 2012-03-13 13:28:12 UTC (rev 15931) +++ shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml 2012-03-13 13:51:15 UTC (rev 15932) @@ -43,6 +43,9 @@ <condition property="jboss.home" value="${jboss711.home}"> <equals arg1="${jbossws.integration.target}" arg2="jboss711"/> </condition> + <condition property="jboss.home" value="${jboss712.home}"> + <equals arg1="${jbossws.integration.target}" arg2="jboss712"/> + </condition>  <fail message="Tests output dir not set." unless="tests.output.dir"/>

14 years, 1 month

1
0
0 / 0

JBossWS SVN: r15931 - in stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws: wsaddressing/replyto and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: ropalka Date: 2012-03-13 09:28:12 -0400 (Tue, 13 Mar 2012) New Revision: 15931 Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/webserviceref/ServiceRefOverridesTestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/webserviceref/StubPropertyTestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/AddressingReplyToTestCase.java Log: [JBWS-3435] finalizing appclient integration Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/webserviceref/ServiceRefOverridesTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/webserviceref/ServiceRefOverridesTestCase.java 2012-03-13 13:24:23 UTC (rev 15930) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/webserviceref/ServiceRefOverridesTestCase.java 2012-03-13 13:28:12 UTC (rev 15931) @@ -96,23 +96,30 @@ private String executeApplicationClient(final String... appclientArgs) throws Throwable { - final OutputStream appclientOS = new ByteArrayOutputStream(); - JBossWSTestHelper.deployAppclient("jaxws-webserviceref-override-appclient.ear#jaxws-webserviceref-override-appclient.jar", appclientOS, appclientArgs); - // wait till appclient stops - String appclientLog = appclientOS.toString(); - while (!appclientLog.contains("stopped in")) { - Thread.sleep(100); - appclientLog = appclientOS.toString(); + try + { + final OutputStream appclientOS = new ByteArrayOutputStream(); + JBossWSTestHelper.deployAppclient("jaxws-webserviceref-override-appclient.ear#jaxws-webserviceref-override-appclient.jar", appclientOS, appclientArgs); + // wait till appclient stops + String appclientLog = appclientOS.toString(); + while (!appclientLog.contains("stopped in")) { + Thread.sleep(100); + appclientLog = appclientOS.toString(); + } + // assert appclient logs + assertTrue(appclientLog.contains("TEST START")); + assertTrue(appclientLog.contains("TEST END")); + assertTrue(appclientLog.contains("RESULT [")); + assertTrue(appclientLog.contains("] RESULT")); + int indexOfResultStart = appclientLog.indexOf("RESULT ["); + int indexOfResultStop = appclientLog.indexOf("] RESULT"); + assertTrue(indexOfResultStart > 0); + assertTrue(indexOfResultStop > 0); + return appclientLog.substring(indexOfResultStart + 8, indexOfResultStop); } - // assert appclient logs - assertTrue(appclientLog.contains("TEST START")); - assertTrue(appclientLog.contains("TEST END")); - assertTrue(appclientLog.contains("RESULT [")); - assertTrue(appclientLog.contains("] RESULT")); - int indexOfResultStart = appclientLog.indexOf("RESULT ["); - int indexOfResultStop = appclientLog.indexOf("] RESULT"); - assertTrue(indexOfResultStart > 0); - assertTrue(indexOfResultStop > 0); - return appclientLog.substring(indexOfResultStart + 8, indexOfResultStop); + finally + { + JBossWSTestHelper.undeployAppclient("jaxws-webserviceref-override-appclient.ear#jaxws-webserviceref-override-appclient.jar", false); + } } } Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/webserviceref/StubPropertyTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/webserviceref/StubPropertyTestCase.java 2012-03-13 13:24:23 UTC (rev 15930) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/webserviceref/StubPropertyTestCase.java 2012-03-13 13:28:12 UTC (rev 15931) @@ -119,24 +119,31 @@ private String executeApplicationClient(final String... appclientArgs) throws Throwable { - final OutputStream appclientOS = new ByteArrayOutputStream(); - JBossWSTestHelper.deployAppclient("jaxws-webserviceref-secure-appclient.ear#jaxws-webserviceref-secure-appclient.jar", appclientOS, appclientArgs); - // wait till appclient stops - String appclientLog = appclientOS.toString(); - while (!appclientLog.contains("stopped in")) { - Thread.sleep(100); - appclientLog = appclientOS.toString(); + try + { + final OutputStream appclientOS = new ByteArrayOutputStream(); + JBossWSTestHelper.deployAppclient("jaxws-webserviceref-secure-appclient.ear#jaxws-webserviceref-secure-appclient.jar", appclientOS, appclientArgs); + // wait till appclient stops + String appclientLog = appclientOS.toString(); + while (!appclientLog.contains("stopped in")) { + Thread.sleep(100); + appclientLog = appclientOS.toString(); + } + // assert appclient logs + assertTrue(appclientLog.contains("TEST START")); + assertTrue(appclientLog.contains("TEST END")); + assertTrue(appclientLog.contains("RESULT [")); + assertTrue(appclientLog.contains("] RESULT")); + int indexOfResultStart = appclientLog.indexOf("RESULT ["); + int indexOfResultStop = appclientLog.indexOf("] RESULT"); + assertTrue(indexOfResultStart > 0); + assertTrue(indexOfResultStop > 0); + return appclientLog.substring(indexOfResultStart + 8, indexOfResultStop); } - // assert appclient logs - assertTrue(appclientLog.contains("TEST START")); - assertTrue(appclientLog.contains("TEST END")); - assertTrue(appclientLog.contains("RESULT [")); - assertTrue(appclientLog.contains("] RESULT")); - int indexOfResultStart = appclientLog.indexOf("RESULT ["); - int indexOfResultStop = appclientLog.indexOf("] RESULT"); - assertTrue(indexOfResultStart > 0); - assertTrue(indexOfResultStop > 0); - return appclientLog.substring(indexOfResultStart + 8, indexOfResultStop); + finally + { + JBossWSTestHelper.undeployAppclient("jaxws-webserviceref-secure-appclient.ear#jaxws-webserviceref-secure-appclient.jar", false); + } } } Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/AddressingReplyToTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/AddressingReplyToTestCase.java 2012-03-13 13:24:23 UTC (rev 15930) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/AddressingReplyToTestCase.java 2012-03-13 13:28:12 UTC (rev 15931) @@ -51,19 +51,26 @@ public void testApplicationClient() throws Exception { - final String appclientArg = getServerHost();; - final OutputStream appclientOS = new ByteArrayOutputStream(); - JBossWSTestHelper.deployAppclient("jaxws-wsaddressing-appclient.ear#jaxws-wsaddressing-appclient.jar", appclientOS, appclientArg); - // wait till appclient stops - String appclientLog = appclientOS.toString(); - while (!appclientLog.contains("stopped in")) { - Thread.sleep(100); - appclientLog = appclientOS.toString(); + try + { + final String appclientArg = getServerHost();; + final OutputStream appclientOS = new ByteArrayOutputStream(); + JBossWSTestHelper.deployAppclient("jaxws-wsaddressing-appclient.ear#jaxws-wsaddressing-appclient.jar", appclientOS, appclientArg); + // wait till appclient stops + String appclientLog = appclientOS.toString(); + while (!appclientLog.contains("stopped in")) { + Thread.sleep(100); + appclientLog = appclientOS.toString(); + } + // assert appclient logs + assertTrue(!appclientLog.contains("APPCLIENT TEST FAILURE")); + assertTrue(appclientLog.contains("TEST START")); + assertTrue(appclientLog.contains("TEST END")); } - // assert appclient logs - assertTrue(!appclientLog.contains("APPCLIENT TEST FAILURE")); - assertTrue(appclientLog.contains("TEST START")); - assertTrue(appclientLog.contains("TEST END")); + finally + { + JBossWSTestHelper.undeployAppclient("jaxws-wsaddressing-appclient.ear#jaxws-wsaddressing-appclient.jar", false); + } } }

14 years, 1 month

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits March 2012