May 2012 - jbossws-commits - Jboss List Archives

JBossWS SVN: r16257 - in stack/cxf/trunk/modules/testsuite/cxf-tests: src/test/java/org/jboss/test/ws/jaxws/cxf and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2012-05-10 15:54:15 -0400 (Thu, 10 May 2012) New Revision: 16257 Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsmex/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsmex/Endpoint.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsmex/EndpointBean.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsmex/WSMexTestCase.java Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml Log: [JBWS-3496] Adding testcase Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2012-05-10 15:59:16 UTC (rev 16256) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2012-05-10 19:54:15 UTC (rev 16257) @@ -250,6 +250,14 @@ </manifest> </war> +  + <jar destfile="${tests.output.dir}/test-libs/jaxws-cxf-wsmex.jar"> + <fileset dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/cxf/wsmex/Endpoint.class"/> + <include name="org/jboss/test/ws/jaxws/cxf/wsmex/EndpointBean.class"/> + </fileset> + </jar> +  <war warfile="${tests.output.dir}/test-libs/saaj-soap-connection.war" Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsmex/Endpoint.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsmex/Endpoint.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsmex/Endpoint.java 2012-05-10 19:54:15 UTC (rev 16257) @@ -0,0 +1,32 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2009, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.cxf.wsmex; + +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + +@WebService(name = "EndpointService", targetNamespace = "http://org.jboss.ws/cxf/wsmex") +@SOAPBinding(style = SOAPBinding.Style.DOCUMENT, use = SOAPBinding.Use.LITERAL, parameterStyle = SOAPBinding.ParameterStyle.WRAPPED) +public interface Endpoint +{ + public String echo(String user); +} Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsmex/EndpointBean.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsmex/EndpointBean.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsmex/EndpointBean.java 2012-05-10 19:54:15 UTC (rev 16257) @@ -0,0 +1,38 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2009, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.cxf.wsmex; + +import javax.ejb.Stateless; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + +@WebService(name = "EndpointService", targetNamespace = "http://org.jboss.ws/cxf/wsmex") +@SOAPBinding(style = SOAPBinding.Style.DOCUMENT, use = SOAPBinding.Use.LITERAL, parameterStyle = SOAPBinding.ParameterStyle.WRAPPED) +@Stateless +public class EndpointBean implements Endpoint +{ + public String echo(String user) + { + System.out.println("user: " + user); + return user; + } +} Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsmex/WSMexTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsmex/WSMexTestCase.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsmex/WSMexTestCase.java 2012-05-10 19:54:15 UTC (rev 16257) @@ -0,0 +1,67 @@ +/* + * JBoss, Home of Professional Open Source. + * 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. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.cxf.wsmex; + +import junit.framework.Test; + +import org.apache.cxf.jaxws.JaxWsProxyFactoryBean; +import org.apache.cxf.ws.mex.MetadataExchange; +import org.apache.cxf.ws.mex.model._2004_09.Metadata; +import org.apache.cxf.ws.mex.model._2004_09.MetadataSection; +import org.jboss.ws.common.DOMWriter; +import org.jboss.wsf.test.JBossWSCXFTestSetup; +import org.jboss.wsf.test.JBossWSTest; +import org.w3c.dom.Node; + +/** + * Test WS-MetadataExchange + * + * @author alessio.soldano(a)jboss.com + * @since 10-May-2012 + */ +public class WSMexTestCase extends JBossWSTest +{ + private String endpointAddress = "http://" + getServerHost() + ":8080/jaxws-cxf-wsmex/EndpointService"; + + public static Test suite() + { + return new JBossWSCXFTestSetup(WSMexTestCase.class, "jaxws-cxf-wsmex.jar"); + } + + public void testEndpoint() throws Exception + { + JaxWsProxyFactoryBean proxyFac = new JaxWsProxyFactoryBean(); + proxyFac.setAddress(endpointAddress); + MetadataExchange exc = proxyFac.create(MetadataExchange.class); + Metadata metadata = exc.get2004(); + + assertNotNull(metadata); + assertEquals(1, metadata.getMetadataSection().size()); + + MetadataSection ms = metadata.getMetadataSection().get(0); + assertEquals("http://schemas.xmlsoap.org/wsdl/", ms.getDialect()); + assertEquals("http://org.jboss.ws/cxf/wsmex", ms.getIdentifier()); + + String wsdl = DOMWriter.printNode((Node)ms.getAny(), true); + assertTrue(wsdl.contains("EndpointBeanServiceSoapBinding")); + } +}

12 years, 8 months

1
0
0 / 0

JBossWS SVN: r16256 - hudson/trunk.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2012-05-10 11:59:16 -0400 (Thu, 10 May 2012) New Revision: 16256 Modified: hudson/trunk/ant.properties.example Log: [JBWS-3494] Fixing ant.properties.example Modified: hudson/trunk/ant.properties.example =================================================================== --- hudson/trunk/ant.properties.example 2012-05-10 15:19:23 UTC (rev 16255) +++ hudson/trunk/ant.properties.example 2012-05-10 15:59:16 UTC (rev 16256) @@ -32,9 +32,9 @@ hudson.jboss712.build=jboss-as-7.1.2.Final hudson.jboss712.rev=7.1.2.Final -hudson.jboss712.url=https://github.com/jbossas/jboss-as -hudson.jboss712.build=jboss-as-7.2.0.Alpha1-SNAPSHOT -hudson.jboss712.rev=master +hudson.jboss720.url=https://github.com/jbossas/jboss-as +hudson.jboss720.build=jboss-as-7.2.0.Alpha1-SNAPSHOT +hudson.jboss720.rev=master hudson.mail.recipients= hudson.smtp.host=localhost

12 years, 8 months

1
0
0 / 0

JBossWS SVN: r16255 - in stack/cxf/trunk: modules/client and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2012-05-10 11:19:23 -0400 (Thu, 10 May 2012) New Revision: 16255 Modified: stack/cxf/trunk/modules/client/pom.xml stack/cxf/trunk/modules/server/pom.xml stack/cxf/trunk/pom.xml Log: [JBWS-3496] Install cxf-rt-ws-mex.jar Modified: stack/cxf/trunk/modules/client/pom.xml =================================================================== --- stack/cxf/trunk/modules/client/pom.xml 2012-05-10 14:50:24 UTC (rev 16254) +++ stack/cxf/trunk/modules/client/pom.xml 2012-05-10 15:19:23 UTC (rev 16255) @@ -79,6 +79,10 @@ </dependency> <dependency> <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-ws-mex</artifactId> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-ws-rm</artifactId> </dependency> <dependency> Modified: stack/cxf/trunk/modules/server/pom.xml =================================================================== --- stack/cxf/trunk/modules/server/pom.xml 2012-05-10 14:50:24 UTC (rev 16254) +++ stack/cxf/trunk/modules/server/pom.xml 2012-05-10 15:19:23 UTC (rev 16255) @@ -83,6 +83,10 @@ </dependency> <dependency> <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-ws-mex</artifactId> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-ws-rm</artifactId> </dependency> <dependency> Modified: stack/cxf/trunk/pom.xml =================================================================== --- stack/cxf/trunk/pom.xml 2012-05-10 14:50:24 UTC (rev 16254) +++ stack/cxf/trunk/pom.xml 2012-05-10 15:19:23 UTC (rev 16255) @@ -512,6 +512,11 @@ </dependency> <dependency> <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-ws-mex</artifactId> + <version>${cxf.version}</version> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-ws-rm</artifactId> <version>${cxf.version}</version> <exclusions>

12 years, 8 months

1
0
0 / 0

