JBossWS SVN: r10150 - stack/cxf/trunk.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-05-30 09:36:30 -0400 (Sat, 30 May 2009)
New Revision: 10150
Modified:
stack/cxf/trunk/pom.xml
Log:
Fix framework testsuite version being used
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2009-05-30 13:35:24 UTC (rev 10149)
+++ stack/cxf/trunk/pom.xml 2009-05-30 13:36:30 UTC (rev 10150)
@@ -101,7 +101,7 @@
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-framework</artifactId>
- <version>${version}</version>
+ <version>${jbossws.framework.version}</version>
<classifier>testsuite</classifier>
<type>zip</type>
</dependency>
15 years, 6 months
JBossWS SVN: r10149 - stack/cxf/branches/jbossws-cxf-3.1.2.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-05-30 09:35:24 -0400 (Sat, 30 May 2009)
New Revision: 10149
Modified:
stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml
Log:
Fix framework testsuite version being used
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml 2009-05-30 10:02:14 UTC (rev 10148)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml 2009-05-30 13:35:24 UTC (rev 10149)
@@ -100,7 +100,7 @@
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-framework</artifactId>
- <version>${version}</version>
+ <version>${jbossws.framework.version}</version>
<classifier>testsuite</classifier>
<type>zip</type>
</dependency>
15 years, 6 months
JBossWS SVN: r10148 - stack/cxf/branches/jbossws-cxf-3.1.2.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-05-30 06:02:14 -0400 (Sat, 30 May 2009)
New Revision: 10148
Modified:
stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml
Log:
Using container integration 3.1.2.GA
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml 2009-05-29 14:19:43 UTC (rev 10147)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml 2009-05-30 10:02:14 UTC (rev 10148)
@@ -46,8 +46,8 @@
<jbossws.common.version>1.1.0-SNAPSHOT</jbossws.common.version>
<jbossws.framework.version>3.1.2-SNAPSHOT</jbossws.framework.version>
<jbossws.spi.version>1.1.2-SNAPSHOT</jbossws.spi.version>
- <jbossws.jboss500.version>3.1.2-SNAPSHOT</jbossws.jboss500.version>
- <jbossws.jboss501.version>3.1.2-SNAPSHOT</jbossws.jboss501.version>
+ <jbossws.jboss500.version>3.1.2.GA</jbossws.jboss500.version>
+ <jbossws.jboss501.version>3.1.2.GA</jbossws.jboss501.version>
<!-- JBWS-2505 -->
<!-- START -->
<!--
15 years, 6 months
JBossWS SVN: r10147 - in stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests: src/test/java/org/jboss/test/ws/jaxws/cxf/interop/wstrust10 and 1 other directories.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-05-29 10:19:43 -0400 (Fri, 29 May 2009)
New Revision: 10147
Added:
stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario10-client-config.xml
stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario2-client-config.xml
stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario5-client-config.xml
stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario6-client-config.xml
stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario9-client-config.xml
Removed:
stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario10/
stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario2/
stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario5/
stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario6/
stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario9/
Modified:
stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml
stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/interop/wstrust10/AsymmetricBindingClientTestCase.java
stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/interop/wstrust10/SymmetricBindingClientTestCase.java
Log:
[JBWS-2661] svn merge -r10146:10145 . Rollback commit introducing regression, will work on this on 3.2.0 as this not a major issue and it's related to tests only.
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2009-05-29 13:25:20 UTC (rev 10146)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2009-05-29 14:19:43 UTC (rev 10147)
@@ -33,51 +33,12 @@
</war>
<!-- jaxws-cxf-interop-wstrust10-client -->
- <jar destfile="${tests.output.dir}/test-libs/jaxws-cxf-interop-wstrust10-scenario2-client.jar">
+ <jar destfile="${tests.output.dir}/test-libs/jaxws-cxf-interop-wstrust10-client.jar">
<metainf dir="${tests.output.dir}/test-resources/jaxws/cxf/interop/wstrust10/META-INF">
<include name="**/*" />
</metainf>
- <metainf dir="${tests.output.dir}/test-resources/jaxws/cxf/interop/wstrust10/META-INF/scenario2">
- <include name="cxf.xml" />
- </metainf>
</jar>
- <jar destfile="${tests.output.dir}/test-libs/jaxws-cxf-interop-wstrust10-scenario5-client.jar">
- <metainf dir="${tests.output.dir}/test-resources/jaxws/cxf/interop/wstrust10/META-INF">
- <include name="**/*" />
- </metainf>
- <metainf dir="${tests.output.dir}/test-resources/jaxws/cxf/interop/wstrust10/META-INF/scenario5">
- <include name="cxf.xml" />
- </metainf>
- </jar>
-
- <jar destfile="${tests.output.dir}/test-libs/jaxws-cxf-interop-wstrust10-scenario6-client.jar">
- <metainf dir="${tests.output.dir}/test-resources/jaxws/cxf/interop/wstrust10/META-INF">
- <include name="**/*" />
- </metainf>
- <metainf dir="${tests.output.dir}/test-resources/jaxws/cxf/interop/wstrust10/META-INF/scenario6">
- <include name="cxf.xml" />
- </metainf>
- </jar>
-
- <jar destfile="${tests.output.dir}/test-libs/jaxws-cxf-interop-wstrust10-scenario9-client.jar">
- <metainf dir="${tests.output.dir}/test-resources/jaxws/cxf/interop/wstrust10/META-INF">
- <include name="**/*" />
- </metainf>
- <metainf dir="${tests.output.dir}/test-resources/jaxws/cxf/interop/wstrust10/META-INF/scenario9">
- <include name="cxf.xml" />
- </metainf>
- </jar>
-
- <jar destfile="${tests.output.dir}/test-libs/jaxws-cxf-interop-wstrust10-scenario10-client.jar">
- <metainf dir="${tests.output.dir}/test-resources/jaxws/cxf/interop/wstrust10/META-INF">
- <include name="**/*" />
- </metainf>
- <metainf dir="${tests.output.dir}/test-resources/jaxws/cxf/interop/wstrust10/META-INF/scenario10">
- <include name="cxf.xml" />
- </metainf>
- </jar>
-
<!-- jaxws-cxf-wsrm-basic-doc -->
<war warfile="${tests.output.dir}/test-libs/jaxws-cxf-wsrm-basic-doc.war" webxml="${tests.output.dir}/test-resources/jaxws/cxf/wsrm/basic-doc/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/interop/wstrust10/AsymmetricBindingClientTestCase.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/interop/wstrust10/AsymmetricBindingClientTestCase.java 2009-05-29 13:25:20 UTC (rev 10146)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/interop/wstrust10/AsymmetricBindingClientTestCase.java 2009-05-29 14:19:43 UTC (rev 10147)
@@ -29,6 +29,9 @@
import junit.framework.Test;
+import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
+import org.apache.cxf.bus.spring.SpringBusFactory;
import org.jboss.test.ws.jaxws.cxf.interop.wstrust10.interopbaseaddress.interop.IPingService;
import org.jboss.wsf.test.JBossWSTest;
import org.jboss.wsf.test.JBossWSTestSetup;
@@ -44,59 +47,66 @@
*/
public class AsymmetricBindingClientTestCase extends JBossWSTest
{
+ private Bus bus;
+
public static Test suite()
{
- return new JBossWSTestSetup(AsymmetricBindingClientTestCase.class, "");
+ return new JBossWSTestSetup(AsymmetricBindingClientTestCase.class, "jaxws-cxf-interop-wstrust10-client.jar");
}
public void testScenario9() throws Exception
{
- this.deploy("jaxws-cxf-interop-wstrust10-scenario9-client.jar");
+ this.loadBus("scenario9");
+ QName serviceName = new QName("http://tempuri.org/", "AsymmetricFederatedService");
+ Service service = Service.create(getServiceURL(), serviceName);
+ QName portName = new QName("http://tempuri.org/", "Scenario_9_IssuedTokenForCertificate_MutualCertificate11");
+ IPingService proxy = service.getPort(portName, IPingService.class);
try
{
- QName serviceName = new QName("http://tempuri.org/", "AsymmetricFederatedService");
- Service service = Service.create(getServiceURL(), serviceName);
- QName portName = new QName("http://tempuri.org/", "Scenario_9_IssuedTokenForCertificate_MutualCertificate11");
- IPingService proxy = service.getPort(portName, IPingService.class);
- try
- {
- assertEquals("Hi!", proxy.echo("Hi!"));
- }
- catch (SOAPFaultException e)
- {
- throw new Exception("Please check that the Bouncy Castle provider is installed.", e);
- }
+ assertEquals("Hi!", proxy.echo("Hi!"));
}
- finally
+ catch (SOAPFaultException e)
{
- this.undeploy("jaxws-cxf-interop-wstrust10-scenario9-client.jar");
+ throw new Exception("Please check that the Bouncy Castle provider is installed.", e);
}
}
public void testScenario10() throws Exception
{
- this.deploy("jaxws-cxf-interop-wstrust10-scenario10-client.jar");
+ this.loadBus("scenario10");
+ QName serviceName = new QName("http://tempuri.org/", "AsymmetricFederatedService");
+ Service service = Service.create(getServiceURL(), serviceName);
+ QName portName = new QName("http://tempuri.org/", "Scenario_10_IssuedTokenForCertificateSecureConversation_MutualCertificate11");
+ IPingService proxy = service.getPort(portName, IPingService.class);
try
{
- QName serviceName = new QName("http://tempuri.org/", "AsymmetricFederatedService");
- Service service = Service.create(getServiceURL(), serviceName);
- QName portName = new QName("http://tempuri.org/", "Scenario_10_IssuedTokenForCertificateSecureConversation_MutualCertificate11");
- IPingService proxy = service.getPort(portName, IPingService.class);
- try
- {
- assertEquals("Hi!", proxy.echo("Hi!"));
- }
- catch (SOAPFaultException e)
- {
- throw new Exception("Please check that the Bouncy Castle provider is installed.", e);
- }
+ assertEquals("Hi!", proxy.echo("Hi!"));
}
- finally
+ catch (SOAPFaultException e)
{
- this.undeploy("jaxws-cxf-interop-wstrust10-scenario10-client.jar");
+ throw new Exception("Please check that the Bouncy Castle provider is installed.", e);
}
}
+ private void loadBus(String scenario) throws Exception
+ {
+ System.out.println("Loading bus for " + scenario + "...");
+ SpringBusFactory busFactory = new SpringBusFactory();
+ URL cxfConfig = getResourceURL("jaxws/cxf/interop/wstrust10/META-INF/" + scenario + "-client-config.xml");
+ bus = busFactory.createBus(cxfConfig);
+ BusFactory.setDefaultBus(bus);
+ }
+
+ @Override
+ protected void tearDown() throws Exception
+ {
+ System.out.println("... bus teardown");
+ if (bus != null)
+ bus.shutdown(true);
+
+ super.tearDown();
+ }
+
private URL getServiceURL() throws Exception
{
return getResourceURL("jaxws/cxf/interop/wstrust10/META-INF/wsdl/WsTrustAsym.wsdl");
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/interop/wstrust10/SymmetricBindingClientTestCase.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/interop/wstrust10/SymmetricBindingClientTestCase.java 2009-05-29 13:25:20 UTC (rev 10146)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/interop/wstrust10/SymmetricBindingClientTestCase.java 2009-05-29 14:19:43 UTC (rev 10147)
@@ -29,6 +29,9 @@
import junit.framework.Test;
+import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
+import org.apache.cxf.bus.spring.SpringBusFactory;
import org.jboss.test.ws.jaxws.cxf.interop.wstrust10.interopbaseaddress.interop.IPingService;
import org.jboss.wsf.test.JBossWSTest;
import org.jboss.wsf.test.JBossWSTestSetup;
@@ -43,86 +46,85 @@
*/
public class SymmetricBindingClientTestCase extends JBossWSTest
{
+ private Bus bus;
+
public static Test suite()
{
- return new JBossWSTestSetup(SymmetricBindingClientTestCase.class, "");
+ return new JBossWSTestSetup(SymmetricBindingClientTestCase.class, "jaxws-cxf-interop-wstrust10-client.jar");
}
public void testScenario2() throws Exception
{
- this.deploy("jaxws-cxf-interop-wstrust10-scenario2-client.jar");
+ this.loadBus("scenario2");
+ QName serviceName = new QName("http://tempuri.org/", "SymmetricFederatedService");
+ Service service = Service.create(getServiceURL(), serviceName);
+ QName portName = new QName("http://tempuri.org/", "Scenario_2_IssuedToken_MutualCertificate10");
+ IPingService proxy = service.getPort(portName, IPingService.class);
try
{
- QName serviceName = new QName("http://tempuri.org/", "SymmetricFederatedService");
- Service service = Service.create(getServiceURL(), serviceName);
- QName portName = new QName("http://tempuri.org/", "Scenario_2_IssuedToken_MutualCertificate10");
- IPingService proxy = service.getPort(portName, IPingService.class);
- try
- {
- assertEquals("Hi!", proxy.echo("Hi!"));
- }
- catch (SOAPFaultException e)
- {
- throw new Exception("Please check that the Bouncy Castle provider is installed.", e);
- }
+ assertEquals("Hi!", proxy.echo("Hi!"));
}
- finally
+ catch (SOAPFaultException e)
{
- this.undeploy("jaxws-cxf-interop-wstrust10-scenario2-client.jar");
+ throw new Exception("Please check that the Bouncy Castle provider is installed.", e);
}
}
public void testScenario5() throws Exception
{
- this.deploy("jaxws-cxf-interop-wstrust10-scenario5-client.jar");
+ this.loadBus("scenario5");
+ QName serviceName = new QName("http://tempuri.org/", "SymmetricFederatedService");
+ Service service = Service.create(getServiceURL(), serviceName);
+ QName portName = new QName("http://tempuri.org/", "Scenario_5_IssuedTokenForCertificate_MutualCertificate11");
+ IPingService proxy = service.getPort(portName, IPingService.class);
try
{
- QName serviceName = new QName("http://tempuri.org/", "SymmetricFederatedService");
- Service service = Service.create(getServiceURL(), serviceName);
- QName portName = new QName("http://tempuri.org/", "Scenario_5_IssuedTokenForCertificate_MutualCertificate11");
- IPingService proxy = service.getPort(portName, IPingService.class);
- try
- {
- assertEquals("Hi!", proxy.echo("Hi!"));
- }
- catch (SOAPFaultException e)
- {
- throw new Exception("Please check that the Bouncy Castle provider is installed.", e);
- }
+ assertEquals("Hi!", proxy.echo("Hi!"));
}
- finally
+ catch (SOAPFaultException e)
{
- this.undeploy("jaxws-cxf-interop-wstrust10-scenario5-client.jar");
+ throw new Exception("Please check that the Bouncy Castle provider is installed.", e);
}
}
public void testScenario6() throws Exception
{
- this.deploy("jaxws-cxf-interop-wstrust10-scenario6-client.jar");
+ this.loadBus("scenario6");
+ QName serviceName = new QName("http://tempuri.org/", "SymmetricFederatedService");
+ Service service = Service.create(getServiceURL(), serviceName);
+ QName portName = new QName("http://tempuri.org/", "Scenario_6_IssuedTokenForCertificateSecureConversation_MutualCertificate11");
+ IPingService proxy = service.getPort(portName, IPingService.class);
try
{
- QName serviceName = new QName("http://tempuri.org/", "SymmetricFederatedService");
- Service service = Service.create(getServiceURL(), serviceName);
- QName portName = new QName("http://tempuri.org/", "Scenario_6_IssuedTokenForCertificateSecureConversation_MutualCertificate11");
- IPingService proxy = service.getPort(portName, IPingService.class);
- try
- {
- assertEquals("Hi!", proxy.echo("Hi!"));
- }
- catch (SOAPFaultException e)
- {
- throw new Exception("Please check that the Bouncy Castle provider is installed.", e);
- }
+ assertEquals("Hi!", proxy.echo("Hi!"));
}
- finally
+ catch (SOAPFaultException e)
{
- this.undeploy("jaxws-cxf-interop-wstrust10-scenario6-client.jar");
+ throw new Exception("Please check that the Bouncy Castle provider is installed.", e);
}
}
+ private void loadBus(String scenario) throws Exception
+ {
+ System.out.println("Loading bus for " + scenario + "...");
+ SpringBusFactory busFactory = new SpringBusFactory();
+ URL cxfConfig = getResourceURL("jaxws/cxf/interop/wstrust10/META-INF/" + scenario + "-client-config.xml");
+ bus = busFactory.createBus(cxfConfig);
+ BusFactory.setDefaultBus(bus);
+ }
+
+ @Override
+ protected void tearDown() throws Exception
+ {
+ System.out.println("... bus teardown");
+ if (bus != null)
+ bus.shutdown(true);
+
+ super.tearDown();
+ }
+
private URL getServiceURL() throws Exception
{
return getResourceURL("jaxws/cxf/interop/wstrust10/META-INF/wsdl/WsTrustSym.wsdl");
}
-
}
Copied: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario10-client-config.xml (from rev 10145, stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario10-client-config.xml)
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario10-client-config.xml (rev 0)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario10-client-config.xml 2009-05-29 14:19:43 UTC (rev 10147)
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:p="http://cxf.apache.org/policy"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd
+ http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd
+ http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd
+ http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd
+ http://cxf.apache.org/policy http://cxf.apache.org/schemas/policy.xsd"
+>
+ <cxf:bus>
+ <cxf:features>
+ <p:policies/>
+ <cxf:logging/>
+ </cxf:features>
+ </cxf:bus>
+
+ <!-- Scenario 10 -->
+ <bean name="{http://tempuri.org/}Scenario_10_IssuedTokenForCertificateSecureConversation_MutualCertificate11.sct-client.sts-client"
+ class="org.apache.cxf.ws.security.trust.STSClient" abstract="true">
+ <property name="wsdlLocation" value="META-INF/wsdl/STSAsym.wsdl"/>
+ <property name="serviceName" value="{http://tempuri.org/}SecurityTokenService"/>
+ <property name="endpointName" value="{http://tempuri.org/}WSHttpBinding_ISecurityTokenService3"/>
+ <property name="properties">
+ <map>
+ <entry key="ws-security.callback-handler" value="org.jboss.test.ws.jaxws.cxf.interop.wstrust10.KeystorePasswordCallback"/>
+ <entry key="ws-security.signature.properties" value="META-INF/etc/wssip.properties"/>
+ <entry key="ws-security.encryption.properties" value="META-INF/etc/wssip.properties"/>
+ <entry key="ws-security.sts.token.properties" value="META-INF/etc/wssip.properties"/>
+ <entry key="ws-security.sts.token.properties.decrypt" value="META-INF/etc/bob.properties"/>
+ </map>
+ </property>
+ </bean>
+ <jaxws:client name="{http://tempuri.org/}Scenario_10_IssuedTokenForCertificateSecureConversation_MutualCertificate11" createdFromAPI="true">
+ <jaxws:properties>
+ <entry key="ws-security.callback-handler.sct" value="org.jboss.test.ws.jaxws.cxf.interop.wstrust10.KeystorePasswordCallback"/>
+ <entry key="ws-security.encryption.properties.sct" value="META-INF/etc/bob.properties"/>
+ </jaxws:properties>
+ </jaxws:client>
+</beans>
Copied: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario2-client-config.xml (from rev 10145, stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario2-client-config.xml)
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario2-client-config.xml (rev 0)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario2-client-config.xml 2009-05-29 14:19:43 UTC (rev 10147)
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:p="http://cxf.apache.org/policy"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd
+ http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd
+ http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd
+ http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd
+ http://cxf.apache.org/policy http://cxf.apache.org/schemas/policy.xsd"
+>
+ <cxf:bus>
+ <cxf:features>
+ <p:policies/>
+ <cxf:logging/>
+ </cxf:features>
+ </cxf:bus>
+
+ <!-- Scenario 2 -->
+ <bean name="{http://tempuri.org/}Scenario_2_IssuedToken_MutualCertificate10.sts-client"
+ class="org.apache.cxf.ws.security.trust.STSClient" abstract="true">
+ <property name="wsdlLocation" value="META-INF/wsdl/STSSym.wsdl"/>
+ <property name="serviceName" value="{http://tempuri.org/}SecurityTokenService"/>
+ <property name="endpointName" value="{http://tempuri.org/}CustomBinding_ISecurityTokenService1"/>
+ <property name="properties">
+ <map>
+ <entry key="ws-security.callback-handler" value="org.jboss.test.ws.jaxws.cxf.interop.wstrust10.KeystorePasswordCallback"/>
+ <entry key="ws-security.signature.properties" value="META-INF/etc/alice.properties"/>
+ <entry key="ws-security.encryption.properties" value="META-INF/etc/wssip.properties"/>
+ <entry key="ws-security.sts.token.properties" value="META-INF/etc/bob.properties"/>
+ </map>
+ </property>
+ </bean>
+</beans>
Copied: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario5-client-config.xml (from rev 10145, stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario5-client-config.xml)
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario5-client-config.xml (rev 0)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario5-client-config.xml 2009-05-29 14:19:43 UTC (rev 10147)
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:p="http://cxf.apache.org/policy"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd
+ http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd
+ http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd
+ http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd
+ http://cxf.apache.org/policy http://cxf.apache.org/schemas/policy.xsd"
+>
+ <cxf:bus>
+ <cxf:features>
+ <p:policies/>
+ <cxf:logging/>
+ </cxf:features>
+ </cxf:bus>
+
+ <!-- Scenario 5 -->
+ <bean name="{http://tempuri.org/}Scenario_5_IssuedTokenForCertificate_MutualCertificate11.sts-client"
+ class="org.apache.cxf.ws.security.trust.STSClient" abstract="true">
+ <property name="wsdlLocation" value="META-INF/wsdl/STSSym.wsdl"/>
+ <property name="serviceName" value="{http://tempuri.org/}SecurityTokenService"/>
+ <property name="endpointName" value="{http://tempuri.org/}CustomBinding_ISecurityTokenService1"/>
+ <property name="properties">
+ <map>
+ <entry key="ws-security.callback-handler" value="org.jboss.test.ws.jaxws.cxf.interop.wstrust10.KeystorePasswordCallback"/>
+ <entry key="ws-security.signature.properties" value="META-INF/etc/alice.properties"/>
+ <entry key="ws-security.encryption.properties" value="META-INF/etc/wssip.properties"/>
+ <entry key="ws-security.sts.token.properties" value="META-INF/etc/bob.properties"/>
+ </map>
+ </property>
+ </bean>
+ <jaxws:client name="{http://tempuri.org/}Scenario_5_IssuedTokenForCertificate_MutualCertificate11" createdFromAPI="true">
+ <jaxws:properties>
+ <entry key="ws-security.callback-handler" value="org.jboss.test.ws.jaxws.cxf.interop.wstrust10.KeystorePasswordCallback"/>
+ <entry key="ws-security.encryption.properties" value="META-INF/etc/bob.properties"/>
+ </jaxws:properties>
+ </jaxws:client>
+</beans>
Copied: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario6-client-config.xml (from rev 10145, stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario6-client-config.xml)
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario6-client-config.xml (rev 0)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario6-client-config.xml 2009-05-29 14:19:43 UTC (rev 10147)
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:p="http://cxf.apache.org/policy"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd
+ http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd
+ http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd
+ http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd
+ http://cxf.apache.org/policy http://cxf.apache.org/schemas/policy.xsd"
+>
+ <cxf:bus>
+ <cxf:features>
+ <p:policies/>
+ <cxf:logging/>
+ </cxf:features>
+ </cxf:bus>
+
+ <!-- Scenario 6 -->
+ <bean name="{http://tempuri.org/}Scenario_6_IssuedTokenForCertificateSecureConversation_MutualCertificate11.sct-client.sts-client"
+ class="org.apache.cxf.ws.security.trust.STSClient" abstract="true">
+ <property name="wsdlLocation" value="META-INF/wsdl/STSSym.wsdl"/>
+ <property name="serviceName" value="{http://tempuri.org/}SecurityTokenService"/>
+ <property name="endpointName" value="{http://tempuri.org/}CustomBinding_ISecurityTokenService1"/>
+ <property name="properties">
+ <map>
+ <entry key="ws-security.callback-handler" value="org.jboss.test.ws.jaxws.cxf.interop.wstrust10.KeystorePasswordCallback"/>
+ <entry key="ws-security.signature.properties" value="META-INF/etc/alice.properties"/>
+ <entry key="ws-security.encryption.properties" value="META-INF/etc/wssip.properties"/>
+ <entry key="ws-security.sts.token.properties" value="META-INF/etc/bob.properties"/>
+ </map>
+ </property>
+ </bean>
+ <jaxws:client name="{http://tempuri.org/}Scenario_6_IssuedTokenForCertificateSecureConversation_MutualCertificate11" createdFromAPI="true">
+ <jaxws:properties>
+ <entry key="ws-security.callback-handler.sct" value="org.jboss.test.ws.jaxws.cxf.interop.wstrust10.KeystorePasswordCallback"/>
+ <entry key="ws-security.encryption.properties.sct" value="META-INF/etc/bob.properties"/>
+ </jaxws:properties>
+ </jaxws:client>
+</beans>
Copied: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario9-client-config.xml (from rev 10145, stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario9-client-config.xml)
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario9-client-config.xml (rev 0)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario9-client-config.xml 2009-05-29 14:19:43 UTC (rev 10147)
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:p="http://cxf.apache.org/policy"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd
+ http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd
+ http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd
+ http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd
+ http://cxf.apache.org/policy http://cxf.apache.org/schemas/policy.xsd"
+>
+ <cxf:bus>
+ <cxf:features>
+ <p:policies/>
+ <cxf:logging/>
+ </cxf:features>
+ </cxf:bus>
+
+ <!-- Scenario 9 -->
+ <bean name="{http://tempuri.org/}Scenario_9_IssuedTokenForCertificate_MutualCertificate11.sts-client"
+ class="org.apache.cxf.ws.security.trust.STSClient" abstract="true">
+ <property name="wsdlLocation" value="META-INF/wsdl/STSAsym.wsdl"/>
+ <property name="serviceName" value="{http://tempuri.org/}SecurityTokenService"/>
+ <property name="endpointName" value="{http://tempuri.org/}WSHttpBinding_ISecurityTokenService2"/>
+ <property name="properties">
+ <map>
+ <entry key="ws-security.callback-handler" value="org.jboss.test.ws.jaxws.cxf.interop.wstrust10.KeystorePasswordCallback"/>
+ <entry key="ws-security.signature.properties" value="META-INF/etc/wssip.properties"/>
+ <entry key="ws-security.encryption.properties" value="META-INF/etc/wssip.properties"/>
+ <entry key="ws-security.sts.token.properties" value="META-INF/etc/wssip.properties"/>
+ <entry key="ws-security.sts.token.properties.decrypt" value="META-INF/etc/bob.properties"/>
+ </map>
+ </property>
+ </bean>
+ <jaxws:client name="{http://tempuri.org/}Scenario_9_IssuedTokenForCertificate_MutualCertificate11" createdFromAPI="true">
+ <jaxws:properties>
+ <entry key="ws-security.callback-handler" value="org.jboss.test.ws.jaxws.cxf.interop.wstrust10.KeystorePasswordCallback"/>
+ <entry key="ws-security.encryption.properties" value="META-INF/etc/bob.properties"/>
+ </jaxws:properties>
+ </jaxws:client>
+</beans>
15 years, 6 months
JBossWS SVN: r10146 - in stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests: src/test/java/org/jboss/test/ws/jaxws/cxf/interop/wstrust10 and 6 other directories.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-05-29 09:25:20 -0400 (Fri, 29 May 2009)
New Revision: 10146
Added:
stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario10/
stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario10/cxf.xml
stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario2/
stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario2/cxf.xml
stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario5/
stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario5/cxf.xml
stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario6/
stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario6/cxf.xml
stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario9/
stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario9/cxf.xml
Removed:
stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario10-client-config.xml
stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario2-client-config.xml
stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario5-client-config.xml
stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario6-client-config.xml
stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario9-client-config.xml
Modified:
stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml
stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/interop/wstrust10/AsymmetricBindingClientTestCase.java
stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/interop/wstrust10/SymmetricBindingClientTestCase.java
Log:
[JBWS-2661] fixing wstrust interop - could you Alessio have a look why exception is thrown? Feel free to rollback this commit
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2009-05-29 13:21:21 UTC (rev 10145)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2009-05-29 13:25:20 UTC (rev 10146)
@@ -33,12 +33,51 @@
</war>
<!-- jaxws-cxf-interop-wstrust10-client -->
- <jar destfile="${tests.output.dir}/test-libs/jaxws-cxf-interop-wstrust10-client.jar">
+ <jar destfile="${tests.output.dir}/test-libs/jaxws-cxf-interop-wstrust10-scenario2-client.jar">
<metainf dir="${tests.output.dir}/test-resources/jaxws/cxf/interop/wstrust10/META-INF">
<include name="**/*" />
</metainf>
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/cxf/interop/wstrust10/META-INF/scenario2">
+ <include name="cxf.xml" />
+ </metainf>
</jar>
+ <jar destfile="${tests.output.dir}/test-libs/jaxws-cxf-interop-wstrust10-scenario5-client.jar">
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/cxf/interop/wstrust10/META-INF">
+ <include name="**/*" />
+ </metainf>
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/cxf/interop/wstrust10/META-INF/scenario5">
+ <include name="cxf.xml" />
+ </metainf>
+ </jar>
+
+ <jar destfile="${tests.output.dir}/test-libs/jaxws-cxf-interop-wstrust10-scenario6-client.jar">
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/cxf/interop/wstrust10/META-INF">
+ <include name="**/*" />
+ </metainf>
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/cxf/interop/wstrust10/META-INF/scenario6">
+ <include name="cxf.xml" />
+ </metainf>
+ </jar>
+
+ <jar destfile="${tests.output.dir}/test-libs/jaxws-cxf-interop-wstrust10-scenario9-client.jar">
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/cxf/interop/wstrust10/META-INF">
+ <include name="**/*" />
+ </metainf>
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/cxf/interop/wstrust10/META-INF/scenario9">
+ <include name="cxf.xml" />
+ </metainf>
+ </jar>
+
+ <jar destfile="${tests.output.dir}/test-libs/jaxws-cxf-interop-wstrust10-scenario10-client.jar">
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/cxf/interop/wstrust10/META-INF">
+ <include name="**/*" />
+ </metainf>
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/cxf/interop/wstrust10/META-INF/scenario10">
+ <include name="cxf.xml" />
+ </metainf>
+ </jar>
+
<!-- jaxws-cxf-wsrm-basic-doc -->
<war warfile="${tests.output.dir}/test-libs/jaxws-cxf-wsrm-basic-doc.war" webxml="${tests.output.dir}/test-resources/jaxws/cxf/wsrm/basic-doc/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/interop/wstrust10/AsymmetricBindingClientTestCase.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/interop/wstrust10/AsymmetricBindingClientTestCase.java 2009-05-29 13:21:21 UTC (rev 10145)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/interop/wstrust10/AsymmetricBindingClientTestCase.java 2009-05-29 13:25:20 UTC (rev 10146)
@@ -29,9 +29,6 @@
import junit.framework.Test;
-import org.apache.cxf.Bus;
-import org.apache.cxf.BusFactory;
-import org.apache.cxf.bus.spring.SpringBusFactory;
import org.jboss.test.ws.jaxws.cxf.interop.wstrust10.interopbaseaddress.interop.IPingService;
import org.jboss.wsf.test.JBossWSTest;
import org.jboss.wsf.test.JBossWSTestSetup;
@@ -47,66 +44,59 @@
*/
public class AsymmetricBindingClientTestCase extends JBossWSTest
{
- private Bus bus;
-
public static Test suite()
{
- return new JBossWSTestSetup(AsymmetricBindingClientTestCase.class, "jaxws-cxf-interop-wstrust10-client.jar");
+ return new JBossWSTestSetup(AsymmetricBindingClientTestCase.class, "");
}
public void testScenario9() throws Exception
{
- this.loadBus("scenario9");
- QName serviceName = new QName("http://tempuri.org/", "AsymmetricFederatedService");
- Service service = Service.create(getServiceURL(), serviceName);
- QName portName = new QName("http://tempuri.org/", "Scenario_9_IssuedTokenForCertificate_MutualCertificate11");
- IPingService proxy = service.getPort(portName, IPingService.class);
+ this.deploy("jaxws-cxf-interop-wstrust10-scenario9-client.jar");
try
{
- assertEquals("Hi!", proxy.echo("Hi!"));
+ QName serviceName = new QName("http://tempuri.org/", "AsymmetricFederatedService");
+ Service service = Service.create(getServiceURL(), serviceName);
+ QName portName = new QName("http://tempuri.org/", "Scenario_9_IssuedTokenForCertificate_MutualCertificate11");
+ IPingService proxy = service.getPort(portName, IPingService.class);
+ try
+ {
+ assertEquals("Hi!", proxy.echo("Hi!"));
+ }
+ catch (SOAPFaultException e)
+ {
+ throw new Exception("Please check that the Bouncy Castle provider is installed.", e);
+ }
}
- catch (SOAPFaultException e)
+ finally
{
- throw new Exception("Please check that the Bouncy Castle provider is installed.", e);
+ this.undeploy("jaxws-cxf-interop-wstrust10-scenario9-client.jar");
}
}
public void testScenario10() throws Exception
{
- this.loadBus("scenario10");
- QName serviceName = new QName("http://tempuri.org/", "AsymmetricFederatedService");
- Service service = Service.create(getServiceURL(), serviceName);
- QName portName = new QName("http://tempuri.org/", "Scenario_10_IssuedTokenForCertificateSecureConversation_MutualCertificate11");
- IPingService proxy = service.getPort(portName, IPingService.class);
+ this.deploy("jaxws-cxf-interop-wstrust10-scenario10-client.jar");
try
{
- assertEquals("Hi!", proxy.echo("Hi!"));
+ QName serviceName = new QName("http://tempuri.org/", "AsymmetricFederatedService");
+ Service service = Service.create(getServiceURL(), serviceName);
+ QName portName = new QName("http://tempuri.org/", "Scenario_10_IssuedTokenForCertificateSecureConversation_MutualCertificate11");
+ IPingService proxy = service.getPort(portName, IPingService.class);
+ try
+ {
+ assertEquals("Hi!", proxy.echo("Hi!"));
+ }
+ catch (SOAPFaultException e)
+ {
+ throw new Exception("Please check that the Bouncy Castle provider is installed.", e);
+ }
}
- catch (SOAPFaultException e)
+ finally
{
- throw new Exception("Please check that the Bouncy Castle provider is installed.", e);
+ this.undeploy("jaxws-cxf-interop-wstrust10-scenario10-client.jar");
}
}
- private void loadBus(String scenario) throws Exception
- {
- System.out.println("Loading bus for " + scenario + "...");
- SpringBusFactory busFactory = new SpringBusFactory();
- URL cxfConfig = getResourceURL("jaxws/cxf/interop/wstrust10/META-INF/" + scenario + "-client-config.xml");
- bus = busFactory.createBus(cxfConfig);
- BusFactory.setDefaultBus(bus);
- }
-
- @Override
- protected void tearDown() throws Exception
- {
- System.out.println("... bus teardown");
- if (bus != null)
- bus.shutdown(true);
-
- super.tearDown();
- }
-
private URL getServiceURL() throws Exception
{
return getResourceURL("jaxws/cxf/interop/wstrust10/META-INF/wsdl/WsTrustAsym.wsdl");
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/interop/wstrust10/SymmetricBindingClientTestCase.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/interop/wstrust10/SymmetricBindingClientTestCase.java 2009-05-29 13:21:21 UTC (rev 10145)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/interop/wstrust10/SymmetricBindingClientTestCase.java 2009-05-29 13:25:20 UTC (rev 10146)
@@ -29,9 +29,6 @@
import junit.framework.Test;
-import org.apache.cxf.Bus;
-import org.apache.cxf.BusFactory;
-import org.apache.cxf.bus.spring.SpringBusFactory;
import org.jboss.test.ws.jaxws.cxf.interop.wstrust10.interopbaseaddress.interop.IPingService;
import org.jboss.wsf.test.JBossWSTest;
import org.jboss.wsf.test.JBossWSTestSetup;
@@ -46,85 +43,86 @@
*/
public class SymmetricBindingClientTestCase extends JBossWSTest
{
- private Bus bus;
-
public static Test suite()
{
- return new JBossWSTestSetup(SymmetricBindingClientTestCase.class, "jaxws-cxf-interop-wstrust10-client.jar");
+ return new JBossWSTestSetup(SymmetricBindingClientTestCase.class, "");
}
public void testScenario2() throws Exception
{
- this.loadBus("scenario2");
- QName serviceName = new QName("http://tempuri.org/", "SymmetricFederatedService");
- Service service = Service.create(getServiceURL(), serviceName);
- QName portName = new QName("http://tempuri.org/", "Scenario_2_IssuedToken_MutualCertificate10");
- IPingService proxy = service.getPort(portName, IPingService.class);
+ this.deploy("jaxws-cxf-interop-wstrust10-scenario2-client.jar");
try
{
- assertEquals("Hi!", proxy.echo("Hi!"));
+ QName serviceName = new QName("http://tempuri.org/", "SymmetricFederatedService");
+ Service service = Service.create(getServiceURL(), serviceName);
+ QName portName = new QName("http://tempuri.org/", "Scenario_2_IssuedToken_MutualCertificate10");
+ IPingService proxy = service.getPort(portName, IPingService.class);
+ try
+ {
+ assertEquals("Hi!", proxy.echo("Hi!"));
+ }
+ catch (SOAPFaultException e)
+ {
+ throw new Exception("Please check that the Bouncy Castle provider is installed.", e);
+ }
}
- catch (SOAPFaultException e)
+ finally
{
- throw new Exception("Please check that the Bouncy Castle provider is installed.", e);
+ this.undeploy("jaxws-cxf-interop-wstrust10-scenario2-client.jar");
}
}
public void testScenario5() throws Exception
{
- this.loadBus("scenario5");
- QName serviceName = new QName("http://tempuri.org/", "SymmetricFederatedService");
- Service service = Service.create(getServiceURL(), serviceName);
- QName portName = new QName("http://tempuri.org/", "Scenario_5_IssuedTokenForCertificate_MutualCertificate11");
- IPingService proxy = service.getPort(portName, IPingService.class);
+ this.deploy("jaxws-cxf-interop-wstrust10-scenario5-client.jar");
try
{
- assertEquals("Hi!", proxy.echo("Hi!"));
+ QName serviceName = new QName("http://tempuri.org/", "SymmetricFederatedService");
+ Service service = Service.create(getServiceURL(), serviceName);
+ QName portName = new QName("http://tempuri.org/", "Scenario_5_IssuedTokenForCertificate_MutualCertificate11");
+ IPingService proxy = service.getPort(portName, IPingService.class);
+ try
+ {
+ assertEquals("Hi!", proxy.echo("Hi!"));
+ }
+ catch (SOAPFaultException e)
+ {
+ throw new Exception("Please check that the Bouncy Castle provider is installed.", e);
+ }
}
- catch (SOAPFaultException e)
+ finally
{
- throw new Exception("Please check that the Bouncy Castle provider is installed.", e);
+ this.undeploy("jaxws-cxf-interop-wstrust10-scenario5-client.jar");
}
}
public void testScenario6() throws Exception
{
- this.loadBus("scenario6");
- QName serviceName = new QName("http://tempuri.org/", "SymmetricFederatedService");
- Service service = Service.create(getServiceURL(), serviceName);
- QName portName = new QName("http://tempuri.org/", "Scenario_6_IssuedTokenForCertificateSecureConversation_MutualCertificate11");
- IPingService proxy = service.getPort(portName, IPingService.class);
+ this.deploy("jaxws-cxf-interop-wstrust10-scenario6-client.jar");
try
{
- assertEquals("Hi!", proxy.echo("Hi!"));
+ QName serviceName = new QName("http://tempuri.org/", "SymmetricFederatedService");
+ Service service = Service.create(getServiceURL(), serviceName);
+ QName portName = new QName("http://tempuri.org/", "Scenario_6_IssuedTokenForCertificateSecureConversation_MutualCertificate11");
+ IPingService proxy = service.getPort(portName, IPingService.class);
+ try
+ {
+ assertEquals("Hi!", proxy.echo("Hi!"));
+ }
+ catch (SOAPFaultException e)
+ {
+ throw new Exception("Please check that the Bouncy Castle provider is installed.", e);
+ }
}
- catch (SOAPFaultException e)
+ finally
{
- throw new Exception("Please check that the Bouncy Castle provider is installed.", e);
+ this.undeploy("jaxws-cxf-interop-wstrust10-scenario6-client.jar");
}
}
- private void loadBus(String scenario) throws Exception
- {
- System.out.println("Loading bus for " + scenario + "...");
- SpringBusFactory busFactory = new SpringBusFactory();
- URL cxfConfig = getResourceURL("jaxws/cxf/interop/wstrust10/META-INF/" + scenario + "-client-config.xml");
- bus = busFactory.createBus(cxfConfig);
- BusFactory.setDefaultBus(bus);
- }
-
- @Override
- protected void tearDown() throws Exception
- {
- System.out.println("... bus teardown");
- if (bus != null)
- bus.shutdown(true);
-
- super.tearDown();
- }
-
private URL getServiceURL() throws Exception
{
return getResourceURL("jaxws/cxf/interop/wstrust10/META-INF/wsdl/WsTrustSym.wsdl");
}
+
}
Added: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario10/cxf.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario10/cxf.xml (rev 0)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario10/cxf.xml 2009-05-29 13:25:20 UTC (rev 10146)
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:p="http://cxf.apache.org/policy"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd
+ http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd
+ http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd
+ http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd
+ http://cxf.apache.org/policy http://cxf.apache.org/schemas/policy.xsd"
+>
+ <cxf:bus>
+ <cxf:features>
+ <p:policies/>
+ <cxf:logging/>
+ </cxf:features>
+ </cxf:bus>
+
+ <!-- Scenario 10 -->
+ <bean name="{http://tempuri.org/}Scenario_10_IssuedTokenForCertificateSecureConversation_MutualCertificate11.sct-client.sts-client"
+ class="org.apache.cxf.ws.security.trust.STSClient" abstract="true">
+ <property name="wsdlLocation" value="META-INF/wsdl/STSAsym.wsdl"/>
+ <property name="serviceName" value="{http://tempuri.org/}SecurityTokenService"/>
+ <property name="endpointName" value="{http://tempuri.org/}WSHttpBinding_ISecurityTokenService3"/>
+ <property name="properties">
+ <map>
+ <entry key="ws-security.callback-handler" value="org.jboss.test.ws.jaxws.cxf.interop.wstrust10.KeystorePasswordCallback"/>
+ <entry key="ws-security.signature.properties" value="META-INF/etc/wssip.properties"/>
+ <entry key="ws-security.encryption.properties" value="META-INF/etc/wssip.properties"/>
+ <entry key="ws-security.sts.token.properties" value="META-INF/etc/wssip.properties"/>
+ <entry key="ws-security.sts.token.properties.decrypt" value="META-INF/etc/bob.properties"/>
+ </map>
+ </property>
+ </bean>
+ <jaxws:client name="{http://tempuri.org/}Scenario_10_IssuedTokenForCertificateSecureConversation_MutualCertificate11" createdFromAPI="true">
+ <jaxws:properties>
+ <entry key="ws-security.callback-handler.sct" value="org.jboss.test.ws.jaxws.cxf.interop.wstrust10.KeystorePasswordCallback"/>
+ <entry key="ws-security.encryption.properties.sct" value="META-INF/etc/bob.properties"/>
+ </jaxws:properties>
+ </jaxws:client>
+</beans>
Deleted: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario10-client-config.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario10-client-config.xml 2009-05-29 13:21:21 UTC (rev 10145)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario10-client-config.xml 2009-05-29 13:25:20 UTC (rev 10146)
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:http="http://cxf.apache.org/transports/http/configuration"
- xmlns:jaxws="http://cxf.apache.org/jaxws"
- xmlns:cxf="http://cxf.apache.org/core"
- xmlns:p="http://cxf.apache.org/policy"
- xmlns:sec="http://cxf.apache.org/configuration/security"
- xsi:schemaLocation="
- http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd
- http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd
- http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd
- http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd
- http://cxf.apache.org/policy http://cxf.apache.org/schemas/policy.xsd"
->
- <cxf:bus>
- <cxf:features>
- <p:policies/>
- <cxf:logging/>
- </cxf:features>
- </cxf:bus>
-
- <!-- Scenario 10 -->
- <bean name="{http://tempuri.org/}Scenario_10_IssuedTokenForCertificateSecureConversation_MutualCertificate11.sct-client.sts-client"
- class="org.apache.cxf.ws.security.trust.STSClient" abstract="true">
- <property name="wsdlLocation" value="META-INF/wsdl/STSAsym.wsdl"/>
- <property name="serviceName" value="{http://tempuri.org/}SecurityTokenService"/>
- <property name="endpointName" value="{http://tempuri.org/}WSHttpBinding_ISecurityTokenService3"/>
- <property name="properties">
- <map>
- <entry key="ws-security.callback-handler" value="org.jboss.test.ws.jaxws.cxf.interop.wstrust10.KeystorePasswordCallback"/>
- <entry key="ws-security.signature.properties" value="META-INF/etc/wssip.properties"/>
- <entry key="ws-security.encryption.properties" value="META-INF/etc/wssip.properties"/>
- <entry key="ws-security.sts.token.properties" value="META-INF/etc/wssip.properties"/>
- <entry key="ws-security.sts.token.properties.decrypt" value="META-INF/etc/bob.properties"/>
- </map>
- </property>
- </bean>
- <jaxws:client name="{http://tempuri.org/}Scenario_10_IssuedTokenForCertificateSecureConversation_MutualCertificate11" createdFromAPI="true">
- <jaxws:properties>
- <entry key="ws-security.callback-handler.sct" value="org.jboss.test.ws.jaxws.cxf.interop.wstrust10.KeystorePasswordCallback"/>
- <entry key="ws-security.encryption.properties.sct" value="META-INF/etc/bob.properties"/>
- </jaxws:properties>
- </jaxws:client>
-</beans>
Added: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario2/cxf.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario2/cxf.xml (rev 0)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario2/cxf.xml 2009-05-29 13:25:20 UTC (rev 10146)
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:p="http://cxf.apache.org/policy"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd
+ http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd
+ http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd
+ http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd
+ http://cxf.apache.org/policy http://cxf.apache.org/schemas/policy.xsd"
+>
+ <cxf:bus>
+ <cxf:features>
+ <p:policies/>
+ <cxf:logging/>
+ </cxf:features>
+ </cxf:bus>
+
+ <!-- Scenario 2 -->
+ <bean name="{http://tempuri.org/}Scenario_2_IssuedToken_MutualCertificate10.sts-client"
+ class="org.apache.cxf.ws.security.trust.STSClient" abstract="true">
+ <property name="wsdlLocation" value="META-INF/wsdl/STSSym.wsdl"/>
+ <property name="serviceName" value="{http://tempuri.org/}SecurityTokenService"/>
+ <property name="endpointName" value="{http://tempuri.org/}CustomBinding_ISecurityTokenService1"/>
+ <property name="properties">
+ <map>
+ <entry key="ws-security.callback-handler" value="org.jboss.test.ws.jaxws.cxf.interop.wstrust10.KeystorePasswordCallback"/>
+ <entry key="ws-security.signature.properties" value="META-INF/etc/alice.properties"/>
+ <entry key="ws-security.encryption.properties" value="META-INF/etc/wssip.properties"/>
+ <entry key="ws-security.sts.token.properties" value="META-INF/etc/bob.properties"/>
+ </map>
+ </property>
+ </bean>
+</beans>
Deleted: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario2-client-config.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario2-client-config.xml 2009-05-29 13:21:21 UTC (rev 10145)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario2-client-config.xml 2009-05-29 13:25:20 UTC (rev 10146)
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:http="http://cxf.apache.org/transports/http/configuration"
- xmlns:jaxws="http://cxf.apache.org/jaxws"
- xmlns:cxf="http://cxf.apache.org/core"
- xmlns:p="http://cxf.apache.org/policy"
- xmlns:sec="http://cxf.apache.org/configuration/security"
- xsi:schemaLocation="
- http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd
- http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd
- http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd
- http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd
- http://cxf.apache.org/policy http://cxf.apache.org/schemas/policy.xsd"
->
- <cxf:bus>
- <cxf:features>
- <p:policies/>
- <cxf:logging/>
- </cxf:features>
- </cxf:bus>
-
- <!-- Scenario 2 -->
- <bean name="{http://tempuri.org/}Scenario_2_IssuedToken_MutualCertificate10.sts-client"
- class="org.apache.cxf.ws.security.trust.STSClient" abstract="true">
- <property name="wsdlLocation" value="META-INF/wsdl/STSSym.wsdl"/>
- <property name="serviceName" value="{http://tempuri.org/}SecurityTokenService"/>
- <property name="endpointName" value="{http://tempuri.org/}CustomBinding_ISecurityTokenService1"/>
- <property name="properties">
- <map>
- <entry key="ws-security.callback-handler" value="org.jboss.test.ws.jaxws.cxf.interop.wstrust10.KeystorePasswordCallback"/>
- <entry key="ws-security.signature.properties" value="META-INF/etc/alice.properties"/>
- <entry key="ws-security.encryption.properties" value="META-INF/etc/wssip.properties"/>
- <entry key="ws-security.sts.token.properties" value="META-INF/etc/bob.properties"/>
- </map>
- </property>
- </bean>
-</beans>
Added: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario5/cxf.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario5/cxf.xml (rev 0)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario5/cxf.xml 2009-05-29 13:25:20 UTC (rev 10146)
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:p="http://cxf.apache.org/policy"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd
+ http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd
+ http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd
+ http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd
+ http://cxf.apache.org/policy http://cxf.apache.org/schemas/policy.xsd"
+>
+ <cxf:bus>
+ <cxf:features>
+ <p:policies/>
+ <cxf:logging/>
+ </cxf:features>
+ </cxf:bus>
+
+ <!-- Scenario 5 -->
+ <bean name="{http://tempuri.org/}Scenario_5_IssuedTokenForCertificate_MutualCertificate11.sts-client"
+ class="org.apache.cxf.ws.security.trust.STSClient" abstract="true">
+ <property name="wsdlLocation" value="META-INF/wsdl/STSSym.wsdl"/>
+ <property name="serviceName" value="{http://tempuri.org/}SecurityTokenService"/>
+ <property name="endpointName" value="{http://tempuri.org/}CustomBinding_ISecurityTokenService1"/>
+ <property name="properties">
+ <map>
+ <entry key="ws-security.callback-handler" value="org.jboss.test.ws.jaxws.cxf.interop.wstrust10.KeystorePasswordCallback"/>
+ <entry key="ws-security.signature.properties" value="META-INF/etc/alice.properties"/>
+ <entry key="ws-security.encryption.properties" value="META-INF/etc/wssip.properties"/>
+ <entry key="ws-security.sts.token.properties" value="META-INF/etc/bob.properties"/>
+ </map>
+ </property>
+ </bean>
+ <jaxws:client name="{http://tempuri.org/}Scenario_5_IssuedTokenForCertificate_MutualCertificate11" createdFromAPI="true">
+ <jaxws:properties>
+ <entry key="ws-security.callback-handler" value="org.jboss.test.ws.jaxws.cxf.interop.wstrust10.KeystorePasswordCallback"/>
+ <entry key="ws-security.encryption.properties" value="META-INF/etc/bob.properties"/>
+ </jaxws:properties>
+ </jaxws:client>
+</beans>
Deleted: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario5-client-config.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario5-client-config.xml 2009-05-29 13:21:21 UTC (rev 10145)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario5-client-config.xml 2009-05-29 13:25:20 UTC (rev 10146)
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:http="http://cxf.apache.org/transports/http/configuration"
- xmlns:jaxws="http://cxf.apache.org/jaxws"
- xmlns:cxf="http://cxf.apache.org/core"
- xmlns:p="http://cxf.apache.org/policy"
- xmlns:sec="http://cxf.apache.org/configuration/security"
- xsi:schemaLocation="
- http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd
- http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd
- http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd
- http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd
- http://cxf.apache.org/policy http://cxf.apache.org/schemas/policy.xsd"
->
- <cxf:bus>
- <cxf:features>
- <p:policies/>
- <cxf:logging/>
- </cxf:features>
- </cxf:bus>
-
- <!-- Scenario 5 -->
- <bean name="{http://tempuri.org/}Scenario_5_IssuedTokenForCertificate_MutualCertificate11.sts-client"
- class="org.apache.cxf.ws.security.trust.STSClient" abstract="true">
- <property name="wsdlLocation" value="META-INF/wsdl/STSSym.wsdl"/>
- <property name="serviceName" value="{http://tempuri.org/}SecurityTokenService"/>
- <property name="endpointName" value="{http://tempuri.org/}CustomBinding_ISecurityTokenService1"/>
- <property name="properties">
- <map>
- <entry key="ws-security.callback-handler" value="org.jboss.test.ws.jaxws.cxf.interop.wstrust10.KeystorePasswordCallback"/>
- <entry key="ws-security.signature.properties" value="META-INF/etc/alice.properties"/>
- <entry key="ws-security.encryption.properties" value="META-INF/etc/wssip.properties"/>
- <entry key="ws-security.sts.token.properties" value="META-INF/etc/bob.properties"/>
- </map>
- </property>
- </bean>
- <jaxws:client name="{http://tempuri.org/}Scenario_5_IssuedTokenForCertificate_MutualCertificate11" createdFromAPI="true">
- <jaxws:properties>
- <entry key="ws-security.callback-handler" value="org.jboss.test.ws.jaxws.cxf.interop.wstrust10.KeystorePasswordCallback"/>
- <entry key="ws-security.encryption.properties" value="META-INF/etc/bob.properties"/>
- </jaxws:properties>
- </jaxws:client>
-</beans>
Added: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario6/cxf.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario6/cxf.xml (rev 0)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario6/cxf.xml 2009-05-29 13:25:20 UTC (rev 10146)
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:p="http://cxf.apache.org/policy"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd
+ http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd
+ http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd
+ http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd
+ http://cxf.apache.org/policy http://cxf.apache.org/schemas/policy.xsd"
+>
+ <cxf:bus>
+ <cxf:features>
+ <p:policies/>
+ <cxf:logging/>
+ </cxf:features>
+ </cxf:bus>
+
+ <!-- Scenario 6 -->
+ <bean name="{http://tempuri.org/}Scenario_6_IssuedTokenForCertificateSecureConversation_MutualCertificate11.sct-client.sts-client"
+ class="org.apache.cxf.ws.security.trust.STSClient" abstract="true">
+ <property name="wsdlLocation" value="META-INF/wsdl/STSSym.wsdl"/>
+ <property name="serviceName" value="{http://tempuri.org/}SecurityTokenService"/>
+ <property name="endpointName" value="{http://tempuri.org/}CustomBinding_ISecurityTokenService1"/>
+ <property name="properties">
+ <map>
+ <entry key="ws-security.callback-handler" value="org.jboss.test.ws.jaxws.cxf.interop.wstrust10.KeystorePasswordCallback"/>
+ <entry key="ws-security.signature.properties" value="META-INF/etc/alice.properties"/>
+ <entry key="ws-security.encryption.properties" value="META-INF/etc/wssip.properties"/>
+ <entry key="ws-security.sts.token.properties" value="META-INF/etc/bob.properties"/>
+ </map>
+ </property>
+ </bean>
+ <jaxws:client name="{http://tempuri.org/}Scenario_6_IssuedTokenForCertificateSecureConversation_MutualCertificate11" createdFromAPI="true">
+ <jaxws:properties>
+ <entry key="ws-security.callback-handler.sct" value="org.jboss.test.ws.jaxws.cxf.interop.wstrust10.KeystorePasswordCallback"/>
+ <entry key="ws-security.encryption.properties.sct" value="META-INF/etc/bob.properties"/>
+ </jaxws:properties>
+ </jaxws:client>
+</beans>
Deleted: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario6-client-config.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario6-client-config.xml 2009-05-29 13:21:21 UTC (rev 10145)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario6-client-config.xml 2009-05-29 13:25:20 UTC (rev 10146)
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:http="http://cxf.apache.org/transports/http/configuration"
- xmlns:jaxws="http://cxf.apache.org/jaxws"
- xmlns:cxf="http://cxf.apache.org/core"
- xmlns:p="http://cxf.apache.org/policy"
- xmlns:sec="http://cxf.apache.org/configuration/security"
- xsi:schemaLocation="
- http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd
- http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd
- http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd
- http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd
- http://cxf.apache.org/policy http://cxf.apache.org/schemas/policy.xsd"
->
- <cxf:bus>
- <cxf:features>
- <p:policies/>
- <cxf:logging/>
- </cxf:features>
- </cxf:bus>
-
- <!-- Scenario 6 -->
- <bean name="{http://tempuri.org/}Scenario_6_IssuedTokenForCertificateSecureConversation_MutualCertificate11.sct-client.sts-client"
- class="org.apache.cxf.ws.security.trust.STSClient" abstract="true">
- <property name="wsdlLocation" value="META-INF/wsdl/STSSym.wsdl"/>
- <property name="serviceName" value="{http://tempuri.org/}SecurityTokenService"/>
- <property name="endpointName" value="{http://tempuri.org/}CustomBinding_ISecurityTokenService1"/>
- <property name="properties">
- <map>
- <entry key="ws-security.callback-handler" value="org.jboss.test.ws.jaxws.cxf.interop.wstrust10.KeystorePasswordCallback"/>
- <entry key="ws-security.signature.properties" value="META-INF/etc/alice.properties"/>
- <entry key="ws-security.encryption.properties" value="META-INF/etc/wssip.properties"/>
- <entry key="ws-security.sts.token.properties" value="META-INF/etc/bob.properties"/>
- </map>
- </property>
- </bean>
- <jaxws:client name="{http://tempuri.org/}Scenario_6_IssuedTokenForCertificateSecureConversation_MutualCertificate11" createdFromAPI="true">
- <jaxws:properties>
- <entry key="ws-security.callback-handler.sct" value="org.jboss.test.ws.jaxws.cxf.interop.wstrust10.KeystorePasswordCallback"/>
- <entry key="ws-security.encryption.properties.sct" value="META-INF/etc/bob.properties"/>
- </jaxws:properties>
- </jaxws:client>
-</beans>
Added: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario9/cxf.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario9/cxf.xml (rev 0)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario9/cxf.xml 2009-05-29 13:25:20 UTC (rev 10146)
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:p="http://cxf.apache.org/policy"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd
+ http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd
+ http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd
+ http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd
+ http://cxf.apache.org/policy http://cxf.apache.org/schemas/policy.xsd"
+>
+ <cxf:bus>
+ <cxf:features>
+ <p:policies/>
+ <cxf:logging/>
+ </cxf:features>
+ </cxf:bus>
+
+ <!-- Scenario 9 -->
+ <bean name="{http://tempuri.org/}Scenario_9_IssuedTokenForCertificate_MutualCertificate11.sts-client"
+ class="org.apache.cxf.ws.security.trust.STSClient" abstract="true">
+ <property name="wsdlLocation" value="META-INF/wsdl/STSAsym.wsdl"/>
+ <property name="serviceName" value="{http://tempuri.org/}SecurityTokenService"/>
+ <property name="endpointName" value="{http://tempuri.org/}WSHttpBinding_ISecurityTokenService2"/>
+ <property name="properties">
+ <map>
+ <entry key="ws-security.callback-handler" value="org.jboss.test.ws.jaxws.cxf.interop.wstrust10.KeystorePasswordCallback"/>
+ <entry key="ws-security.signature.properties" value="META-INF/etc/wssip.properties"/>
+ <entry key="ws-security.encryption.properties" value="META-INF/etc/wssip.properties"/>
+ <entry key="ws-security.sts.token.properties" value="META-INF/etc/wssip.properties"/>
+ <entry key="ws-security.sts.token.properties.decrypt" value="META-INF/etc/bob.properties"/>
+ </map>
+ </property>
+ </bean>
+ <jaxws:client name="{http://tempuri.org/}Scenario_9_IssuedTokenForCertificate_MutualCertificate11" createdFromAPI="true">
+ <jaxws:properties>
+ <entry key="ws-security.callback-handler" value="org.jboss.test.ws.jaxws.cxf.interop.wstrust10.KeystorePasswordCallback"/>
+ <entry key="ws-security.encryption.properties" value="META-INF/etc/bob.properties"/>
+ </jaxws:properties>
+ </jaxws:client>
+</beans>
Deleted: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario9-client-config.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario9-client-config.xml 2009-05-29 13:21:21 UTC (rev 10145)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario9-client-config.xml 2009-05-29 13:25:20 UTC (rev 10146)
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:http="http://cxf.apache.org/transports/http/configuration"
- xmlns:jaxws="http://cxf.apache.org/jaxws"
- xmlns:cxf="http://cxf.apache.org/core"
- xmlns:p="http://cxf.apache.org/policy"
- xmlns:sec="http://cxf.apache.org/configuration/security"
- xsi:schemaLocation="
- http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd
- http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd
- http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd
- http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd
- http://cxf.apache.org/policy http://cxf.apache.org/schemas/policy.xsd"
->
- <cxf:bus>
- <cxf:features>
- <p:policies/>
- <cxf:logging/>
- </cxf:features>
- </cxf:bus>
-
- <!-- Scenario 9 -->
- <bean name="{http://tempuri.org/}Scenario_9_IssuedTokenForCertificate_MutualCertificate11.sts-client"
- class="org.apache.cxf.ws.security.trust.STSClient" abstract="true">
- <property name="wsdlLocation" value="META-INF/wsdl/STSAsym.wsdl"/>
- <property name="serviceName" value="{http://tempuri.org/}SecurityTokenService"/>
- <property name="endpointName" value="{http://tempuri.org/}WSHttpBinding_ISecurityTokenService2"/>
- <property name="properties">
- <map>
- <entry key="ws-security.callback-handler" value="org.jboss.test.ws.jaxws.cxf.interop.wstrust10.KeystorePasswordCallback"/>
- <entry key="ws-security.signature.properties" value="META-INF/etc/wssip.properties"/>
- <entry key="ws-security.encryption.properties" value="META-INF/etc/wssip.properties"/>
- <entry key="ws-security.sts.token.properties" value="META-INF/etc/wssip.properties"/>
- <entry key="ws-security.sts.token.properties.decrypt" value="META-INF/etc/bob.properties"/>
- </map>
- </property>
- </bean>
- <jaxws:client name="{http://tempuri.org/}Scenario_9_IssuedTokenForCertificate_MutualCertificate11" createdFromAPI="true">
- <jaxws:properties>
- <entry key="ws-security.callback-handler" value="org.jboss.test.ws.jaxws.cxf.interop.wstrust10.KeystorePasswordCallback"/>
- <entry key="ws-security.encryption.properties" value="META-INF/etc/bob.properties"/>
- </jaxws:properties>
- </jaxws:client>
-</beans>
15 years, 6 months
JBossWS SVN: r10145 - in stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests: src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm and 5 other directories.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-05-29 09:21:21 -0400 (Fri, 29 May 2009)
New Revision: 10145
Added:
stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/cxf.xml
stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsa/cxf.xml
stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsrm/cxf.xml
Removed:
stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/wsrm-client-config.xml
stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsa/cxf-client-config.xml
stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsrm/wsrm-client-config.xml
Modified:
stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml
stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/scripts/cxf-samples-jaxws.xml
stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocTestCase.java
stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCTestCase.java
stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/AddressingTestCase.java
stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/SimpleServiceTestCase.java
Log:
[JBWS-2661] fixing samples/tests (except wstrust)
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2009-05-29 11:24:49 UTC (rev 10144)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2009-05-29 13:21:21 UTC (rev 10145)
@@ -7,9 +7,9 @@
<!-- ============================================================ -->
<project>
-
+
<description>JBossWS test archive builder</description>
-
+
<!-- ============================================================================== -->
<!-- Building -->
<!-- -->
@@ -17,11 +17,11 @@
<!-- http://www.jboss.com/index.html?module=bb&op=viewtopic&p=4144172#4144172 -->
<!-- -->
<!-- ============================================================================== -->
-
+
<target name="build-jars-jaxws" description="Build the deployments.">
-
+
<mkdir dir="${tests.output.dir}/test-libs"/>
-
+
<!-- jaxws-cxf-descriptor -->
<war warfile="${tests.output.dir}/test-libs/jaxws-cxf-descriptor.war" webxml="${tests.output.dir}/test-resources/jaxws/cxf/descriptor/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
@@ -31,14 +31,14 @@
<include name="jbossws-cxf.xml"/>
</webinf>
</war>
-
+
<!-- jaxws-cxf-interop-wstrust10-client -->
<jar destfile="${tests.output.dir}/test-libs/jaxws-cxf-interop-wstrust10-client.jar">
- <metainf dir="${tests.output.dir}/test-resources/jaxws/cxf/interop/wstrust10/META-INF">
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/cxf/interop/wstrust10/META-INF">
<include name="**/*" />
</metainf>
</jar>
-
+
<!-- jaxws-cxf-wsrm-basic-doc -->
<war warfile="${tests.output.dir}/test-libs/jaxws-cxf-wsrm-basic-doc.war" webxml="${tests.output.dir}/test-resources/jaxws/cxf/wsrm/basic-doc/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
@@ -49,7 +49,7 @@
<include name="jbossws-cxf.xml"/>
</webinf>
</war>
-
+
<!-- jaxws-cxf-wsrm-basic-rpc -->
<war warfile="${tests.output.dir}/test-libs/jaxws-cxf-wsrm-basic-rpc.war" webxml="${tests.output.dir}/test-resources/jaxws/cxf/wsrm/basic-rpc/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
@@ -60,9 +60,16 @@
<include name="jbossws-cxf.xml"/>
</webinf>
</war>
-
+
+ <!-- jaxws-cxf-wsrm-basic-client -->
+ <jar destfile="${tests.output.dir}/test-libs/jaxws-cxf-wsrm-basic-client.jar">
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/cxf/wsrm/">
+ <include name="cxf.xml" />
+ </metainf>
+ </jar>
+
<!-- Please add alphabetically -->
-
+
</target>
-
+
</project>
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/scripts/cxf-samples-jaxws.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/scripts/cxf-samples-jaxws.xml 2009-05-29 11:24:49 UTC (rev 10144)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/scripts/cxf-samples-jaxws.xml 2009-05-29 13:21:21 UTC (rev 10145)
@@ -7,15 +7,15 @@
<!-- ============================================================ -->
<project>
-
+
<!-- ================================================================== -->
<!-- Building -->
<!-- ================================================================== -->
-
+
<target name="build-samples-jaxws" description="Build the jaxws samples deployments">
-
+
<mkdir dir="${tests.output.dir}/test-libs"/>
-
+
<!-- jaxws-samples-wsa -->
<war
warfile="${tests.output.dir}/test-libs/jaxws-samples-wsa.war"
@@ -32,6 +32,12 @@
prefix="WEB-INF/wsdl"/>
</war>
+ <jar destfile="${tests.output.dir}/test-libs/jaxws-samples-wsa-client.jar">
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/wsa">
+ <include name="cxf.xml"/>
+ </metainf>
+ </jar>
+
<!-- jaxws-samples-wsrm -->
<war
warfile="${tests.output.dir}/test-libs/jaxws-samples-wsrm.war"
@@ -46,8 +52,13 @@
dir="${tests.output.dir}/test-resources/jaxws/samples/wsrm/WEB-INF/wsdl"
prefix="WEB-INF/wsdl"/>
</war>
-
-
+
+ <jar destfile="${tests.output.dir}/test-libs/jaxws-samples-wsrm-client.jar">
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/wsrm">
+ <include name="cxf.xml"/>
+ </metainf>
+ </jar>
+
<!-- jaxws-samples-wsse-sign -->
<war
warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-sign.war"
@@ -55,26 +66,26 @@
<classes dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/samples/wsse/Service*.class"/>
<include name="org/jboss/test/ws/jaxws/samples/wsse/jaxws/*.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/wsse/KeystorePasswordCallback.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/wsse/KeystorePasswordCallback.class"/>
</classes>
<webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign/WEB-INF">
<include name="jbossws-cxf.xml"/>
- <include name="wsdl/*"/>
+ <include name="wsdl/*"/>
</webinf>
<zipfileset dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign/WEB-INF" prefix="WEB-INF/classes">
<include name="bob.jks" />
<include name="bob.properties" />
</zipfileset>
</war>
-
+
<!-- jaxws-samples-wsse-sign-client -->
<jar destfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-sign-client.jar">
- <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign/META-INF">
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign/META-INF">
<include name="alice.properties" />
- <include name="alice.jks" />
+ <include name="alice.jks" />
</metainf>
</jar>
-
+
<!-- jaxws-samples-wsse-sign-encrypt -->
<war
warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-sign-encrypt.war"
@@ -82,26 +93,26 @@
<classes dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/samples/wsse/Service*.class"/>
<include name="org/jboss/test/ws/jaxws/samples/wsse/jaxws/*.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/wsse/KeystorePasswordCallback.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/wsse/KeystorePasswordCallback.class"/>
</classes>
<webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign-encrypt/WEB-INF">
<include name="jbossws-cxf.xml"/>
- <include name="wsdl/*"/>
+ <include name="wsdl/*"/>
</webinf>
<zipfileset dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign-encrypt/WEB-INF" prefix="WEB-INF/classes">
<include name="bob.jks" />
<include name="bob.properties" />
</zipfileset>
</war>
-
+
<!-- jaxws-samples-wsse-sign-encrypt-client -->
<jar destfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-sign-encrypt-client.jar">
- <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign-encrypt/META-INF">
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign-encrypt/META-INF">
<include name="alice.properties" />
- <include name="alice.jks" />
+ <include name="alice.jks" />
</metainf>
</jar>
-
+
<!-- jaxws-samples-wsse-username -->
<war
warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-username.war"
@@ -109,14 +120,14 @@
<classes dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/samples/wsse/Service*.class"/>
<include name="org/jboss/test/ws/jaxws/samples/wsse/jaxws/*.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/wsse/ServerUsernamePasswordCallback.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/wsse/ServerUsernamePasswordCallback.class"/>
</classes>
<webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/username/WEB-INF">
<include name="jbossws-cxf.xml"/>
- <include name="wsdl/*"/>
+ <include name="wsdl/*"/>
</webinf>
</war>
-
+
<!-- jaxws-samples-wssePolicy-sign -->
<war
warfile="${tests.output.dir}/test-libs/jaxws-samples-wssePolicy-sign.war"
@@ -124,26 +135,26 @@
<classes dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/samples/wssePolicy/Service*.class"/>
<include name="org/jboss/test/ws/jaxws/samples/wssePolicy/jaxws/*.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/wssePolicy/KeystorePasswordCallback.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/wssePolicy/KeystorePasswordCallback.class"/>
</classes>
<webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wssePolicy/sign/WEB-INF">
<include name="jbossws-cxf.xml"/>
- <include name="wsdl/*"/>
+ <include name="wsdl/*"/>
</webinf>
<zipfileset dir="${tests.output.dir}/test-resources/jaxws/samples/wssePolicy/sign/WEB-INF" prefix="WEB-INF/classes">
<include name="bob.jks" />
<include name="bob.properties" />
</zipfileset>
</war>
-
+
<!-- jaxws-samples-wssePolicy-sign-client -->
<jar destfile="${tests.output.dir}/test-libs/jaxws-samples-wssePolicy-sign-client.jar">
- <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/wssePolicy/sign/META-INF">
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/wssePolicy/sign/META-INF">
<include name="alice.properties" />
- <include name="alice.jks" />
+ <include name="alice.jks" />
</metainf>
</jar>
-
+
<!-- jaxws-samples-wssePolicy-sign-encrypt -->
<war
warfile="${tests.output.dir}/test-libs/jaxws-samples-wssePolicy-sign-encrypt.war"
@@ -151,26 +162,26 @@
<classes dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/samples/wssePolicy/Service*.class"/>
<include name="org/jboss/test/ws/jaxws/samples/wssePolicy/jaxws/*.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/wssePolicy/KeystorePasswordCallback.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/wssePolicy/KeystorePasswordCallback.class"/>
</classes>
<webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wssePolicy/sign-encrypt/WEB-INF">
<include name="jbossws-cxf.xml"/>
- <include name="wsdl/*"/>
+ <include name="wsdl/*"/>
</webinf>
<zipfileset dir="${tests.output.dir}/test-resources/jaxws/samples/wssePolicy/sign-encrypt/WEB-INF" prefix="WEB-INF/classes">
<include name="bob.jks" />
<include name="bob.properties" />
</zipfileset>
</war>
-
+
<!-- jaxws-samples-wssePolicy-sign-encrypt-client -->
<jar destfile="${tests.output.dir}/test-libs/jaxws-samples-wssePolicy-sign-encrypt-client.jar">
- <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/wssePolicy/sign-encrypt/META-INF">
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/wssePolicy/sign-encrypt/META-INF">
<include name="alice.properties" />
- <include name="alice.jks" />
+ <include name="alice.jks" />
</metainf>
</jar>
-
+
<!-- jaxws-samples-wssePolicy-username -->
<war
warfile="${tests.output.dir}/test-libs/jaxws-samples-wssePolicy-username.war"
@@ -178,16 +189,16 @@
<classes dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/samples/wssePolicy/Service*.class"/>
<include name="org/jboss/test/ws/jaxws/samples/wssePolicy/jaxws/*.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/wssePolicy/ServerUsernamePasswordCallback.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/wssePolicy/ServerUsernamePasswordCallback.class"/>
</classes>
<webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wssePolicy/username/WEB-INF">
<include name="jbossws-cxf.xml"/>
- <include name="wsdl/*"/>
+ <include name="wsdl/*"/>
</webinf>
</war>
<!-- Please add alphabetically -->
-
+
</target>
-
+
</project>
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocTestCase.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocTestCase.java 2009-05-29 11:24:49 UTC (rev 10144)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocTestCase.java 2009-05-29 13:21:21 UTC (rev 10145)
@@ -29,9 +29,6 @@
import junit.framework.Test;
-import org.apache.cxf.Bus;
-import org.apache.cxf.BusFactory;
-import org.apache.cxf.bus.spring.SpringBusFactory;
import org.jboss.wsf.common.DOMUtils;
import org.jboss.wsf.test.JBossWSTest;
import org.jboss.wsf.test.JBossWSTestSetup;
@@ -50,7 +47,7 @@
public static Test suite()
{
- return new JBossWSTestSetup(BasicDocTestCase.class, "jaxws-cxf-wsrm-basic-doc.war");
+ return new JBossWSTestSetup(BasicDocTestCase.class, "jaxws-cxf-wsrm-basic-doc.war,jaxws-cxf-wsrm-basic-client.jar");
}
public void testWSDLAccess() throws Exception
@@ -62,7 +59,7 @@
System.out.println("FIXME: [CXF-1310] Generated WSDL for an WS-RM endpoint does not contain RM policies");
}
- public void _testStandardClient() throws Exception
+ public void testClient() throws Exception
{
URL wsdlURL = getResourceURL("jaxws/cxf/wsrm/basic-doc/wsrm-basic-doc.wsdl");
QName serviceName = new QName(targetNS, "RMService");
@@ -70,37 +67,11 @@
Service service = Service.create(wsdlURL, serviceName);
BasicDocEndpoint port = (BasicDocEndpoint)service.getPort(BasicDocEndpoint.class);
- System.out.println("FIXME: [CXF-1320] Configure WS-RM client from WSDL only");
+ // Enable addressing
+ BindingProvider bp = (BindingProvider)port;
+ bp.getRequestContext().put("org.apache.cxf.ws.addressing.using", Boolean.TRUE);
- //Object retObj = port.echo("Hello");
- //assertEquals("Hello", retObj);
+ Object retObj = port.echo("Hello");
+ assertEquals("Hello", retObj);
}
-
- public void testSpringClient() throws Exception
- {
- SpringBusFactory bf = new SpringBusFactory();
- URL cxfConfig = getResourceURL("jaxws/cxf/wsrm/wsrm-client-config.xml");
- Bus bus = bf.createBus(cxfConfig);
- try
- {
- BusFactory.setDefaultBus(bus);
-
- URL wsdlURL = getResourceURL("jaxws/cxf/wsrm/basic-doc/wsrm-basic-doc.wsdl");
- QName serviceName = new QName(targetNS, "RMService");
-
- Service service = Service.create(wsdlURL, serviceName);
- BasicDocEndpoint port = (BasicDocEndpoint)service.getPort(BasicDocEndpoint.class);
-
- // Enable addressing
- BindingProvider bp = (BindingProvider)port;
- bp.getRequestContext().put("org.apache.cxf.ws.addressing.using", Boolean.TRUE);
-
- Object retObj = port.echo("Hello");
- assertEquals("Hello", retObj);
- }
- finally
- {
- bus.shutdown(true);
- }
- }
}
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCTestCase.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCTestCase.java 2009-05-29 11:24:49 UTC (rev 10144)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCTestCase.java 2009-05-29 13:21:21 UTC (rev 10145)
@@ -29,9 +29,6 @@
import junit.framework.Test;
-import org.apache.cxf.Bus;
-import org.apache.cxf.BusFactory;
-import org.apache.cxf.bus.spring.SpringBusFactory;
import org.jboss.wsf.common.DOMUtils;
import org.jboss.wsf.test.JBossWSTest;
import org.jboss.wsf.test.JBossWSTestSetup;
@@ -50,7 +47,7 @@
public static Test suite()
{
- return new JBossWSTestSetup(BasicRPCTestCase.class, "jaxws-cxf-wsrm-basic-rpc.war");
+ return new JBossWSTestSetup(BasicRPCTestCase.class, "jaxws-cxf-wsrm-basic-rpc.war,jaxws-cxf-wsrm-basic-client.jar");
}
public void testWSDLAccess() throws Exception
@@ -62,7 +59,7 @@
System.out.println("FIXME: [CXF-1310] Generated WSDL for an WS-RM endpoint does not contain RM policies");
}
- public void _testStandardClient() throws Exception
+ public void testClient() throws Exception
{
URL wsdlURL = getResourceURL("jaxws/cxf/wsrm/basic-rpc/wsrm-basic-rpc.wsdl");
QName serviceName = new QName(targetNS, "RMService");
@@ -70,37 +67,11 @@
Service service = Service.create(wsdlURL, serviceName);
BasicRPCEndpoint port = (BasicRPCEndpoint)service.getPort(BasicRPCEndpoint.class);
- System.out.println("FIXME: [CXF-1320] Configure WS-RM client from WSDL only");
+ // Enable addressing
+ BindingProvider bp = (BindingProvider)port;
+ bp.getRequestContext().put("org.apache.cxf.ws.addressing.using", Boolean.TRUE);
Object retObj = port.echo("Hello");
assertEquals("Hello", retObj);
}
-
- public void testSpringClient() throws Exception
- {
- SpringBusFactory bf = new SpringBusFactory();
- URL cxfConfig = getResourceURL("jaxws/cxf/wsrm/wsrm-client-config.xml");
- Bus bus = bf.createBus(cxfConfig);
- try
- {
- BusFactory.setDefaultBus(bus);
-
- URL wsdlURL = getResourceURL("jaxws/cxf/wsrm/basic-rpc/wsrm-basic-rpc.wsdl");
- QName serviceName = new QName(targetNS, "RMService");
-
- Service service = Service.create(wsdlURL, serviceName);
- BasicRPCEndpoint port = (BasicRPCEndpoint)service.getPort(BasicRPCEndpoint.class);
-
- // Enable addressing
- BindingProvider bp = (BindingProvider)port;
- bp.getRequestContext().put("org.apache.cxf.ws.addressing.using", Boolean.TRUE);
-
- Object retObj = port.echo("Hello");
- assertEquals("Hello", retObj);
- }
- finally
- {
- bus.shutdown(true);
- }
- }
}
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/AddressingTestCase.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/AddressingTestCase.java 2009-05-29 11:24:49 UTC (rev 10144)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/AddressingTestCase.java 2009-05-29 13:21:21 UTC (rev 10145)
@@ -21,13 +21,11 @@
*/
package org.jboss.test.ws.jaxws.samples.wsa;
-import java.io.File;
import java.net.URL;
import javax.xml.namespace.QName;
import javax.xml.ws.Service;
+
import junit.framework.Test;
-import org.apache.cxf.Bus;
-import org.apache.cxf.bus.spring.SpringBusFactory;
import org.jboss.wsf.test.JBossWSTest;
import org.jboss.wsf.test.JBossWSTestSetup;
@@ -40,11 +38,10 @@
{
private final String serviceURL = "http://" + getServerHost() + ":8080/jaxws-samples-wsa/AddressingService";
private ServiceIface proxy;
- private Bus bus;
public static Test suite()
{
- return new JBossWSTestSetup(AddressingTestCase.class, "jaxws-samples-wsa.war");
+ return new JBossWSTestSetup(AddressingTestCase.class, "jaxws-samples-wsa.war,jaxws-samples-wsa-client.jar");
}
@Override
@@ -52,25 +49,12 @@
{
super.setUp();
- SpringBusFactory busFactory = new SpringBusFactory();
- URL cxfConfig = new File("test-resources/jaxws/samples/wsa/cxf-client-config.xml").toURL();
- bus = busFactory.createBus(cxfConfig);
- busFactory.setDefaultBus(bus);
-
QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wsaddressing", "AddressingService");
URL wsdlURL = new URL(serviceURL + "?wsdl");
Service service = Service.create(wsdlURL, serviceName);
proxy = (ServiceIface)service.getPort(ServiceIface.class);
}
- @Override
- protected void tearDown() throws Exception
- {
- bus.shutdown(true);
-
- super.tearDown();
- }
-
public void test() throws Exception
{
assertEquals("Hello World!", proxy.sayHello());
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/SimpleServiceTestCase.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/SimpleServiceTestCase.java 2009-05-29 11:24:49 UTC (rev 10144)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/SimpleServiceTestCase.java 2009-05-29 13:21:21 UTC (rev 10145)
@@ -21,14 +21,11 @@
*/
package org.jboss.test.ws.jaxws.samples.wsrm.client;
-import java.io.File;
import java.net.URL;
import javax.xml.namespace.QName;
import javax.xml.ws.Service;
+
import junit.framework.Test;
-import org.apache.cxf.Bus;
-import org.apache.cxf.BusFactory;
-import org.apache.cxf.bus.spring.SpringBusFactory;
import org.jboss.wsf.test.JBossWSTest;
import org.jboss.wsf.test.JBossWSTestSetup;
import org.jboss.test.ws.jaxws.samples.wsrm.generated.SimpleService;
@@ -42,11 +39,10 @@
{
private final String serviceURL = "http://" + getServerHost() + ":8080/jaxws-samples-wsrm/SimpleService";
private SimpleService proxy;
- private Bus bus;
public static Test suite()
{
- return new JBossWSTestSetup(SimpleServiceTestCase.class, "jaxws-samples-wsrm.war");
+ return new JBossWSTestSetup(SimpleServiceTestCase.class, "jaxws-samples-wsrm.war,jaxws-samples-wsrm-client.jar");
}
@Override
@@ -54,25 +50,12 @@
{
super.setUp();
- SpringBusFactory busFactory = new SpringBusFactory();
- URL cxfConfig = getResourceURL("jaxws/samples/wsrm/wsrm-client-config.xml");
- bus = busFactory.createBus(cxfConfig);
- busFactory.setDefaultBus(bus);
-
QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wsrm", "SimpleService");
URL wsdlURL = new URL(serviceURL + "?wsdl");
Service service = Service.create(wsdlURL, serviceName);
proxy = (SimpleService)service.getPort(SimpleService.class);
}
- @Override
- protected void tearDown() throws Exception
- {
- bus.shutdown(true);
-
- super.tearDown();
- }
-
public void test() throws Exception
{
proxy.ping(); // one way call
Added: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/cxf.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/cxf.xml (rev 0)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/cxf.xml 2009-05-29 13:21:21 UTC (rev 10145)
@@ -0,0 +1,51 @@
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:p="http://cxf.apache.org/policy" xmlns:cxf="http://cxf.apache.org/core"
+ xsi:schemaLocation="
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+ http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd
+ http://cxf.apache.org/policy http://cxf.apache.org/schemas/policy.xsd
+ http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
+
+ <bean id="mapAggregator" class="org.apache.cxf.ws.addressing.MAPAggregator"/>
+ <bean id="mapCodec" class="org.apache.cxf.ws.addressing.soap.MAPCodec"/>
+ <bean id="rmLogicalOut" class="org.apache.cxf.ws.rm.RMOutInterceptor">
+ <property name="bus" ref="cxf"/>
+ </bean>
+ <bean id="rmLogicalIn" class="org.apache.cxf.ws.rm.RMInInterceptor">
+ <property name="bus" ref="cxf"/>
+ </bean>
+ <bean id="rmCodec" class="org.apache.cxf.ws.rm.soap.RMSoapInterceptor"/>
+
+ <!--p:engine enabled="true" ignoreUnknownAssertions="true"/-->
+
+ <cxf:bus name="cxf">
+ <!--cxf:features>
+ <p:policies ignoreUnknownAssertions="true"/>
+ </cxf:features-->
+ <cxf:inInterceptors>
+ <ref bean="mapAggregator"/>
+ <ref bean="mapCodec"/>
+ <ref bean="rmLogicalIn"/>
+ <ref bean="rmCodec"/>
+ </cxf:inInterceptors>
+ <cxf:inFaultInterceptors>
+ <ref bean="mapAggregator"/>
+ <ref bean="mapCodec"/>
+ <ref bean="rmLogicalIn"/>
+ <ref bean="rmCodec"/>
+ </cxf:inFaultInterceptors>
+ <cxf:outInterceptors>
+ <ref bean="mapAggregator"/>
+ <ref bean="mapCodec"/>
+ <ref bean="rmLogicalOut"/>
+ <ref bean="rmCodec"/>
+ </cxf:outInterceptors>
+ <cxf:outFaultInterceptors>
+ <ref bean="mapAggregator"/>
+ <ref bean="mapCodec"/>
+ <ref bean="rmLogicalOut"/>
+ <ref bean="rmCodec"/>
+ </cxf:outFaultInterceptors>
+ </cxf:bus>
+
+</beans>
\ No newline at end of file
Deleted: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/wsrm-client-config.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/wsrm-client-config.xml 2009-05-29 11:24:49 UTC (rev 10144)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/wsrm-client-config.xml 2009-05-29 13:21:21 UTC (rev 10145)
@@ -1,51 +0,0 @@
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws"
- xmlns:p="http://cxf.apache.org/policy" xmlns:cxf="http://cxf.apache.org/core"
- xsi:schemaLocation="
- http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
- http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd
- http://cxf.apache.org/policy http://cxf.apache.org/schemas/policy.xsd
- http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
-
- <bean id="mapAggregator" class="org.apache.cxf.ws.addressing.MAPAggregator"/>
- <bean id="mapCodec" class="org.apache.cxf.ws.addressing.soap.MAPCodec"/>
- <bean id="rmLogicalOut" class="org.apache.cxf.ws.rm.RMOutInterceptor">
- <property name="bus" ref="cxf"/>
- </bean>
- <bean id="rmLogicalIn" class="org.apache.cxf.ws.rm.RMInInterceptor">
- <property name="bus" ref="cxf"/>
- </bean>
- <bean id="rmCodec" class="org.apache.cxf.ws.rm.soap.RMSoapInterceptor"/>
-
- <!--p:engine enabled="true" ignoreUnknownAssertions="true"/-->
-
- <cxf:bus name="cxf">
- <!--cxf:features>
- <p:policies ignoreUnknownAssertions="true"/>
- </cxf:features-->
- <cxf:inInterceptors>
- <ref bean="mapAggregator"/>
- <ref bean="mapCodec"/>
- <ref bean="rmLogicalIn"/>
- <ref bean="rmCodec"/>
- </cxf:inInterceptors>
- <cxf:inFaultInterceptors>
- <ref bean="mapAggregator"/>
- <ref bean="mapCodec"/>
- <ref bean="rmLogicalIn"/>
- <ref bean="rmCodec"/>
- </cxf:inFaultInterceptors>
- <cxf:outInterceptors>
- <ref bean="mapAggregator"/>
- <ref bean="mapCodec"/>
- <ref bean="rmLogicalOut"/>
- <ref bean="rmCodec"/>
- </cxf:outInterceptors>
- <cxf:outFaultInterceptors>
- <ref bean="mapAggregator"/>
- <ref bean="mapCodec"/>
- <ref bean="rmLogicalOut"/>
- <ref bean="rmCodec"/>
- </cxf:outFaultInterceptors>
- </cxf:bus>
-
-</beans>
\ No newline at end of file
Deleted: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsa/cxf-client-config.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsa/cxf-client-config.xml 2009-05-29 11:24:49 UTC (rev 10144)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsa/cxf-client-config.xml 2009-05-29 13:21:21 UTC (rev 10145)
@@ -1,18 +0,0 @@
-<beans
- xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:cxf="http://cxf.apache.org/core"
- xmlns:wsa="http://cxf.apache.org/ws/addressing"
- xsi:schemaLocation="
- http://cxf.apache.org/core
- http://cxf.apache.org/schemas/core.xsd
- http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd">
-
- <cxf:bus>
- <cxf:features>
- <wsa:addressing/>
- </cxf:features>
- </cxf:bus>
-
-</beans>
Added: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsa/cxf.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsa/cxf.xml (rev 0)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsa/cxf.xml 2009-05-29 13:21:21 UTC (rev 10145)
@@ -0,0 +1,18 @@
+<beans
+ xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:wsa="http://cxf.apache.org/ws/addressing"
+ xsi:schemaLocation="
+ http://cxf.apache.org/core
+ http://cxf.apache.org/schemas/core.xsd
+ http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans.xsd">
+
+ <cxf:bus>
+ <cxf:features>
+ <wsa:addressing/>
+ </cxf:features>
+ </cxf:bus>
+
+</beans>
Added: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsrm/cxf.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsrm/cxf.xml (rev 0)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsrm/cxf.xml 2009-05-29 13:21:21 UTC (rev 10145)
@@ -0,0 +1,37 @@
+<beans
+ xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:wsa="http://cxf.apache.org/ws/addressing"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:wsrm-policy="http://schemas.xmlsoap.org/ws/2005/02/rm/policy"
+ xmlns:wsrm-mgr="http://cxf.apache.org/ws/rm/manager"
+ xsi:schemaLocation="
+ http://cxf.apache.org/core
+ http://cxf.apache.org/schemas/core.xsd
+ http://cxf.apache.org/transports/http/configuration
+ http://cxf.apache.org/schemas/configuration/http-conf.xsd
+ http://schemas.xmlsoap.org/ws/2005/02/rm/policy
+ http://schemas.xmlsoap.org/ws/2005/02/rm/wsrm-policy.xsd
+ http://cxf.apache.org/ws/rm/manager
+ http://cxf.apache.org/schemas/configuration/wsrm-manager.xsd
+ http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans.xsd">
+
+ <cxf:bus>
+ <cxf:features>
+ <cxf:logging/>
+ <wsa:addressing/>
+ <wsrm-mgr:reliableMessaging>
+ <wsrm-policy:RMAssertion>
+ <wsrm-policy:BaseRetransmissionInterval Milliseconds="4000"/>
+ <wsrm-policy:AcknowledgementInterval Milliseconds="2000"/>
+ </wsrm-policy:RMAssertion>
+ <wsrm-mgr:destinationPolicy>
+ <wsrm-mgr:acksPolicy intraMessageThreshold="0" />
+ </wsrm-mgr:destinationPolicy>
+ </wsrm-mgr:reliableMessaging>
+ </cxf:features>
+ </cxf:bus>
+
+</beans>
Deleted: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsrm/wsrm-client-config.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsrm/wsrm-client-config.xml 2009-05-29 11:24:49 UTC (rev 10144)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsrm/wsrm-client-config.xml 2009-05-29 13:21:21 UTC (rev 10145)
@@ -1,37 +0,0 @@
-<beans
- xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:cxf="http://cxf.apache.org/core"
- xmlns:wsa="http://cxf.apache.org/ws/addressing"
- xmlns:http="http://cxf.apache.org/transports/http/configuration"
- xmlns:wsrm-policy="http://schemas.xmlsoap.org/ws/2005/02/rm/policy"
- xmlns:wsrm-mgr="http://cxf.apache.org/ws/rm/manager"
- xsi:schemaLocation="
- http://cxf.apache.org/core
- http://cxf.apache.org/schemas/core.xsd
- http://cxf.apache.org/transports/http/configuration
- http://cxf.apache.org/schemas/configuration/http-conf.xsd
- http://schemas.xmlsoap.org/ws/2005/02/rm/policy
- http://schemas.xmlsoap.org/ws/2005/02/rm/wsrm-policy.xsd
- http://cxf.apache.org/ws/rm/manager
- http://cxf.apache.org/schemas/configuration/wsrm-manager.xsd
- http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd">
-
- <cxf:bus>
- <cxf:features>
- <cxf:logging/>
- <wsa:addressing/>
- <wsrm-mgr:reliableMessaging>
- <wsrm-policy:RMAssertion>
- <wsrm-policy:BaseRetransmissionInterval Milliseconds="4000"/>
- <wsrm-policy:AcknowledgementInterval Milliseconds="2000"/>
- </wsrm-policy:RMAssertion>
- <wsrm-mgr:destinationPolicy>
- <wsrm-mgr:acksPolicy intraMessageThreshold="0" />
- </wsrm-mgr:destinationPolicy>
- </wsrm-mgr:reliableMessaging>
- </cxf:features>
- </cxf:bus>
-
-</beans>
15 years, 6 months
JBossWS SVN: r10144 - in stack/cxf/trunk: modules/client/src/main/resources/META-INF and 2 other directories.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-05-29 07:24:49 -0400 (Fri, 29 May 2009)
New Revision: 10144
Removed:
stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-http-tomcat.xml
Modified:
stack/cxf/trunk/modules/client/src/main/resources/META-INF/bus-extensions.xml
stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/bus-extensions.xml
stack/cxf/trunk/pom.xml
Log:
[JBWS-2653] svn merge -r 10142:10143 https://svn.jboss.org/repos/jbossws/stack/cxf/branches/jbossws-cxf-3.1.2 .
Modified: stack/cxf/trunk/modules/client/src/main/resources/META-INF/bus-extensions.xml
===================================================================
--- stack/cxf/trunk/modules/client/src/main/resources/META-INF/bus-extensions.xml 2009-05-29 11:19:47 UTC (rev 10143)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/bus-extensions.xml 2009-05-29 11:24:49 UTC (rev 10144)
@@ -54,16 +54,8 @@
<namespace>http://www.w3.org/2004/08/wsdl/http</namespace>
<namespace>http://schemas.xmlsoap.org/wsdl/http/</namespace>
</extension>
- <extension class="org.apache.cxf.transport.http.ClientOnlyHTTPTransportFactory" deferred="true">
- <namespace>http://schemas.xmlsoap.org/wsdl/soap/http</namespace>
- <namespace>http://schemas.xmlsoap.org/soap/http</namespace>
- <namespace>http://www.w3.org/2003/05/soap/bindings/HTTP/</namespace>
- <namespace>http://schemas.xmlsoap.org/wsdl/http/</namespace>
- <namespace>http://cxf.apache.org/transports/http/configuration</namespace>
- <namespace>http://cxf.apache.org/bindings/xformat</namespace>
- </extension>
<extension class="org.apache.cxf.management.jmx.InstrumentationManagerImpl" interface="org.apache.cxf.management.InstrumentationManager" />
- <extension class="org.apache.cxf.transport.http_jetty.JettyHTTPTransportFactory" deferred="false">
+ <extension class="org.apache.cxf.transport.http_jetty.JettyHTTPTransportFactory" deferred="true">
<namespace>http://schemas.xmlsoap.org/wsdl/soap/http</namespace>
<namespace>http://schemas.xmlsoap.org/soap/http</namespace>
<namespace>http://www.w3.org/2003/05/soap/bindings/HTTP/</namespace>
Modified: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/bus-extensions.xml
===================================================================
--- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/bus-extensions.xml 2009-05-29 11:19:47 UTC (rev 10143)
+++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/bus-extensions.xml 2009-05-29 11:24:49 UTC (rev 10144)
@@ -54,16 +54,8 @@
<namespace>http://www.w3.org/2004/08/wsdl/http</namespace>
<namespace>http://schemas.xmlsoap.org/wsdl/http/</namespace>
</extension>
- <extension class="org.apache.cxf.transport.http.ClientOnlyHTTPTransportFactory" deferred="true">
- <namespace>http://schemas.xmlsoap.org/wsdl/soap/http</namespace>
- <namespace>http://schemas.xmlsoap.org/soap/http</namespace>
- <namespace>http://www.w3.org/2003/05/soap/bindings/HTTP/</namespace>
- <namespace>http://schemas.xmlsoap.org/wsdl/http/</namespace>
- <namespace>http://cxf.apache.org/transports/http/configuration</namespace>
- <namespace>http://cxf.apache.org/bindings/xformat</namespace>
- </extension>
<extension class="org.apache.cxf.management.jmx.InstrumentationManagerImpl" interface="org.apache.cxf.management.InstrumentationManager" />
- <extension class="org.apache.cxf.transport.http_jetty.JettyHTTPTransportFactory" deferred="false">
+ <extension class="org.apache.cxf.transport.http_jetty.JettyHTTPTransportFactory" deferred="true">
<namespace>http://schemas.xmlsoap.org/wsdl/soap/http</namespace>
<namespace>http://schemas.xmlsoap.org/soap/http</namespace>
<namespace>http://www.w3.org/2003/05/soap/bindings/HTTP/</namespace>
Deleted: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-http-tomcat.xml
===================================================================
--- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-http-tomcat.xml 2009-05-29 11:19:47 UTC (rev 10143)
+++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-http-tomcat.xml 2009-05-29 11:24:49 UTC (rev 10144)
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:foo="http://cxf.apache.org/configuration/foo"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
-
- <import resource="classpath:META-INF/cxf/cxf-extension-http.xml"/>
-
- <bean class="org.jboss.wsf.stack.cxf.transport.TomcatHTTPTransportFactory" lazy-init="false" depends-on="org.apache.cxf.transport.http.ClientOnlyHTTPTransportFactory">
- <property name="bus" ref="cxf"/>
- <property name="transportIds">
- <list>
- <value>http://schemas.xmlsoap.org/soap/http</value>
- <value>http://schemas.xmlsoap.org/wsdl/http/</value>
- <value>http://schemas.xmlsoap.org/wsdl/soap/http</value>
- <value>http://www.w3.org/2003/05/soap/bindings/HTTP/</value>
- <value>http://cxf.apache.org/transports/http/configuration</value>
- <value>http://cxf.apache.org/bindings/xformat</value>
- </list>
- </property>
- </bean>
-
-</beans>
\ No newline at end of file
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2009-05-29 11:19:47 UTC (rev 10143)
+++ stack/cxf/trunk/pom.xml 2009-05-29 11:24:49 UTC (rev 10144)
@@ -56,7 +56,7 @@
<jbossws.jboss600.version>3.2.0-SNAPSHOT</jbossws.jboss600.version>
-->
<!-- END -->
- <cxf.version>2.2.2-SNAPSHOT</cxf.version>
+ <cxf.version>2.2.2</cxf.version>
<cxf.anttasks.version>2.1.5</cxf.anttasks.version>
<cxf.stax.version>1.0.1</cxf.stax.version>
<cxf.asm.version>2.2.3</cxf.asm.version>
15 years, 6 months
JBossWS SVN: r10143 - in stack/cxf/branches/jbossws-cxf-3.1.2: modules/client/src/main/resources/META-INF and 2 other directories.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-05-29 07:19:47 -0400 (Fri, 29 May 2009)
New Revision: 10143
Removed:
stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-http-tomcat.xml
Modified:
stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/src/main/resources/META-INF/bus-extensions.xml
stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/bus-extensions.xml
stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml
Log:
[JBWS-2653] Upgrade to CXF 2.2.2
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/src/main/resources/META-INF/bus-extensions.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/src/main/resources/META-INF/bus-extensions.xml 2009-05-29 10:05:26 UTC (rev 10142)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/src/main/resources/META-INF/bus-extensions.xml 2009-05-29 11:19:47 UTC (rev 10143)
@@ -54,16 +54,8 @@
<namespace>http://www.w3.org/2004/08/wsdl/http</namespace>
<namespace>http://schemas.xmlsoap.org/wsdl/http/</namespace>
</extension>
- <extension class="org.apache.cxf.transport.http.ClientOnlyHTTPTransportFactory" deferred="true">
- <namespace>http://schemas.xmlsoap.org/wsdl/soap/http</namespace>
- <namespace>http://schemas.xmlsoap.org/soap/http</namespace>
- <namespace>http://www.w3.org/2003/05/soap/bindings/HTTP/</namespace>
- <namespace>http://schemas.xmlsoap.org/wsdl/http/</namespace>
- <namespace>http://cxf.apache.org/transports/http/configuration</namespace>
- <namespace>http://cxf.apache.org/bindings/xformat</namespace>
- </extension>
<extension class="org.apache.cxf.management.jmx.InstrumentationManagerImpl" interface="org.apache.cxf.management.InstrumentationManager" />
- <extension class="org.apache.cxf.transport.http_jetty.JettyHTTPTransportFactory" deferred="false">
+ <extension class="org.apache.cxf.transport.http_jetty.JettyHTTPTransportFactory" deferred="true">
<namespace>http://schemas.xmlsoap.org/wsdl/soap/http</namespace>
<namespace>http://schemas.xmlsoap.org/soap/http</namespace>
<namespace>http://www.w3.org/2003/05/soap/bindings/HTTP/</namespace>
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/bus-extensions.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/bus-extensions.xml 2009-05-29 10:05:26 UTC (rev 10142)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/bus-extensions.xml 2009-05-29 11:19:47 UTC (rev 10143)
@@ -54,16 +54,8 @@
<namespace>http://www.w3.org/2004/08/wsdl/http</namespace>
<namespace>http://schemas.xmlsoap.org/wsdl/http/</namespace>
</extension>
- <extension class="org.apache.cxf.transport.http.ClientOnlyHTTPTransportFactory" deferred="true">
- <namespace>http://schemas.xmlsoap.org/wsdl/soap/http</namespace>
- <namespace>http://schemas.xmlsoap.org/soap/http</namespace>
- <namespace>http://www.w3.org/2003/05/soap/bindings/HTTP/</namespace>
- <namespace>http://schemas.xmlsoap.org/wsdl/http/</namespace>
- <namespace>http://cxf.apache.org/transports/http/configuration</namespace>
- <namespace>http://cxf.apache.org/bindings/xformat</namespace>
- </extension>
<extension class="org.apache.cxf.management.jmx.InstrumentationManagerImpl" interface="org.apache.cxf.management.InstrumentationManager" />
- <extension class="org.apache.cxf.transport.http_jetty.JettyHTTPTransportFactory" deferred="false">
+ <extension class="org.apache.cxf.transport.http_jetty.JettyHTTPTransportFactory" deferred="true">
<namespace>http://schemas.xmlsoap.org/wsdl/soap/http</namespace>
<namespace>http://schemas.xmlsoap.org/soap/http</namespace>
<namespace>http://www.w3.org/2003/05/soap/bindings/HTTP/</namespace>
Deleted: stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-http-tomcat.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-http-tomcat.xml 2009-05-29 10:05:26 UTC (rev 10142)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-http-tomcat.xml 2009-05-29 11:19:47 UTC (rev 10143)
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:foo="http://cxf.apache.org/configuration/foo"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
-
- <import resource="classpath:META-INF/cxf/cxf-extension-http.xml"/>
-
- <bean class="org.jboss.wsf.stack.cxf.transport.TomcatHTTPTransportFactory" lazy-init="false" depends-on="org.apache.cxf.transport.http.ClientOnlyHTTPTransportFactory">
- <property name="bus" ref="cxf"/>
- <property name="transportIds">
- <list>
- <value>http://schemas.xmlsoap.org/soap/http</value>
- <value>http://schemas.xmlsoap.org/wsdl/http/</value>
- <value>http://schemas.xmlsoap.org/wsdl/soap/http</value>
- <value>http://www.w3.org/2003/05/soap/bindings/HTTP/</value>
- <value>http://cxf.apache.org/transports/http/configuration</value>
- <value>http://cxf.apache.org/bindings/xformat</value>
- </list>
- </property>
- </bean>
-
-</beans>
\ No newline at end of file
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml 2009-05-29 10:05:26 UTC (rev 10142)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml 2009-05-29 11:19:47 UTC (rev 10143)
@@ -55,7 +55,7 @@
<jbossws.jboss600.version>3.1.0-SNAPSHOT</jbossws.jboss600.version>
-->
<!-- END -->
- <cxf.version>2.2.2-SNAPSHOT</cxf.version>
+ <cxf.version>2.2.2</cxf.version>
<cxf.anttasks.version>2.1.5</cxf.anttasks.version>
<cxf.stax.version>1.0.1</cxf.stax.version>
<cxf.asm.version>2.2.3</cxf.asm.version>
15 years, 6 months
JBossWS SVN: r10142 - in framework/trunk/hudson: hudson-home and 33 other directories.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-05-29 06:05:26 -0400 (Fri, 29 May 2009)
New Revision: 10142
Added:
framework/trunk/hudson/hudson-home/jobs/AS-5.2.0/
framework/trunk/hudson/hudson-home/jobs/AS-5.2.0/config.xml
framework/trunk/hudson/hudson-home/jobs/AS-ALL/
framework/trunk/hudson/hudson-home/jobs/AS-ALL/config.xml
framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-5.2.0/
framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-5.2.0/config.xml
framework/trunk/hudson/hudson-home/jobs/CXF-Binary-Distro-AS-5.2.0-JDK5/
framework/trunk/hudson/hudson-home/jobs/CXF-Binary-Distro-AS-5.2.0-JDK5/config.xml
framework/trunk/hudson/hudson-home/jobs/CXF-Binary-Distro-AS-5.2.0-JDK6/
framework/trunk/hudson/hudson-home/jobs/CXF-Binary-Distro-AS-5.2.0-JDK6/config.xml
framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-5.2.0-JDK5/
framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-5.2.0-JDK5/config.xml
framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-5.2.0-JDK6/
framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-5.2.0-JDK6/config.xml
framework/trunk/hudson/hudson-home/jobs/CXF-Source-Distro-AS-5.2.0-JDK5/
framework/trunk/hudson/hudson-home/jobs/CXF-Source-Distro-AS-5.2.0-JDK5/config.xml
framework/trunk/hudson/hudson-home/jobs/CXF-Source-Distro-AS-5.2.0-JDK6/
framework/trunk/hudson/hudson-home/jobs/CXF-Source-Distro-AS-5.2.0-JDK6/config.xml
framework/trunk/hudson/hudson-home/jobs/Metro-Binary-Distro-AS-5.2.0-JDK5/
framework/trunk/hudson/hudson-home/jobs/Metro-Binary-Distro-AS-5.2.0-JDK5/config.xml
framework/trunk/hudson/hudson-home/jobs/Metro-Binary-Distro-AS-5.2.0-JDK6/
framework/trunk/hudson/hudson-home/jobs/Metro-Binary-Distro-AS-5.2.0-JDK6/config.xml
framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.2.0-JDK5/
framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.2.0-JDK5/config.xml
framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.2.0-JDK6/
framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.2.0-JDK6/config.xml
framework/trunk/hudson/hudson-home/jobs/Metro-Source-Distro-AS-5.2.0-JDK5/
framework/trunk/hudson/hudson-home/jobs/Metro-Source-Distro-AS-5.2.0-JDK5/config.xml
framework/trunk/hudson/hudson-home/jobs/Metro-Source-Distro-AS-5.2.0-JDK6/
framework/trunk/hudson/hudson-home/jobs/Metro-Source-Distro-AS-5.2.0-JDK6/config.xml
framework/trunk/hudson/hudson-home/jobs/Native-Binary-Distro-AS-5.2.0-JDK5/
framework/trunk/hudson/hudson-home/jobs/Native-Binary-Distro-AS-5.2.0-JDK5/config.xml
framework/trunk/hudson/hudson-home/jobs/Native-Binary-Distro-AS-5.2.0-JDK6/
framework/trunk/hudson/hudson-home/jobs/Native-Binary-Distro-AS-5.2.0-JDK6/config.xml
framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.2.0-JDK5/
framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.2.0-JDK5/config.xml
framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.2.0-JDK6/
framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.2.0-JDK6/config.xml
framework/trunk/hudson/hudson-home/jobs/Native-Source-Distro-AS-5.2.0-JDK5/
framework/trunk/hudson/hudson-home/jobs/Native-Source-Distro-AS-5.2.0-JDK5/config.xml
framework/trunk/hudson/hudson-home/jobs/Native-Source-Distro-AS-5.2.0-JDK6/
framework/trunk/hudson/hudson-home/jobs/Native-Source-Distro-AS-5.2.0-JDK6/config.xml
Removed:
framework/trunk/hudson/hudson-home/users/maeste/
Modified:
framework/trunk/hudson/ant.properties.example
framework/trunk/hudson/hudson-home/config.xml
framework/trunk/hudson/hudson-home/hudson.tasks.Mailer.xml
framework/trunk/hudson/hudson-home/jobs/AS-Tests-ALL/config.xml
framework/trunk/hudson/hudson-home/jobs/CXF-ALL/config.xml
framework/trunk/hudson/hudson-home/jobs/CXF-Light/config.xml
framework/trunk/hudson/hudson-home/jobs/Metro-ALL/config.xml
framework/trunk/hudson/hudson-home/jobs/Metro-Light/config.xml
framework/trunk/hudson/hudson-home/jobs/Native-ALL/config.xml
framework/trunk/hudson/hudson-home/jobs/Native-Light/config.xml
framework/trunk/hudson/hudson-home/jobs/Release-Matrix-Step1/config.xml
framework/trunk/hudson/hudson-home/jobs/Weekend-Matrix/config.xml
framework/trunk/hudson/hudson-home/jobs/Working-Days-Matrix/config.xml
Log:
adding AS 5.2.x support
Modified: framework/trunk/hudson/ant.properties.example
===================================================================
--- framework/trunk/hudson/ant.properties.example 2009-05-29 06:57:11 UTC (rev 10141)
+++ framework/trunk/hudson/ant.properties.example 2009-05-29 10:05:26 UTC (rev 10142)
@@ -34,10 +34,14 @@
hudson.jboss501.build=jboss-5.0.1.GA
hudson.jboss501.rev=HEAD
-hudson.jboss510.url=http://anonsvn.jboss.org/repos/jbossas/branches/Branch_5_x
+hudson.jboss510.url=http://anonsvn.jboss.org/repos/jbossas/tags/JBoss_5_1_0_GA
hudson.jboss510.build=jboss-5.1.0.GA
hudson.jboss510.rev=HEAD
+hudson.jboss520.url=http://anonsvn.jboss.org/repos/jbossas/branches/Branch_5_x
+hudson.jboss520.build=jboss-5.2.0.Beta
+hudson.jboss520.rev=HEAD
+
hudson.jboss600.url=http://anonsvn.jboss.org/repos/jbossas/trunk
hudson.jboss600.build=jboss-6.0.0.Alpha1
hudson.jboss600.rev=HEAD
Modified: framework/trunk/hudson/hudson-home/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/config.xml 2009-05-29 06:57:11 UTC (rev 10141)
+++ framework/trunk/hudson/hudson-home/config.xml 2009-05-29 10:05:26 UTC (rev 10142)
@@ -16,6 +16,7 @@
<tr><th align=left>@hudson.jboss500.build@</th><td>-r(a)hudson.jboss500.rev@ @hudson.jboss500.url@</td></tr>
<tr><th align=left>@hudson.jboss501.build@</th><td>-r(a)hudson.jboss501.rev@ @hudson.jboss501.url@</td></tr>
<tr><th align=left>@hudson.jboss510.build@</th><td>-r(a)hudson.jboss510.rev@ @hudson.jboss510.url@</td></tr>
+ <tr><th align=left>@hudson.jboss520.build@</th><td>-r(a)hudson.jboss520.rev@ @hudson.jboss520.url@</td></tr>
<tr><th align=left>@hudson.jboss600.build@</th><td>-r(a)hudson.jboss600.rev@ @hudson.jboss600.url@</td></tr>
<tr><td colspan=2></td></tr>
</table>
@@ -26,6 +27,26 @@
<quietPeriod>5</quietPeriod>
<views>
+ <!-- AS Builds -->
+ <view>
+ <owner reference="../../.."/>
+ <jobNames class="tree-set">
+ <no-comparator/>
+ <string>AS-ALL</string>
+ <string>AS-5.0.0</string>
+ <string>AS-5.0.1</string>
+ <string>AS-5.1.0</string>
+ <string>AS-5.2.0</string>
+ <string>AS-6.0.0</string>
+ </jobNames>
+ <name>AS Builds</name>
+ <description>
+ <![CDATA[
+ Run AS builds.
+]]>
+ </description>
+ </view>
+
<!-- AS Tests -->
<view>
<owner reference="../../.."/>
@@ -35,6 +56,7 @@
<string>AS-Tests-AS-5.0.0</string>
<string>AS-Tests-AS-5.0.1</string>
<string>AS-Tests-AS-5.1.0</string>
+ <string>AS-Tests-AS-5.2.0</string>
<string>AS-Tests-AS-6.0.0</string>
</jobNames>
<name>AS Tests</name>
@@ -57,26 +79,32 @@
<string>Native-Core-AS-5.0.0-JDK5</string>
<string>Native-Core-AS-5.0.1-JDK5</string>
<string>Native-Core-AS-5.1.0-JDK5</string>
+ <string>Native-Core-AS-5.2.0-JDK5</string>
<string>Native-Core-AS-6.0.0-JDK5</string>
<string>Native-Core-AS-5.0.0-JDK6</string>
<string>Native-Core-AS-5.0.1-JDK6</string>
<string>Native-Core-AS-5.1.0-JDK6</string>
+ <string>Native-Core-AS-5.2.0-JDK6</string>
<string>Native-Core-AS-6.0.0-JDK6</string>
<string>Native-Binary-Distro-AS-5.0.0-JDK5</string>
<string>Native-Binary-Distro-AS-5.0.1-JDK5</string>
<string>Native-Binary-Distro-AS-5.1.0-JDK5</string>
+ <string>Native-Binary-Distro-AS-5.2.0-JDK5</string>
<string>Native-Binary-Distro-AS-6.0.0-JDK5</string>
<string>Native-Binary-Distro-AS-5.0.0-JDK6</string>
<string>Native-Binary-Distro-AS-5.0.1-JDK6</string>
<string>Native-Binary-Distro-AS-5.1.0-JDK6</string>
+ <string>Native-Binary-Distro-AS-5.2.0-JDK6</string>
<string>Native-Binary-Distro-AS-6.0.0-JDK6</string>
<string>Native-Source-Distro-AS-5.0.0-JDK5</string>
<string>Native-Source-Distro-AS-5.0.1-JDK5</string>
<string>Native-Source-Distro-AS-5.1.0-JDK5</string>
+ <string>Native-Source-Distro-AS-5.2.0-JDK5</string>
<string>Native-Source-Distro-AS-6.0.0-JDK5</string>
<string>Native-Source-Distro-AS-5.0.0-JDK6</string>
<string>Native-Source-Distro-AS-5.0.1-JDK6</string>
<string>Native-Source-Distro-AS-5.1.0-JDK6</string>
+ <string>Native-Source-Distro-AS-5.2.0-JDK6</string>
<string>Native-Source-Distro-AS-6.0.0-JDK6</string>
</jobNames>
<name>Native Tests</name>
@@ -99,26 +127,32 @@
<string>Metro-Core-AS-5.0.0-JDK5</string>
<string>Metro-Core-AS-5.0.1-JDK5</string>
<string>Metro-Core-AS-5.1.0-JDK5</string>
+ <string>Metro-Core-AS-5.2.0-JDK5</string>
<string>Metro-Core-AS-6.0.0-JDK5</string>
<string>Metro-Core-AS-5.0.0-JDK6</string>
<string>Metro-Core-AS-5.0.1-JDK6</string>
<string>Metro-Core-AS-5.1.0-JDK6</string>
+ <string>Metro-Core-AS-5.2.0-JDK6</string>
<string>Metro-Core-AS-6.0.0-JDK6</string>
<string>Metro-Binary-Distro-AS-5.0.0-JDK5</string>
<string>Metro-Binary-Distro-AS-5.0.1-JDK5</string>
<string>Metro-Binary-Distro-AS-5.1.0-JDK5</string>
+ <string>Metro-Binary-Distro-AS-5.2.0-JDK5</string>
<string>Metro-Binary-Distro-AS-6.0.0-JDK5</string>
<string>Metro-Binary-Distro-AS-5.0.0-JDK6</string>
<string>Metro-Binary-Distro-AS-5.0.1-JDK6</string>
<string>Metro-Binary-Distro-AS-5.1.0-JDK6</string>
+ <string>Metro-Binary-Distro-AS-5.2.0-JDK6</string>
<string>Metro-Binary-Distro-AS-6.0.0-JDK6</string>
<string>Metro-Source-Distro-AS-5.0.0-JDK5</string>
<string>Metro-Source-Distro-AS-5.0.1-JDK5</string>
<string>Metro-Source-Distro-AS-5.1.0-JDK5</string>
+ <string>Metro-Source-Distro-AS-5.2.0-JDK5</string>
<string>Metro-Source-Distro-AS-6.0.0-JDK5</string>
<string>Metro-Source-Distro-AS-5.0.0-JDK6</string>
<string>Metro-Source-Distro-AS-5.0.1-JDK6</string>
<string>Metro-Source-Distro-AS-5.1.0-JDK6</string>
+ <string>Metro-Source-Distro-AS-5.2.0-JDK6</string>
<string>Metro-Source-Distro-AS-6.0.0-JDK6</string>
</jobNames>
<name>Metro Tests</name>
@@ -141,26 +175,32 @@
<string>CXF-Core-AS-5.0.0-JDK5</string>
<string>CXF-Core-AS-5.0.1-JDK5</string>
<string>CXF-Core-AS-5.1.0-JDK5</string>
+ <string>CXF-Core-AS-5.2.0-JDK5</string>
<string>CXF-Core-AS-6.0.0-JDK5</string>
<string>CXF-Core-AS-5.0.0-JDK6</string>
<string>CXF-Core-AS-5.0.1-JDK6</string>
<string>CXF-Core-AS-5.1.0-JDK6</string>
+ <string>CXF-Core-AS-5.2.0-JDK6</string>
<string>CXF-Core-AS-6.0.0-JDK6</string>
<string>CXF-Binary-Distro-AS-5.0.0-JDK5</string>
<string>CXF-Binary-Distro-AS-5.0.1-JDK5</string>
<string>CXF-Binary-Distro-AS-5.1.0-JDK5</string>
+ <string>CXF-Binary-Distro-AS-5.2.0-JDK5</string>
<string>CXF-Binary-Distro-AS-6.0.0-JDK5</string>
<string>CXF-Binary-Distro-AS-5.0.0-JDK6</string>
<string>CXF-Binary-Distro-AS-5.0.1-JDK6</string>
<string>CXF-Binary-Distro-AS-5.1.0-JDK6</string>
+ <string>CXF-Binary-Distro-AS-5.2.0-JDK6</string>
<string>CXF-Binary-Distro-AS-6.0.0-JDK6</string>
<string>CXF-Source-Distro-AS-5.0.0-JDK5</string>
<string>CXF-Source-Distro-AS-5.0.1-JDK5</string>
<string>CXF-Source-Distro-AS-5.1.0-JDK5</string>
+ <string>CXF-Source-Distro-AS-5.2.0-JDK5</string>
<string>CXF-Source-Distro-AS-6.0.0-JDK5</string>
<string>CXF-Source-Distro-AS-5.0.0-JDK6</string>
<string>CXF-Source-Distro-AS-5.0.1-JDK6</string>
<string>CXF-Source-Distro-AS-5.1.0-JDK6</string>
+ <string>CXF-Source-Distro-AS-5.2.0-JDK6</string>
<string>CXF-Source-Distro-AS-6.0.0-JDK6</string>
</jobNames>
<name>CXF Tests</name>
@@ -192,6 +232,7 @@
<tr align=center><th align=left>AS-5.0.0</th> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td></tr>
<tr align=center><th align=left>AS-5.0.1</th> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td></tr>
<tr align=center><th align=left>AS-5.1.0</th> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td></tr>
+<tr align=center><th align=left>AS-5.2.0</th> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td></tr>
<tr align=center><th align=left>AS-6.0.0</th> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td></tr>
</table>
]]>
@@ -206,6 +247,7 @@
<string>AS-5.0.0</string>
<string>AS-5.0.1</string>
<string>AS-5.1.0</string>
+ <string>AS-5.2.0</string>
<string>AS-6.0.0</string>
</jobNames>
<name>Target Container</name>
@@ -224,52 +266,64 @@
<string>Metro-Core-AS-5.0.0-JDK5</string>
<string>Metro-Core-AS-5.0.1-JDK5</string>
<string>Metro-Core-AS-5.1.0-JDK5</string>
+ <string>Metro-Core-AS-5.2.0-JDK5</string>
<string>Metro-Core-AS-6.0.0-JDK5</string>
<string>Metro-Core-AS-5.0.0-JDK6</string>
<string>Metro-Core-AS-5.0.1-JDK6</string>
<string>Metro-Core-AS-5.1.0-JDK6</string>
+ <string>Metro-Core-AS-5.2.0-JDK6</string>
<string>Metro-Core-AS-6.0.0-JDK6</string>
<string>Metro-Binary-Distro-AS-5.0.0-JDK5</string>
<string>Metro-Binary-Distro-AS-5.0.1-JDK5</string>
<string>Metro-Binary-Distro-AS-5.1.0-JDK5</string>
+ <string>Metro-Binary-Distro-AS-5.2.0-JDK5</string>
<string>Metro-Binary-Distro-AS-6.0.0-JDK5</string>
<string>Metro-Binary-Distro-AS-5.0.0-JDK6</string>
<string>Metro-Binary-Distro-AS-5.0.1-JDK6</string>
<string>Metro-Binary-Distro-AS-5.1.0-JDK6</string>
+ <string>Metro-Binary-Distro-AS-5.2.0-JDK6</string>
<string>Metro-Binary-Distro-AS-6.0.0-JDK6</string>
<string>CXF-Light</string>
<string>CXF-Core-AS-5.0.0-JDK5</string>
<string>CXF-Core-AS-5.0.1-JDK5</string>
<string>CXF-Core-AS-5.1.0-JDK5</string>
+ <string>CXF-Core-AS-5.2.0-JDK5</string>
<string>CXF-Core-AS-6.0.0-JDK5</string>
<string>CXF-Core-AS-5.0.0-JDK6</string>
<string>CXF-Core-AS-5.0.1-JDK6</string>
<string>CXF-Core-AS-5.1.0-JDK6</string>
+ <string>CXF-Core-AS-5.2.0-JDK6</string>
<string>CXF-Core-AS-6.0.0-JDK6</string>
<string>CXF-Binary-Distro-AS-5.0.0-JDK5</string>
<string>CXF-Binary-Distro-AS-5.0.1-JDK5</string>
<string>CXF-Binary-Distro-AS-5.1.0-JDK5</string>
+ <string>CXF-Binary-Distro-AS-5.2.0-JDK5</string>
<string>CXF-Binary-Distro-AS-6.0.0-JDK5</string>
<string>CXF-Binary-Distro-AS-5.0.0-JDK6</string>
<string>CXF-Binary-Distro-AS-5.0.1-JDK6</string>
<string>CXF-Binary-Distro-AS-5.1.0-JDK6</string>
+ <string>CXF-Binary-Distro-AS-5.2.0-JDK6</string>
<string>CXF-Binary-Distro-AS-6.0.0-JDK6</string>
<string>Native-Light</string>
<string>Native-Core-AS-5.0.0-JDK5</string>
<string>Native-Core-AS-5.0.1-JDK5</string>
<string>Native-Core-AS-5.1.0-JDK5</string>
+ <string>Native-Core-AS-5.2.0-JDK5</string>
<string>Native-Core-AS-6.0.0-JDK5</string>
<string>Native-Core-AS-5.0.0-JDK6</string>
<string>Native-Core-AS-5.0.1-JDK6</string>
<string>Native-Core-AS-5.1.0-JDK6</string>
+ <string>Native-Core-AS-5.2.0-JDK6</string>
<string>Native-Core-AS-6.0.0-JDK6</string>
<string>Native-Binary-Distro-AS-5.0.0-JDK5</string>
<string>Native-Binary-Distro-AS-5.0.1-JDK5</string>
<string>Native-Binary-Distro-AS-5.1.0-JDK5</string>
+ <string>Native-Binary-Distro-AS-5.2.0-JDK5</string>
<string>Native-Binary-Distro-AS-6.0.0-JDK5</string>
<string>Native-Binary-Distro-AS-5.0.0-JDK6</string>
<string>Native-Binary-Distro-AS-5.0.1-JDK6</string>
<string>Native-Binary-Distro-AS-5.1.0-JDK6</string>
+ <string>Native-Binary-Distro-AS-5.2.0-JDK6</string>
<string>Native-Binary-Distro-AS-6.0.0-JDK6</string>
</jobNames>
<name>Working Days Tests</name>
Modified: framework/trunk/hudson/hudson-home/hudson.tasks.Mailer.xml
===================================================================
--- framework/trunk/hudson/hudson-home/hudson.tasks.Mailer.xml 2009-05-29 06:57:11 UTC (rev 10141)
+++ framework/trunk/hudson/hudson-home/hudson.tasks.Mailer.xml 2009-05-29 10:05:26 UTC (rev 10142)
@@ -2,6 +2,6 @@
<hudson.tasks.Mailer-DescriptorImpl>
<defaultSuffix></defaultSuffix>
<hudsonUrl>http://@hudson.host@:@hudson.http.port@/hudson/</hudsonUrl>
- <adminAddress>thomas.diesler(a)jboss.com</adminAddress>
+ <adminAddress>richard.opalka(a)jboss.com</adminAddress>
<smtpHost>@hudson.smtp.host@</smtpHost>
</hudson.tasks.Mailer-DescriptorImpl>
Added: framework/trunk/hudson/hudson-home/jobs/AS-5.2.0/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/AS-5.2.0/config.xml (rev 0)
+++ framework/trunk/hudson/hudson-home/jobs/AS-5.2.0/config.xml 2009-05-29 10:05:26 UTC (rev 10142)
@@ -0,0 +1,69 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+SVNBASE=JBossAS-5.2.0
+
+#
+# checkout with an explicit version
+#
+#if [ -d "$SVNBASE" ]; then
+# svn up -r(a)hudson.jboss520.rev@ $SVNBASE
+#else
+# svn co -r(a)hudson.jboss520.rev@ @hudson.jboss520.url@
+#fi
+
+#
+# build jboss
+#
+cd $SVNBASE
+./build/build.sh -Dthirdparty.maven.opts=-Dskip-download-sources clean main
+
+#
+# Verify build
+#
+if [ ! -d ./build/output/(a)hudson.jboss520.build@ ]; then
+ echo "Cannot find expected build: @hudson.jboss520.build@"
+ exit 1
+fi
+ </command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <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>@hudson.jboss520.url@</remote>
+ <local>JBossAS-5.2.0</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ </locations>
+ <useUpdate>true</useUpdate>
+ <browser class="hudson.scm.browsers.FishEyeSVN">
+ <url>http://fisheye.jboss.com/browse/JBossAS/</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 AS-5.2.0</description>
+ <actions class="vector"/>
+</project>
Added: framework/trunk/hudson/hudson-home/jobs/AS-ALL/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/AS-ALL/config.xml (rev 0)
+++ framework/trunk/hudson/hudson-home/jobs/AS-ALL/config.xml 2009-05-29 10:05:26 UTC (rev 10142)
@@ -0,0 +1,23 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector"/>
+ <publishers class="vector">
+ <hudson.tasks.BuildTrigger>
+ <childProjects>AS-5.0.0, AS-5.0.1, AS-5.1.0, AS-5.2.0, AS-6.0.0</childProjects>
+ </hudson.tasks.BuildTrigger>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.NullSCM"/>
+ <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>Builds all AS servers</description>
+ <actions class="vector"/>
+</project>
Modified: framework/trunk/hudson/hudson-home/jobs/AS-Tests-ALL/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/AS-Tests-ALL/config.xml 2009-05-29 06:57:11 UTC (rev 10141)
+++ framework/trunk/hudson/hudson-home/jobs/AS-Tests-ALL/config.xml 2009-05-29 10:05:26 UTC (rev 10142)
@@ -3,7 +3,7 @@
<builders class="vector"/>
<publishers class="vector">
<hudson.tasks.BuildTrigger>
- <childProjects>AS-Tests-AS-5.0.0, AS-Tests-AS-5.0.1, AS-Tests-AS-5.1.0, AS-Tests-AS-6.0.0</childProjects>
+ <childProjects>AS-Tests-AS-5.0.0, AS-Tests-AS-5.0.1, AS-Tests-AS-5.1.0, AS-Tests-AS-5.2.0, AS-Tests-AS-6.0.0</childProjects>
</hudson.tasks.BuildTrigger>
</publishers>
<buildWrappers class="vector"/>
Added: framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-5.2.0/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-5.2.0/config.xml (rev 0)
+++ framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-5.2.0/config.xml 2009-05-29 10:05:26 UTC (rev 10142)
@@ -0,0 +1,118 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=AS-Tests-AS-5.2.0
+
+WORKSPACE=`pwd`
+FRAMEWORK_DIR=$WORKSPACE/framework
+STACK_DIR=$WORKSPACE/stack-native
+JBOSS_TARGET=jboss520
+JBOSS_BIND_ADDRESS=(a)jboss.bind.address@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.2.0/workspace/JBossAS-5.2.0/build/output/(a)hudson.jboss520.build@
+ENVIRONMENT="-Dmaven.opts=-U -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss520.home=$JBOSS_INSTANCE"
+
+#
+# stop jbossas
+#
+$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
+
+#
+# build and deploy
+#
+cd $STACK_DIR
+cp profiles.xml.example profiles.xml
+mvn -Ptestsuite clean
+ant $ENVIRONMENT deploy-jboss520
+
+# remove obsolete logs
+rm -f $JBOSS_INSTANCE/server/@jboss.server.instance(a)/log/boot.log
+rm -f $JBOSS_INSTANCE/server/@jboss.server.instance(a)/log/server.log
+
+#
+# start jbossas
+#
+$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BIND_ADDRESS
+
+# Was it successfully started?
+$FRAMEWORK_DIR/hudson/jboss/bin/http-spider.sh $JBOSS_BIND_ADDRESS:8080 $WORKSPACE
+if [ -e $WORKSPACE/spider.failed ]; then
+ tail -n 100 $JBOSS_INSTANCE/server/@jboss.server.instance(a)/log/server.log
+ $FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BIND_ADDRESS
+ exit 1
+fi
+
+#
+# build the testsuite
+#
+cd $JBOSS_INSTANCE/../../../testsuite
+./build.sh -Dnode0=$JBOSS_BIND_ADDRESS clean main
+
+#
+# execute tests
+#
+./build.sh -Dnode0=$JBOSS_BIND_ADDRESS tests-webservice tests-report 2>&1 | tee $WORKSPACE/tests.log
+cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u | tee $WORKSPACE/fixme.txt
+cat $STACK_DIR/modules/testsuite/test-excludes-$JBOSS_TARGET.txt $WORKSPACE/fixme.txt | egrep "\[\S*]" > $WORKSPACE/errata-$JBOSS_TARGET.txt
+
+#
+# copy the test reports
+#
+rm -rf $WORKSPACE/test-reports
+mkdir $WORKSPACE/test-reports
+cp -r ./output/reports/*.xml $WORKSPACE/test-reports
+
+#
+# stop jbossas
+#
+$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
+cp $JBOSS_INSTANCE/server/@jboss.server.instance(a)/log/boot.log $WORKSPACE/jboss-boot.log
+cp $JBOSS_INSTANCE/server/@jboss.server.instance(a)/log/server.log $WORKSPACE/jboss-server.log
+</command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.junit.JUnitResultArchiver>
+ <testResults>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>@hudson.framework.url@</remote>
+ <local>framework</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>Run the AS-5.2.0 webservice testsuite agains jbossws-(a)version.id@</description>
+ <actions class="vector"/>
+</project>
Modified: framework/trunk/hudson/hudson-home/jobs/CXF-ALL/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/CXF-ALL/config.xml 2009-05-29 06:57:11 UTC (rev 10141)
+++ framework/trunk/hudson/hudson-home/jobs/CXF-ALL/config.xml 2009-05-29 10:05:26 UTC (rev 10142)
@@ -7,31 +7,37 @@
CXF-Core-AS-5.0.0-JDK5
, CXF-Core-AS-5.0.1-JDK5
, CXF-Core-AS-5.1.0-JDK5
+, CXF-Core-AS-5.2.0-JDK5
, CXF-Core-AS-6.0.0-JDK5
, CXF-Core-AS-5.0.0-JDK6
, CXF-Core-AS-5.0.1-JDK6
, CXF-Core-AS-5.1.0-JDK6
+, CXF-Core-AS-5.2.0-JDK6
, CXF-Core-AS-6.0.0-JDK6
, CXF-Binary-Distro-AS-5.0.0-JDK5
, CXF-Binary-Distro-AS-5.0.1-JDK5
, CXF-Binary-Distro-AS-5.1.0-JDK5
+, CXF-Binary-Distro-AS-5.2.0-JDK5
, CXF-Binary-Distro-AS-6.0.0-JDK5
, CXF-Binary-Distro-AS-5.0.0-JDK6
, CXF-Binary-Distro-AS-5.0.1-JDK6
, CXF-Binary-Distro-AS-5.1.0-JDK6
+, CXF-Binary-Distro-AS-5.2.0-JDK6
, CXF-Binary-Distro-AS-6.0.0-JDK6
, CXF-Source-Distro-AS-5.0.0-JDK5
, CXF-Source-Distro-AS-5.0.1-JDK5
, CXF-Source-Distro-AS-5.1.0-JDK5
+, CXF-Source-Distro-AS-5.2.0-JDK5
, CXF-Source-Distro-AS-6.0.0-JDK5
, CXF-Source-Distro-AS-5.0.0-JDK6
, CXF-Source-Distro-AS-5.0.1-JDK6
, CXF-Source-Distro-AS-5.1.0-JDK6
+, CXF-Source-Distro-AS-5.2.0-JDK6
, CXF-Source-Distro-AS-6.0.0-JDK6
</childProjects>
</hudson.tasks.BuildTrigger>
Added: framework/trunk/hudson/hudson-home/jobs/CXF-Binary-Distro-AS-5.2.0-JDK5/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/CXF-Binary-Distro-AS-5.2.0-JDK5/config.xml (rev 0)
+++ framework/trunk/hudson/hudson-home/jobs/CXF-Binary-Distro-AS-5.2.0-JDK5/config.xml 2009-05-29 10:05:26 UTC (rev 10142)
@@ -0,0 +1,75 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=CXF-Binary-Distro-AS-5.2.0-JDK5
+
+WORKSPACE=`pwd`
+STACK_ID=cxf
+JAVA_HOME=(a)java.home.jdk15@
+FRAMEWORK_DIR=$WORKSPACE/framework
+STACK_DIR=$WORKSPACE/stack-cxf
+TEST_OPTS=
+JBOSS_TARGET=jboss520
+JBOSS_BIND_ADDRESS=(a)jboss.bind.address@
+JBOSS_CONFIG=(a)jboss.server.instance@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.2.0/workspace/JBossAS-5.2.0/build/output/(a)hudson.jboss520.build@
+
+#
+# load test functions
+#
+. $FRAMEWORK_DIR/hudson/jboss/bin/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>@hudson.framework.url@</remote>
+ <local>framework</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-5.2.0 with JDK5</description>
+ <actions class="vector"/>
+</project>
Added: framework/trunk/hudson/hudson-home/jobs/CXF-Binary-Distro-AS-5.2.0-JDK6/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/CXF-Binary-Distro-AS-5.2.0-JDK6/config.xml (rev 0)
+++ framework/trunk/hudson/hudson-home/jobs/CXF-Binary-Distro-AS-5.2.0-JDK6/config.xml 2009-05-29 10:05:26 UTC (rev 10142)
@@ -0,0 +1,75 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=CXF-Binary-Distro-AS-5.2.0-JDK6
+
+WORKSPACE=`pwd`
+STACK_ID=cxf
+JAVA_HOME=(a)java.home.jdk16@
+FRAMEWORK_DIR=$WORKSPACE/framework
+STACK_DIR=$WORKSPACE/stack-cxf
+TEST_OPTS=
+JBOSS_TARGET=jboss520
+JBOSS_BIND_ADDRESS=(a)jboss.bind.address@
+JBOSS_CONFIG=(a)jboss.server.instance@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.2.0/workspace/JBossAS-5.2.0/build/output/(a)hudson.jboss520.build@
+
+#
+# load test functions
+#
+. $FRAMEWORK_DIR/hudson/jboss/bin/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>@hudson.framework.url@</remote>
+ <local>framework</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-5.2.0 with JDK6</description>
+ <actions class="vector"/>
+</project>
Added: framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-5.2.0-JDK5/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-5.2.0-JDK5/config.xml (rev 0)
+++ framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-5.2.0-JDK5/config.xml 2009-05-29 10:05:26 UTC (rev 10142)
@@ -0,0 +1,75 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=CXF-Core-AS-5.2.0-JDK5
+
+WORKSPACE=`pwd`
+STACK_ID=cxf
+JAVA_HOME=(a)java.home.jdk15@
+FRAMEWORK_DIR=$WORKSPACE/framework
+STACK_DIR=$WORKSPACE/stack-cxf
+TEST_OPTS=
+JBOSS_TARGET=jboss520
+JBOSS_BIND_ADDRESS=(a)jboss.bind.address@
+JBOSS_CONFIG=(a)jboss.server.instance@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.2.0/workspace/JBossAS-5.2.0/build/output/(a)hudson.jboss520.build@
+
+#
+# load test functions
+#
+. $FRAMEWORK_DIR/hudson/jboss/bin/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>@hudson.framework.url@</remote>
+ <local>framework</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 AS-5.2.0 with JDK5</description>
+ <actions class="vector"/>
+</project>
Added: framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-5.2.0-JDK6/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-5.2.0-JDK6/config.xml (rev 0)
+++ framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-5.2.0-JDK6/config.xml 2009-05-29 10:05:26 UTC (rev 10142)
@@ -0,0 +1,75 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=CXF-Core-AS-5.2.0-JDK6
+
+WORKSPACE=`pwd`
+STACK_ID=cxf
+JAVA_HOME=(a)java.home.jdk16@
+FRAMEWORK_DIR=$WORKSPACE/framework
+STACK_DIR=$WORKSPACE/stack-cxf
+TEST_OPTS=
+JBOSS_TARGET=jboss520
+JBOSS_BIND_ADDRESS=(a)jboss.bind.address@
+JBOSS_CONFIG=(a)jboss.server.instance@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.2.0/workspace/JBossAS-5.2.0/build/output/(a)hudson.jboss520.build@
+
+#
+# load test functions
+#
+. $FRAMEWORK_DIR/hudson/jboss/bin/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>@hudson.framework.url@</remote>
+ <local>framework</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 AS-5.2.0 with JDK6</description>
+ <actions class="vector"/>
+</project>
Modified: framework/trunk/hudson/hudson-home/jobs/CXF-Light/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/CXF-Light/config.xml 2009-05-29 06:57:11 UTC (rev 10141)
+++ framework/trunk/hudson/hudson-home/jobs/CXF-Light/config.xml 2009-05-29 10:05:26 UTC (rev 10142)
@@ -7,21 +7,25 @@
CXF-Core-AS-5.0.0-JDK5
, CXF-Core-AS-5.0.1-JDK5
, CXF-Core-AS-5.1.0-JDK5
+, CXF-Core-AS-5.2.0-JDK5
, CXF-Core-AS-6.0.0-JDK5
, CXF-Core-AS-5.0.0-JDK6
, CXF-Core-AS-5.0.1-JDK6
, CXF-Core-AS-5.1.0-JDK6
+, CXF-Core-AS-5.2.0-JDK6
, CXF-Core-AS-6.0.0-JDK6
, CXF-Binary-Distro-AS-5.0.0-JDK5
, CXF-Binary-Distro-AS-5.0.1-JDK5
, CXF-Binary-Distro-AS-5.1.0-JDK5
+, CXF-Binary-Distro-AS-5.2.0-JDK5
, CXF-Binary-Distro-AS-6.0.0-JDK5
, CXF-Binary-Distro-AS-5.0.0-JDK6
, CXF-Binary-Distro-AS-5.0.1-JDK6
, CXF-Binary-Distro-AS-5.1.0-JDK6
+, CXF-Binary-Distro-AS-5.2.0-JDK6
, CXF-Binary-Distro-AS-6.0.0-JDK6
</childProjects>
</hudson.tasks.BuildTrigger>
Added: framework/trunk/hudson/hudson-home/jobs/CXF-Source-Distro-AS-5.2.0-JDK5/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/CXF-Source-Distro-AS-5.2.0-JDK5/config.xml (rev 0)
+++ framework/trunk/hudson/hudson-home/jobs/CXF-Source-Distro-AS-5.2.0-JDK5/config.xml 2009-05-29 10:05:26 UTC (rev 10142)
@@ -0,0 +1,75 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=CXF-Source-Distro-AS-5.2.0-JDK5
+
+WORKSPACE=`pwd`
+STACK_ID=cxf
+JAVA_HOME=(a)java.home.jdk15@
+FRAMEWORK_DIR=$WORKSPACE/framework
+STACK_DIR=$WORKSPACE/stack-cxf
+TEST_OPTS=
+JBOSS_TARGET=jboss520
+JBOSS_BIND_ADDRESS=(a)jboss.bind.address@
+JBOSS_CONFIG=(a)jboss.server.instance@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.2.0/workspace/JBossAS-5.2.0/build/output/(a)hudson.jboss520.build@
+
+#
+# load test functions
+#
+. $FRAMEWORK_DIR/hudson/jboss/bin/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>@hudson.framework.url@</remote>
+ <local>framework</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-5.2.0 with JDK5</description>
+ <actions class="vector"/>
+</project>
Added: framework/trunk/hudson/hudson-home/jobs/CXF-Source-Distro-AS-5.2.0-JDK6/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/CXF-Source-Distro-AS-5.2.0-JDK6/config.xml (rev 0)
+++ framework/trunk/hudson/hudson-home/jobs/CXF-Source-Distro-AS-5.2.0-JDK6/config.xml 2009-05-29 10:05:26 UTC (rev 10142)
@@ -0,0 +1,75 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=CXF-Source-Distro-AS-5.2.0-JDK6
+
+WORKSPACE=`pwd`
+STACK_ID=cxf
+JAVA_HOME=(a)java.home.jdk16@
+FRAMEWORK_DIR=$WORKSPACE/framework
+STACK_DIR=$WORKSPACE/stack-cxf
+TEST_OPTS=
+JBOSS_TARGET=jboss520
+JBOSS_BIND_ADDRESS=(a)jboss.bind.address@
+JBOSS_CONFIG=(a)jboss.server.instance@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.2.0/workspace/JBossAS-5.2.0/build/output/(a)hudson.jboss520.build@
+
+#
+# load test functions
+#
+. $FRAMEWORK_DIR/hudson/jboss/bin/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>@hudson.framework.url@</remote>
+ <local>framework</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-5.2.0 with JDK6</description>
+ <actions class="vector"/>
+</project>
Modified: framework/trunk/hudson/hudson-home/jobs/Metro-ALL/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Metro-ALL/config.xml 2009-05-29 06:57:11 UTC (rev 10141)
+++ framework/trunk/hudson/hudson-home/jobs/Metro-ALL/config.xml 2009-05-29 10:05:26 UTC (rev 10142)
@@ -7,31 +7,37 @@
Metro-Core-AS-5.0.0-JDK5
, Metro-Core-AS-5.0.1-JDK5
, Metro-Core-AS-5.1.0-JDK5
+, Metro-Core-AS-5.2.0-JDK5
, Metro-Core-AS-6.0.0-JDK5
, Metro-Core-AS-5.0.0-JDK6
, Metro-Core-AS-5.0.1-JDK6
, Metro-Core-AS-5.1.0-JDK6
+, Metro-Core-AS-5.2.0-JDK6
, Metro-Core-AS-6.0.0-JDK6
, Metro-Binary-Distro-AS-5.0.0-JDK5
, Metro-Binary-Distro-AS-5.0.1-JDK5
, Metro-Binary-Distro-AS-5.1.0-JDK5
+, Metro-Binary-Distro-AS-5.2.0-JDK5
, Metro-Binary-Distro-AS-6.0.0-JDK5
, Metro-Binary-Distro-AS-5.0.0-JDK6
, Metro-Binary-Distro-AS-5.0.1-JDK6
, Metro-Binary-Distro-AS-5.1.0-JDK6
+, Metro-Binary-Distro-AS-5.2.0-JDK6
, Metro-Binary-Distro-AS-6.0.0-JDK6
, Metro-Source-Distro-AS-5.0.0-JDK5
, Metro-Source-Distro-AS-5.0.1-JDK5
, Metro-Source-Distro-AS-5.1.0-JDK5
+, Metro-Source-Distro-AS-5.2.0-JDK5
, Metro-Source-Distro-AS-6.0.0-JDK5
, Metro-Source-Distro-AS-5.0.0-JDK6
, Metro-Source-Distro-AS-5.0.1-JDK6
, Metro-Source-Distro-AS-5.1.0-JDK6
+, Metro-Source-Distro-AS-5.2.0-JDK6
, Metro-Source-Distro-AS-6.0.0-JDK6
</childProjects>
</hudson.tasks.BuildTrigger>
Added: framework/trunk/hudson/hudson-home/jobs/Metro-Binary-Distro-AS-5.2.0-JDK5/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Metro-Binary-Distro-AS-5.2.0-JDK5/config.xml (rev 0)
+++ framework/trunk/hudson/hudson-home/jobs/Metro-Binary-Distro-AS-5.2.0-JDK5/config.xml 2009-05-29 10:05:26 UTC (rev 10142)
@@ -0,0 +1,75 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=Metro-Binary-Distro-AS-5.2.0-JDK5
+
+WORKSPACE=`pwd`
+STACK_ID=metro
+JAVA_HOME=(a)java.home.jdk15@
+FRAMEWORK_DIR=$WORKSPACE/framework
+STACK_DIR=$WORKSPACE/stack-metro
+TEST_OPTS=
+JBOSS_TARGET=jboss520
+JBOSS_BIND_ADDRESS=(a)jboss.bind.address@
+JBOSS_CONFIG=(a)jboss.server.instance@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.2.0/workspace/JBossAS-5.2.0/build/output/(a)hudson.jboss520.build@
+
+#
+# load test functions
+#
+. $FRAMEWORK_DIR/hudson/jboss/bin/jbossws-qa.sh
+
+#
+# execute binary distribution tests
+#
+binaryDistributionTest
+
+</command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.junit.JUnitResultArchiver>
+ <testResults>stack-metro/target/jbossws-metro-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>@hudson.framework.url@</remote>
+ <local>framework</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.metro.url@</remote>
+ <local>stack-metro</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-metro-(a)version.id@ binary distribution against AS-5.2.0 with JDK5</description>
+ <actions class="vector"/>
+</project>
Added: framework/trunk/hudson/hudson-home/jobs/Metro-Binary-Distro-AS-5.2.0-JDK6/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Metro-Binary-Distro-AS-5.2.0-JDK6/config.xml (rev 0)
+++ framework/trunk/hudson/hudson-home/jobs/Metro-Binary-Distro-AS-5.2.0-JDK6/config.xml 2009-05-29 10:05:26 UTC (rev 10142)
@@ -0,0 +1,75 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=Metro-Binary-Distro-AS-5.2.0-JDK6
+
+WORKSPACE=`pwd`
+STACK_ID=metro
+JAVA_HOME=(a)java.home.jdk16@
+FRAMEWORK_DIR=$WORKSPACE/framework
+STACK_DIR=$WORKSPACE/stack-metro
+TEST_OPTS=
+JBOSS_TARGET=jboss520
+JBOSS_BIND_ADDRESS=(a)jboss.bind.address@
+JBOSS_CONFIG=(a)jboss.server.instance@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.2.0/workspace/JBossAS-5.2.0/build/output/(a)hudson.jboss520.build@
+
+#
+# load test functions
+#
+. $FRAMEWORK_DIR/hudson/jboss/bin/jbossws-qa.sh
+
+#
+# execute binary distribution tests
+#
+binaryDistributionTest
+
+</command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.junit.JUnitResultArchiver>
+ <testResults>stack-metro/target/jbossws-metro-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>@hudson.framework.url@</remote>
+ <local>framework</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.metro.url@</remote>
+ <local>stack-metro</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-metro-(a)version.id@ binary distribution against AS-5.2.0 with JDK6</description>
+ <actions class="vector"/>
+</project>
Added: framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.2.0-JDK5/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.2.0-JDK5/config.xml (rev 0)
+++ framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.2.0-JDK5/config.xml 2009-05-29 10:05:26 UTC (rev 10142)
@@ -0,0 +1,75 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=Metro-Core-AS-5.2.0-JDK5
+
+WORKSPACE=`pwd`
+STACK_ID=metro
+JAVA_HOME=(a)java.home.jdk15@
+FRAMEWORK_DIR=$WORKSPACE/framework
+STACK_DIR=$WORKSPACE/stack-metro
+TEST_OPTS=
+JBOSS_TARGET=jboss520
+JBOSS_BIND_ADDRESS=(a)jboss.bind.address@
+JBOSS_CONFIG=(a)jboss.server.instance@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.2.0/workspace/JBossAS-5.2.0/build/output/(a)hudson.jboss520.build@
+
+#
+# load test functions
+#
+. $FRAMEWORK_DIR/hudson/jboss/bin/jbossws-qa.sh
+
+#
+# execute core tests
+#
+coreTest
+
+</command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.junit.JUnitResultArchiver>
+ <testResults>stack-metro/**/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>@hudson.framework.url@</remote>
+ <local>framework</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.metro.url@</remote>
+ <local>stack-metro</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-metro-(a)version.id@ against AS-5.2.0 with JDK5</description>
+ <actions class="vector"/>
+</project>
Added: framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.2.0-JDK6/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.2.0-JDK6/config.xml (rev 0)
+++ framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.2.0-JDK6/config.xml 2009-05-29 10:05:26 UTC (rev 10142)
@@ -0,0 +1,75 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=Metro-Core-AS-5.2.0-JDK6
+
+WORKSPACE=`pwd`
+STACK_ID=metro
+JAVA_HOME=(a)java.home.jdk16@
+FRAMEWORK_DIR=$WORKSPACE/framework
+STACK_DIR=$WORKSPACE/stack-metro
+TEST_OPTS=
+JBOSS_TARGET=jboss520
+JBOSS_BIND_ADDRESS=(a)jboss.bind.address@
+JBOSS_CONFIG=(a)jboss.server.instance@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.2.0/workspace/JBossAS-5.2.0/build/output/(a)hudson.jboss520.build@
+
+#
+# load test functions
+#
+. $FRAMEWORK_DIR/hudson/jboss/bin/jbossws-qa.sh
+
+#
+# execute core tests
+#
+coreTest
+
+</command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.junit.JUnitResultArchiver>
+ <testResults>stack-metro/**/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>@hudson.framework.url@</remote>
+ <local>framework</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.metro.url@</remote>
+ <local>stack-metro</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-metro-(a)version.id@ against AS-5.2.0 with JDK6</description>
+ <actions class="vector"/>
+</project>
Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Light/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Metro-Light/config.xml 2009-05-29 06:57:11 UTC (rev 10141)
+++ framework/trunk/hudson/hudson-home/jobs/Metro-Light/config.xml 2009-05-29 10:05:26 UTC (rev 10142)
@@ -7,21 +7,25 @@
Metro-Core-AS-5.0.0-JDK5
, Metro-Core-AS-5.0.1-JDK5
, Metro-Core-AS-5.1.0-JDK5
+, Metro-Core-AS-5.2.0-JDK5
, Metro-Core-AS-6.0.0-JDK5
, Metro-Core-AS-5.0.0-JDK6
, Metro-Core-AS-5.0.1-JDK6
, Metro-Core-AS-5.1.0-JDK6
+, Metro-Core-AS-5.2.0-JDK6
, Metro-Core-AS-6.0.0-JDK6
, Metro-Binary-Distro-AS-5.0.0-JDK5
, Metro-Binary-Distro-AS-5.0.1-JDK5
, Metro-Binary-Distro-AS-5.1.0-JDK5
+, Metro-Binary-Distro-AS-5.2.0-JDK5
, Metro-Binary-Distro-AS-6.0.0-JDK5
, Metro-Binary-Distro-AS-5.0.0-JDK6
, Metro-Binary-Distro-AS-5.0.1-JDK6
, Metro-Binary-Distro-AS-5.1.0-JDK6
+, Metro-Binary-Distro-AS-5.2.0-JDK6
, Metro-Binary-Distro-AS-6.0.0-JDK6
</childProjects>
</hudson.tasks.BuildTrigger>
Added: framework/trunk/hudson/hudson-home/jobs/Metro-Source-Distro-AS-5.2.0-JDK5/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Metro-Source-Distro-AS-5.2.0-JDK5/config.xml (rev 0)
+++ framework/trunk/hudson/hudson-home/jobs/Metro-Source-Distro-AS-5.2.0-JDK5/config.xml 2009-05-29 10:05:26 UTC (rev 10142)
@@ -0,0 +1,75 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=Metro-Source-Distro-AS-5.2.0-JDK5
+
+WORKSPACE=`pwd`
+STACK_ID=metro
+JAVA_HOME=(a)java.home.jdk15@
+FRAMEWORK_DIR=$WORKSPACE/framework
+STACK_DIR=$WORKSPACE/stack-metro
+TEST_OPTS=
+JBOSS_TARGET=jboss520
+JBOSS_BIND_ADDRESS=(a)jboss.bind.address@
+JBOSS_CONFIG=(a)jboss.server.instance@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.2.0/workspace/JBossAS-5.2.0/build/output/(a)hudson.jboss520.build@
+
+#
+# load test functions
+#
+. $FRAMEWORK_DIR/hudson/jboss/bin/jbossws-qa.sh
+
+#
+# execute source distribution tests
+#
+sourceDistributionTest
+
+</command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.junit.JUnitResultArchiver>
+ <testResults>stack-metro/target/jbossws-metro-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>@hudson.framework.url@</remote>
+ <local>framework</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.metro.url@</remote>
+ <local>stack-metro</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-metro-(a)version.id@ source distribution against AS-5.2.0 with JDK5</description>
+ <actions class="vector"/>
+</project>
Added: framework/trunk/hudson/hudson-home/jobs/Metro-Source-Distro-AS-5.2.0-JDK6/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Metro-Source-Distro-AS-5.2.0-JDK6/config.xml (rev 0)
+++ framework/trunk/hudson/hudson-home/jobs/Metro-Source-Distro-AS-5.2.0-JDK6/config.xml 2009-05-29 10:05:26 UTC (rev 10142)
@@ -0,0 +1,75 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=Metro-Source-Distro-AS-5.2.0-JDK6
+
+WORKSPACE=`pwd`
+STACK_ID=metro
+JAVA_HOME=(a)java.home.jdk16@
+FRAMEWORK_DIR=$WORKSPACE/framework
+STACK_DIR=$WORKSPACE/stack-metro
+TEST_OPTS=
+JBOSS_TARGET=jboss520
+JBOSS_BIND_ADDRESS=(a)jboss.bind.address@
+JBOSS_CONFIG=(a)jboss.server.instance@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.2.0/workspace/JBossAS-5.2.0/build/output/(a)hudson.jboss520.build@
+
+#
+# load test functions
+#
+. $FRAMEWORK_DIR/hudson/jboss/bin/jbossws-qa.sh
+
+#
+# execute source distribution tests
+#
+sourceDistributionTest
+
+</command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.junit.JUnitResultArchiver>
+ <testResults>stack-metro/target/jbossws-metro-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>@hudson.framework.url@</remote>
+ <local>framework</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.metro.url@</remote>
+ <local>stack-metro</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-metro-(a)version.id@ source distribution against AS-5.2.0 with JDK6</description>
+ <actions class="vector"/>
+</project>
Modified: framework/trunk/hudson/hudson-home/jobs/Native-ALL/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Native-ALL/config.xml 2009-05-29 06:57:11 UTC (rev 10141)
+++ framework/trunk/hudson/hudson-home/jobs/Native-ALL/config.xml 2009-05-29 10:05:26 UTC (rev 10142)
@@ -7,31 +7,37 @@
Native-Core-AS-5.0.0-JDK5
, Native-Core-AS-5.0.1-JDK5
, Native-Core-AS-5.1.0-JDK5
+, Native-Core-AS-5.2.0-JDK5
, Native-Core-AS-6.0.0-JDK5
, Native-Core-AS-5.0.0-JDK6
, Native-Core-AS-5.0.1-JDK6
, Native-Core-AS-5.1.0-JDK6
+, Native-Core-AS-5.2.0-JDK6
, Native-Core-AS-6.0.0-JDK6
, Native-Binary-Distro-AS-5.0.0-JDK5
, Native-Binary-Distro-AS-5.0.1-JDK5
, Native-Binary-Distro-AS-5.1.0-JDK5
+, Native-Binary-Distro-AS-5.2.0-JDK5
, Native-Binary-Distro-AS-6.0.0-JDK5
, Native-Binary-Distro-AS-5.0.0-JDK6
, Native-Binary-Distro-AS-5.0.1-JDK6
, Native-Binary-Distro-AS-5.1.0-JDK6
+, Native-Binary-Distro-AS-5.2.0-JDK6
, Native-Binary-Distro-AS-6.0.0-JDK6
, Native-Source-Distro-AS-5.0.0-JDK5
, Native-Source-Distro-AS-5.0.1-JDK5
, Native-Source-Distro-AS-5.1.0-JDK5
+, Native-Source-Distro-AS-5.2.0-JDK5
, Native-Source-Distro-AS-6.0.0-JDK5
, Native-Source-Distro-AS-5.0.0-JDK6
, Native-Source-Distro-AS-5.0.1-JDK6
, Native-Source-Distro-AS-5.1.0-JDK6
+, Native-Source-Distro-AS-5.2.0-JDK6
, Native-Source-Distro-AS-6.0.0-JDK6
</childProjects>
</hudson.tasks.BuildTrigger>
Added: framework/trunk/hudson/hudson-home/jobs/Native-Binary-Distro-AS-5.2.0-JDK5/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Native-Binary-Distro-AS-5.2.0-JDK5/config.xml (rev 0)
+++ framework/trunk/hudson/hudson-home/jobs/Native-Binary-Distro-AS-5.2.0-JDK5/config.xml 2009-05-29 10:05:26 UTC (rev 10142)
@@ -0,0 +1,75 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=Native-Binary-Distro-AS-5.2.0-JDK5
+
+WORKSPACE=`pwd`
+STACK_ID=native
+JAVA_HOME=(a)java.home.jdk15@
+FRAMEWORK_DIR=$WORKSPACE/framework
+STACK_DIR=$WORKSPACE/stack-native
+TEST_OPTS=
+JBOSS_TARGET=jboss520
+JBOSS_BIND_ADDRESS=(a)jboss.bind.address@
+JBOSS_CONFIG=(a)jboss.server.instance@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.2.0/workspace/JBossAS-5.2.0/build/output/(a)hudson.jboss520.build@
+
+#
+# load test functions
+#
+. $FRAMEWORK_DIR/hudson/jboss/bin/jbossws-qa.sh
+
+#
+# execute binary distribution tests
+#
+binaryDistributionTest
+
+</command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.junit.JUnitResultArchiver>
+ <testResults>stack-native/target/jbossws-native-bin-dist/output/test-reports/TEST-*.xml</testResults>
+ </hudson.tasks.junit.JUnitResultArchiver>
+ <hudson.tasks.Mailer>
+ <recipients>@hudson.mail.recipients@</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>true</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.SubversionSCM">
+ <locations>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.framework.url@</remote>
+ <local>framework</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.native.url@</remote>
+ <local>stack-native</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ </locations>
+ <useUpdate>true</useUpdate>
+ <browser class="hudson.scm.browsers.FishEyeSVN">
+ <url>http://fisheye.jboss.com/browse/JBossWS/</url>
+ <rootModule></rootModule>
+ </browser>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <logRotator>
+ <daysToKeep>14</daysToKeep>
+ <numToKeep>-1</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Build and test jbossws-native-(a)version.id@ binary distribution against AS-5.2.0 with JDK5</description>
+ <actions class="vector"/>
+</project>
Added: framework/trunk/hudson/hudson-home/jobs/Native-Binary-Distro-AS-5.2.0-JDK6/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Native-Binary-Distro-AS-5.2.0-JDK6/config.xml (rev 0)
+++ framework/trunk/hudson/hudson-home/jobs/Native-Binary-Distro-AS-5.2.0-JDK6/config.xml 2009-05-29 10:05:26 UTC (rev 10142)
@@ -0,0 +1,75 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=Native-Binary-Distro-AS-5.2.0-JDK6
+
+WORKSPACE=`pwd`
+STACK_ID=native
+JAVA_HOME=(a)java.home.jdk16@
+FRAMEWORK_DIR=$WORKSPACE/framework
+STACK_DIR=$WORKSPACE/stack-native
+TEST_OPTS=
+JBOSS_TARGET=jboss520
+JBOSS_BIND_ADDRESS=(a)jboss.bind.address@
+JBOSS_CONFIG=(a)jboss.server.instance@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.2.0/workspace/JBossAS-5.2.0/build/output/(a)hudson.jboss520.build@
+
+#
+# load test functions
+#
+. $FRAMEWORK_DIR/hudson/jboss/bin/jbossws-qa.sh
+
+#
+# execute binary distribution tests
+#
+binaryDistributionTest
+
+</command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.junit.JUnitResultArchiver>
+ <testResults>stack-native/target/jbossws-native-bin-dist/output/test-reports/TEST-*.xml</testResults>
+ </hudson.tasks.junit.JUnitResultArchiver>
+ <hudson.tasks.Mailer>
+ <recipients>@hudson.mail.recipients@</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>true</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.SubversionSCM">
+ <locations>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.framework.url@</remote>
+ <local>framework</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.native.url@</remote>
+ <local>stack-native</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ </locations>
+ <useUpdate>true</useUpdate>
+ <browser class="hudson.scm.browsers.FishEyeSVN">
+ <url>http://fisheye.jboss.com/browse/JBossWS/</url>
+ <rootModule></rootModule>
+ </browser>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <logRotator>
+ <daysToKeep>14</daysToKeep>
+ <numToKeep>-1</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Build and test jbossws-native-(a)version.id@ binary distribution against AS-5.2.0 with JDK6</description>
+ <actions class="vector"/>
+</project>
Added: framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.2.0-JDK5/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.2.0-JDK5/config.xml (rev 0)
+++ framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.2.0-JDK5/config.xml 2009-05-29 10:05:26 UTC (rev 10142)
@@ -0,0 +1,75 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=Native-Core-AS-5.2.0-JDK5
+
+WORKSPACE=`pwd`
+STACK_ID=native
+JAVA_HOME=(a)java.home.jdk15@
+FRAMEWORK_DIR=$WORKSPACE/framework
+STACK_DIR=$WORKSPACE/stack-native
+TEST_OPTS="-Dinterop=true"
+JBOSS_TARGET=jboss520
+JBOSS_BIND_ADDRESS=(a)jboss.bind.address@
+JBOSS_CONFIG=(a)jboss.server.instance@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.2.0/workspace/JBossAS-5.2.0/build/output/(a)hudson.jboss520.build@
+
+#
+# load test functions
+#
+. $FRAMEWORK_DIR/hudson/jboss/bin/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>@hudson.framework.url@</remote>
+ <local>framework</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 AS-5.2.0 with JDK5</description>
+ <actions class="vector"/>
+</project>
Added: framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.2.0-JDK6/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.2.0-JDK6/config.xml (rev 0)
+++ framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.2.0-JDK6/config.xml 2009-05-29 10:05:26 UTC (rev 10142)
@@ -0,0 +1,75 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=Native-Core-AS-5.2.0-JDK6
+
+WORKSPACE=`pwd`
+STACK_ID=native
+JAVA_HOME=(a)java.home.jdk16@
+FRAMEWORK_DIR=$WORKSPACE/framework
+STACK_DIR=$WORKSPACE/stack-native
+TEST_OPTS="-Dinterop=true"
+JBOSS_TARGET=jboss520
+JBOSS_BIND_ADDRESS=(a)jboss.bind.address@
+JBOSS_CONFIG=(a)jboss.server.instance@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.2.0/workspace/JBossAS-5.2.0/build/output/(a)hudson.jboss520.build@
+
+#
+# load test functions
+#
+. $FRAMEWORK_DIR/hudson/jboss/bin/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>@hudson.framework.url@</remote>
+ <local>framework</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 AS-5.2.0 with JDK6</description>
+ <actions class="vector"/>
+</project>
Modified: framework/trunk/hudson/hudson-home/jobs/Native-Light/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Native-Light/config.xml 2009-05-29 06:57:11 UTC (rev 10141)
+++ framework/trunk/hudson/hudson-home/jobs/Native-Light/config.xml 2009-05-29 10:05:26 UTC (rev 10142)
@@ -7,21 +7,25 @@
Native-Core-AS-5.0.0-JDK5
, Native-Core-AS-5.0.1-JDK5
, Native-Core-AS-5.1.0-JDK5
+, Native-Core-AS-5.2.0-JDK5
, Native-Core-AS-6.0.0-JDK5
, Native-Core-AS-5.0.0-JDK6
, Native-Core-AS-5.0.1-JDK6
, Native-Core-AS-5.1.0-JDK6
+, Native-Core-AS-5.2.0-JDK6
, Native-Core-AS-6.0.0-JDK6
, Native-Binary-Distro-AS-5.0.0-JDK5
, Native-Binary-Distro-AS-5.0.1-JDK5
, Native-Binary-Distro-AS-5.1.0-JDK5
+, Native-Binary-Distro-AS-5.2.0-JDK5
, Native-Binary-Distro-AS-6.0.0-JDK5
, Native-Binary-Distro-AS-5.0.0-JDK6
, Native-Binary-Distro-AS-5.0.1-JDK6
, Native-Binary-Distro-AS-5.1.0-JDK6
+, Native-Binary-Distro-AS-5.2.0-JDK6
, Native-Binary-Distro-AS-6.0.0-JDK6
</childProjects>
</hudson.tasks.BuildTrigger>
Added: framework/trunk/hudson/hudson-home/jobs/Native-Source-Distro-AS-5.2.0-JDK5/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Native-Source-Distro-AS-5.2.0-JDK5/config.xml (rev 0)
+++ framework/trunk/hudson/hudson-home/jobs/Native-Source-Distro-AS-5.2.0-JDK5/config.xml 2009-05-29 10:05:26 UTC (rev 10142)
@@ -0,0 +1,75 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=Native-Source-Distro-AS-5.2.0-JDK5
+
+WORKSPACE=`pwd`
+STACK_ID=native
+JAVA_HOME=(a)java.home.jdk15@
+FRAMEWORK_DIR=$WORKSPACE/framework
+STACK_DIR=$WORKSPACE/stack-native
+TEST_OPTS=
+JBOSS_TARGET=jboss520
+JBOSS_BIND_ADDRESS=(a)jboss.bind.address@
+JBOSS_CONFIG=(a)jboss.server.instance@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.2.0/workspace/JBossAS-5.2.0/build/output/(a)hudson.jboss520.build@
+
+#
+# load test functions
+#
+. $FRAMEWORK_DIR/hudson/jboss/bin/jbossws-qa.sh
+
+#
+# execute source distribution tests
+#
+sourceDistributionTest
+
+</command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.junit.JUnitResultArchiver>
+ <testResults>stack-native/target/jbossws-native-src-dist/modules/testsuite/**/target/surefire-reports/TEST-*.xml</testResults>
+ </hudson.tasks.junit.JUnitResultArchiver>
+ <hudson.tasks.Mailer>
+ <recipients>@hudson.mail.recipients@</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>true</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.SubversionSCM">
+ <locations>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.framework.url@</remote>
+ <local>framework</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.native.url@</remote>
+ <local>stack-native</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ </locations>
+ <useUpdate>true</useUpdate>
+ <browser class="hudson.scm.browsers.FishEyeSVN">
+ <url>http://fisheye.jboss.com/browse/JBossWS/</url>
+ <rootModule></rootModule>
+ </browser>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <logRotator>
+ <daysToKeep>14</daysToKeep>
+ <numToKeep>-1</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Build and test jbossws-native-(a)version.id@ source distribution against AS-5.2.0 with JDK5</description>
+ <actions class="vector"/>
+</project>
Added: framework/trunk/hudson/hudson-home/jobs/Native-Source-Distro-AS-5.2.0-JDK6/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Native-Source-Distro-AS-5.2.0-JDK6/config.xml (rev 0)
+++ framework/trunk/hudson/hudson-home/jobs/Native-Source-Distro-AS-5.2.0-JDK6/config.xml 2009-05-29 10:05:26 UTC (rev 10142)
@@ -0,0 +1,75 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=Native-Source-Distro-AS-5.2.0-JDK6
+
+WORKSPACE=`pwd`
+STACK_ID=native
+JAVA_HOME=(a)java.home.jdk16@
+FRAMEWORK_DIR=$WORKSPACE/framework
+STACK_DIR=$WORKSPACE/stack-native
+TEST_OPTS=
+JBOSS_TARGET=jboss520
+JBOSS_BIND_ADDRESS=(a)jboss.bind.address@
+JBOSS_CONFIG=(a)jboss.server.instance@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.2.0/workspace/JBossAS-5.2.0/build/output/(a)hudson.jboss520.build@
+
+#
+# load test functions
+#
+. $FRAMEWORK_DIR/hudson/jboss/bin/jbossws-qa.sh
+
+#
+# execute source distribution tests
+#
+sourceDistributionTest
+
+</command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.junit.JUnitResultArchiver>
+ <testResults>stack-native/target/jbossws-native-src-dist/modules/testsuite/**/target/surefire-reports/TEST-*.xml</testResults>
+ </hudson.tasks.junit.JUnitResultArchiver>
+ <hudson.tasks.Mailer>
+ <recipients>@hudson.mail.recipients@</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>true</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.SubversionSCM">
+ <locations>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.framework.url@</remote>
+ <local>framework</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.native.url@</remote>
+ <local>stack-native</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ </locations>
+ <useUpdate>true</useUpdate>
+ <browser class="hudson.scm.browsers.FishEyeSVN">
+ <url>http://fisheye.jboss.com/browse/JBossWS/</url>
+ <rootModule></rootModule>
+ </browser>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <logRotator>
+ <daysToKeep>14</daysToKeep>
+ <numToKeep>-1</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Build and test jbossws-native-(a)version.id@ source distribution against AS-5.2.0 with JDK6</description>
+ <actions class="vector"/>
+</project>
Modified: framework/trunk/hudson/hudson-home/jobs/Release-Matrix-Step1/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Release-Matrix-Step1/config.xml 2009-05-29 06:57:11 UTC (rev 10141)
+++ framework/trunk/hudson/hudson-home/jobs/Release-Matrix-Step1/config.xml 2009-05-29 10:05:26 UTC (rev 10142)
@@ -3,7 +3,7 @@
<builders class="vector"/>
<publishers class="vector">
<hudson.tasks.BuildTrigger>
- <childProjects>AS-5.0.0, AS-5.0.1, AS-5.1.0, AS-6.0.0, AS-Tests-ALL</childProjects>
+ <childProjects>AS-ALL, AS-Tests-ALL</childProjects>
</hudson.tasks.BuildTrigger>
</publishers>
<buildWrappers class="vector"/>
Modified: framework/trunk/hudson/hudson-home/jobs/Weekend-Matrix/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Weekend-Matrix/config.xml 2009-05-29 06:57:11 UTC (rev 10141)
+++ framework/trunk/hudson/hudson-home/jobs/Weekend-Matrix/config.xml 2009-05-29 10:05:26 UTC (rev 10142)
@@ -3,7 +3,7 @@
<builders class="vector"/>
<publishers class="vector">
<hudson.tasks.BuildTrigger>
- <childProjects>AS-5.0.0, AS-5.0.1, AS-5.1.0, AS-6.0.0, AS-Tests-ALL, Native-ALL, CXF-ALL, Metro-ALL</childProjects>
+ <childProjects>AS-ALL, AS-Tests-ALL, Native-ALL, CXF-ALL, Metro-ALL</childProjects>
</hudson.tasks.BuildTrigger>
</publishers>
<buildWrappers class="vector"/>
Modified: framework/trunk/hudson/hudson-home/jobs/Working-Days-Matrix/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Working-Days-Matrix/config.xml 2009-05-29 06:57:11 UTC (rev 10141)
+++ framework/trunk/hudson/hudson-home/jobs/Working-Days-Matrix/config.xml 2009-05-29 10:05:26 UTC (rev 10142)
@@ -3,7 +3,7 @@
<builders class="vector"/>
<publishers class="vector">
<hudson.tasks.BuildTrigger>
- <childProjects>AS-5.0.0, AS-5.0.1, AS-5.1.0, AS-6.0.0, AS-Tests-ALL, Native-Light, CXF-Light, Metro-Light</childProjects>
+ <childProjects>AS-ALL, AS-Tests-ALL, Native-Light, CXF-Light, Metro-Light</childProjects>
</hudson.tasks.BuildTrigger>
</publishers>
<buildWrappers class="vector"/>
15 years, 6 months
JBossWS SVN: r10141 - in stack/native/trunk: modules/core and 6 other directories.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-05-29 02:57:11 -0400 (Fri, 29 May 2009)
New Revision: 10141
Added:
stack/native/trunk/modules/testsuite/test-excludes-jboss520.txt
Modified:
stack/native/trunk/build.xml
stack/native/trunk/modules/core/pom.xml
stack/native/trunk/modules/core/src/main/scripts/antrun-beans-config.xml
stack/native/trunk/modules/management/pom.xml
stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
stack/native/trunk/modules/testsuite/pom.xml
stack/native/trunk/pom.xml
stack/native/trunk/profiles.xml.example
stack/native/trunk/src/main/distro/Install.txt
stack/native/trunk/src/main/distro/ant.properties.example
stack/native/trunk/src/main/distro/build-deploy.xml
stack/native/trunk/src/main/distro/build-setup.xml
stack/native/trunk/src/main/distro/build.xml
stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml
Log:
adding AS 5.2.x support
Modified: stack/native/trunk/build.xml
===================================================================
--- stack/native/trunk/build.xml 2009-05-28 16:44:04 UTC (rev 10140)
+++ stack/native/trunk/build.xml 2009-05-29 06:57:11 UTC (rev 10141)
@@ -59,6 +59,9 @@
<condition property="jboss510.home" value="${profiles.profile.properties.jboss510.home}">
<isset property="profiles.profile.properties.jboss510.home"/>
</condition>
+ <condition property="jboss520.home" value="${profiles.profile.properties.jboss520.home}">
+ <isset property="profiles.profile.properties.jboss520.home"/>
+ </condition>
<condition property="jboss600.home" value="${profiles.profile.properties.jboss600.home}">
<isset property="profiles.profile.properties.jboss600.home"/>
</condition>
@@ -68,12 +71,14 @@
<property name="jboss500.home" value="${profiles.profile.properties.jboss500.home}"/>
<property name="jboss501.home" value="${profiles.profile.properties.jboss501.home}"/>
<property name="jboss510.home" value="${profiles.profile.properties.jboss510.home}"/>
+ <property name="jboss520.home" value="${profiles.profile.properties.jboss520.home}"/>
<property name="jboss600.home" value="${profiles.profile.properties.jboss600.home}"/>
<echo/>
<echo message="jboss500.home=${jboss500.home}"/>
<echo message="jboss501.home=${jboss501.home}"/>
<echo message="jboss510.home=${jboss510.home}"/>
+ <echo message="jboss520.home=${jboss520.home}"/>
<echo message="jboss600.home=${jboss600.home}"/>
</target>
Modified: stack/native/trunk/modules/core/pom.xml
===================================================================
--- stack/native/trunk/modules/core/pom.xml 2009-05-28 16:44:04 UTC (rev 10140)
+++ stack/native/trunk/modules/core/pom.xml 2009-05-29 06:57:11 UTC (rev 10141)
@@ -206,16 +206,24 @@
<type>zip</type>
<outputDirectory>${project.build.directory}/resources/jbossws-jboss501</outputDirectory>
</artifactItem>
+ <artifactItem>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss510</artifactId>
+ <version>${jbossws.jboss510.version}</version>
+ <classifier>resources</classifier>
+ <type>zip</type>
+ <outputDirectory>${project.build.directory}/resources/jbossws-jboss510</outputDirectory>
+ </artifactItem>
<!-- [JBWS-2505] -->
<!-- START -->
<!--
<artifactItem>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss510x</artifactId>
- <version>${jbossws.jboss510.version}</version>
+ <artifactId>jbossws-jboss520x</artifactId>
+ <version>${jbossws.jboss520.version}</version>
<classifier>resources</classifier>
<type>zip</type>
- <outputDirectory>${project.build.directory}/resources/jbossws-jboss510</outputDirectory>
+ <outputDirectory>${project.build.directory}/resources/jbossws-jboss520</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>org.jboss.ws</groupId>
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 2009-05-28 16:44:04 UTC (rev 10140)
+++ stack/native/trunk/modules/core/src/main/scripts/antrun-beans-config.xml 2009-05-29 06:57:11 UTC (rev 10141)
@@ -57,6 +57,16 @@
</deployment> </footer>
</concat>
+ <!-- Concat jbossws-jboss520/jbossws.beans -->
+ <echo message="Concat jbossws-jboss520/jbossws.beans"/>
+ <concat destfile="${project.build.resources.directory}/jbossws-jboss520/jbossws.beans/META-INF/jboss-beans.xml">
+ <header trimleading="yes">
+ <deployment xmlns="urn:jboss:bean-deployer:2.0"> </header>
+ <fileset file="${project.resources.directory}/jbossws-native-config.xml"/>
+ <footer trimleading="yes">
+ </deployment> </footer>
+ </concat>
+
<!-- Concat jbossws-jboss600/jbossws.beans -->
<echo message="Concat jbossws-jboss600/jbossws.beans"/>
<concat destfile="${project.build.resources.directory}/jbossws-jboss600/jbossws.beans/META-INF/jboss-beans.xml">
Modified: stack/native/trunk/modules/management/pom.xml
===================================================================
--- stack/native/trunk/modules/management/pom.xml 2009-05-28 16:44:04 UTC (rev 10140)
+++ stack/native/trunk/modules/management/pom.xml 2009-05-29 06:57:11 UTC (rev 10141)
@@ -39,12 +39,17 @@
<artifactId>jbossws-jboss501</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss510</artifactId>
+ <scope>provided</scope>
+ </dependency>
<!-- [JBWS-2505] -->
<!-- START -->
<!--
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss510x</artifactId>
+ <artifactId>jbossws-jboss520x</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
===================================================================
--- stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2009-05-28 16:44:04 UTC (rev 10140)
+++ stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2009-05-29 06:57:11 UTC (rev 10141)
@@ -135,6 +135,21 @@
</sequential>
</macrodef>
+ <macrodef name="macro-deploy-jbossws-lib52">
+ <attribute name="thirdpartydir"/>
+ <attribute name="targetdir"/>
+ <sequential>
+ <mkdir dir="@{targetdir}"/>
+ <copy todir="@{targetdir}" flatten="true" overwrite="true">
+ <fileset dir="@{thirdpartydir}">
+ <patternset refid="jbossws.lib.patternset"/>
+ <include name="**/jaxb-impl.jar"/>
+ <include name="**/wstx.jar"/>
+ </fileset>
+ </copy>
+ </sequential>
+ </macrodef>
+
<macrodef name="macro-deploy-jbossws-lib60">
<attribute name="thirdpartydir"/>
<attribute name="targetdir"/>
@@ -195,6 +210,21 @@
<copy todir="@{targetdir}" flatten="true" overwrite="true">
<fileset dir="@{thirdpartydir}">
<patternset refid="jbossws.client.patternset"/>
+ <include name="**/jbossws-(a){jbossid}.jar"/>
+ </fileset>
+ </copy>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="macro-deploy-jbossws-client52">
+ <attribute name="thirdpartydir"/>
+ <attribute name="targetdir"/>
+ <attribute name="jbossid"/>
+ <sequential>
+ <mkdir dir="@{targetdir}"/>
+ <copy todir="@{targetdir}" flatten="true" overwrite="true">
+ <fileset dir="@{thirdpartydir}">
+ <patternset refid="jbossws.client.patternset"/>
<!-- JBWS-2505 -->
<!-- START -->
<!--
@@ -258,6 +288,20 @@
</sequential>
</macrodef>
+ <macrodef name="macro-deploy-jbossws-server-lib52">
+ <attribute name="thirdpartydir"/>
+ <attribute name="targetdir"/>
+ <attribute name="jbossid"/>
+ <sequential>
+ <mkdir dir="@{targetdir}"/>
+ <copy todir="@{targetdir}" flatten="true" overwrite="true">
+ <fileset dir="@{thirdpartydir}">
+ <patternset refid="jbossws.server.lib.patternset"/>
+ </fileset>
+ </copy>
+ </sequential>
+ </macrodef>
+
<macrodef name="macro-deploy-jbossws-server-lib60">
<attribute name="thirdpartydir"/>
<attribute name="targetdir"/>
@@ -329,6 +373,21 @@
</sequential>
</macrodef>
+ <macrodef name="macro-deploy-jbossws-sar52">
+ <attribute name="thirdpartydir"/>
+ <attribute name="artifactsdir"/>
+ <attribute name="targetdir"/>
+ <attribute name="jbossid"/>
+ <sequential>
+ <mkdir dir="@{targetdir}"/>
+ <unzip dest="@{targetdir}/jbossws-management.war">
+ <fileset dir="@{thirdpartydir}">
+ <include name="**/jbossws-native-management.war"/>
+ </fileset>
+ </unzip>
+ </sequential>
+ </macrodef>
+
<macrodef name="macro-deploy-jbossws-sar60">
<attribute name="thirdpartydir"/>
<attribute name="artifactsdir"/>
@@ -411,6 +470,43 @@
<fileset dir="@{thirdpartydir}">
<include name="**/jbossws-common.jar"/>
<include name="**/jbossws-framework.jar"/>
+ <include name="**/jbossws-(a){jbossid}.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true">
+ <fileset dir="@{artifactsdir}/resources/jbossws-@{jbossid}">
+ <include name="**/jbossws-deployer-jboss-beans.xml"/>
+ </fileset>
+ </copy>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="macro-deploy-jbossws-deployers52">
+ <attribute name="thirdpartydir"/>
+ <attribute name="artifactsdir"/>
+ <attribute name="targetdir"/>
+ <attribute name="jbossid"/>
+ <sequential>
+ <mkdir dir="@{targetdir}"/>
+ <copy todir="@{targetdir}" flatten="true" overwrite="true">
+ <fileset dir="@{thirdpartydir}">
+ <patternset refid="jbossws.service.lib.patternset"/>
+ </fileset>
+ </copy>
+ <copy todir="@{targetdir}">
+ <fileset dir="@{artifactsdir}/resources/jbossws-(a){jbossid}/jbossws.beans">
+ <include name="META-INF/**"/>
+ </fileset>
+ </copy>
+ <copy todir="@{targetdir}/META-INF">
+ <fileset dir="@{artifactsdir}/resources">
+ <include name="standard-*-config.xml"/>
+ </fileset>
+ </copy>
+ <copy todir="@{targetdir}" flatten="true" overwrite="true">
+ <fileset dir="@{thirdpartydir}">
+ <include name="**/jbossws-common.jar"/>
+ <include name="**/jbossws-framework.jar"/>
<!-- [JBWS-2505] -->
<!-- START -->
<!--
@@ -507,6 +603,17 @@
<macro-deploy-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" thirdpartydir="${thirdpartydir}"/>
</target>
+ <target name="deploy-jbossws-native52" depends="check-parameters">
+ <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/>
+ <macro-deploy-jbossws-client52 targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
+ <macro-deploy-jbossws-lib52 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/>
+ <macro-deploy-jbossws-endorsed targetdir="${installserver}/../../lib/endorsed" thirdpartydir="${thirdpartydir}"/>
+ <macro-deploy-jbossws-server-lib52 targetdir="${installserver}/../../common/lib" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> <!-- Please note the "../../common" to use common server lib! -->
+ <macro-deploy-jbossws-sar52 targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
+ <macro-deploy-jbossws-deployers52 targetdir="${installserver}/deployers/jbossws.deployer/" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
+ <macro-deploy-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" thirdpartydir="${thirdpartydir}"/>
+ </target>
+
<target name="deploy-jbossws-native60" depends="check-parameters">
<macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/>
<macro-deploy-jbossws-client60 targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
@@ -580,6 +687,42 @@
<available property="jboss.undeploy.client" file="${jboss.home}/client"/>
<fail message="Cannot find ${jboss.home}/client" unless="jboss.undeploy.client"/>
+ <!-- delete stale container integration jars -->
+ <delete>
+ <fileset dir="${jboss.server.home}">
+ <include name="**/jbossws-jboss*.jar"/>
+ </fileset>
+ <fileset dir="${jboss.home}/client">
+ <include name="jbossws-jboss*.jar"/>
+ </fileset>
+ </delete>
+
+ <!-- delete content of last deployment -->
+ <delete>
+ <fileset dir="${jboss.home}" includes="${jbossws.deploy.conf}"/>
+ </delete>
+
+ <!-- delete jbossws.sar -->
+ <delete dir="@{targetdir}"/>
+
+ <!-- delete juddi-service.sar -->
+ <delete dir="@{targetdir}/../juddi-service.sar"/>
+
+ </sequential>
+ </macrodef>
+
+ <macrodef name="macro-undeploy-jbossws52">
+ <attribute name="defaultconf"/>
+ <attribute name="targetdir"/>
+ <sequential>
+ <loadfile property="jbossws.deploy.conf" srcfile="@{targetdir}/jbossws-deploy.conf" failonerror="false"/>
+ <loadfile property="jbossws.deploy.conf" srcfile="@{defaultconf}" failonerror="false"/>
+
+ <property name="jboss.server.home" value="@{targetdir}/../.."/>
+ <property name="jboss.home" value="${jboss.server.home}/../.."/>
+ <available property="jboss.undeploy.client" file="${jboss.home}/client"/>
+ <fail message="Cannot find ${jboss.home}/client" unless="jboss.undeploy.client"/>
+
<!-- [JBWS-2505] -->
<!-- START -->
<!-- delete stale container integration jars -->
Modified: stack/native/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/pom.xml 2009-05-28 16:44:04 UTC (rev 10140)
+++ stack/native/trunk/modules/testsuite/pom.xml 2009-05-29 06:57:11 UTC (rev 10141)
@@ -429,16 +429,77 @@
<profile>
<id>jboss510</id>
<properties>
- <jboss.version>5.1.0-SNAPSHOT</jboss.version>
+ <jboss.version>5.1.0.GA</jboss.version>
<jbossws.integration.target>jboss510</jbossws.integration.target>
</properties>
<dependencies>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss510</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>jboss.jbossws</groupId>
+ <artifactId>jboss-jaxws</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate</artifactId>
+ <version>${hibernate.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-ejb3</artifactId>
+ <version>${jboss.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-security</artifactId>
+ <version>${jboss.version}</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <!-- http://jira.codehaus.org/browse/MCOMPILER-72 -->
+ <testExcludeFile>../test-excludes-jboss510.txt</testExcludeFile>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <argLine>${surefire.jvm.args} -Djava.endorsed.dirs=${jboss510.home}/lib/endorsed</argLine>
+ <!-- TODO: replace with maven dependencies -->
+ <additionalClasspathElements>
+ <additionalClasspathElement>${jboss.home}/client/jbossall-client.jar</additionalClasspathElement>
+ <additionalClasspathElement>${jboss.home}/common/lib/jboss-ejb3-core.jar</additionalClasspathElement>
+ </additionalClasspathElements>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <!--
+ Name: jboss520
+ Descr: JBoss-5.2.0 specific options
+ -->
+ <profile>
+ <id>jboss520</id>
+ <properties>
+ <jboss.version>5.2.0-SNAPSHOT</jboss.version>
+ <jbossws.integration.target>jboss520</jbossws.integration.target>
+ </properties>
+ <dependencies>
<!-- [JBWS-2505] -->
<!-- START -->
<!--
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss510x</artifactId>
+ <artifactId>jbossws-jboss520x</artifactId>
<exclusions>
<exclusion>
<groupId>jboss.jbossws</groupId>
@@ -475,13 +536,13 @@
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<!-- http://jira.codehaus.org/browse/MCOMPILER-72 -->
- <testExcludeFile>../test-excludes-jboss510.txt</testExcludeFile>
+ <testExcludeFile>../test-excludes-jboss520.txt</testExcludeFile>
</configuration>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <argLine>${surefire.jvm.args} -Djava.endorsed.dirs=${jboss510.home}/lib/endorsed</argLine>
+ <argLine>${surefire.jvm.args} -Djava.endorsed.dirs=${jboss520.home}/lib/endorsed</argLine>
<!-- TODO: replace with maven dependencies -->
<additionalClasspathElements>
<additionalClasspathElement>${jboss.home}/client/jbossall-client.jar</additionalClasspathElement>
Added: stack/native/trunk/modules/testsuite/test-excludes-jboss520.txt
===================================================================
--- stack/native/trunk/modules/testsuite/test-excludes-jboss520.txt (rev 0)
+++ stack/native/trunk/modules/testsuite/test-excludes-jboss520.txt 2009-05-29 06:57:11 UTC (rev 10141)
@@ -0,0 +1,8 @@
+# UsernameTokenHTTPSTestCase requires keystore & trustore in jboss-web tomcat configuration
+org/jboss/test/ws/interop/nov2007/wsse/UsernameTokenHTTPSTestCase.*
+
+# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored
+org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*
+
+# [JBWS-2217] Fix BPEL jaxrpc samples
+org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/*TestCase.*
Modified: stack/native/trunk/pom.xml
===================================================================
--- stack/native/trunk/pom.xml 2009-05-28 16:44:04 UTC (rev 10140)
+++ stack/native/trunk/pom.xml 2009-05-29 06:57:11 UTC (rev 10141)
@@ -52,11 +52,12 @@
<jbossws.spi.version>1.2.0-SNAPSHOT</jbossws.spi.version>
<jbossws.jboss500.version>3.2.0-SNAPSHOT</jbossws.jboss500.version>
<jbossws.jboss501.version>3.2.0-SNAPSHOT</jbossws.jboss501.version>
+ <jbossws.jboss510.version>3.2.0-SNAPSHOT</jbossws.jboss510.version>
<!-- [JBWS-2505] -->
<!-- START -->
<!--
- <jbossws.jboss510.version>3.1.2-SNAPSHOT</jbossws.jboss510.version>
- <jbossws.jboss600.version>3.1.2-SNAPSHOT</jbossws.jboss600.version>
+ <jbossws.jboss520.version>3.2.0-SNAPSHOT</jbossws.jboss520.version>
+ <jbossws.jboss600.version>3.2.0-SNAPSHOT</jbossws.jboss600.version>
-->
<!-- END -->
<codehaus.jettison.version>1.0-RC2</codehaus.jettison.version>
@@ -131,18 +132,30 @@
<classifier>resources</classifier>
<type>zip</type>
</dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss510</artifactId>
+ <version>${jbossws.jboss510.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss510</artifactId>
+ <version>${jbossws.jboss510.version}</version>
+ <classifier>resources</classifier>
+ <type>zip</type>
+ </dependency>
<!-- [JBWS-2505] -->
<!-- START -->
<!--
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss510x</artifactId>
- <version>${jbossws.jboss510.version}</version>
+ <artifactId>jbossws-jboss520x</artifactId>
+ <version>${jbossws.jboss520.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss510x</artifactId>
- <version>${jbossws.jboss510.version}</version>
+ <artifactId>jbossws-jboss520x</artifactId>
+ <version>${jbossws.jboss520.version}</version>
<classifier>resources</classifier>
<type>zip</type>
</dependency>
@@ -489,6 +502,18 @@
</profile>
<!--
+ Name: jboss520
+ Descr: JBoss-5.2.0 specific options
+ -->
+ <profile>
+ <id>jboss520</id>
+ <properties>
+ <jbossws.integration.target>jboss520</jbossws.integration.target>
+ <jboss.home>${jboss520.home}</jboss.home>
+ </properties>
+ </profile>
+
+ <!--
Name: jboss600
Descr: JBoss-6.0.0 specific options
-->
Modified: stack/native/trunk/profiles.xml.example
===================================================================
--- stack/native/trunk/profiles.xml.example 2009-05-28 16:44:04 UTC (rev 10140)
+++ stack/native/trunk/profiles.xml.example 2009-05-29 06:57:11 UTC (rev 10141)
@@ -13,8 +13,9 @@
<properties>
<java.jdk15.home>/usr/java/jdk1.5</java.jdk15.home>
<jboss500.home>/home/opalka/svn/jbossas/tags/JBoss_5_0_0_GA/build/output/jboss-5.0.0.GA</jboss500.home>
- <jboss501.home>/home/opalka/svn/jbossas/branches/Branch_5_0/build/output/jboss-5.0.1.GA</jboss501.home>
- <jboss510.home>/home/opalka/svn/jbossas/branches/Branch_5_x/build/output/jboss-5.1.0.GA</jboss510.home>
+ <jboss501.home>/home/opalka/svn/jbossas/tags/JBoss_5_0_1_GA/build/output/jboss-5.0.1.GA</jboss501.home>
+ <jboss510.home>/home/opalka/svn/jbossas/tags/JBoss_5_1_0_GA/build/output/jboss-5.1.0.GA</jboss510.home>
+ <jboss520.home>/home/opalka/svn/jbossas/branches/Branch_5_x/build/output/jboss-5.2.0.Beta</jboss520.home>
<jboss600.home>/home/opalka/svn/jbossas/trunk/build/output/jboss-6.0.0.Alpha1</jboss600.home>
</properties>
</profile>
Modified: stack/native/trunk/src/main/distro/Install.txt
===================================================================
--- stack/native/trunk/src/main/distro/Install.txt 2009-05-28 16:44:04 UTC (rev 10140)
+++ stack/native/trunk/src/main/distro/Install.txt 2009-05-29 06:57:11 UTC (rev 10141)
@@ -13,9 +13,11 @@
2.) Modify the target container location in ant.properties
3.) Execute one of the following
- ant deploy-jboss50x
- ant deploy-jboss51x
- ant deploy-jboss60x
+ ant deploy-jboss500
+ ant deploy-jboss501
+ ant deploy-jboss510
+ ant deploy-jboss520
+ ant deploy-jboss600
4.) Execute the samples to verify your installation
Modified: stack/native/trunk/src/main/distro/ant.properties.example
===================================================================
--- stack/native/trunk/src/main/distro/ant.properties.example 2009-05-28 16:44:04 UTC (rev 10140)
+++ stack/native/trunk/src/main/distro/ant.properties.example 2009-05-29 06:57:11 UTC (rev 10141)
@@ -6,10 +6,11 @@
jboss500.home=(a)jboss500.home@
jboss501.home=(a)jboss501.home@
jboss510.home=(a)jboss510.home@
+jboss520.home=(a)jboss520.home@
jboss600.home=(a)jboss600.home@
-# The JBoss server under test. This can be [jboss500|jboss501|jboss510|jboss600]
-jbossws.integration.target=jboss500
+# The JBoss server under test. This can be [jboss500|jboss501|jboss510|jboss520|jboss600]
+jbossws.integration.target=jboss510
# The JBoss settings
jboss.server.instance=default
Modified: stack/native/trunk/src/main/distro/build-deploy.xml
===================================================================
--- stack/native/trunk/src/main/distro/build-deploy.xml 2009-05-28 16:44:04 UTC (rev 10140)
+++ stack/native/trunk/src/main/distro/build-deploy.xml 2009-05-29 06:57:11 UTC (rev 10141)
@@ -108,6 +108,43 @@
</target>
<!-- ================================================================== -->
+ <!-- Prepare Deployment Structure JBoss-5.2.x -->
+ <!-- ================================================================== -->
+
+ <target name="deploy-structure-jboss52" depends="prepare-deploy">
+ <delete dir="${deploy.structure}"/>
+ <antcall target="deploy-jbossws-native52" inheritall="false">
+ <param name="installserver" value="${deploy.structure}/server/${jboss.server.instance}"/>
+ <param name="jbossid" value="${jbossws.integration.target}"/>
+ <param name="artifactsdir" value="${deploy.artifacts.dir}"/>
+ <param name="thirdpartydir" value="${deploy.artifacts.dir}"/>
+ </antcall>
+ <macro-create-deploy-conf deploystructure="${deploy.structure}"/>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Deployment JBoss520 -->
+ <!-- ================================================================== -->
+
+ <target name="target-jboss520">
+ <property name="jbossws.integration.target" value="jboss520"/>
+ <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/>
+ </target>
+
+ <target name="deploy-jboss520" depends="undeploy-jboss520,deploy-structure-jboss52" description="Deploy jbossws to jboss520">
+ <fail message="Not available: ${jboss520.available.file}" unless="jboss520.available"/>
+ <copy todir="${jboss520.home}" overwrite="true">
+ <fileset dir="${deploy.structure}"/>
+ </copy>
+ <chmod dir="${jboss520.home}/bin" perm="+x" includes="*.sh"/>
+ </target>
+
+ <target name="undeploy-jboss520" depends="target-jboss520,init" description="Remove jbossws from jboss520">
+ <fail message="Not available: ${jboss520.available.file}" unless="jboss520.available"/>
+ <macro-undeploy-jbossws52 targetdir="${jboss520.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/>
+ </target>
+
+ <!-- ================================================================== -->
<!-- Prepare Deployment Structure JBoss-6.0.x -->
<!-- ================================================================== -->
Modified: stack/native/trunk/src/main/distro/build-setup.xml
===================================================================
--- stack/native/trunk/src/main/distro/build-setup.xml 2009-05-28 16:44:04 UTC (rev 10140)
+++ stack/native/trunk/src/main/distro/build-setup.xml 2009-05-29 06:57:11 UTC (rev 10141)
@@ -42,6 +42,13 @@
<property name="jboss510.server.deploy" value="${jboss510.server}/deploy"/>
<property name="jboss510.server.deployers" value="${jboss510.server}/deployers"/>
+ <property name="jboss520.lib" value="${jboss520.home}/lib"/>
+ <property name="jboss520.client" value="${jboss520.home}/client"/>
+ <property name="jboss520.server" value="${jboss520.home}/server/${jboss.server.instance}"/>
+ <property name="jboss520.server.lib" value="${jboss520.home}/common/lib"/>
+ <property name="jboss520.server.deploy" value="${jboss520.server}/deploy"/>
+ <property name="jboss520.server.deployers" value="${jboss520.server}/deployers"/>
+
<property name="jboss600.lib" value="${jboss600.home}/lib"/>
<property name="jboss600.client" value="${jboss600.home}/client"/>
<property name="jboss600.server" value="${jboss600.home}/server/${jboss.server.instance}"/>
@@ -52,11 +59,13 @@
<property name="jboss500.available.file" value="${jboss500.client}/jboss-client.jar"/>
<property name="jboss501.available.file" value="${jboss501.client}/jboss-client.jar"/>
<property name="jboss510.available.file" value="${jboss510.client}/jboss-client.jar"/>
+ <property name="jboss520.available.file" value="${jboss520.client}/jboss-client.jar"/>
<property name="jboss600.available.file" value="${jboss600.client}/jboss-client.jar"/>
<available property="jboss500.available" file="${jboss500.available.file}"/>
<available property="jboss501.available" file="${jboss501.available.file}"/>
<available property="jboss510.available" file="${jboss510.available.file}"/>
+ <available property="jboss520.available" file="${jboss520.available.file}"/>
<available property="jboss600.available" file="${jboss600.available.file}"/>
<tstamp>
Modified: stack/native/trunk/src/main/distro/build.xml
===================================================================
--- stack/native/trunk/src/main/distro/build.xml 2009-05-28 16:44:04 UTC (rev 10140)
+++ stack/native/trunk/src/main/distro/build.xml 2009-05-29 06:57:11 UTC (rev 10141)
@@ -56,6 +56,11 @@
<equals arg1="${jbossws.integration.target}" arg2="jboss510"/>
</or>
</condition>
+ <condition property="jbossws.integration.jboss52" value="true">
+ <or>
+ <equals arg1="${jbossws.integration.target}" arg2="jboss520"/>
+ </or>
+ </condition>
<condition property="jbossws.integration.jboss60" value="true">
<or>
<equals arg1="${jbossws.integration.target}" arg2="jboss600"/>
Modified: stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2009-05-28 16:44:04 UTC (rev 10140)
+++ stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2009-05-29 06:57:11 UTC (rev 10141)
@@ -98,17 +98,27 @@
<include>org.jboss.ws:jbossws-jboss501:jar</include>
</includes>
</dependencySet>
+ <dependencySet>
+ <outputDirectory>lib</outputDirectory>
+ <outputFileNameMapping>jbossws-jboss510.${module.extension}</outputFileNameMapping>
+ <useStrictFiltering>true</useStrictFiltering>
+ <scope>provided</scope>
+ <unpack>false</unpack>
+ <includes>
+ <include>org.jboss.ws:jbossws-jboss510:jar</include>
+ </includes>
+ </dependencySet>
<!-- [JBWS-2505] -->
<!-- START -->
<!--
<dependencySet>
<outputDirectory>lib</outputDirectory>
- <outputFileNameMapping>jbossws-jboss510.${module.extension}</outputFileNameMapping>
+ <outputFileNameMapping>jbossws-jboss520.${module.extension}</outputFileNameMapping>
<useStrictFiltering>true</useStrictFiltering>
<scope>provided</scope>
<unpack>false</unpack>
<includes>
- <include>org.jboss.ws:jbossws-jboss510x:jar</include>
+ <include>org.jboss.ws:jbossws-jboss520x:jar</include>
</includes>
</dependencySet>
<dependencySet>
15 years, 6 months