JBossWS SVN: r16254 - in stack/cxf/trunk/modules/testsuite/cxf-tests/src/test: resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2012-05-10 10:50:24 -0400 (Thu, 10 May 2012) New Revision: 16254 Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustPicketLinkTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustTestUtils.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/SecurityService.wsdl Log: [JBWS-3434] Adding testcase using WSA EPR for getting STS client configuration - currently excluded while waiting for [CXF-4304] to be included in a CXF release Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustPicketLinkTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustPicketLinkTestCase.java 2012-05-10 14:16:16 UTC (rev 16253) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustPicketLinkTestCase.java 2012-05-10 14:50:24 UTC (rev 16254) @@ -64,7 +64,7 @@ final QName stsServiceName = new QName("urn:picketlink:identity-federation:sts", "PicketLinkSTS"); final QName stsPortName = new QName("urn:picketlink:identity-federation:sts", "PicketLinkSTSPort"); - WSTrustTestUtils.setupWsse(proxy, bus, stsURL + "?wsdl", stsServiceName, stsPortName); + WSTrustTestUtils.setupWsseAndSTSClient(proxy, bus, stsURL + "?wsdl", stsServiceName, stsPortName); assertEquals("WS-Trust Hello World!", proxy.sayHello()); } Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustTestCase.java 2012-05-10 14:16:16 UTC (rev 16253) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustTestCase.java 2012-05-10 14:50:24 UTC (rev 16254) @@ -52,6 +52,11 @@ "jaxws-samples-wsse-policy-trust-client.jar jaxws-samples-wsse-policy-trust-sts.war jaxws-samples-wsse-policy-trust.war"); } + /** + * WS-Trust test with the STS information programmatically provided + * + * @throws Exception + */ public void test() throws Exception { Bus bus = BusFactory.newInstance().createBus(); @@ -66,7 +71,7 @@ final QName stsServiceName = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512/", "SecurityTokenService"); final QName stsPortName = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512/", "UT_Port"); - WSTrustTestUtils.setupWsse(proxy, bus, stsURL + "?wsdl", stsServiceName, stsPortName); + WSTrustTestUtils.setupWsseAndSTSClient(proxy, bus, stsURL + "?wsdl", stsServiceName, stsPortName); assertEquals("WS-Trust Hello World!", proxy.sayHello()); } @@ -75,4 +80,36 @@ bus.shutdown(true); } } + + /** + * WS-Trust test with the STS information coming from EPR specified in service endpoint contract policy + * + * @throws Exception + */ + public void testUsingEPR() throws Exception + { + if (true) { + System.out.println("FIXME: [CXF-4304] Complete WSA support for STS client configuration via EPR"); + return; + } + + Bus bus = BusFactory.newInstance().createBus(); + try + { + BusFactory.setThreadDefaultBus(bus); + + final QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wssecuritypolicy", "SecurityService"); + final URL wsdlURL = new URL(serviceURL + "?wsdl"); + Service service = Service.create(wsdlURL, serviceName); + ServiceIface proxy = (ServiceIface) service.getPort(ServiceIface.class); + + WSTrustTestUtils.setupWsse(proxy, bus); + + assertEquals("WS-Trust Hello World!", proxy.sayHello()); + } + finally + { + bus.shutdown(true); + } + } } Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustTestUtils.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustTestUtils.java 2012-05-10 14:16:16 UTC (rev 16253) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustTestUtils.java 2012-05-10 14:50:24 UTC (rev 16254) @@ -53,7 +53,7 @@ return testSetup; } - public static void setupWsse(ServiceIface proxy, Bus bus, String stsWsdlLocation, QName stsService, QName stsPort) + public static void setupWsseAndSTSClient(ServiceIface proxy, Bus bus, String stsWsdlLocation, QName stsService, QName stsPort) { Map<String, Object> ctx = ((BindingProvider) proxy).getRequestContext(); ctx.put(SecurityConstants.CALLBACK_HANDLER, new ClientCallbackHandler()); @@ -62,9 +62,11 @@ ctx.put(SecurityConstants.SIGNATURE_USERNAME, "myclientkey"); ctx.put(SecurityConstants.ENCRYPT_USERNAME, "myservicekey"); STSClient stsClient = new STSClient(bus); - stsClient.setWsdlLocation(stsWsdlLocation); - stsClient.setServiceQName(stsService); - stsClient.setEndpointQName(stsPort); + if (stsWsdlLocation != null) { + stsClient.setWsdlLocation(stsWsdlLocation); + stsClient.setServiceQName(stsService); + stsClient.setEndpointQName(stsPort); + } Map<String, Object> props = stsClient.getProperties(); props.put(SecurityConstants.USERNAME, "alice"); props.put(SecurityConstants.CALLBACK_HANDLER, new ClientCallbackHandler()); @@ -75,4 +77,26 @@ props.put(SecurityConstants.STS_TOKEN_USE_CERT_FOR_KEYINFO, "true"); ctx.put(SecurityConstants.STS_CLIENT, stsClient); } + + public static void setupWsse(ServiceIface proxy, Bus bus) + { + Map<String, Object> ctx = ((BindingProvider) proxy).getRequestContext(); + ctx.put(SecurityConstants.CALLBACK_HANDLER, new ClientCallbackHandler()); + ctx.put(SecurityConstants.SIGNATURE_PROPERTIES, Thread.currentThread().getContextClassLoader().getResource("META-INF/clientKeystore.properties")); + ctx.put(SecurityConstants.ENCRYPT_PROPERTIES, Thread.currentThread().getContextClassLoader().getResource("META-INF/clientKeystore.properties")); + ctx.put(SecurityConstants.SIGNATURE_USERNAME, "myclientkey"); + ctx.put(SecurityConstants.ENCRYPT_USERNAME, "myservicekey"); + ctx.put(appendIssuedTokenSuffix(SecurityConstants.USERNAME), "alice"); + ctx.put(appendIssuedTokenSuffix(SecurityConstants.CALLBACK_HANDLER), new ClientCallbackHandler()); + ctx.put(appendIssuedTokenSuffix(SecurityConstants.ENCRYPT_PROPERTIES), Thread.currentThread().getContextClassLoader().getResource("META-INF/clientKeystore.properties")); + ctx.put(appendIssuedTokenSuffix(SecurityConstants.ENCRYPT_USERNAME), "mystskey"); + ctx.put(appendIssuedTokenSuffix(SecurityConstants.STS_TOKEN_USERNAME), "myclientkey"); + ctx.put(appendIssuedTokenSuffix(SecurityConstants.STS_TOKEN_PROPERTIES), Thread.currentThread().getContextClassLoader().getResource("META-INF/clientKeystore.properties")); + ctx.put(appendIssuedTokenSuffix(SecurityConstants.STS_TOKEN_USE_CERT_FOR_KEYINFO), "true"); + } + + private static String appendIssuedTokenSuffix(String prop) + { + return prop + ".it"; + } } Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/SecurityService.wsdl =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/SecurityService.wsdl 2012-05-10 14:16:16 UTC (rev 16253) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/SecurityService.wsdl 2012-05-10 14:50:24 UTC (rev 16254) @@ -68,8 +68,13 @@ <sp:RequireInternalReference /> </wsp:Policy> <sp:Issuer> - <wsaws:Address>http://localhost:8080/jaxws-samples-wsse-policy-trust-sts - </wsaws:Address> + <wsaws:Address>http://localhost:8080/jaxws-samples-wsse-policy-trust-sts/SecurityTokenSe...</wsaws:Address> + <wsaws:Metadata xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance" + wsdli:wsdlLocation="http://localhost:8080/jaxws-samples-wsse-policy-trust-sts/SecurityTokenSe..."> + <wsaw:ServiceName xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" + xmlns:stsns="http://docs.oasis-open.org/ws-sx/ws-trust/200512/" + EndpointName="UT_Port">stsns:SecurityTokenService</wsaw:ServiceName> + </wsaws:Metadata> </sp:Issuer> </sp:IssuedToken> </wsp:Policy>

12 years, 8 months

1
0
0 / 0

JBossWS SVN: r16253 - stack/cxf/trunk/modules/dist.

by jbossws-commits＠lists.jboss.org

Author: ropalka Date: 2012-05-10 10:16:16 -0400 (Thu, 10 May 2012) New Revision: 16253 Modified: stack/cxf/trunk/modules/dist/pom.xml Log: [JBWS-3494] fix bin-dist Modified: stack/cxf/trunk/modules/dist/pom.xml =================================================================== --- stack/cxf/trunk/modules/dist/pom.xml 2012-05-10 14:11:46 UTC (rev 16252) +++ stack/cxf/trunk/modules/dist/pom.xml 2012-05-10 14:16:16 UTC (rev 16253) @@ -315,7 +315,7 @@ </dependency> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss720</artifactId> + <artifactId>jbossws-jboss712</artifactId> <classifier>tests-integration</classifier> <scope>provided</scope> </dependency>

12 years, 8 months

1
0
0 / 0

JBossWS SVN: r16252 - in hudson/trunk: hudson-home and 14 other directories.

by jbossws-commits＠lists.jboss.org

Author: ropalka Date: 2012-05-10 10:11:46 -0400 (Thu, 10 May 2012) New Revision: 16252 Added: hudson/trunk/hudson-home/jobs/AS-7.2.0/ hudson/trunk/hudson-home/jobs/AS-7.2.0/config.xml hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-7.2.0-SPRING-SUN-JDK-6/ hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-7.2.0-SPRING-SUN-JDK-6/config.xml hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-7.2.0-SUN-JDK-6/ hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-7.2.0-SUN-JDK-6/config.xml hudson/trunk/hudson-home/jobs/CXF-CORE-AS-7.2.0-SPRING-SUN-JDK-6/ hudson/trunk/hudson-home/jobs/CXF-CORE-AS-7.2.0-SPRING-SUN-JDK-6/config.xml hudson/trunk/hudson-home/jobs/CXF-CORE-AS-7.2.0-SUN-JDK-6/ hudson/trunk/hudson-home/jobs/CXF-CORE-AS-7.2.0-SUN-JDK-6/config.xml hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-7.2.0-SPRING-SUN-JDK-6/ hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-7.2.0-SPRING-SUN-JDK-6/config.xml hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-7.2.0-SUN-JDK-6/ hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-7.2.0-SUN-JDK-6/config.xml hudson/trunk/hudson-home/jobs/NATIVE-CORE-AS-7.2.0-SUN-JDK-6/ hudson/trunk/hudson-home/jobs/NATIVE-CORE-AS-7.2.0-SUN-JDK-6/config.xml Removed: hudson/trunk/hudson-home/jobs/AS-7.0.2/ hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-7.0.2-SPRING-SUN-JDK-6/ hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-7.0.2-SUN-JDK-6/ hudson/trunk/hudson-home/jobs/CXF-CORE-AS-7.0.2-SPRING-SUN-JDK-6/ hudson/trunk/hudson-home/jobs/CXF-CORE-AS-7.0.2-SUN-JDK-6/ hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-7.0.2-SPRING-SUN-JDK-6/ hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-7.0.2-SUN-JDK-6/ hudson/trunk/hudson-home/jobs/NATIVE-CORE-AS-7.1.1-SUN-JDK-6/ Modified: hudson/trunk/ant.properties.example hudson/trunk/hudson-home/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-LIGHT/config.xml Log: [JBWS-3494] implementing AS720 support, dropping AS70x support Modified: hudson/trunk/ant.properties.example =================================================================== --- hudson/trunk/ant.properties.example 2012-05-10 14:06:18 UTC (rev 16251) +++ hudson/trunk/ant.properties.example 2012-05-10 14:11:46 UTC (rev 16252) @@ -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.jboss702.url=https://github.com/jbossas/jboss-as -hudson.jboss702.build=jboss-as-7.0.2.Final -hudson.jboss702.rev=7.0.2.Final - hudson.jboss710.url=https://github.com/jbossas/jboss-as hudson.jboss710.build=jboss-as-7.1.0.Final hudson.jboss710.rev=7.1.0.Final @@ -33,7 +29,11 @@ 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.build=jboss-as-7.1.2.Final +hudson.jboss712.rev=7.1.2.Final + +hudson.jboss712.url=https://github.com/jbossas/jboss-as +hudson.jboss712.build=jboss-as-7.2.0.Alpha1-SNAPSHOT hudson.jboss712.rev=master hudson.mail.recipients= Modified: hudson/trunk/hudson-home/config.xml =================================================================== --- hudson/trunk/hudson-home/config.xml 2012-05-10 14:06:18 UTC (rev 16251) +++ hudson/trunk/hudson-home/config.xml 2012-05-10 14:11:46 UTC (rev 16252) @@ -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.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><th align=left>@hudson.jboss720.build@</th><td>-r(a)hudson.jboss720.rev@ @hudson.jboss720.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.2</string> <string>AS-7.1.0</string> <string>AS-7.1.1</string> <string>AS-7.1.2</string> + <string>AS-7.2.0</string> </jobNames> <name>AS Builds</name> <description> @@ -75,8 +75,8 @@ <jobNames class="tree-set"> <no-comparator/> <string>NATIVE-LIGHT</string> - <string>NATIVE-CORE-AS-7.1.1-SUN-JDK-6</string> <string>NATIVE-CORE-AS-7.1.2-SUN-JDK-6</string> + <string>NATIVE-CORE-AS-7.2.0-SUN-JDK-6</string> </jobNames> <name>Native Tests</name> <description> @@ -95,30 +95,30 @@ <no-comparator/> <string>CXF-ALL</string> <string>CXF-LIGHT</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.1.2-SUN-JDK-6</string> - <string>CXF-CORE-AS-7.0.2-SPRING-SUN-JDK-6</string> + <string>CXF-CORE-AS-7.2.0-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-CORE-AS-7.1.2-SPRING-SUN-JDK-6</string> - <string>CXF-BINDIST-AS-7.0.2-SUN-JDK-6</string> + <string>CXF-CORE-AS-7.2.0-SPRING-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.1.2-SUN-JDK-6</string> - <string>CXF-BINDIST-AS-7.0.2-SPRING-SUN-JDK-6</string> + <string>CXF-BINDIST-AS-7.2.0-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>CXF-SRCDIST-AS-7.0.2-SUN-JDK-6</string> + <string>CXF-BINDIST-AS-7.2.0-SPRING-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.1.2-SUN-JDK-6</string> - <string>CXF-SRCDIST-AS-7.0.2-SPRING-SUN-JDK-6</string> + <string>CXF-SRCDIST-AS-7.2.0-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> + <string>CXF-SRCDIST-AS-7.2.0-SPRING-SUN-JDK-6</string> </jobNames> <name>CXF Tests</name> <description> @@ -136,25 +136,25 @@ <jobNames class="tree-set"> <no-comparator/> <string>CXF-LIGHT</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.1.2-SUN-JDK-6</string> - <string>CXF-CORE-AS-7.0.2-SPRING-SUN-JDK-6</string> + <string>CXF-CORE-AS-7.2.0-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-CORE-AS-7.1.2-SPRING-SUN-JDK-6</string> - <string>CXF-BINDIST-AS-7.0.2-SUN-JDK-6</string> + <string>CXF-CORE-AS-7.2.0-SPRING-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.1.2-SUN-JDK-6</string> - <string>CXF-BINDIST-AS-7.0.2-SPRING-SUN-JDK-6</string> + <string>CXF-BINDIST-AS-7.2.0-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>CXF-BINDIST-AS-7.2.0-SPRING-SUN-JDK-6</string> <string>NATIVE-LIGHT</string> - <string>NATIVE-CORE-AS-7.1.1-SUN-JDK-6</string> <string>NATIVE-CORE-AS-7.1.2-SUN-JDK-6</string> + <string>NATIVE-CORE-AS-7.2.0-SUN-JDK-6</string> </jobNames> <name>Working Days Tests</name> <description> Added: hudson/trunk/hudson-home/jobs/AS-7.2.0/config.xml =================================================================== --- hudson/trunk/hudson-home/jobs/AS-7.2.0/config.xml (rev 0) +++ hudson/trunk/hudson-home/jobs/AS-7.2.0/config.xml 2012-05-10 14:11:46 UTC (rev 16252) @@ -0,0 +1,75 @@ +<?xml version='1.0' encoding='UTF-8'?> +<project> + <actions/> + <description>Builds JBoss AS 7.2.0</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.jboss720.url@.git</string> + <string>tagopt</string> + <string></string> + </org.spearce.jgit.transport.RemoteConfig> + </remoteRepositories> + <branches> + <hudson.plugins.git.BranchSpec> + <name>@hudson.jboss720.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.jboss720.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 -DskipTests=true -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-05-10 14:06:18 UTC (rev 16251) +++ hudson/trunk/hudson-home/jobs/AS-ALL/config.xml 2012-05-10 14:11:46 UTC (rev 16252) @@ -3,7 +3,7 @@ <builders class="vector"/> <publishers class="vector"> <hudson.tasks.BuildTrigger> - <childProjects>AS-7.0.2, AS-7.1.0, AS-7.1.1, AS-7.1.2</childProjects> + <childProjects>AS-7.1.0, AS-7.1.1, AS-7.1.2, AS-7.2.0</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-05-10 14:06:18 UTC (rev 16251) +++ hudson/trunk/hudson-home/jobs/AS-LIGHT/config.xml 2012-05-10 14:11:46 UTC (rev 16252) @@ -3,7 +3,7 @@ <builders class="vector"/> <publishers class="vector"> <hudson.tasks.BuildTrigger> - <childProjects>AS-7.1.2</childProjects> + <childProjects>AS-7.2.0</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-05-10 14:06:18 UTC (rev 16251) +++ hudson/trunk/hudson-home/jobs/CXF-ALL/config.xml 2012-05-10 14:11:46 UTC (rev 16252) @@ -4,53 +4,53 @@ <publishers class="vector"> <hudson.tasks.BuildTrigger> <childProjects> -CXF-CORE-AS-7.0.2-SUN-JDK-6 +CXF-CORE-AS-7.1.0-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.2.0-SUN-JDK-6 + , CXF-CORE-AS-7.1.0-SPRING-SUN-JDK-6 , CXF-CORE-AS-7.1.1-SPRING-SUN-JDK-6 , CXF-CORE-AS-7.1.2-SPRING-SUN-JDK-6 -, CXF-BINDIST-AS-7.0.2-SUN-JDK-6 +, CXF-CORE-AS-7.2.0-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.2.0-SUN-JDK-6 + , CXF-BINDIST-AS-7.1.0-SPRING-SUN-JDK-6 , CXF-BINDIST-AS-7.1.1-SPRING-SUN-JDK-6 , CXF-BINDIST-AS-7.1.2-SPRING-SUN-JDK-6 -, CXF-SRCDIST-AS-7.0.2-SUN-JDK-6 +, CXF-BINDIST-AS-7.2.0-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.2.0-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 + +, CXF-SRCDIST-AS-7.2.0-SPRING-SUN-JDK-6 </childProjects> <threshold> <name>UNSTABLE</name> Added: hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-7.2.0-SPRING-SUN-JDK-6/config.xml =================================================================== --- hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-7.2.0-SPRING-SUN-JDK-6/config.xml (rev 0) +++ hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-7.2.0-SPRING-SUN-JDK-6/config.xml 2012-05-10 14:11:46 UTC (rev 16252) @@ -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.2.0-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=jboss720 +JBOSS_BIND_ADDRESS=(a)jboss.bind.address@ +JBOSS_INSTANCE=@hudson.home@/jobs/AS-7.2.0/workspace/build/target/(a)hudson.jboss720.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.2.0 with SpringFramework libraries available and Sun JDK 6</description> + <actions class="vector"/> +</project> Added: hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-7.2.0-SUN-JDK-6/config.xml =================================================================== --- hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-7.2.0-SUN-JDK-6/config.xml (rev 0) +++ hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-7.2.0-SUN-JDK-6/config.xml 2012-05-10 14:11:46 UTC (rev 16252) @@ -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.2.0-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=jboss720 +JBOSS_BIND_ADDRESS=(a)jboss.bind.address@ +JBOSS_INSTANCE=@hudson.home@/jobs/AS-7.2.0/workspace/build/target/(a)hudson.jboss720.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.2.0 with Sun JDK 6</description> + <actions class="vector"/> +</project> Added: hudson/trunk/hudson-home/jobs/CXF-CORE-AS-7.2.0-SPRING-SUN-JDK-6/config.xml =================================================================== --- hudson/trunk/hudson-home/jobs/CXF-CORE-AS-7.2.0-SPRING-SUN-JDK-6/config.xml (rev 0) +++ hudson/trunk/hudson-home/jobs/CXF-CORE-AS-7.2.0-SPRING-SUN-JDK-6/config.xml 2012-05-10 14:11:46 UTC (rev 16252) @@ -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.2.0-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=jboss720 +JBOSS_BIND_ADDRESS=(a)jboss.bind.address@ +JBOSS_INSTANCE=@hudson.home@/jobs/AS-7.2.0/workspace/build/target/(a)hudson.jboss720.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.jboss720.build@ with SpringFramework libraires available and Sun JDK 6</description> + <actions class="vector"/> +</project> Added: hudson/trunk/hudson-home/jobs/CXF-CORE-AS-7.2.0-SUN-JDK-6/config.xml =================================================================== --- hudson/trunk/hudson-home/jobs/CXF-CORE-AS-7.2.0-SUN-JDK-6/config.xml (rev 0) +++ hudson/trunk/hudson-home/jobs/CXF-CORE-AS-7.2.0-SUN-JDK-6/config.xml 2012-05-10 14:11:46 UTC (rev 16252) @@ -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.2.0-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=jboss720 +JBOSS_BIND_ADDRESS=(a)jboss.bind.address@ +JBOSS_INSTANCE=@hudson.home@/jobs/AS-7.2.0/workspace/build/target/(a)hudson.jboss720.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.jboss720.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-05-10 14:06:18 UTC (rev 16251) +++ hudson/trunk/hudson-home/jobs/CXF-LIGHT/config.xml 2012-05-10 14:11:46 UTC (rev 16252) @@ -4,12 +4,8 @@ <publishers class="vector"> <hudson.tasks.BuildTrigger> <childProjects> -CXF-CORE-AS-7.0.2-SUN-JDK-6 +CXF-CORE-AS-7.1.0-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.0-SPRING-SUN-JDK-6 , CXF-CORE-AS-7.1.1-SUN-JDK-6 @@ -20,9 +16,9 @@ , CXF-CORE-AS-7.1.2-SPRING-SUN-JDK-6 -, CXF-BINDIST-AS-7.0.2-SUN-JDK-6 +, CXF-CORE-AS-7.2.0-SUN-JDK-6 -, CXF-BINDIST-AS-7.0.2-SPRING-SUN-JDK-6 +, CXF-CORE-AS-7.2.0-SPRING-SUN-JDK-6 , CXF-BINDIST-AS-7.1.0-SUN-JDK-6 @@ -35,6 +31,10 @@ , CXF-BINDIST-AS-7.1.2-SUN-JDK-6 , CXF-BINDIST-AS-7.1.2-SPRING-SUN-JDK-6 + +, CXF-BINDIST-AS-7.2.0-SUN-JDK-6 + +, CXF-BINDIST-AS-7.2.0-SPRING-SUN-JDK-6 </childProjects> <threshold> <name>UNSTABLE</name> Added: hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-7.2.0-SPRING-SUN-JDK-6/config.xml =================================================================== --- hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-7.2.0-SPRING-SUN-JDK-6/config.xml (rev 0) +++ hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-7.2.0-SPRING-SUN-JDK-6/config.xml 2012-05-10 14:11:46 UTC (rev 16252) @@ -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.2.0-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=jboss720 +JBOSS_BIND_ADDRESS=(a)jboss.bind.address@ +JBOSS_INSTANCE=@hudson.home@/jobs/AS-7.2.0/workspace/build/target/(a)hudson.jboss720.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.2.0 with SpringFramework libraries available and Sun JDK 6</description> + <actions class="vector"/> +</project> Added: hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-7.2.0-SUN-JDK-6/config.xml =================================================================== --- hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-7.2.0-SUN-JDK-6/config.xml (rev 0) +++ hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-7.2.0-SUN-JDK-6/config.xml 2012-05-10 14:11:46 UTC (rev 16252) @@ -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.2.0-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=jboss720 +JBOSS_BIND_ADDRESS=(a)jboss.bind.address@ +JBOSS_INSTANCE=@hudson.home@/jobs/AS-7.2.0/workspace/build/target/(a)hudson.jboss720.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.2.0 with Sun JDK 6</description> + <actions class="vector"/> +</project> Added: hudson/trunk/hudson-home/jobs/NATIVE-CORE-AS-7.2.0-SUN-JDK-6/config.xml =================================================================== --- hudson/trunk/hudson-home/jobs/NATIVE-CORE-AS-7.2.0-SUN-JDK-6/config.xml (rev 0) +++ hudson/trunk/hudson-home/jobs/NATIVE-CORE-AS-7.2.0-SUN-JDK-6/config.xml 2012-05-10 14:11:46 UTC (rev 16252) @@ -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.2.0-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=jboss720 +JBOSS_BIND_ADDRESS=(a)jboss.bind.address@ +JBOSS_INSTANCE=@hudson.home@/jobs/AS-7.2.0/workspace/build/target/(a)hudson.jboss720.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.jboss720.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-05-10 14:06:18 UTC (rev 16251) +++ hudson/trunk/hudson-home/jobs/NATIVE-LIGHT/config.xml 2012-05-10 14:11:46 UTC (rev 16252) @@ -4,9 +4,9 @@ <publishers class="vector"> <hudson.tasks.BuildTrigger> <childProjects> -NATIVE-CORE-AS-7.1.1-SUN-JDK-6 +NATIVE-CORE-AS-7.1.2-SUN-JDK-6 -, NATIVE-CORE-AS-7.1.2-SUN-JDK-6 +, NATIVE-CORE-AS-7.2.0-SUN-JDK-6 </childProjects> <threshold> <name>UNSTABLE</name>

12 years, 8 months

1
0
0 / 0

JBossWS SVN: r16251 - in stack/cxf/trunk: modules/dist and 74 other directories.

by jbossws-commits＠lists.jboss.org

Author: ropalka Date: 2012-05-10 10:06:18 -0400 (Thu, 10 May 2012) New Revision: 16251 Added: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/apache/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/apache/cxf/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/apache/cxf/main/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/apache/cxf/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/apache/neethi/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/apache/neethi/main/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/apache/neethi/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/apache/santuario/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/apache/santuario/xmlsec/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/apache/santuario/xmlsec/main/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/apache/santuario/xmlsec/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/apache/ws/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/apache/ws/security/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/apache/ws/security/main/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/apache/ws/security/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/apache/ws/xmlschema/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/apache/ws/xmlschema/main/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/apache/ws/xmlschema/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/as/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/as/webservices/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/as/webservices/main/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/as/webservices/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/as/webservices/server/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/as/webservices/server/integration/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/as/webservices/server/integration/main/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/as/webservices/server/integration/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/as/webservices/server/jaxrpc-integration/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/as/webservices/server/jaxrpc-integration/main/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/as/webservices/server/jaxrpc-integration/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/api/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/api/main/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/api/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/common/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/common/main/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/common/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/cxf/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/cxf/jbossws-cxf-client/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/cxf/jbossws-cxf-client/main/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/cxf/jbossws-cxf-client/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/cxf/jbossws-cxf-factories/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/cxf/jbossws-cxf-factories/main/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/cxf/jbossws-cxf-factories/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/cxf/jbossws-cxf-server/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/cxf/jbossws-cxf-server/main/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/cxf/jbossws-cxf-transports-httpserver/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/cxf/jbossws-cxf-transports-httpserver/main/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/cxf/jbossws-cxf-transports-httpserver/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/jaxws-client/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/jaxws-client/main/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/jaxws-client/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/jaxws-jboss-httpserver-httpspi/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/jaxws-jboss-httpserver-httpspi/main/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/jaxws-jboss-httpserver-httpspi/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/native/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/native/jbossws-native-core/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/native/jbossws-native-core/main/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/native/jbossws-native-core/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/native/jbossws-native-services/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/native/jbossws-native-services/main/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/native/jbossws-native-services/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/saaj-impl/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/saaj-impl/main/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/saaj-impl/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/spi/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/spi/main/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/spi/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/tools/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/tools/common/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/tools/common/main/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/tools/common/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/tools/wsconsume/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/tools/wsconsume/main/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/tools/wsconsume/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/tools/wsprovide/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/tools/wsprovide/main/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/tools/wsprovide/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/opensaml/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/opensaml/main/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/opensaml/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/springframework/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/springframework/spring/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/springframework/spring/main/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/springframework/spring/main/module.xml stack/cxf/trunk/modules/testsuite/src/test/resources/jboss720/ stack/cxf/trunk/modules/testsuite/src/test/resources/jboss720/appclient-ws.xml Removed: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss700/ 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/dist/src/main/scripts/assembly-deploy-artifacts.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/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/JMSEndpointOnlyDeploymentTestCaseForked.java stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/JMSHTTPEndpointDeploymentTestCaseForked.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/EJB3ClientBusTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/ServletClientBusTestCase.java stack/cxf/trunk/modules/testsuite/pom.xml stack/cxf/trunk/pom.xml Log: [JBWS-3494] implementing AS720 support, dropping AS70x support Modified: stack/cxf/trunk/build.xml =================================================================== --- stack/cxf/trunk/build.xml 2012-05-10 12:47:58 UTC (rev 16250) +++ stack/cxf/trunk/build.xml 2012-05-10 14:06:18 UTC (rev 16251) @@ -68,9 +68,6 @@ <arg line="${maven.opts} help:effective-settings"/> </exec> <xmlproperty file="${dist.output.dir}/effective-settings.xml" keeproot="false"/> - <condition property="jboss702.home" value="${profiles.profile.properties.jboss702.home}"> - <isset property="profiles.profile.properties.jboss702.home"/> - </condition> <condition property="jboss710.home" value="${profiles.profile.properties.jboss710.home}"> <isset property="profiles.profile.properties.jboss710.home"/> </condition> @@ -80,15 +77,15 @@ <condition property="jboss712.home" value="${profiles.profile.properties.jboss712.home}"> <isset property="profiles.profile.properties.jboss712.home"/> </condition> + <condition property="jboss720.home" value="${profiles.profile.properties.jboss720.home}"> + <isset property="profiles.profile.properties.jboss720.home"/> + </condition> - <fail message="jboss home not set, use jboss702.home=value, jboss710.home=value, jboss711.home=value or jboss712.home=value to set"> + <fail message="jboss home not set, use jboss710.home=value, jboss711.home=value, jboss712.home=value or jboss720.home=value to set"> <condition> <and> <not> - <isset property="jboss702.home"/> - </not> - <not> <isset property="jboss710.home"/> </not> <not> @@ -97,15 +94,18 @@ <not> <isset property="jboss712.home"/> </not> + <not> + <isset property="jboss720.home"/> + </not> </and> </condition> </fail> <echo/> - <echo message="jboss702.home=${jboss702.home}"/> <echo message="jboss710.home=${jboss710.home}"/> <echo message="jboss711.home=${jboss711.home}"/> <echo message="jboss712.home=${jboss712.home}"/> + <echo message="jboss720.home=${jboss720.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-05-10 12:47:58 UTC (rev 16250) +++ stack/cxf/trunk/modules/dist/pom.xml 2012-05-10 14:06:18 UTC (rev 16251) @@ -33,28 +33,28 @@ <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> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf-resources</artifactId> <version>${project.version}</version> - <classifier>jboss712</classifier> + <classifier>jboss720</classifier> </dependency> <dependency> @@ -156,18 +156,10 @@  <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> - <exclusion> <groupId>org.jboss.as</groupId> <artifactId>jboss-as-controller-client</artifactId> </exclusion> @@ -184,7 +176,7 @@ <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss710</artifactId> + <artifactId>jbossws-jboss711</artifactId> <scope>provided</scope> <exclusions> <exclusion> @@ -204,7 +196,7 @@ <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss711</artifactId> + <artifactId>jbossws-jboss712</artifactId> <scope>provided</scope> <exclusions> <exclusion> @@ -271,18 +263,18 @@ <configuration> <target> <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-jboss702.txt"> - <param name="targetName" expression="jboss702" /> - </xslt> <xslt style="${basedir}/src/main/distro/test-exclude.xsl" in="../testsuite/pom.xml" out="${basedir}/target/exclude-file/test-excludes-jboss710.txt"> <param name="targetName" expression="jboss710" /> - </xslt> + </xslt> <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> <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> + </xslt> + <xslt style="${basedir}/src/main/distro/test-exclude.xsl" in="../testsuite/pom.xml" out="${basedir}/target/exclude-file/test-excludes-jboss720.txt"> + <param name="targetName" expression="jboss720" /> + </xslt> </target> </configuration> <goals> @@ -311,19 +303,19 @@  <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> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss711</artifactId> + <artifactId>jbossws-jboss720</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-05-10 12:47:58 UTC (rev 16250) +++ stack/cxf/trunk/modules/dist/src/main/distro/Install.txt 2012-05-10 14:06:18 UTC (rev 16251) @@ -13,16 +13,16 @@ 2.) Modify the target container location in ant.properties 3.) Execute one of the following - ant deploy-jboss702 ant deploy-jboss710 ant deploy-jboss711 ant deploy-jboss712 + ant deploy-jboss720 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-jboss711 + ant -Dspring=true deploy-jboss712 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-05-10 12:47:58 UTC (rev 16250) +++ stack/cxf/trunk/modules/dist/src/main/distro/ant.properties.example 2012-05-10 14:06:18 UTC (rev 16251) @@ -3,13 +3,13 @@ # # Optional JBoss Home -jboss702.home=(a)jboss702.home@ jboss710.home=(a)jboss710.home@ jboss711.home=(a)jboss711.home@ jboss712.home=(a)jboss712.home@ +jboss720.home=(a)jboss720.home@ -# The JBoss server under test. This can be [jboss702|jboss710|jboss711|jboss712] -jbossws.integration.target=jboss711 +# The JBoss server under test. This can be [jboss710|jboss711|jboss712|jboss720] +jbossws.integration.target=jboss712 # The JBoss settings jboss.bind.address=localhost @@ -18,10 +18,6 @@ jbossws.deployer.authentication.username=admin jbossws.deployer.authentication.password=admin -# JBoss JMX invoker authentication (AS 7.0.x) -#jmx.authentication.username=admin -#jmx.authentication.password=admin - # Java Compiler options javac.debug=yes javac.deprecation=no Modified: stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml =================================================================== --- stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml 2012-05-10 12:47:58 UTC (rev 16250) +++ stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml 2012-05-10 14:06:18 UTC (rev 16251) @@ -25,57 +25,6 @@ <project>  -  -  - - <target name="deploy-structure-jboss70x" depends="prepare-deploy"> - <delete dir="${deploy.structure}"/> - - <path id="jbossws-common.path"> - <fileset dir="${deploy.artifacts.dir}"> - <include name="**/jbossws-common-tools.jar"/> - </fileset> - </path> - <taskdef name="installModules" classname="org.jboss.ws.tools.ant.InstallModulesTask" classpathref="jbossws-common.path"/> - - <antcall target="deploy-jbossws-cxf-modules" inheritall="false"> - <param name="installserver" value="${deploy.structure}"/> - <param name="thirdpartydir" value="${deploy.artifacts.dir}"/> - <param name="jbossid" value="${jbossws.integration.target}"/> - <param name="modules-jbossid" value="jboss700"/> - </antcall> - </target> - -  -  -  - - <target name="target-jboss702"> - <property name="jbossws.integration.target" value="jboss702"/> - <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/> - </target> - - <target name="deploy-jboss702" depends="undeploy-jboss702,deploy-structure-jboss70x,check-spring,install-spring-module70x" description="Deploy jbossws to jboss702"> - <fail message="Not available: ${jboss702.available.file}" unless="jboss702.available"/> - <copy todir="${jboss702.home}" overwrite="true" verbose="true"> - <fileset dir="${deploy.structure}"> - <exclude name="**/jboss/as/webservices/**/module.xml"/> - </fileset> - </copy> -  - <installModules targetDir="${jboss702.home}/modules"> - <fileset dir="${deploy.structure}/modules"> - <include name="**/jboss/as/webservices/**/module.xml"/> - </fileset> - </installModules> - </target> - - <target name="undeploy-jboss702" depends="target-jboss702,init" description="Remove jbossws from jboss702"> - <fail message="Not available: ${jboss702.available.file}" unless="jboss702.available"/> - <macro-undeploy-jbossws-modules targetdir="${jboss702.home}" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="true"/> - </target> - -    @@ -185,6 +134,57 @@ </target>  +  +  + + <target name="deploy-structure-jboss72x" depends="prepare-deploy"> + <delete dir="${deploy.structure}"/> + + <path id="jbossws-common.path"> + <fileset dir="${deploy.artifacts.dir}"> + <include name="**/jbossws-common-tools.jar"/> + </fileset> + </path> + <taskdef name="installModules" classname="org.jboss.ws.tools.ant.InstallModulesTask" classpathref="jbossws-common.path"/> + + <antcall target="deploy-jbossws-cxf-modules" inheritall="false"> + <param name="installserver" value="${deploy.structure}"/> + <param name="thirdpartydir" value="${deploy.artifacts.dir}"/> + <param name="jbossid" value="${jbossws.integration.target}"/> + <param name="modules-jbossid" value="jboss720"/> + </antcall> + </target> + +  +  +  + + <target name="target-jboss720"> + <property name="jbossws.integration.target" value="jboss720"/> + <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/> + </target> + + <target name="deploy-jboss720" depends="undeploy-jboss720,deploy-structure-jboss72x,check-spring,install-spring-module72x" description="Deploy jbossws to jboss720"> + <fail message="Not available: ${jboss720.available.file}" unless="jboss720.available"/> + <copy todir="${jboss720.home}" overwrite="true" verbose="true"> + <fileset dir="${deploy.structure}"> + <exclude name="**/jboss/as/webservices/**/module.xml"/> + </fileset> + </copy> +  + <installModules targetDir="${jboss720.home}/modules"> + <fileset dir="${deploy.structure}/modules"> + <include name="**/jboss/as/webservices/**/module.xml"/> + </fileset> + </installModules> + </target> + + <target name="undeploy-jboss720" depends="target-jboss720,init" description="Remove jbossws from jboss720"> + <fail message="Not available: ${jboss720.available.file}" unless="jboss720.available"/> + <macro-undeploy-jbossws-modules targetdir="${jboss720.home}" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="false"/> + </target> + +    <target name="check-spring"> @@ -195,19 +195,19 @@ </condition> </target> - <target name="install-spring-module70x" if="spring-required"> + <target name="install-spring-module71x" if="spring-required"> <antcall target="deploy-spring-module" inheritall="false"> <param name="installserver" value="${deploy.structure}"/> <param name="thirdpartydir" value="${deploy.artifacts.dir}"/> - <param name="modules-jbossid" value="jboss700"/> + <param name="modules-jbossid" value="jboss710"/> </antcall> </target> - <target name="install-spring-module71x" if="spring-required"> + <target name="install-spring-module72x" if="spring-required"> <antcall target="deploy-spring-module" inheritall="false"> <param name="installserver" value="${deploy.structure}"/> <param name="thirdpartydir" value="${deploy.artifacts.dir}"/> - <param name="modules-jbossid" value="jboss710"/> + <param name="modules-jbossid" value="jboss720"/> </antcall> </target> Modified: stack/cxf/trunk/modules/dist/src/main/distro/build-setup.xml =================================================================== --- stack/cxf/trunk/modules/dist/src/main/distro/build-setup.xml 2012-05-10 12:47:58 UTC (rev 16250) +++ stack/cxf/trunk/modules/dist/src/main/distro/build-setup.xml 2012-05-10 14:06:18 UTC (rev 16251) @@ -33,18 +33,15 @@  <property file="${target.properties.file}"/> - <property name="jboss700.modules" value="${jboss700.home}/modules"/> - <property name="jboss710.modules" value="${jboss710.home}/modules"/> - - <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"/> + <property name="jboss720.available.file" value="${jboss720.home}/jboss-modules.jar"/> - <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}"/> + <available property="jboss720.available" file="${jboss720.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-05-10 12:47:58 UTC (rev 16250) +++ stack/cxf/trunk/modules/dist/src/main/distro/build.xml 2012-05-10 14:06:18 UTC (rev 16251) @@ -57,19 +57,20 @@ <fail message="jbossws.integration.target not set" unless="jbossws.integration.target"/> <echo message="integration.target=${jbossws.integration.target}"/> - <condition property="jbossws.integration.jboss700" value="true"> + <condition property="jbossws.integration.jboss71x" value="true"> <or> - <equals arg1="${jbossws.integration.target}" arg2="jboss702"/> - </or> - </condition> - <condition property="jbossws.integration.jboss710" value="true"> - <or> <equals arg1="${jbossws.integration.target}" arg2="jboss710"/> <equals arg1="${jbossws.integration.target}" arg2="jboss711"/> <equals arg1="${jbossws.integration.target}" arg2="jboss712"/> </or> </condition> + <condition property="jbossws.integration.jboss72x" value="true"> + <or> + <equals arg1="${jbossws.integration.target}" arg2="jboss720"/> + </or> + </condition> + <property name="deploy.structure" value="${output.dir}/deploy-${jbossws.integration.target}"/> <property name="excludesfile" value="${tests.dir}/resources/test-excludes-${jbossws.integration.target}.txt"/> </target> Modified: stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-05-10 12:47:58 UTC (rev 16250) +++ stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-05-10 14:06:18 UTC (rev 16251) @@ -85,7 +85,6 @@ <include>org.opensaml:xmltooling:jar</include> <include>org.jboss.ws:jbossws-common-tools:jar</include> <include>org.jboss.ws:jbossws-jboss*:jar</include> - <include>org.jboss.as:jboss-as-webservices-tests-integration:jar</include> </includes> <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping> <scope>provided</scope> @@ -126,16 +125,6 @@ <dependencySet> <outputDirectory>deploy-artifacts/lib</outputDirectory> - <unpack>false</unpack> - <includes> - <include>org.jboss.naming:jnp-client:jar</include> - </includes> - <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping> - <scope>test</scope> - <useProjectArtifact>false</useProjectArtifact> - </dependencySet> - <dependencySet> - <outputDirectory>deploy-artifacts/lib</outputDirectory> <unpack>false</unpack> <outputFileNameMapping>wstx.jar</outputFileNameMapping> <includes> Modified: stack/cxf/trunk/modules/resources/pom.xml =================================================================== --- stack/cxf/trunk/modules/resources/pom.xml 2012-05-10 12:47:58 UTC (rev 16250) +++ stack/cxf/trunk/modules/resources/pom.xml 2012-05-10 14:06:18 UTC (rev 16251) @@ -51,15 +51,6 @@ <phase>package</phase> </execution> <execution> - <id>jboss702</id> - <goals><goal>jar</goal></goals> - <phase>package</phase> - <configuration> - <classifier>jboss702</classifier> - <classesDirectory>${project.build.directory}/classes/resources/jbossws-jboss702/jbossws.beans</classesDirectory> - </configuration> - </execution> - <execution> <id>jboss710</id> <goals><goal>jar</goal></goals> <phase>package</phase> @@ -86,6 +77,15 @@ <classesDirectory>${project.build.directory}/classes/resources/jbossws-jboss712/jbossws.beans</classesDirectory> </configuration> </execution> + <execution> + <id>jboss720</id> + <goals><goal>jar</goal></goals> + <phase>package</phase> + <configuration> + <classifier>jboss720</classifier> + <classesDirectory>${project.build.directory}/classes/resources/jbossws-jboss720/jbossws.beans</classesDirectory> + </configuration> + </execution> </executions> </plugin> </plugins> Added: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/apache/cxf/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/apache/cxf/main/module.xml (rev 0) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/apache/cxf/main/module.xml 2012-05-10 14:06:18 UTC (rev 16251) @@ -0,0 +1,57 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + +<module xmlns="urn:jboss:module:1.1" name="org.apache.cxf"> + + <resources> +  + </resources> + + <dependencies> + <module name="asm.asm" /> + <module name="javax.api" /> + <module name="javax.annotation.api" /> + <module name="javax.jms.api" /> + <module name="javax.jws.api" /> + <module name="javax.mail.api" /> + <module name="javax.resource.api" /> + <module name="javax.servlet.api" /> + <module name="javax.wsdl4j.api" /> + <module name="javax.xml.bind.api" services="import"/> + <module name="com.sun.xml.bind" services="import"/> + <module name="javax.xml.soap.api" /> + <module name="javax.xml.stream.api" /> + <module name="javax.xml.ws.api" /> + <module name="org.apache.commons.lang" /> + <module name="org.apache.neethi" /> + <module name="org.apache.velocity" /> + <module name="org.apache.xml-resolver" /> + <module name="org.apache.ws.xmlschema" /> + <module name="org.apache.ws.security" /> + <module name="org.apache.santuario.xmlsec" /> + <module name="org.joda.time" /> + <module name="org.opensaml" /> + <module name="org.springframework.spring" optional="true"/> + </dependencies> +</module> Added: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/apache/neethi/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/apache/neethi/main/module.xml (rev 0) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/apache/neethi/main/module.xml 2012-05-10 14:06:18 UTC (rev 16251) @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + +<module xmlns="urn:jboss:module:1.1" name="org.apache.neethi"> + + <resources> +  + </resources> + + <dependencies> + <module name="javax.api"/> + <module name="javax.xml.stream.api" /> + </dependencies> +</module> Added: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/apache/santuario/xmlsec/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/apache/santuario/xmlsec/main/module.xml (rev 0) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/apache/santuario/xmlsec/main/module.xml 2012-05-10 14:06:18 UTC (rev 16251) @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + +<module xmlns="urn:jboss:module:1.1" name="org.apache.santuario.xmlsec"> + <properties> + <property name="jboss.api" value="private"/> + </properties> + + <resources> +  + </resources> + + <dependencies> + <module name="javax.api" /> + <module name="org.apache.commons.logging" /> + <module name="org.apache.xalan" /> + </dependencies> +</module> Added: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/apache/ws/security/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/apache/ws/security/main/module.xml (rev 0) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/apache/ws/security/main/module.xml 2012-05-10 14:06:18 UTC (rev 16251) @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + +<module xmlns="urn:jboss:module:1.1" name="org.apache.ws.security"> + + <resources> +  + </resources> + + <dependencies> + <module name="javax.api" /> + <module name="javax.xml.rpc.api" /> + <module name="org.apache.commons.logging" /> + <module name="org.apache.santuario.xmlsec" /> + <module name="org.apache.xalan" /> + <module name="org.joda.time" /> + <module name="org.opensaml" /> + </dependencies> +</module> Added: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/apache/ws/xmlschema/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/apache/ws/xmlschema/main/module.xml (rev 0) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/apache/ws/xmlschema/main/module.xml 2012-05-10 14:06:18 UTC (rev 16251) @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + +<module xmlns="urn:jboss:module:1.1" name="org.apache.ws.xmlschema"> + + <resources> +  + </resources> + + <dependencies> + <module name="javax.api" /> + </dependencies> +</module> Added: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/as/webservices/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/as/webservices/main/module.xml (rev 0) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/as/webservices/main/module.xml 2012-05-10 14:06:18 UTC (rev 16251) @@ -0,0 +1,61 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + +<module xmlns="urn:jboss:module:1.1" name="org.jboss.as.webservices"> + + <resources> +  + </resources> + + <dependencies> + <module name="javax.annotation.api"/> + <module name="javax.api"/> + <module name="javax.ejb.api"/> + <module name="javax.jws.api"/> + <module name="javax.servlet.api"/> + <module name="javax.xml.ws.api"/> + <module name="org.jboss.ejb3"/> + <module name="org.jboss.invocation"/> + <module name="org.jboss.jandex"/> + <module name="org.jboss.metadata"/> + <module name="org.jboss.staxmapper"/> + <module name="org.jboss.as.controller"/> + <module name="org.jboss.as.server"/> + <module name="org.jboss.as.ejb3"/> + <module name="org.jboss.as.ee"/> + <module name="org.jboss.as.naming"/> + <module name="org.jboss.as.security"/> + <module name="org.jboss.as.web"/> + <module name="org.jboss.threads"/> + <module name="org.jboss.modules"/> + <module name="org.jboss.msc"/> + <module name="org.jboss.vfs"/> + <module name="org.jboss.logging"/> + <module name="org.jboss.common-core" /> + <module name="org.jboss.ws.api" /> + <module name="org.jboss.ws.common" services="import" /> + <module name="org.jboss.ws.spi" /> + <module name="org.picketbox" /> + </dependencies> +</module> Added: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/as/webservices/server/integration/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/as/webservices/server/integration/main/module.xml (rev 0) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/as/webservices/server/integration/main/module.xml 2012-05-10 14:06:18 UTC (rev 16251) @@ -0,0 +1,87 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + +<module xmlns="urn:jboss:module:1.1" name="org.jboss.as.webservices.server.integration"> + + <resources> + </resources> + + <dependencies> + <module name="javax.api" export="true"/> + <module name="javax.jws.api" export="true"/> + <module name="javax.wsdl4j.api" export="true"/> + <module name="javax.xml.ws.api" export="true"/> + <module name="com.sun.xml.bind" services="export" export="true"/> + <module name="org.jboss.ws.api" export="true"/> + <module name="org.jboss.ws.spi" export="true"/> + <module name="org.jboss.ws.common" services="import" export="true"/> + <module name="org.jboss.ws.jaxws-client" services="export" export="true"> + <imports> + <include path="META-INF/cxf"/> + <include path="META-INF"/> + </imports> + <exports> + <include path="META-INF/cxf"/> + <include path="META-INF"/> + </exports> + </module> + <module name="org.jboss.ws.cxf.jbossws-cxf-factories" services="export" export="true"/> + <module name="org.jboss.ws.cxf.jbossws-cxf-transports-httpserver" export="true"> + <imports> + <include path="META-INF/cxf"/> + <include path="META-INF"/> + </imports> + <exports> + <include path="META-INF/cxf"/> + <include path="META-INF"/> + </exports> + </module> + <module name="org.jboss.ws.cxf.jbossws-cxf-server" services="export" export="true"/> +  + <module name="org.apache.cxf" export="true"> + <imports> + <include path="META-INF/cxf"/> + <include path="META-INF"/> + </imports> + <exports> + <include path="META-INF/cxf"/> + <include path="META-INF"/> + </exports> + </module> + <module name="org.apache.xalan" services="export" export="true"/> + <module name="org.apache.xerces" services="export" export="true"/> + <module name="org.jboss.as.webservices" services="export" export="true"/> + <module name="com.sun.xml.messaging.saaj" services="export" export="true"/> + <module name="org.apache.ws.security" export="true"/> + <module name="org.apache.santuario.xmlsec" export="true"/> + <module name="org.springframework.spring" optional="true" export="true"> + <imports> + <include path="META-INF"/> + </imports> + <exports> + <include path="META-INF"/> + </exports> + </module> + </dependencies> +</module> Added: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/as/webservices/server/jaxrpc-integration/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/as/webservices/server/jaxrpc-integration/main/module.xml (rev 0) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/as/webservices/server/jaxrpc-integration/main/module.xml 2012-05-10 14:06:18 UTC (rev 16251) @@ -0,0 +1,55 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + +<module xmlns="urn:jboss:module:1.1" name="org.jboss.as.webservices.server.jaxrpc-integration"> + + <resources> + </resources> + + <dependencies> + <module name="javax.api" export="true"/> + <module name="javax.xml.rpc.api" export="true"/> + <module name="javax.wsdl4j.api" export="true"/> + <module name="com.sun.xml.bind" services="export" export="true"/> + <module name="org.jboss.ws.api" export="true"/> + <module name="org.jboss.ws.spi" export="true"/> + <module name="org.jboss.ws.common" services="import" export="true"/> + <module name="org.jboss.ws.native.jbossws-native-core" services="export" export="true"> + <imports> + <include path="META-INF"/> + <include path="dtd"/> + <include path="schema"/> + </imports> + <exports> + <include path="META-INF"/> + <include path="dtd"/> + <include path="schema"/> + </exports> + </module> + <module name="org.jboss.ws.native.jbossws-native-services" services="export" export="true"/> + <module name="org.apache.xalan" services="export" export="true"/> + <module name="org.apache.xerces" services="export" export="true"/> + <module name="org.jboss.as.webservices" services="export" export="true"/> + </dependencies> +</module> Added: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/api/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/api/main/module.xml (rev 0) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/api/main/module.xml 2012-05-10 14:06:18 UTC (rev 16251) @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + +<module xmlns="urn:jboss:module:1.1" name="org.jboss.ws.api"> + + <resources> +  + </resources> + + <dependencies> + <module name="javax.api"/> + <module name="javax.xml.soap.api"/> + <module name="javax.xml.ws.api"/> + <module name="org.jboss.logging"/> + <module name="org.jboss.modules"/> + </dependencies> + +</module> Added: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/common/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/common/main/module.xml (rev 0) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/common/main/module.xml 2012-05-10 14:06:18 UTC (rev 16251) @@ -0,0 +1,48 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + +<module xmlns="urn:jboss:module:1.1" name="org.jboss.ws.common"> + + <resources> +  + </resources> + + <dependencies> + <module name="javax.api"/> + <module name="javax.annotation.api"/> + <module name="javax.xml.stream.api"/> + <module name="javax.ejb.api"/> + <module name="javax.jws.api"/> + <module name="javax.servlet.api"/> + <module name="javax.wsdl4j.api" /> + <module name="javax.xml.ws.api"/> + <module name="org.jboss.ws.api"/> + <module name="org.jboss.ws.spi"/> + <module name="org.jboss.logging"/> + <module name="org.jboss.common-core"/> + <module name="org.apache.xerces" services="import"/> + <module name="org.jboss.jaxbintros"/> + </dependencies> + +</module> Added: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/cxf/jbossws-cxf-client/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/cxf/jbossws-cxf-client/main/module.xml (rev 0) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/cxf/jbossws-cxf-client/main/module.xml 2012-05-10 14:06:18 UTC (rev 16251) @@ -0,0 +1,49 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + +<module xmlns="urn:jboss:module:1.1" name="org.jboss.ws.cxf.jbossws-cxf-client"> + + <resources> +  + </resources> + + <dependencies> +  + <module name="javax.xml.bind.api" export="true"/> + <module name="com.sun.xml.bind" export="true" services="export"/> + <module name="javax.xml.ws.api" /> +  + <module name="javax.wsdl4j.api" export="true"/> +  + <module name="org.jboss.ws.api" export="true" /> +  + <module name="org.jboss.ws.jaxws-client" export="true" services="export" /> +  + <module name="org.jboss.ws.cxf.jbossws-cxf-factories" services="export" /> +  + <module name="org.apache.cxf" export="true" /> + <module name="org.jboss.ws.cxf.jbossws-cxf-transports-httpserver" export="true" services="export" /> + <module name="org.jboss.jaxbintros" export="true"/> + </dependencies> +</module> Added: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/cxf/jbossws-cxf-factories/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/cxf/jbossws-cxf-factories/main/module.xml (rev 0) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/cxf/jbossws-cxf-factories/main/module.xml 2012-05-10 14:06:18 UTC (rev 16251) @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + +<module xmlns="urn:jboss:module:1.1" name="org.jboss.ws.cxf.jbossws-cxf-factories"> + + <resources> +  + </resources> + + <dependencies> + + </dependencies> +</module> Added: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml (rev 0) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml 2012-05-10 14:06:18 UTC (rev 16251) @@ -0,0 +1,63 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + +<module xmlns="urn:jboss:module:1.1" name="org.jboss.ws.cxf.jbossws-cxf-server"> + + <resources> +  + </resources> + + <dependencies> + <module name="javax.api" /> + <module name="javax.servlet.api" /> + <module name="javax.jws.api" /> + <module name="javax.wsdl4j.api" /> + <module name="javax.xml.bind.api" /> + <module name="javax.xml.stream.api" /> + <module name="javax.xml.ws.api" /> + <module name="org.jboss.ws.api" /> + <module name="org.jboss.ws.spi" /> + <module name="org.jboss.ws.common" /> + <module name="org.jboss.ws.jaxws-client" /> + <module name="org.jboss.ws.cxf.jbossws-cxf-factories" services="import"/> +  + <module name="org.apache.cxf"> + <imports> + <include path="META-INF/cxf"/>  + <include path="META-INF/"/> + </imports> + </module> + <module name="org.jboss.ws.cxf.jbossws-cxf-transports-httpserver" services="import"> + <imports> + <include path="META-INF/cxf"/>  + <include path="META-INF/"/> + </imports> + </module> + <module name="org.jboss.common-core" /> + <module name="org.jboss.logging" /> + <module name="org.apache.ws.security" /> + <module name="org.picketbox" /> + <module name="org.springframework.spring" optional="true" /> + </dependencies> +</module> Added: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/cxf/jbossws-cxf-transports-httpserver/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/cxf/jbossws-cxf-transports-httpserver/main/module.xml (rev 0) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/cxf/jbossws-cxf-transports-httpserver/main/module.xml 2012-05-10 14:06:18 UTC (rev 16251) @@ -0,0 +1,45 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + +<module xmlns="urn:jboss:module:1.1" name="org.jboss.ws.cxf.jbossws-cxf-transports-httpserver"> + + <resources> +  + </resources> + + <dependencies> + <module name="org.jboss.ws.spi" /> + <module name="org.jboss.ws.common" /> + <module name="javax.annotation.api" /> + <module name="javax.xml.ws.api" /> + <module name="org.jboss.ws.jaxws-jboss-httpserver-httpspi" /> + <module name="org.apache.cxf" services="import"> + <imports> + <include path="META-INF/cxf"/>  + <include path="META-INF/"/> + </imports> + </module> + <module name="org.jboss.com.sun.httpserver"/> + </dependencies> +</module> Added: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/jaxws-client/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/jaxws-client/main/module.xml (rev 0) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/jaxws-client/main/module.xml 2012-05-10 14:06:18 UTC (rev 16251) @@ -0,0 +1,59 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + +<module xmlns="urn:jboss:module:1.1" name="org.jboss.ws.jaxws-client"> + + <resources> +  + </resources> + + <dependencies> + <module name="javax.api" /> + <module name="javax.xml.bind.api" /> + <module name="com.sun.xml.bind" services="import"/> + <module name="javax.xml.ws.api" /> + <module name="org.jboss.ws.api" /> + <module name="org.jboss.ws.spi" /> + <module name="org.jboss.ws.common" /> + <module name="org.jboss.ws.cxf.jbossws-cxf-factories" services="import"/> +  + <module name="org.apache.cxf"> + <imports> + <include path="META-INF/cxf"/>  + <include path="META-INF/"/> + </imports> + </module> + <module name="org.jboss.ws.cxf.jbossws-cxf-transports-httpserver" services="import"> + <imports> + <include path="META-INF/cxf"/>  + <include path="META-INF/"/> + </imports> + </module> + <module name="org.apache.log4j" /> + <module name="org.apache.neethi" /> + <module name="org.jboss.logging" /> + <module name="org.springframework.spring" optional="true" /> + <module name="javax.wsdl4j.api" /> + </dependencies> +</module> Added: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/jaxws-jboss-httpserver-httpspi/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/jaxws-jboss-httpserver-httpspi/main/module.xml (rev 0) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/jaxws-jboss-httpserver-httpspi/main/module.xml 2012-05-10 14:06:18 UTC (rev 16251) @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + +<module xmlns="urn:jboss:module:1.1" name="org.jboss.ws.jaxws-jboss-httpserver-httpspi"> + + <resources> +  + </resources> + + <dependencies> + <module name="javax.xml.ws.api" /> + <module name="org.jboss.com.sun.httpserver"/> + </dependencies> +</module> Added: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/native/jbossws-native-core/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/native/jbossws-native-core/main/module.xml (rev 0) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/native/jbossws-native-core/main/module.xml 2012-05-10 14:06:18 UTC (rev 16251) @@ -0,0 +1,49 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + +<module xmlns="urn:jboss:module:1.1" name="org.jboss.ws.native.jbossws-native-core"> + + <resources> +  + </resources> + + <dependencies> + <module name="javax.api" /> + <module name="javax.servlet.api" /> + <module name="javax.mail.api" /> + <module name="javax.wsdl4j.api" /> + <module name="javax.xml.stream.api" /> + <module name="javax.xml.rpc.api" /> + <module name="org.apache.xerces" services="import"/> + <module name="org.javassist" /> + <module name="org.jboss.netty" /> + <module name="org.jboss.xb" /> + <module name="org.jboss.ws.api" /> + <module name="org.jboss.ws.spi" /> + <module name="org.jboss.ws.common" /> + <module name="org.jboss.ws.native.jbossws-native-services" services="import"/> + <module name="org.jboss.common-core" /> + <module name="org.jboss.logging" /> + </dependencies> +</module> Added: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/native/jbossws-native-services/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/native/jbossws-native-services/main/module.xml (rev 0) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/native/jbossws-native-services/main/module.xml 2012-05-10 14:06:18 UTC (rev 16251) @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + +<module xmlns="urn:jboss:module:1.1" name="org.jboss.ws.native.jbossws-native-services"> + + <resources> +  + </resources> + + <dependencies> + + </dependencies> +</module> Added: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/saaj-impl/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/saaj-impl/main/module.xml (rev 0) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/saaj-impl/main/module.xml 2012-05-10 14:06:18 UTC (rev 16251) @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + +<module xmlns="urn:jboss:module:1.1" name="org.jboss.ws.saaj-impl"> + + <resources> +  + </resources> + + <dependencies> + <module name="com.sun.xml.messaging.saaj" services="import"/> + </dependencies> + +</module> Added: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/spi/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/spi/main/module.xml (rev 0) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/spi/main/module.xml 2012-05-10 14:06:18 UTC (rev 16251) @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + +<module xmlns="urn:jboss:module:1.1" name="org.jboss.ws.spi"> + + <resources> +  + </resources> + + <dependencies> + <module name="javax.api"/> + <module name="javax.servlet.api"/> + <module name="javax.xml.stream.api"/> + <module name="javax.xml.ws.api"/> + <module name="org.jboss.logging"/> + <module name="org.jboss.ws.api"/> + <module name="org.jboss.as.webservices"/> + </dependencies> +</module> Added: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/tools/common/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/tools/common/main/module.xml (rev 0) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/tools/common/main/module.xml 2012-05-10 14:06:18 UTC (rev 16251) @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + +<module xmlns="urn:jboss:module:1.1" name="org.jboss.ws.tools.common"> + + <resources> +  + </resources> + + <dependencies> + <module name="gnu.getopt"/> + <module name="org.apache.log4j"/> + <module name="org.jboss.as.webservices.server.integration" services="import"> + <imports> + <include path="META-INF"/> + <include path="META-INF/cxf"/> + </imports> + </module> + </dependencies> + +</module> Added: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/tools/wsconsume/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/tools/wsconsume/main/module.xml (rev 0) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/tools/wsconsume/main/module.xml 2012-05-10 14:06:18 UTC (rev 16251) @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + +<module xmlns="urn:jboss:module:1.1" name="org.jboss.ws.tools.wsconsume"> + + <main-class name="org.jboss.ws.tools.cmd.WSConsume"/> + + <dependencies> + <module name="org.jboss.ws.tools.common"/> + </dependencies> + +</module> Added: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/tools/wsprovide/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/tools/wsprovide/main/module.xml (rev 0) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/tools/wsprovide/main/module.xml 2012-05-10 14:06:18 UTC (rev 16251) @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + +<module xmlns="urn:jboss:module:1.1" name="org.jboss.ws.tools.wsprovide"> + + <main-class name="org.jboss.ws.tools.cmd.WSProvide"/> + + <dependencies> + <module name="org.jboss.ws.tools.common"/> + </dependencies> + +</module> Added: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/opensaml/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/opensaml/main/module.xml (rev 0) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/opensaml/main/module.xml 2012-05-10 14:06:18 UTC (rev 16251) @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + +<module xmlns="urn:jboss:module:1.1" name="org.opensaml"> + + <resources> +  + </resources> + + <dependencies> + <module name="javax.api"/> + <module name="org.slf4j"/> + <module name="org.apache.santuario.xmlsec"/> + <module name="org.joda.time"/> + </dependencies> +</module> Added: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/springframework/spring/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/springframework/spring/main/module.xml (rev 0) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/springframework/spring/main/module.xml 2012-05-10 14:06:18 UTC (rev 16251) @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + +<module xmlns="urn:jboss:module:1.1" name="org.springframework.spring"> + + <resources> +  + </resources> + + <dependencies> + <module name="javax.api" /> + <module name="javax.jms.api" /> + <module name="javax.annotation.api" /> + <module name="org.apache.commons.logging" /> + <module name="org.jboss.vfs" /> + </dependencies> +</module> 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-05-10 12:47:58 UTC (rev 16250) +++ stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2012-05-10 14:06:18 UTC (rev 16251) @@ -31,15 +31,6 @@ <copy file="${src.dir}/jbossws-cxf-config-as7.xml" - tofile="${dest.dir}/jbossws-jboss702/jbossws.beans/META-INF/stack-specific-deployment-aspects.xml" - /> - <copy - file="${src.dir}/jbossws-jaxrpc-config-as7.xml" - tofile="${dest.dir}/jbossws-jboss702/jbossws.beans/META-INF/jaxrpc-deployment-aspects.xml" - /> - - <copy - file="${src.dir}/jbossws-cxf-config-as7.xml" tofile="${dest.dir}/jbossws-jboss710/jbossws.beans/META-INF/stack-specific-deployment-aspects.xml" /> <copy @@ -65,6 +56,15 @@ tofile="${dest.dir}/jbossws-jboss712/jbossws.beans/META-INF/jaxrpc-deployment-aspects.xml" /> + <copy + file="${src.dir}/jbossws-cxf-config-as7.xml" + tofile="${dest.dir}/jbossws-jboss720/jbossws.beans/META-INF/stack-specific-deployment-aspects.xml" + /> + <copy + file="${src.dir}/jbossws-jaxrpc-config-as7.xml" + tofile="${dest.dir}/jbossws-jboss720/jbossws.beans/META-INF/jaxrpc-deployment-aspects.xml" + /> + </target> </project> Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/JMSEndpointOnlyDeploymentTestCaseForked.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/JMSEndpointOnlyDeploymentTestCaseForked.java 2012-05-10 12:47:58 UTC (rev 16250) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/JMSEndpointOnlyDeploymentTestCaseForked.java 2012-05-10 14:06:18 UTC (rev 16251) @@ -75,10 +75,6 @@ public void testJMSEndpointClientSide() 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; - } URL wsdlUrl = getResourceURL("jaxws/cxf/jms/META-INF-as7/wsdl/HelloWorldService.wsdl"); QName serviceName = new QName("http://org.jboss.ws/jaxws/cxf/jms", "HelloWorldService"); @@ -94,11 +90,6 @@ 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>" + Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/JMSHTTPEndpointDeploymentTestCaseForked.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/JMSHTTPEndpointDeploymentTestCaseForked.java 2012-05-10 12:47:58 UTC (rev 16250) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/JMSHTTPEndpointDeploymentTestCaseForked.java 2012-05-10 14:06:18 UTC (rev 16251) @@ -62,11 +62,6 @@ public void testJMSEndpointClientSide() 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; - } - URL wsdlUrl = getResourceURL("jaxws/cxf/jms_http/WEB-INF/wsdl/HelloWorldService.wsdl"); QName serviceName = new QName("http://org.jboss.ws/jaxws/cxf/jms", "HelloWorldService"); Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/EJB3ClientBusTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/EJB3ClientBusTestCase.java 2012-05-10 12:47:58 UTC (rev 16250) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/EJB3ClientBusTestCase.java 2012-05-10 14:06:18 UTC (rev 16251) @@ -55,9 +55,7 @@ ejb3Remote.testBusCreation(); ejb3Remote.testSOAPConnection(host); ejb3Remote.testWebServiceClient(host); - if (!isTargetJBoss70()) { - ejb3Remote.testWebServiceRef(); - } + ejb3Remote.testWebServiceRef(); } finally { Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/ServletClientBusTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/ServletClientBusTestCase.java 2012-05-10 12:47:58 UTC (rev 16250) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/ServletClientBusTestCase.java 2012-05-10 14:06:18 UTC (rev 16251) @@ -63,12 +63,10 @@ retStr = br.readLine(); assertEquals("OK testSOAPConnection", retStr); - if (!isTargetJBoss70()) { - url = new URL(TARGET_ENDPOINT_ADDRESS + "?method=testWebServiceRef"); - br = new BufferedReader(new InputStreamReader(url.openStream())); - retStr = br.readLine(); - assertEquals("OK testWebServiceRef", retStr); - } + url = new URL(TARGET_ENDPOINT_ADDRESS + "?method=testWebServiceRef"); + br = new BufferedReader(new InputStreamReader(url.openStream())); + retStr = br.readLine(); + assertEquals("OK testWebServiceRef", retStr); url = new URL(TARGET_ENDPOINT_ADDRESS + "?method=testWebServiceClient&host=" + getServerHost()); br = new BufferedReader(new InputStreamReader(url.openStream())); Modified: stack/cxf/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/pom.xml 2012-05-10 12:47:58 UTC (rev 16250) +++ stack/cxf/trunk/modules/testsuite/pom.xml 2012-05-10 14:06:18 UTC (rev 16251) @@ -26,7 +26,6 @@ <wsdl.publish.location>${project.build.directory}/wsdl-publish</wsdl.publish.location> <log4j.output.dir>${project.build.directory}</log4j.output.dir> <appclient.output.dir>${project.build.directory}/appclient-logs</appclient.output.dir> - <org.littleshoot.littleproxy.version>0.4</org.littleshoot.littleproxy.version> <org.slf4j.version>1.6.1</org.slf4j.version> <gnu.getopt.version>1.0.13</gnu.getopt.version> @@ -581,38 +580,63 @@ </dependency> </dependencies> </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.ws</groupId> - <artifactId>jbossws-jboss702</artifactId> + <artifactId>jbossws-jboss710</artifactId> <classifier>tests-integration</classifier> + <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> @@ -622,6 +646,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> @@ -639,11 +738,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> @@ -655,7 +751,7 @@ <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> <excludes>  <exclude>org/jboss/test/ws/jaxws/samples/wssePolicy/UsernameTestCase.*</exclude> @@ -667,9 +763,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> @@ -679,82 +772,27 @@  <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/wsse/policy/trust/WSTrustPicketLinkTestCase*</exclude> + <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/trust/PicketLinkSTService*</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> - -  - <exclude>org/jboss/test/ws/jaxws/cxf/spring/ClientSpringAppTestCase*</exclude> - -  - <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustPicketLinkTestCase*</exclude> - <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/trust/PicketLinkSTService*</exclude> -  - <exclude>org/jboss/test/ws/jaxws/jbws2259/**</exclude> <exclude>org/jboss/test/ws/jaxws/jbws2978/**</exclude> <exclude>org/jboss/test/ws/jaxws/jbws3124/**</exclude> </excludes> @@ -765,19 +803,19 @@ </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> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss710</artifactId> + <artifactId>jbossws-jboss711</artifactId> <classifier>tests-integration</classifier> <exclusions> <exclusion> @@ -788,16 +826,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> @@ -881,27 +928,27 @@ </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> <groupId>org.hornetq</groupId> <artifactId>hornetq-jms</artifactId> - <version>2.2.11.Final</version> + <version>2.2.13.Final</version> <scope>test</scope> </dependency> <dependency> <groupId>org.hornetq</groupId> <artifactId>hornetq-core</artifactId> - <version>2.2.11.Final</version> + <version>2.2.13.Final</version> <scope>test</scope> </dependency> </dependencies> @@ -921,8 +968,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> @@ -955,9 +1000,6 @@  <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> @@ -968,13 +1010,6 @@  <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> -  <exclude>org/jboss/test/ws/jaxws/jbws2978/**</exclude> <exclude>org/jboss/test/ws/jaxws/jbws3124/**</exclude> @@ -986,20 +1021,20 @@ </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> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss711</artifactId> - <classifier>tests-integration</classifier> + <groupId>org.jboss.as</groupId> + <artifactId>jboss-as-webservices-tests-integration</artifactId> + <version>${jboss.version}</version> <exclusions> <exclusion> <groupId>org.jboss.as</groupId> @@ -1018,7 +1053,7 @@ <dependency> <groupId>org.jboss</groupId> <artifactId>jboss-remote-naming</artifactId> - <version>1.0.2.Final</version> + <version>1.0.3.Final</version> </dependency> <dependency> <groupId>javax.mail</groupId> @@ -1027,7 +1062,7 @@ <dependency> <groupId>org.jboss</groupId> <artifactId>jboss-ejb-client</artifactId> - <version>1.0.4.Final</version> + <version>1.0.10.Final</version> <exclusions> <exclusion> <groupId>org.jboss.remoting3</groupId> @@ -1113,25 +1148,25 @@ <dependency> <groupId>org.jboss.remotingjmx</groupId> <artifactId>remoting-jmx</artifactId> - <version>1.0.2.Final</version> + <version>1.0.3.Final</version> <scope>test</scope> </dependency> <dependency> <groupId>org.jboss.remoting3</groupId> <artifactId>jboss-remoting</artifactId> - <version>3.2.2.GA</version> + <version>3.2.7.GA</version> <scope>test</scope> </dependency> <dependency> <groupId>org.hornetq</groupId> <artifactId>hornetq-jms</artifactId> - <version>2.2.13.Final</version> + <version>2.2.16.Final</version> <scope>test</scope> </dependency> <dependency> <groupId>org.hornetq</groupId> <artifactId>hornetq-core</artifactId> - <version>2.2.13.Final</version> + <version>2.2.16.Final</version> <scope>test</scope> </dependency> </dependencies> @@ -1186,9 +1221,12 @@  <exclude>org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationCustomFileTestCase*</exclude> +  + <exclude>org/jboss/test/ws/jaxws/cxf/jms/**</exclude> + <exclude>org/jboss/test/ws/jaxws/cxf/jms_http/**</exclude> +  <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustPicketLinkTestCase*</exclude> - <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/trust/PicketLinkSTService*</exclude>  <exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude> @@ -1204,14 +1242,14 @@ </profile>  <profile> - <id>jboss712</id> + <id>jboss720</id> <properties> - <jboss.version>${jboss712.version}</jboss.version> - <jbossws.integration.target>jboss712</jbossws.integration.target> + <jboss.version>${jboss720.version}</jboss.version> + <jbossws.integration.target>jboss720</jbossws.integration.target> </properties> <dependencies> <dependency> @@ -1407,7 +1445,7 @@  <exclude>org/jboss/test/ws/jaxws/cxf/jms/**</exclude> <exclude>org/jboss/test/ws/jaxws/cxf/jms_http/**</exclude> - +  <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustPicketLinkTestCase*</exclude> @@ -1423,7 +1461,7 @@ </plugins> </build> </profile> - +  + +<server xmlns="urn:jboss:domain:1.3"> + + <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-05-10 12:47:58 UTC (rev 16250) +++ stack/cxf/trunk/pom.xml 2012-05-10 14:06:18 UTC (rev 16251) @@ -64,14 +64,14 @@ <jbossws.common.version>2.1.0-SNAPSHOT</jbossws.common.version> <jbossws.common.tools.version>1.1.0-SNAPSHOT</jbossws.common.tools.version> <jbossws.shared.testsuite.version>4.1.0-SNAPSHOT</jbossws.shared.testsuite.version> - <jbossws.jboss702.version>4.1.0-SNAPSHOT</jbossws.jboss702.version> <jbossws.jboss710.version>4.1.0-SNAPSHOT</jbossws.jboss710.version> <jbossws.jboss711.version>4.1.0-SNAPSHOT</jbossws.jboss711.version> + <jbossws.jboss712.version>4.1.0-SNAPSHOT</jbossws.jboss712.version> <jbossws.native.version>4.1.0-SNAPSHOT</jbossws.native.version> - <jboss702.version>7.0.2.Final</jboss702.version> <jboss710.version>7.1.0.Final</jboss710.version> <jboss711.version>7.1.1.Final</jboss711.version> - <jboss712.version>7.1.2.Final-SNAPSHOT</jboss712.version> + <jboss712.version>7.1.2.Final</jboss712.version> + <jboss720.version>7.2.0.Alpha1-SNAPSHOT</jboss720.version> <ejb.api.version>1.0.1.Final</ejb.api.version> <cxf.version>2.5.3</cxf.version> <cxf.asm.version>3.3.1</cxf.asm.version> @@ -153,17 +153,6 @@ </dependency> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss702</artifactId> - <version>${jbossws.jboss702.version}</version> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss702</artifactId> - <version>${jbossws.jboss702.version}</version> - <classifier>tests-integration</classifier> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss710</artifactId> <version>${jbossws.jboss710.version}</version> </dependency> @@ -185,9 +174,20 @@ <classifier>tests-integration</classifier> </dependency> <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss712</artifactId> + <version>${jbossws.jboss712.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss712</artifactId> + <version>${jbossws.jboss712.version}</version> + <classifier>tests-integration</classifier> + </dependency> + <dependency> <groupId>org.jboss.as</groupId> <artifactId>jboss-as-webservices-tests-integration</artifactId> - <version>${jboss712.version}</version> + <version>${jboss720.version}</version> </dependency> <dependency> <groupId>org.jboss.ws.projects</groupId> @@ -1363,18 +1363,6 @@ </profile>  - <profile> - <id>jboss702</id> - <properties> - <jbossws.integration.target>jboss702</jbossws.integration.target> - <jboss.home>${jboss702.home}</jboss.home> - </properties> - </profile> - -  @@ -1411,6 +1399,18 @@ </profile>  + <profile> + <id>jboss720</id> + <properties> + <jbossws.integration.target>jboss720</jbossws.integration.target> + <jboss.home>${jboss720.home}</jboss.home> + </properties> + </profile> + +

12 years, 8 months

1
0
0 / 0

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

by jbossws-commits＠lists.jboss.org

Author: ropalka Date: 2012-05-10 08:47:58 -0400 (Thu, 10 May 2012) New Revision: 16250 Added: stack/native/trunk/modules/resources/src/main/resources/modules/jboss712/ stack/native/trunk/modules/resources/src/main/resources/modules/jboss712/org/ stack/native/trunk/modules/resources/src/main/resources/modules/jboss712/org/jboss/ stack/native/trunk/modules/resources/src/main/resources/modules/jboss712/org/jboss/as/ stack/native/trunk/modules/resources/src/main/resources/modules/jboss712/org/jboss/as/webservices/ stack/native/trunk/modules/resources/src/main/resources/modules/jboss712/org/jboss/as/webservices/main/ stack/native/trunk/modules/resources/src/main/resources/modules/jboss712/org/jboss/as/webservices/main/module.xml stack/native/trunk/modules/resources/src/main/resources/modules/jboss712/org/jboss/as/webservices/server/ stack/native/trunk/modules/resources/src/main/resources/modules/jboss712/org/jboss/as/webservices/server/integration/ stack/native/trunk/modules/resources/src/main/resources/modules/jboss712/org/jboss/as/webservices/server/integration/main/ stack/native/trunk/modules/resources/src/main/resources/modules/jboss712/org/jboss/as/webservices/server/integration/main/module.xml stack/native/trunk/modules/resources/src/main/resources/modules/jboss712/org/jboss/ws/ stack/native/trunk/modules/resources/src/main/resources/modules/jboss712/org/jboss/ws/api/ stack/native/trunk/modules/resources/src/main/resources/modules/jboss712/org/jboss/ws/api/main/ stack/native/trunk/modules/resources/src/main/resources/modules/jboss712/org/jboss/ws/api/main/module.xml stack/native/trunk/modules/resources/src/main/resources/modules/jboss712/org/jboss/ws/common/ stack/native/trunk/modules/resources/src/main/resources/modules/jboss712/org/jboss/ws/common/main/ stack/native/trunk/modules/resources/src/main/resources/modules/jboss712/org/jboss/ws/common/main/module.xml stack/native/trunk/modules/resources/src/main/resources/modules/jboss712/org/jboss/ws/native/ stack/native/trunk/modules/resources/src/main/resources/modules/jboss712/org/jboss/ws/native/jbossws-native-core/ stack/native/trunk/modules/resources/src/main/resources/modules/jboss712/org/jboss/ws/native/jbossws-native-core/main/ stack/native/trunk/modules/resources/src/main/resources/modules/jboss712/org/jboss/ws/native/jbossws-native-core/main/module.xml stack/native/trunk/modules/resources/src/main/resources/modules/jboss712/org/jboss/ws/native/jbossws-native-services/ stack/native/trunk/modules/resources/src/main/resources/modules/jboss712/org/jboss/ws/native/jbossws-native-services/main/ stack/native/trunk/modules/resources/src/main/resources/modules/jboss712/org/jboss/ws/native/jbossws-native-services/main/module.xml stack/native/trunk/modules/resources/src/main/resources/modules/jboss712/org/jboss/ws/spi/ stack/native/trunk/modules/resources/src/main/resources/modules/jboss712/org/jboss/ws/spi/main/ stack/native/trunk/modules/resources/src/main/resources/modules/jboss712/org/jboss/ws/spi/main/module.xml stack/native/trunk/modules/resources/src/main/resources/modules/jboss712/org/jboss/xb/ stack/native/trunk/modules/resources/src/main/resources/modules/jboss712/org/jboss/xb/main/ stack/native/trunk/modules/resources/src/main/resources/modules/jboss712/org/jboss/xb/main/module.xml stack/native/trunk/modules/resources/src/main/resources/modules/jboss720/ stack/native/trunk/modules/resources/src/main/resources/modules/jboss720/org/ stack/native/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ stack/native/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/as/ stack/native/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/as/webservices/ stack/native/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/as/webservices/main/ stack/native/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/as/webservices/main/module.xml stack/native/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/as/webservices/server/ stack/native/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/as/webservices/server/integration/ stack/native/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/as/webservices/server/integration/main/ stack/native/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/as/webservices/server/integration/main/module.xml stack/native/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/ stack/native/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/api/ stack/native/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/api/main/ stack/native/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/api/main/module.xml stack/native/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/common/ stack/native/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/common/main/ stack/native/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/common/main/module.xml stack/native/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/native/ stack/native/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/native/jbossws-native-core/ stack/native/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/native/jbossws-native-core/main/ stack/native/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/native/jbossws-native-core/main/module.xml stack/native/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/native/jbossws-native-services/ stack/native/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/native/jbossws-native-services/main/ stack/native/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/native/jbossws-native-services/main/module.xml stack/native/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/spi/ stack/native/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/spi/main/ stack/native/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/spi/main/module.xml stack/native/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/xb/ stack/native/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/xb/main/ stack/native/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/xb/main/module.xml stack/native/trunk/modules/testsuite/src/test/resources/jboss720/ stack/native/trunk/modules/testsuite/src/test/resources/jboss720/appclient-ws.xml Removed: stack/native/trunk/modules/resources/src/main/resources/modules/jboss710/ stack/native/trunk/modules/testsuite/src/test/resources/jboss711/ 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/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: [JBWS-3494] implementing AS720 support, dropping AS70x support Modified: stack/native/trunk/build.xml =================================================================== --- stack/native/trunk/build.xml 2012-05-10 12:35:25 UTC (rev 16249) +++ stack/native/trunk/build.xml 2012-05-10 12:47:58 UTC (rev 16250) @@ -65,29 +65,29 @@ <arg value="help:effective-settings"/> </exec> <xmlproperty file="${dist.output.dir}/effective-settings.xml" keeproot="false"/> - <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> + <condition property="jboss720.home" value="${profiles.profile.properties.jboss720.home}"> + <isset property="profiles.profile.properties.jboss720.home"/> + </condition> - <fail message="jboss home not set, use jboss711.home=value or jboss712.home=value to set"> + <fail message="jboss home not set, use jboss712.home=value or jboss720.home=value to set"> <condition> <and> <not> - <isset property="jboss711.home"/> + <isset property="jboss712.home"/> </not> <not> - <isset property="jboss712.home"/> + <isset property="jboss720.home"/> </not> </and> </condition> </fail> <echo/> - <echo message="jboss711.home=${jboss711.home}"/> <echo message="jboss712.home=${jboss712.home}"/> + <echo message="jboss720.home=${jboss720.home}"/> </target> <target name="init" depends="mvn-settings,prepare,os-init"> @@ -95,7 +95,7 @@ <xmlproperty file="${stack.dir}/pom.xml"/> <property name="version.id" value="${project.version}"/> - <echo message="java.version=${java.version}"/> + <echo message="java.version=${java.version}"/> <echo message="version.id=${version.id}"/> <echo message="integration.target=${jbossws.integration.target}"/> 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-05-10 12:35:25 UTC (rev 16249) +++ stack/native/trunk/modules/core/src/main/scripts/antrun-beans-config.xml 2012-05-10 12:47:58 UTC (rev 16250) @@ -31,12 +31,12 @@ <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" /> <copy file="${src.dir}/jbossws-native-config-as7.xml" - tofile="${dest.dir}/jbossws-jboss712/jbossws.beans/META-INF/stack-specific-deployment-aspects.xml" + tofile="${dest.dir}/jbossws-jboss720/jbossws.beans/META-INF/stack-specific-deployment-aspects.xml" /> </target> Modified: stack/native/trunk/modules/dist/pom.xml =================================================================== --- stack/native/trunk/modules/dist/pom.xml 2012-05-10 12:35:25 UTC (rev 16249) +++ stack/native/trunk/modules/dist/pom.xml 2012-05-10 12:47:58 UTC (rev 16250) @@ -33,14 +33,14 @@ <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native-resources</artifactId> <version>${project.version}</version> - <classifier>jboss711</classifier> + <classifier>jboss712</classifier> </dependency> <dependency> <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native-resources</artifactId> <version>${project.version}</version> - <classifier>jboss712</classifier> + <classifier>jboss720</classifier> </dependency> <dependency> @@ -63,7 +63,7 @@ <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss711</artifactId> + <artifactId>jbossws-jboss712</artifactId> <scope>provided</scope> </dependency> Modified: stack/native/trunk/modules/dist/src/main/distro/build-deploy.xml =================================================================== --- stack/native/trunk/modules/dist/src/main/distro/build-deploy.xml 2012-05-10 12:35:25 UTC (rev 16249) +++ stack/native/trunk/modules/dist/src/main/distro/build-deploy.xml 2012-05-10 12:47:58 UTC (rev 16250) @@ -42,95 +42,88 @@ <param name="installserver" value="${deploy.structure}"/> <param name="thirdpartydir" value="${deploy.artifacts.dir}"/> <param name="jbossid" value="${jbossws.integration.target}"/> - <param name="modules-jbossid" value="jboss710"/> + <param name="modules-jbossid" value="jboss712"/> </antcall> </target>  -  +   - <target name="target-jboss710"> - <property name="jbossws.integration.target" value="jboss710"/> - <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/> - </target> + <target name="deploy-structure-jboss72x" depends="prepare-deploy"> + <delete dir="${deploy.structure}"/> - <target name="deploy-jboss710" depends="undeploy-jboss710,deploy-structure-jboss71x" description="Deploy jbossws to jboss710"> - <fail message="Not available: ${jboss710.available.file}" unless="jboss710.available"/> - <copy todir="${jboss710.home}" overwrite="true" verbose="true"> - <fileset dir="${deploy.structure}"> - <exclude name="**/jboss/as/webservices/**/module.xml"/> + <path id="jbossws-common.path"> + <fileset dir="${deploy.artifacts.dir}"> + <include name="**/jbossws-common-tools.jar"/> </fileset> - </copy> -  - <installModules targetDir="${jboss710.home}/modules"> - <fileset dir="${deploy.structure}/modules"> - <include name="**/jboss/as/webservices/**/module.xml"/> - </fileset> - </installModules> - </target> + </path> + <taskdef name="installModules" classname="org.jboss.ws.tools.ant.InstallModulesTask" classpathref="jbossws-common.path"/> - <target name="undeploy-jboss710" depends="target-jboss710,init" description="Remove jbossws from jboss710"> - <fail message="Not available: ${jboss710.available.file}" unless="jboss710.available"/> - <macro-undeploy-jbossws-modules targetdir="${jboss710.home}" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="true"/> + <antcall target="deploy-jbossws-native-modules" inheritall="false"> + <param name="installserver" value="${deploy.structure}"/> + <param name="thirdpartydir" value="${deploy.artifacts.dir}"/> + <param name="jbossid" value="${jbossws.integration.target}"/> + <param name="modules-jbossid" value="jboss720"/> + </antcall> </target>  -  +   - <target name="target-jboss711"> - <property name="jbossws.integration.target" value="jboss711"/> + <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-jboss711" depends="undeploy-jboss711,deploy-structure-jboss71x" description="Deploy jbossws to jboss711"> - <fail message="Not available: ${jboss711.available.file}" unless="jboss711.available"/> - <copy todir="${jboss711.home}" overwrite="true" verbose="true"> + <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="${jboss711.home}/modules"> + <installModules targetDir="${jboss712.home}/modules"> <fileset dir="${deploy.structure}/modules"> <include name="**/jboss/as/webservices/**/module.xml"/> </fileset> </installModules> </target> - <target name="undeploy-jboss711" depends="target-jboss711,init" description="Remove jbossws from jboss711"> - <fail message="Not available: ${jboss711.available.file}" unless="jboss711.available"/> - <macro-undeploy-jbossws-modules targetdir="${jboss711.home}" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="false"/> + <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="target-jboss712"> - <property name="jbossws.integration.target" value="jboss712"/> + <target name="target-jboss720"> + <property name="jbossws.integration.target" value="jboss720"/> <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"> + <target name="deploy-jboss720" depends="undeploy-jboss720,deploy-structure-jboss72x" description="Deploy jbossws to jboss720"> + <fail message="Not available: ${jboss720.available.file}" unless="jboss720.available"/> + <copy todir="${jboss720.home}" overwrite="true" verbose="true"> <fileset dir="${deploy.structure}"> <exclude name="**/jboss/as/webservices/**/module.xml"/> </fileset> </copy>  - <installModules targetDir="${jboss712.home}/modules"> + <installModules targetDir="${jboss720.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 name="undeploy-jboss720" depends="target-jboss720,init" description="Remove jbossws from jboss720"> + <fail message="Not available: ${jboss720.available.file}" unless="jboss720.available"/> + <macro-undeploy-jbossws-modules targetdir="${jboss720.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-05-10 12:35:25 UTC (rev 16249) +++ stack/native/trunk/modules/dist/src/main/distro/build-setup.xml 2012-05-10 12:47:58 UTC (rev 16250) @@ -34,13 +34,11 @@ <property file="${target.properties.file}"/> <property name="jboss.server.instance" value="default"/> - <property name="jboss710.modules" value="${jboss710.home}/modules"/> - - <property name="jboss711.available.file" value="${jboss711.home}/jboss-modules.jar"/> <property name="jboss712.available.file" value="${jboss712.home}/jboss-modules.jar"/> + <property name="jboss720.available.file" value="${jboss720.home}/jboss-modules.jar"/> - <available property="jboss711.available" file="${jboss711.available.file}"/> <available property="jboss712.available" file="${jboss712.available.file}"/> + <available property="jboss720.available" file="${jboss720.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-05-10 12:35:25 UTC (rev 16249) +++ stack/native/trunk/modules/dist/src/main/distro/build.xml 2012-05-10 12:47:58 UTC (rev 16250) @@ -57,13 +57,18 @@ <fail message="jbossws.integration.target not set" unless="jbossws.integration.target"/> <echo message="integration.target=${jbossws.integration.target}"/> - <condition property="jbossws.integration.jboss710" value="true"> + <condition property="jbossws.integration.jboss71x" value="true"> <or> - <equals arg1="${jbossws.integration.target}" arg2="jboss711"/> <equals arg1="${jbossws.integration.target}" arg2="jboss712"/> </or> </condition> + <condition property="jbossws.integration.jboss72x" value="true"> + <or> + <equals arg1="${jbossws.integration.target}" arg2="jboss720"/> + </or> + </condition> + <property name="deploy.structure" value="${output.dir}/deploy-${jbossws.integration.target}"/> <property name="excludesfile" value="${tests.dir}/resources/test-excludes-${jbossws.integration.target}.txt"/> </target> Modified: stack/native/trunk/modules/resources/pom.xml =================================================================== --- stack/native/trunk/modules/resources/pom.xml 2012-05-10 12:35:25 UTC (rev 16249) +++ stack/native/trunk/modules/resources/pom.xml 2012-05-10 12:47:58 UTC (rev 16250) @@ -43,21 +43,21 @@ <phase>package</phase> </execution> <execution> - <id>jboss711</id> + <id>jboss712</id> <goals><goal>jar</goal></goals> <phase>package</phase> <configuration> - <classifier>jboss711</classifier> - <classesDirectory>${project.build.directory}/classes/resources/jbossws-jboss711/jbossws.beans</classesDirectory> + <classifier>jboss712</classifier> + <classesDirectory>${project.build.directory}/classes/resources/jbossws-jboss712/jbossws.beans</classesDirectory> </configuration> </execution> <execution> - <id>jboss712</id> + <id>jboss720</id> <goals><goal>jar</goal></goals> <phase>package</phase> <configuration> - <classifier>jboss712</classifier> - <classesDirectory>${project.build.directory}/classes/resources/jbossws-jboss712/jbossws.beans</classesDirectory> + <classifier>jboss720</classifier> + <classesDirectory>${project.build.directory}/classes/resources/jbossws-jboss720/jbossws.beans</classesDirectory> </configuration> </execution> </executions> Added: stack/native/trunk/modules/resources/src/main/resources/modules/jboss712/org/jboss/as/webservices/main/module.xml =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/modules/jboss712/org/jboss/as/webservices/main/module.xml (rev 0) +++ stack/native/trunk/modules/resources/src/main/resources/modules/jboss712/org/jboss/as/webservices/main/module.xml 2012-05-10 12:47:58 UTC (rev 16250) @@ -0,0 +1,61 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + +<module xmlns="urn:jboss:module:1.1" name="org.jboss.as.webservices"> + + <resources> +  + </resources> + + <dependencies> + <module name="javax.annotation.api"/> + <module name="javax.api"/> + <module name="javax.ejb.api"/> + <module name="javax.jws.api"/> + <module name="javax.servlet.api"/> + <module name="javax.xml.ws.api"/> + <module name="org.jboss.ejb3"/> + <module name="org.jboss.invocation"/> + <module name="org.jboss.jandex"/> + <module name="org.jboss.metadata"/> + <module name="org.jboss.staxmapper"/> + <module name="org.jboss.as.controller"/> + <module name="org.jboss.as.server"/> + <module name="org.jboss.as.ejb3"/> + <module name="org.jboss.as.ee"/> + <module name="org.jboss.as.naming"/> + <module name="org.jboss.as.security"/> + <module name="org.jboss.as.web"/> + <module name="org.jboss.threads"/> + <module name="org.jboss.modules"/> + <module name="org.jboss.msc"/> + <module name="org.jboss.vfs"/> + <module name="org.jboss.logging"/> + <module name="org.jboss.common-core" /> + <module name="org.jboss.ws.api" /> + <module name="org.jboss.ws.common" services="import" /> + <module name="org.jboss.ws.spi" /> + <module name="org.picketbox" /> + </dependencies> +</module> Added: stack/native/trunk/modules/resources/src/main/resources/modules/jboss712/org/jboss/as/webservices/server/integration/main/module.xml =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/modules/jboss712/org/jboss/as/webservices/server/integration/main/module.xml (rev 0) +++ stack/native/trunk/modules/resources/src/main/resources/modules/jboss712/org/jboss/as/webservices/server/integration/main/module.xml 2012-05-10 12:47:58 UTC (rev 16250) @@ -0,0 +1,53 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + +<module xmlns="urn:jboss:module:1.1" name="org.jboss.as.webservices.server.integration"> + + <resources> + </resources> + + <dependencies> + <module name="javax.api" export="true"/> + <module name="javax.wsdl4j.api" export="true"/> + <module name="org.jboss.ws.api" export="true"/> + <module name="org.jboss.ws.spi" export="true"/> + <module name="org.jboss.ws.common" services="import" export="true"/> + <module name="org.jboss.ws.native.jbossws-native-core" services="export" export="true"> + <imports> + <include path="META-INF"/> + <include path="dtd"/> + <include path="schema"/> + </imports> + <exports> + <include path="META-INF"/> + <include path="dtd"/> + <include path="schema"/> + </exports> + </module> + <module name="org.jboss.ws.native.jbossws-native-services" services="export" export="true"/> + <module name="org.apache.xerces" services="export" export="true"/> + <module name="org.jboss.as.webservices" services="export" export="true"/> + </dependencies> + +</module> Added: stack/native/trunk/modules/resources/src/main/resources/modules/jboss712/org/jboss/ws/api/main/module.xml =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/modules/jboss712/org/jboss/ws/api/main/module.xml (rev 0) +++ stack/native/trunk/modules/resources/src/main/resources/modules/jboss712/org/jboss/ws/api/main/module.xml 2012-05-10 12:47:58 UTC (rev 16250) @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + +<module xmlns="urn:jboss:module:1.1" name="org.jboss.ws.api"> + + <resources> +  + </resources> + + <dependencies> + <module name="javax.api"/> + <module name="javax.xml.soap.api"/> + <module name="javax.xml.ws.api"/> + <module name="org.jboss.logging"/> + <module name="org.jboss.modules"/> + </dependencies> +</module> Added: stack/native/trunk/modules/resources/src/main/resources/modules/jboss712/org/jboss/ws/common/main/module.xml =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/modules/jboss712/org/jboss/ws/common/main/module.xml (rev 0) +++ stack/native/trunk/modules/resources/src/main/resources/modules/jboss712/org/jboss/ws/common/main/module.xml 2012-05-10 12:47:58 UTC (rev 16250) @@ -0,0 +1,46 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + +<module xmlns="urn:jboss:module:1.1" name="org.jboss.ws.common"> + + <resources> +  + </resources> + + <dependencies> + <module name="javax.api"/> + <module name="javax.annotation.api"/> + <module name="javax.xml.stream.api"/> + <module name="javax.ejb.api"/> + <module name="javax.jws.api"/> + <module name="javax.servlet.api"/> + <module name="javax.wsdl4j.api" /> + <module name="javax.xml.ws.api"/> + <module name="org.jboss.ws.api"/> + <module name="org.jboss.ws.spi"/> + <module name="org.jboss.logging"/> + <module name="org.jboss.common-core"/> + <module name="org.apache.xerces" services="import"/> + </dependencies> +</module> Added: stack/native/trunk/modules/resources/src/main/resources/modules/jboss712/org/jboss/ws/native/jbossws-native-core/main/module.xml =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/modules/jboss712/org/jboss/ws/native/jbossws-native-core/main/module.xml (rev 0) +++ stack/native/trunk/modules/resources/src/main/resources/modules/jboss712/org/jboss/ws/native/jbossws-native-core/main/module.xml 2012-05-10 12:47:58 UTC (rev 16250) @@ -0,0 +1,49 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + +<module xmlns="urn:jboss:module:1.1" name="org.jboss.ws.native.jbossws-native-core"> + + <resources> +  + </resources> + + <dependencies> + <module name="javax.api" /> + <module name="javax.servlet.api" /> + <module name="javax.mail.api" /> + <module name="javax.wsdl4j.api" /> + <module name="javax.xml.stream.api" /> + <module name="javax.xml.rpc.api" /> + <module name="org.apache.xerces" services="import"/> + <module name="org.javassist" /> + <module name="org.jboss.netty" /> + <module name="org.jboss.xb" /> + <module name="org.jboss.ws.api" /> + <module name="org.jboss.ws.spi" /> + <module name="org.jboss.ws.common" /> + <module name="org.jboss.ws.native.jbossws-native-services" services="import"/> + <module name="org.jboss.common-core" /> + <module name="org.jboss.logging" /> + </dependencies> +</module> Added: stack/native/trunk/modules/resources/src/main/resources/modules/jboss712/org/jboss/ws/native/jbossws-native-services/main/module.xml =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/modules/jboss712/org/jboss/ws/native/jbossws-native-services/main/module.xml (rev 0) +++ stack/native/trunk/modules/resources/src/main/resources/modules/jboss712/org/jboss/ws/native/jbossws-native-services/main/module.xml 2012-05-10 12:47:58 UTC (rev 16250) @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + +<module xmlns="urn:jboss:module:1.1" name="org.jboss.ws.native.jbossws-native-services"> + + <resources> +  + </resources> + + <dependencies> + + </dependencies> +</module> Added: stack/native/trunk/modules/resources/src/main/resources/modules/jboss712/org/jboss/ws/spi/main/module.xml =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/modules/jboss712/org/jboss/ws/spi/main/module.xml (rev 0) +++ stack/native/trunk/modules/resources/src/main/resources/modules/jboss712/org/jboss/ws/spi/main/module.xml 2012-05-10 12:47:58 UTC (rev 16250) @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + +<module xmlns="urn:jboss:module:1.1" name="org.jboss.ws.spi"> + + <resources> +  + </resources> + + <dependencies> + <module name="javax.api"/> + <module name="javax.servlet.api"/> + <module name="javax.xml.stream.api"/> + <module name="javax.xml.ws.api"/> + <module name="org.jboss.logging"/> + <module name="org.jboss.ws.api"/> + <module name="org.jboss.as.webservices"/> + </dependencies> +</module> Added: stack/native/trunk/modules/resources/src/main/resources/modules/jboss712/org/jboss/xb/main/module.xml =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/modules/jboss712/org/jboss/xb/main/module.xml (rev 0) +++ stack/native/trunk/modules/resources/src/main/resources/modules/jboss712/org/jboss/xb/main/module.xml 2012-05-10 12:47:58 UTC (rev 16250) @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + +<module xmlns="urn:jboss:module:1.1" name="org.jboss.xb"> + + <resources> +  + </resources> + + <dependencies> + <module name="javax.api"/> + <module name="org.apache.xerces" services="import"/> + <module name="org.jboss.logging"/> + <module name="org.jboss.common-core"/> + </dependencies> + +</module> Added: stack/native/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/as/webservices/main/module.xml =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/as/webservices/main/module.xml (rev 0) +++ stack/native/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/as/webservices/main/module.xml 2012-05-10 12:47:58 UTC (rev 16250) @@ -0,0 +1,61 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + +<module xmlns="urn:jboss:module:1.1" name="org.jboss.as.webservices"> + + <resources> +  + </resources> + + <dependencies> + <module name="javax.annotation.api"/> + <module name="javax.api"/> + <module name="javax.ejb.api"/> + <module name="javax.jws.api"/> + <module name="javax.servlet.api"/> + <module name="javax.xml.ws.api"/> + <module name="org.jboss.ejb3"/> + <module name="org.jboss.invocation"/> + <module name="org.jboss.jandex"/> + <module name="org.jboss.metadata"/> + <module name="org.jboss.staxmapper"/> + <module name="org.jboss.as.controller"/> + <module name="org.jboss.as.server"/> + <module name="org.jboss.as.ejb3"/> + <module name="org.jboss.as.ee"/> + <module name="org.jboss.as.naming"/> + <module name="org.jboss.as.security"/> + <module name="org.jboss.as.web"/> + <module name="org.jboss.threads"/> + <module name="org.jboss.modules"/> + <module name="org.jboss.msc"/> + <module name="org.jboss.vfs"/> + <module name="org.jboss.logging"/> + <module name="org.jboss.common-core" /> + <module name="org.jboss.ws.api" /> + <module name="org.jboss.ws.common" services="import" /> + <module name="org.jboss.ws.spi" /> + <module name="org.picketbox" /> + </dependencies> +</module> Added: stack/native/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/as/webservices/server/integration/main/module.xml =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/as/webservices/server/integration/main/module.xml (rev 0) +++ stack/native/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/as/webservices/server/integration/main/module.xml 2012-05-10 12:47:58 UTC (rev 16250) @@ -0,0 +1,53 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + +<module xmlns="urn:jboss:module:1.1" name="org.jboss.as.webservices.server.integration"> + + <resources> + </resources> + + <dependencies> + <module name="javax.api" export="true"/> + <module name="javax.wsdl4j.api" export="true"/> + <module name="org.jboss.ws.api" export="true"/> + <module name="org.jboss.ws.spi" export="true"/> + <module name="org.jboss.ws.common" services="import" export="true"/> + <module name="org.jboss.ws.native.jbossws-native-core" services="export" export="true"> + <imports> + <include path="META-INF"/> + <include path="dtd"/> + <include path="schema"/> + </imports> + <exports> + <include path="META-INF"/> + <include path="dtd"/> + <include path="schema"/> + </exports> + </module> + <module name="org.jboss.ws.native.jbossws-native-services" services="export" export="true"/> + <module name="org.apache.xerces" services="export" export="true"/> + <module name="org.jboss.as.webservices" services="export" export="true"/> + </dependencies> + +</module> Added: stack/native/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/api/main/module.xml =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/api/main/module.xml (rev 0) +++ stack/native/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/api/main/module.xml 2012-05-10 12:47:58 UTC (rev 16250) @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + +<module xmlns="urn:jboss:module:1.1" name="org.jboss.ws.api"> + + <resources> +  + </resources> + + <dependencies> + <module name="javax.api"/> + <module name="javax.xml.soap.api"/> + <module name="javax.xml.ws.api"/> + <module name="org.jboss.logging"/> + <module name="org.jboss.modules"/> + </dependencies> +</module> Added: stack/native/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/common/main/module.xml =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/common/main/module.xml (rev 0) +++ stack/native/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/common/main/module.xml 2012-05-10 12:47:58 UTC (rev 16250) @@ -0,0 +1,46 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + +<module xmlns="urn:jboss:module:1.1" name="org.jboss.ws.common"> + + <resources> +  + </resources> + + <dependencies> + <module name="javax.api"/> + <module name="javax.annotation.api"/> + <module name="javax.xml.stream.api"/> + <module name="javax.ejb.api"/> + <module name="javax.jws.api"/> + <module name="javax.servlet.api"/> + <module name="javax.wsdl4j.api" /> + <module name="javax.xml.ws.api"/> + <module name="org.jboss.ws.api"/> + <module name="org.jboss.ws.spi"/> + <module name="org.jboss.logging"/> + <module name="org.jboss.common-core"/> + <module name="org.apache.xerces" services="import"/> + </dependencies> +</module> Added: stack/native/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/native/jbossws-native-core/main/module.xml =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/native/jbossws-native-core/main/module.xml (rev 0) +++ stack/native/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/native/jbossws-native-core/main/module.xml 2012-05-10 12:47:58 UTC (rev 16250) @@ -0,0 +1,49 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + +<module xmlns="urn:jboss:module:1.1" name="org.jboss.ws.native.jbossws-native-core"> + + <resources> +  + </resources> + + <dependencies> + <module name="javax.api" /> + <module name="javax.servlet.api" /> + <module name="javax.mail.api" /> + <module name="javax.wsdl4j.api" /> + <module name="javax.xml.stream.api" /> + <module name="javax.xml.rpc.api" /> + <module name="org.apache.xerces" services="import"/> + <module name="org.javassist" /> + <module name="org.jboss.netty" /> + <module name="org.jboss.xb" /> + <module name="org.jboss.ws.api" /> + <module name="org.jboss.ws.spi" /> + <module name="org.jboss.ws.common" /> + <module name="org.jboss.ws.native.jbossws-native-services" services="import"/> + <module name="org.jboss.common-core" /> + <module name="org.jboss.logging" /> + </dependencies> +</module> Added: stack/native/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/native/jbossws-native-services/main/module.xml =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/native/jbossws-native-services/main/module.xml (rev 0) +++ stack/native/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/native/jbossws-native-services/main/module.xml 2012-05-10 12:47:58 UTC (rev 16250) @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + +<module xmlns="urn:jboss:module:1.1" name="org.jboss.ws.native.jbossws-native-services"> + + <resources> +  + </resources> + + <dependencies> + + </dependencies> +</module> Added: stack/native/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/spi/main/module.xml =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/spi/main/module.xml (rev 0) +++ stack/native/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/spi/main/module.xml 2012-05-10 12:47:58 UTC (rev 16250) @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + +<module xmlns="urn:jboss:module:1.1" name="org.jboss.ws.spi"> + + <resources> +  + </resources> + + <dependencies> + <module name="javax.api"/> + <module name="javax.servlet.api"/> + <module name="javax.xml.stream.api"/> + <module name="javax.xml.ws.api"/> + <module name="org.jboss.logging"/> + <module name="org.jboss.ws.api"/> + <module name="org.jboss.as.webservices"/> + </dependencies> +</module> Added: stack/native/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/xb/main/module.xml =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/xb/main/module.xml (rev 0) +++ stack/native/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/xb/main/module.xml 2012-05-10 12:47:58 UTC (rev 16250) @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + +<module xmlns="urn:jboss:module:1.1" name="org.jboss.xb"> + + <resources> +  + </resources> + + <dependencies> + <module name="javax.api"/> + <module name="org.apache.xerces" services="import"/> + <module name="org.jboss.logging"/> + <module name="org.jboss.common-core"/> + </dependencies> + +</module> Modified: stack/native/trunk/modules/testsuite/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/pom.xml 2012-05-10 12:35:25 UTC (rev 16249) +++ stack/native/trunk/modules/testsuite/pom.xml 2012-05-10 12:47:58 UTC (rev 16250) @@ -250,20 +250,20 @@ </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> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss711</artifactId> - <classifier>tests-integration</classifier> + <groupId>org.jboss.as</groupId> + <artifactId>jboss-as-webservices-tests-integration</artifactId> + <version>${jboss.version}</version> <exclusions> <exclusion> <groupId>org.jboss.as</groupId> @@ -286,12 +286,12 @@ <dependency> <groupId>org.jboss</groupId> <artifactId>jboss-remote-naming</artifactId> - <version>1.0.2.Final</version> + <version>1.0.3.Final</version> </dependency> <dependency> <groupId>org.jboss</groupId> <artifactId>jboss-ejb-client</artifactId> - <version>1.0.4.Final</version> + <version>1.0.10.Final</version> <exclusions> <exclusion> <groupId>org.jboss.remoting3</groupId> @@ -306,13 +306,13 @@ <dependency> <groupId>org.jboss.remotingjmx</groupId> <artifactId>remoting-jmx</artifactId> - <version>1.0.2.Final</version> + <version>1.0.3.Final</version> <scope>test</scope> </dependency> <dependency> <groupId>org.jboss.remoting3</groupId> <artifactId>jboss-remoting</artifactId> - <version>3.2.2.GA</version> + <version>3.2.7.GA</version> <scope>test</scope> </dependency> </dependencies> @@ -330,16 +330,16 @@ </plugins> </build> </profile> - +  <profile> - <id>jboss712</id> + <id>jboss720</id> <properties> - <jboss.version>${jboss712.version}</jboss.version> - <jbossws.integration.target>jboss712</jbossws.integration.target> + <jboss.version>${jboss720.version}</jboss.version> + <jbossws.integration.target>jboss720</jbossws.integration.target> </properties> <dependencies> <dependency> @@ -412,7 +412,6 @@ </plugins> </build> </profile> -  + +<server xmlns="urn:jboss:domain:1.3"> + + <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-05-10 12:35:25 UTC (rev 16249) +++ stack/native/trunk/pom.xml 2012-05-10 12:47:58 UTC (rev 16250) @@ -61,9 +61,9 @@ <jbossws.common.version>2.1.0-SNAPSHOT</jbossws.common.version> <jbossws.common.tools.version>1.1.0-SNAPSHOT</jbossws.common.tools.version> <jbossws.shared.testsuite.version>4.1.0-SNAPSHOT</jbossws.shared.testsuite.version> - <jbossws.jboss711.version>4.1.0-SNAPSHOT</jbossws.jboss711.version> - <jboss711.version>7.1.1.Final</jboss711.version> - <jboss712.version>7.1.2.Final-SNAPSHOT</jboss712.version> + <jbossws.jboss712.version>4.1.0-SNAPSHOT</jbossws.jboss712.version> + <jboss712.version>7.1.2.Final</jboss712.version> + <jboss720.version>7.2.0.Alpha1-SNAPSHOT</jboss720.version> <javassist.version>3.15.0-GA</javassist.version> <ejb.api.version>1.0.1.Final</ejb.api.version> <jaxrpc.api.version>1.0.0.Final</jaxrpc.api.version> @@ -114,20 +114,15 @@ </dependency> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss711</artifactId> - <version>${jbossws.jboss711.version}</version> + <artifactId>jbossws-jboss712</artifactId> + <version>${jbossws.jboss712.version}</version> </dependency> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss711</artifactId> - <version>${jbossws.jboss711.version}</version> + <artifactId>jbossws-jboss712</artifactId> + <version>${jbossws.jboss712.version}</version> <classifier>tests-integration</classifier> </dependency> - <dependency> - <groupId>org.jboss.as</groupId> - <artifactId>jboss-as-webservices-tests-integration</artifactId> - <version>${jboss712.version}</version> - </dependency>  <dependency> <groupId>org.javassist</groupId> @@ -361,26 +356,26 @@ </profile>  <profile> - <id>jboss711</id> + <id>jboss712</id> <properties> - <jbossws.integration.target>jboss711</jbossws.integration.target> - <jboss.home>${jboss711.home}</jboss.home> + <jbossws.integration.target>jboss712</jbossws.integration.target> + <jboss.home>${jboss712.home}</jboss.home> </properties> </profile>  <profile> - <id>jboss712</id> + <id>jboss720</id> <properties> - <jbossws.integration.target>jboss712</jbossws.integration.target> - <jboss.home>${jboss712.home}</jboss.home> + <jbossws.integration.target>jboss720</jbossws.integration.target> + <jboss.home>${jboss720.home}</jboss.home> </properties> </profile>

12 years, 8 months

1
0
0 / 0

JBossWS SVN: r16249 - container/jboss71/branches/jbossws-jboss712.

by jbossws-commits＠lists.jboss.org

Author: ropalka Date: 2012-05-10 08:35:25 -0400 (Thu, 10 May 2012) New Revision: 16249 Modified: container/jboss71/branches/jbossws-jboss712/ Log: updating svn:ignore accordingly Property changes on: container/jboss71/branches/jbossws-jboss712 ___________________________________________________________________ Added: svn:ignore + .classpath .project .settings target

12 years, 8 months

1
0
0 / 0

JBossWS SVN: r16248 - in shared-testsuite/trunk: testsuite/src/test/ant-import and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: ropalka Date: 2012-05-10 08:33:05 -0400 (Thu, 10 May 2012) New Revision: 16248 Modified: shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTest.java shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml Log: [JBWS-3494] implementing AS720 support, dropping AS70x support Modified: shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTest.java =================================================================== --- shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTest.java 2012-05-10 12:28:50 UTC (rev 16247) +++ shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTest.java 2012-05-10 12:33:05 UTC (rev 16248) @@ -207,14 +207,14 @@ return JBossWSTestHelper.isTargetJBoss7(); } - public static boolean isTargetJBoss70() + public static boolean isTargetJBoss71() { - return JBossWSTestHelper.isTargetJBoss70(); + return JBossWSTestHelper.isTargetJBoss71(); } - public static boolean isTargetJBoss71() + public static boolean isTargetJBoss72() { - return JBossWSTestHelper.isTargetJBoss71(); + return JBossWSTestHelper.isTargetJBoss72(); } public static boolean isIntegrationNative() Modified: shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java =================================================================== --- shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2012-05-10 12:28:50 UTC (rev 16247) +++ shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2012-05-10 12:33:05 UTC (rev 16248) @@ -135,16 +135,16 @@ return target.startsWith("jboss7"); } - public static boolean isTargetJBoss70() + public static boolean isTargetJBoss71() { String target = getIntegrationTarget(); - return target.startsWith("jboss70"); + return target.startsWith("jboss71"); } - public static boolean isTargetJBoss71() + public static boolean isTargetJBoss72() { String target = getIntegrationTarget(); - return target.startsWith("jboss71"); + return target.startsWith("jboss72"); } public static boolean isIntegrationNative() @@ -252,12 +252,7 @@ private static MBeanServerConnection getAS7ServerConnection(String integrationTarget) { String host = getServerHost(); - String urlString; - if (integrationTarget.startsWith("jboss70")) { - urlString = System.getProperty("jmx.service.url", "service:jmx:rmi:///jndi/rmi://" + host + ":" + 1090 + "/jmxrmi"); - } else { - urlString = System.getProperty("jmx.service.url", "service:jmx:remoting-jmx://" + host + ":" + 9999); - } + String urlString = System.getProperty("jmx.service.url", "service:jmx:remoting-jmx://" + host + ":" + 9999); try { JMXServiceURL serviceURL = new JMXServiceURL(urlString); return JMXConnectorFactory.connect(serviceURL, null).getMBeanServerConnection(); @@ -274,8 +269,6 @@ if (integrationTarget == null) throw new IllegalStateException("Cannot obtain system property: " + SYSPROP_JBOSSWS_INTEGRATION_TARGET); - - LOGGER.warn("TODO: [JBWS-3211] implement integrationTarget mismatch check for AS 7.x"); } return integrationTarget; Modified: shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml =================================================================== --- shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml 2012-05-10 12:28:50 UTC (rev 16247) +++ shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml 2012-05-10 12:33:05 UTC (rev 16248) @@ -31,12 +31,6 @@ <target name="tests-prepare" depends="prepare">  - <condition property="jboss.home" value="${jboss701.home}"> - <equals arg1="${jbossws.integration.target}" arg2="jboss701"/> - </condition> - <condition property="jboss.home" value="${jboss702.home}"> - <equals arg1="${jbossws.integration.target}" arg2="jboss702"/> - </condition> <condition property="jboss.home" value="${jboss710.home}"> <equals arg1="${jbossws.integration.target}" arg2="jboss710"/> </condition> @@ -46,6 +40,9 @@ <condition property="jboss.home" value="${jboss712.home}"> <equals arg1="${jbossws.integration.target}" arg2="jboss712"/> </condition> + <condition property="jboss.home" value="${jboss720.home}"> + <equals arg1="${jbossws.integration.target}" arg2="jboss720"/> + </condition>  <fail message="Tests output dir not set." unless="tests.output.dir"/> @@ -128,7 +125,7 @@ </tstamp> </target> - <target name="tests-classpath" depends="tests-classpath-jboss710,tests-classpath-jboss700"> + <target name="tests-classpath" depends="tests-classpath-jboss71x,tests-classpath-jboss72x"> <path id="tests.javac.classpath"> <path refid="ws.stack.classpath"/> <path refid="integration.target.javac.classpath"/> @@ -138,8 +135,8 @@ <path refid="integration.target.client.classpath"/> </path> </target> - - <target name="tests-classpath-jboss700" depends="tests-prepare" if="jbossws.integration.jboss700"> + + <target name="tests-classpath-jboss71x" depends="tests-prepare" if="jbossws.integration.jboss71x"> <path id="integration.target.javac.classpath"> <fileset dir="${jboss.home}/modules/javax/activation/api/main/"> @@ -154,6 +151,9 @@ <fileset dir="${jboss.home}/modules/org/jboss/logging/main/"> <include name="jboss-logging-*.jar"/> </fileset> + <fileset dir="${jboss.home}/modules/org/picketlink/main/"> + <include name="picketlink-core*.jar"/> + </fileset> <fileset dir="${jboss.home}/modules/javax/ejb/api/main/"> <include name="jboss-ejb-api_3.1_spec-*.jar"/> </fileset> @@ -176,9 +176,10 @@ The 's.extra.classpath' contains stack specific jars that are needed to run the stack specific tests. --> <path id="integration.target.client.classpath"> - <pathelement location="${thirdparty.dir}/jbossws-${jbossws.integration.target}-tests-integration.jar"/>  - <pathelement location="${thirdparty.dir}/jbossws-shared-testsuite.jar"/>  - <pathelement location="${thirdparty.dir}/jnp-client.jar"/>  +  + <pathelement location="${thirdparty.dir}/jboss-as-webservices-tests-integration.jar"/> + <pathelement location="${thirdparty.dir}/jbossws-shared-testsuite.jar"/> +  <pathelement location="${jboss.home}/jboss-modules.jar"/> <fileset dir="${jboss.home}/modules/org/jboss/logging/main/"> <include name="jboss-logging-*.jar"/> @@ -222,15 +223,24 @@ <fileset dir="${jboss.home}/modules/javax/servlet/api/main/"> <include name="jboss-servlet-api_3.0_spec-*.jar"/> </fileset> + <fileset dir="${jboss.home}/modules/javax/transaction/api/main/"> + <include name="jboss-transaction-api_1.1_spec-*.jar"/> + </fileset> <fileset dir="${jboss.home}/modules/org/jboss/threads/main/"> <include name="jboss-threads-*.jar"/> </fileset> <fileset dir="${jboss.home}/modules/org/picketbox/main/"> <include name="picketbox-*.jar"/> </fileset> + <fileset dir="${jboss.home}/modules/org/picketlink/main/"> + <include name="picketlink-core*.jar"/> + </fileset> <fileset dir="${jboss.home}/modules/javax/ejb/api/main/"> <include name="jboss-ejb-api_3.1_spec-*.jar"/> </fileset> + <fileset dir="${jboss.home}/modules/org/jboss/ejb-client/main/"> + <include name="jboss-ejb-client-*.jar"/> + </fileset> <fileset dir="${jboss.home}/modules/org/apache/xerces/main/"> <include name="xercesImpl-*.jar"/> </fileset> @@ -246,9 +256,21 @@ <fileset dir="${jboss.home}/modules/org/jboss/remoting3/main/"> <include name="jboss-remoting-*.jar"/> </fileset> + <fileset dir="${jboss.home}/modules/org/jboss/marshalling/river/main/"> + <include name="jboss-marshalling-river-*.jar"/> + </fileset> + <fileset dir="${jboss.home}/modules/org/jboss/remoting3/remoting-jmx/main/"> + <include name="remoting-jmx-*.jar"/> + </fileset> <fileset dir="${jboss.home}/modules/org/jboss/sasl/main/"> <include name="jboss-sasl-*.jar"/> </fileset> + <fileset dir="${jboss.home}/modules/org/jboss/netty/main/"> + <include name="netty-*.jar"/> + </fileset> + <fileset dir="${jboss.home}/modules/org/jboss/xb/main/"> + <include name="jbossxb-*.jar"/> + </fileset> <fileset dir="${jboss.home}/modules/org/apache/xalan/main/"> <include name="serializer-*.jar"/> <include name="xalan-*.jar"/> @@ -259,12 +281,14 @@ <fileset dir="${jboss.home}/modules/org/jboss/xnio/nio/main/"> <include name="xnio-nio-*.jar"/> </fileset> + <fileset dir="${jboss.home}/modules/org/jboss/remote-naming/main/"> + <include name="jboss-remote-naming-*.jar"/> + </fileset> <pathelement location="${tools.jar}"/> </path> </target> - - - <target name="tests-classpath-jboss710" depends="tests-prepare" if="jbossws.integration.jboss710"> + + <target name="tests-classpath-jboss72x" depends="tests-prepare" if="jbossws.integration.jboss72x"> <path id="integration.target.javac.classpath"> <fileset dir="${jboss.home}/modules/javax/activation/api/main/"> @@ -304,9 +328,10 @@ The 's.extra.classpath' contains stack specific jars that are needed to run the stack specific tests. --> <path id="integration.target.client.classpath"> - <pathelement location="${thirdparty.dir}/jboss-as-webservices-tests-integration.jar"/>  - <pathelement location="${thirdparty.dir}/jbossws-shared-testsuite.jar"/>  - <pathelement location="${thirdparty.dir}/jnp-client.jar"/>  +  + <pathelement location="${thirdparty.dir}/jboss-as-webservices-tests-integration.jar"/> + <pathelement location="${thirdparty.dir}/jbossws-shared-testsuite.jar"/> +  <pathelement location="${jboss.home}/jboss-modules.jar"/> <fileset dir="${jboss.home}/modules/org/jboss/logging/main/"> <include name="jboss-logging-*.jar"/> @@ -392,14 +417,12 @@ <fileset dir="${jboss.home}/modules/org/jboss/sasl/main/"> <include name="jboss-sasl-*.jar"/> </fileset> -  <fileset dir="${jboss.home}/modules/org/jboss/netty/main/"> <include name="netty-*.jar"/> </fileset> <fileset dir="${jboss.home}/modules/org/jboss/xb/main/"> <include name="jbossxb-*.jar"/> </fileset> -  <fileset dir="${jboss.home}/modules/org/apache/xalan/main/"> <include name="serializer-*.jar"/> <include name="xalan-*.jar"/>

12 years, 8 months

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits May 2012