JBossWS SVN: r13874 - stack/native/branches/ropalka/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-03-09 08:46:40 -0500 (Wed, 09 Mar 2011)
New Revision: 13874
Modified:
stack/native/branches/ropalka/modules/testsuite/pom.xml
Log:
[JBWS-3216] excluding script and ejb3 tests
Modified: stack/native/branches/ropalka/modules/testsuite/pom.xml
===================================================================
--- stack/native/branches/ropalka/modules/testsuite/pom.xml 2011-03-09 11:17:10 UTC (rev 13873)
+++ stack/native/branches/ropalka/modules/testsuite/pom.xml 2011-03-09 13:46:40 UTC (rev 13874)
@@ -689,6 +689,17 @@
<groupId>org.jboss</groupId>
<artifactId>jbossxb</artifactId>
</dependency>
+ <!-- Apache XML security depends on Xalan impl classes :( -->
+ <dependency>
+ <groupId>apache-xalan</groupId>
+ <artifactId>serializer</artifactId>
+ <version>2.7.1.patch01-brew</version>
+ </dependency>
+ <dependency>
+ <groupId>apache-xalan</groupId>
+ <artifactId>xalan</artifactId>
+ <version>2.7.1.patch01-brew</version>
+ </dependency>
</dependencies>
<build>
<plugins>
@@ -756,6 +767,8 @@
<exclude>org/jboss/test/ws/jaxws/samples/securityDomain/**</exclude>
<!-- EJB3 endpoint deployments -->
+ <exclude>org/jboss/test/ws/jaxws/jbws771/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1309/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws1283/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws1422/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws1446/**</exclude>
@@ -771,16 +784,20 @@
<exclude>org/jboss/test/ws/jaxws/jbws1822/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws1841/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws1845/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1850/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws1872/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws1904/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws1969/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws2000/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws2011/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws2074/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws2166/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws2183/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws2218/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws2221/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws2241/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws2257/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws2437/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws2449/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws2630/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws2634/**</exclude>
@@ -790,9 +807,11 @@
<exclude>org/jboss/test/ws/jaxws/jbws2957/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws2999/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws3026/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws3182/**</exclude>
<exclude>org/jboss/test/ws/jaxws/benchmark/**</exclude>
<exclude>org/jboss/test/ws/jaxws/endpointReference/**</exclude>
<exclude>org/jboss/test/ws/jaxws/samples/context/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/samples/dar/**</exclude>
<exclude>org/jboss/test/ws/jaxws/samples/eardeployment/**</exclude>
<exclude>org/jboss/test/ws/jaxws/samples/exception/**</exclude>
<exclude>org/jboss/test/ws/jaxws/samples/jaxbintros/**</exclude>
@@ -819,6 +838,8 @@
<exclude>org/jboss/test/ws/jaxws/jbws2529/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws2591/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws2593/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws2633/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws2637/**</exclude>
<exclude>org/jboss/test/ws/tools/scripts/ScriptTestCase*</exclude>
<exclude>org/jboss/test/ws/jaxws/smoke/tools/*ScriptTestCase*</exclude>
<exclude>org/jboss/test/ws/jaxws/smoke/tools/WSRunClientTestCase*</exclude>
@@ -858,6 +879,9 @@
<!-- # [JBWS-3242] Servlet base test throws IllegalArgumentException: Resource META-INF/jbossws-entities.properties not found -->
<exclude>org/jboss/test/ws/jaxws/jbws3223/**</exclude>
+ <!-- # [JBAS-8933] ClassCastException: org.jboss.security.plugins.auth.JaasSecurityManagerBase cannot be cast to org.jboss.security.AuthorizationManager -->
+ <exclude>org/jboss/test/ws/jaxws/samples/wssecurity/SimpleUsernameTestCase*</exclude>
+
<!-- JAXR not available -->
<exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude>
13 years, 6 months
JBossWS SVN: r13873 - in stack/native/branches/ropalka/modules: resources/src/main/resources/modules/org/apache/xmlsec and 5 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-03-09 06:17:10 -0500 (Wed, 09 Mar 2011)
New Revision: 13873
Added:
stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/apache/xmlsec/
stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/apache/xmlsec/main/
stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/apache/xmlsec/main/module.xml
Modified:
stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/as/webservices/main/module.xml
stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/ws/native/jbossws-native-core/main/module.xml
stack/native/branches/ropalka/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
stack/native/branches/ropalka/modules/testsuite/pom.xml
Log:
[JBWS-3216] adding apache xmlsecurity to the CP
Added: stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/apache/xmlsec/main/module.xml
===================================================================
--- stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/apache/xmlsec/main/module.xml (rev 0)
+++ stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/apache/xmlsec/main/module.xml 2011-03-09 11:17:10 UTC (rev 13873)
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ~ JBoss, Home of Professional Open Source.
+ ~ Copyright 2010, Red Hat, Inc., and individual contributors
+ ~ as indicated by the @author tags. See the copyright.txt file in the
+ ~ distribution for a full listing of individual contributors.
+ ~
+ ~ This is free software; you can redistribute it and/or modify it
+ ~ under the terms of the GNU Lesser General Public License as
+ ~ published by the Free Software Foundation; either version 2.1 of
+ ~ the License, or (at your option) any later version.
+ ~
+ ~ This software is distributed in the hope that it will be useful,
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ ~ Lesser General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU Lesser General Public
+ ~ License along with this software; if not, write to the Free
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ -->
+
+<module xmlns="urn:jboss:module:1.0" name="org.apache.xmlsec">
+
+ <resources>
+ <!-- Insert resources here -->
+ </resources>
+
+ <dependencies>
+ <module name="javax.api"/>
+ <module name="org.slf4j.jcl-over-slf4j"/>
+ </dependencies>
+
+</module>
Modified: stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/as/webservices/main/module.xml
===================================================================
--- stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/as/webservices/main/module.xml 2011-03-09 11:16:13 UTC (rev 13872)
+++ stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/as/webservices/main/module.xml 2011-03-09 11:17:10 UTC (rev 13873)
@@ -53,11 +53,11 @@
<module name="org.jboss.ws.native.jbossws-native-factories" services="import"/>
<module name="org.jboss.ws.native.jbossws-native-services" services="import"/>
<module name="org.jboss.ws.native.jbossws-native-core" services="import">
- <module name="org.jboss.ws.jaxws-client" services="import"/>
<imports>
<include path="META-INF"/>
</imports>
</module>
+ <module name="org.jboss.ws.jaxws-client" services="import"/>
<module name="org.jboss.ws.spi" />
</dependencies>
</module>
Modified: stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/ws/native/jbossws-native-core/main/module.xml
===================================================================
--- stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/ws/native/jbossws-native-core/main/module.xml 2011-03-09 11:16:13 UTC (rev 13872)
+++ stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/ws/native/jbossws-native-core/main/module.xml 2011-03-09 11:17:10 UTC (rev 13873)
@@ -40,6 +40,7 @@
<module name="javax.xml.ws.api" />
<module name="org.picketbox"/>
<module name="org.apache.xerces" services="import"/>
+ <module name="org.apache.xmlsec"/>
<module name="org.apache.ws.commons.policy"/>
<module name="org.javassist" />
<module name="org.jboss.netty" />
Modified: stack/native/branches/ropalka/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
===================================================================
--- stack/native/branches/ropalka/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2011-03-09 11:16:13 UTC (rev 13872)
+++ stack/native/branches/ropalka/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2011-03-09 11:17:10 UTC (rev 13873)
@@ -324,6 +324,11 @@
<include name="**/wscommons-policy.jar"/>
</fileset>
</copy>
+ <copy todir="@{targetdir}/org/apache/xmlsec/main" flatten="false" overwrite="true">
+ <fileset dir="@{thirdpartydir}/lib">
+ <include name="**/xmlsec.jar"/>
+ </fileset>
+ </copy>
<copy todir="@{targetdir}/org/jboss/ws/common/main" flatten="false" overwrite="true">
<fileset dir="@{thirdpartydir}/lib">
<include name="**/jbossws-common.jar"/>
Modified: stack/native/branches/ropalka/modules/testsuite/pom.xml
===================================================================
--- stack/native/branches/ropalka/modules/testsuite/pom.xml 2011-03-09 11:16:13 UTC (rev 13872)
+++ stack/native/branches/ropalka/modules/testsuite/pom.xml 2011-03-09 11:17:10 UTC (rev 13873)
@@ -775,6 +775,7 @@
<exclude>org/jboss/test/ws/jaxws/jbws1904/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws1969/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws2000/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws2011/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws2074/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws2183/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws2218/**</exclude>
13 years, 6 months
JBossWS SVN: r13872 - stack/native/branches/ropalka/modules/core/src/main/java/org/jboss/ws/extensions/security.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-03-09 06:16:13 -0500 (Wed, 09 Mar 2011)
New Revision: 13872
Modified:
stack/native/branches/ropalka/modules/core/src/main/java/org/jboss/ws/extensions/security/SecurityActions.java
stack/native/branches/ropalka/modules/core/src/main/java/org/jboss/ws/extensions/security/SecurityDecoder.java
stack/native/branches/ropalka/modules/core/src/main/java/org/jboss/ws/extensions/security/SecurityEncoder.java
Log:
[JBWS-3243] fixing TCCL WSSecurity issue
Modified: stack/native/branches/ropalka/modules/core/src/main/java/org/jboss/ws/extensions/security/SecurityActions.java
===================================================================
--- stack/native/branches/ropalka/modules/core/src/main/java/org/jboss/ws/extensions/security/SecurityActions.java 2011-03-08 18:45:04 UTC (rev 13871)
+++ stack/native/branches/ropalka/modules/core/src/main/java/org/jboss/ws/extensions/security/SecurityActions.java 2011-03-09 11:16:13 UTC (rev 13872)
@@ -59,6 +59,30 @@
}
/**
+ * Set context classloader.
+ *
+ * @param classLoader the classloader
+ */
+ static void setContextClassLoader(final ClassLoader classLoader)
+ {
+ if (System.getSecurityManager() == null)
+ {
+ Thread.currentThread().setContextClassLoader(classLoader);
+ }
+ else
+ {
+ AccessController.doPrivileged(new PrivilegedAction<Object>()
+ {
+ public Object run()
+ {
+ Thread.currentThread().setContextClassLoader(classLoader);
+ return null;
+ }
+ });
+ }
+ }
+
+ /**
* Get a system property
*
* @param name
Modified: stack/native/branches/ropalka/modules/core/src/main/java/org/jboss/ws/extensions/security/SecurityDecoder.java
===================================================================
--- stack/native/branches/ropalka/modules/core/src/main/java/org/jboss/ws/extensions/security/SecurityDecoder.java 2011-03-08 18:45:04 UTC (rev 13871)
+++ stack/native/branches/ropalka/modules/core/src/main/java/org/jboss/ws/extensions/security/SecurityDecoder.java 2011-03-09 11:16:13 UTC (rev 13872)
@@ -26,6 +26,7 @@
import java.util.HashSet;
import java.util.List;
+import org.apache.xml.security.Init;
import org.jboss.ws.extensions.security.element.EncryptedKey;
import org.jboss.ws.extensions.security.element.SecurityHeader;
import org.jboss.ws.extensions.security.element.SecurityProcess;
@@ -35,7 +36,6 @@
import org.jboss.ws.extensions.security.element.UsernameToken;
import org.jboss.ws.extensions.security.exception.WSSecurityException;
import org.jboss.ws.extensions.security.nonce.NonceFactory;
-import org.jboss.ws.extensions.security.operation.AuthorizeOperation;
import org.jboss.ws.extensions.security.operation.DecryptionOperation;
import org.jboss.ws.extensions.security.operation.ReceiveUsernameOperation;
import org.jboss.ws.extensions.security.operation.ReceiveX509Certificate;
@@ -45,7 +45,6 @@
import org.jboss.ws.extensions.security.operation.SignatureVerificationOperation;
import org.jboss.ws.extensions.security.operation.TimestampVerificationOperation;
import org.jboss.ws.metadata.wsse.Authenticate;
-import org.jboss.ws.metadata.wsse.Authorize;
import org.jboss.ws.metadata.wsse.TimestampVerification;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -77,7 +76,16 @@
public SecurityDecoder(SecurityStore store, NonceFactory nonceFactory, TimestampVerification timestampVerification, Authenticate authenticate)
{
- org.apache.xml.security.Init.init();
+ final ClassLoader origCL = SecurityActions.getContextClassLoader();
+ try
+ {
+ SecurityActions.setContextClassLoader(Init.class.getClassLoader());
+ Init.init();
+ }
+ finally
+ {
+ SecurityActions.setContextClassLoader(origCL);
+ }
this.store = store;
this.nonceFactory = nonceFactory;
this.timestampVerification = timestampVerification;
Modified: stack/native/branches/ropalka/modules/core/src/main/java/org/jboss/ws/extensions/security/SecurityEncoder.java
===================================================================
--- stack/native/branches/ropalka/modules/core/src/main/java/org/jboss/ws/extensions/security/SecurityEncoder.java 2011-03-08 18:45:04 UTC (rev 13871)
+++ stack/native/branches/ropalka/modules/core/src/main/java/org/jboss/ws/extensions/security/SecurityEncoder.java 2011-03-09 11:16:13 UTC (rev 13872)
@@ -23,6 +23,7 @@
import java.util.List;
+import org.apache.xml.security.Init;
import org.jboss.ws.extensions.security.element.SecurityHeader;
import org.jboss.ws.extensions.security.exception.WSSecurityException;
import org.jboss.ws.extensions.security.operation.EncodingOperation;
@@ -43,7 +44,16 @@
public SecurityEncoder(List<EncodingOperation> operations, SecurityStore store)
{
- org.apache.xml.security.Init.init();
+ final ClassLoader origCL = SecurityActions.getContextClassLoader();
+ try
+ {
+ SecurityActions.setContextClassLoader(Init.class.getClassLoader());
+ Init.init();
+ }
+ finally
+ {
+ SecurityActions.setContextClassLoader(origCL);
+ }
this.operations = operations;
this.store = store;
}
13 years, 6 months
JBossWS SVN: r13871 - in hudson/trunk: scripts and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-03-08 13:45:04 -0500 (Tue, 08 Mar 2011)
New Revision: 13871
Modified:
hudson/trunk/hudson-home/jobs/AS-TESTS-AS-6.0.0/config.xml
hudson/trunk/scripts/jbossws-qa.sh
Log:
[JBWS-3080] Some updates to hudson configuration for always cleaning the dist module too and skipping looking for test-excludes in AS TEST job
Modified: hudson/trunk/hudson-home/jobs/AS-TESTS-AS-6.0.0/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/AS-TESTS-AS-6.0.0/config.xml 2011-03-08 18:31:39 UTC (rev 13870)
+++ hudson/trunk/hudson-home/jobs/AS-TESTS-AS-6.0.0/config.xml 2011-03-08 18:45:04 UTC (rev 13871)
@@ -61,7 +61,6 @@
#
./build.sh -Dnode0=$JBOSS_BIND_ADDRESS init tests-webservice tests-ws 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
Modified: hudson/trunk/scripts/jbossws-qa.sh
===================================================================
--- hudson/trunk/scripts/jbossws-qa.sh 2011-03-08 18:31:39 UTC (rev 13870)
+++ hudson/trunk/scripts/jbossws-qa.sh 2011-03-08 18:45:04 UTC (rev 13871)
@@ -81,19 +81,19 @@
deployCoreDistributionWithSpring() {
cd $STACK_DIR
- mvn -Ptestsuite,spring clean
+ mvn -Ptestsuite,dist,spring clean
ant $ENVIRONMENT -Dspring=true deploy-$JBOSS_TARGET
}
deployCoreDistribution() {
cd $STACK_DIR
- mvn -Ptestsuite clean
+ mvn -Ptestsuite,dist clean
ant $ENVIRONMENT deploy-$JBOSS_TARGET
}
deployBinaryDistributionWithSpring() {
cd $STACK_DIR
- mvn -Ptestsuite clean
+ mvn -Ptestsuite,dist clean
ant $ENVIRONMENT build-bin-dist
cd target
rm -rf jbossws-$STACK_ID-bin-dist
@@ -105,7 +105,7 @@
deployBinaryDistribution() {
cd $STACK_DIR
- mvn -Ptestsuite clean
+ mvn -Ptestsuite,dist clean
ant $ENVIRONMENT build-bin-dist
cd target
rm -rf jbossws-$STACK_ID-bin-dist
@@ -123,7 +123,7 @@
deploySourceDistributionWithSpring() {
cd $STACK_DIR
- mvn -Ptestsuite,spring clean
+ mvn -Ptestsuite,dist,spring clean
ant $ENVIRONMENT build-src-dist
cd target
rm -rf jbossws-$STACK_ID-src-dist
@@ -134,7 +134,7 @@
deploySourceDistribution() {
cd $STACK_DIR
- mvn -Ptestsuite clean
+ mvn -Ptestsuite,dist clean
ant $ENVIRONMENT build-src-dist
cd target
rm -rf jbossws-$STACK_ID-src-dist
13 years, 6 months
JBossWS SVN: r13870 - shared-testsuite/trunk/src/test/ant-import.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-03-08 13:31:39 -0500 (Tue, 08 Mar 2011)
New Revision: 13870
Modified:
shared-testsuite/trunk/src/test/ant-import/build-testsuite.xml
Log:
[JBWS-3210] Adding missing javax mail to bin dist client classpath
Modified: shared-testsuite/trunk/src/test/ant-import/build-testsuite.xml
===================================================================
--- shared-testsuite/trunk/src/test/ant-import/build-testsuite.xml 2011-03-08 17:54:03 UTC (rev 13869)
+++ shared-testsuite/trunk/src/test/ant-import/build-testsuite.xml 2011-03-08 18:31:39 UTC (rev 13870)
@@ -425,6 +425,9 @@
<fileset dir="${jboss.home}/modules/org/apache/log4j/main/">
<include name="log4j-*.jar"/>
</fileset>
+ <fileset dir="${jboss.home}/modules/javax/mail/api/main/">
+ <include name="mail-*.jar"/>
+ </fileset>
</path>
</target>
13 years, 6 months
JBossWS SVN: r13869 - in hudson/trunk/hudson-home/jobs: CXF-LIGHT and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-03-08 12:54:03 -0500 (Tue, 08 Mar 2011)
New Revision: 13869
Modified:
hudson/trunk/hudson-home/jobs/CXF-ALL/config.xml
hudson/trunk/hudson-home/jobs/CXF-LIGHT/config.xml
Log:
[JBWS-3208] Including cxf bindist as7 job in cxf group jobs
Modified: hudson/trunk/hudson-home/jobs/CXF-ALL/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/CXF-ALL/config.xml 2011-03-08 17:29:51 UTC (rev 13868)
+++ hudson/trunk/hudson-home/jobs/CXF-ALL/config.xml 2011-03-08 17:54:03 UTC (rev 13869)
@@ -17,6 +17,8 @@
, CXF-SRCDIST-AS-6.0.0-SUN-JDK-6
, CXF-SRCDIST-AS-6.0.0-SPRING-SUN-JDK-6
+
+, CXF-BINDIST-AS-7.0.0-SUN-JDK-6
</childProjects>
<threshold>
<name>UNSTABLE</name>
Modified: hudson/trunk/hudson-home/jobs/CXF-LIGHT/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/CXF-LIGHT/config.xml 2011-03-08 17:29:51 UTC (rev 13868)
+++ hudson/trunk/hudson-home/jobs/CXF-LIGHT/config.xml 2011-03-08 17:54:03 UTC (rev 13869)
@@ -13,6 +13,8 @@
, CXF-BINDIST-AS-6.0.0-SUN-JDK-6
, CXF-BINDIST-AS-6.0.0-SPRING-SUN-JDK-6
+
+, CXF-BINDIST-AS-7.0.0-SUN-JDK-6
</childProjects>
<threshold>
<name>UNSTABLE</name>
13 years, 6 months
JBossWS SVN: r13868 - in hudson/trunk/hudson-home/jobs: CXF-BINDIST-AS-7.0.0-SUN-JDK-6 and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-03-08 12:29:51 -0500 (Tue, 08 Mar 2011)
New Revision: 13868
Added:
hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-7.0.0-SUN-JDK-6/
hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-7.0.0-SUN-JDK-6/config.xml
Log:
[JBWS-3208] Adding CXF BINDIST AS7 job
Added: hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-7.0.0-SUN-JDK-6/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-7.0.0-SUN-JDK-6/config.xml (rev 0)
+++ hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-7.0.0-SUN-JDK-6/config.xml 2011-03-08 17:29:51 UTC (rev 13868)
@@ -0,0 +1,75 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=CXF-BINDIST-AS-7.0.0-SUN-JDK-6
+
+WORKSPACE=`pwd`
+STACK_ID=cxf
+JAVA_HOME=(a)java.home.sun.jdk6@
+SCRIPTS_DIR=$WORKSPACE/hudson-scripts
+STACK_DIR=$WORKSPACE/stack-cxf
+TEST_OPTS=
+JBOSS_TARGET=jboss700
+JBOSS_BIND_ADDRESS=(a)jboss.bind.address@
+JBOSS_CONFIG=(a)jboss.server.instance@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-7.0.0/workspace/build/target/(a)hudson.jboss700.build@
+
+#
+# load test functions
+#
+. $SCRIPTS_DIR/jbossws-qa.sh
+
+#
+# execute binary distribution tests
+#
+binaryDistributionTest
+
+</command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.junit.JUnitResultArchiver>
+ <testResults>stack-cxf/target/jbossws-cxf-bin-dist/output/test-reports/TEST-*.xml</testResults>
+ </hudson.tasks.junit.JUnitResultArchiver>
+ <hudson.tasks.Mailer>
+ <recipients>@hudson.mail.recipients@</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>true</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.SubversionSCM">
+ <locations>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@jbossws.hudson.url@/scripts</remote>
+ <local>hudson-scripts</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.cxf.url@</remote>
+ <local>stack-cxf</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ </locations>
+ <useUpdate>true</useUpdate>
+ <browser class="hudson.scm.browsers.FishEyeSVN">
+ <url>http://fisheye.jboss.com/browse/JBossWS/</url>
+ <rootModule></rootModule>
+ </browser>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <logRotator>
+ <daysToKeep>14</daysToKeep>
+ <numToKeep>-1</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Build and test jbossws-cxf-(a)version.id@ binary distribution against AS-7.0.0 with Sun JDK 6</description>
+ <actions class="vector"/>
+</project>
13 years, 6 months
JBossWS SVN: r13867 - shared-testsuite/trunk/src/test/ant-import.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-03-08 12:09:10 -0500 (Tue, 08 Mar 2011)
New Revision: 13867
Modified:
shared-testsuite/trunk/src/test/ant-import/build-testsuite.xml
Log:
[JBWS-3210] Preparing binary distribution runs against AS7
Modified: shared-testsuite/trunk/src/test/ant-import/build-testsuite.xml
===================================================================
--- shared-testsuite/trunk/src/test/ant-import/build-testsuite.xml 2011-03-08 17:08:29 UTC (rev 13866)
+++ shared-testsuite/trunk/src/test/ant-import/build-testsuite.xml 2011-03-08 17:09:10 UTC (rev 13867)
@@ -27,6 +27,9 @@
<condition property="jboss.home" value="${jboss601.home}">
<equals arg1="${jbossws.integration.target}" arg2="jboss601"/>
</condition>
+ <condition property="jboss.home" value="${jboss700.home}">
+ <equals arg1="${jbossws.integration.target}" arg2="jboss700"/>
+ </condition>
<!-- Verify required properties that must be set before this file is imported -->
<fail message="Tests output dir not set." unless="tests.output.dir"/>
@@ -108,7 +111,7 @@
</tstamp>
</target>
- <target name="tests-classpath" depends="tests-classpath-jboss60,tests-classpath-jboss51,tests-classpath-jboss50">
+ <target name="tests-classpath" depends="tests-classpath-jboss70,tests-classpath-jboss60,tests-classpath-jboss51,tests-classpath-jboss50">
<path id="tests.javac.classpath">
<path refid="ws.stack.classpath"/>
<path refid="integration.target.javac.classpath"/>
@@ -359,6 +362,72 @@
</path>
</target>
+ <target name="tests-classpath-jboss70" depends="tests-prepare" if="jbossws.integration.jboss70">
+
+ <path id="integration.target.javac.classpath">
+ <fileset dir="${jboss.home}/modules/javax/activation/api/main/">
+ <include name="activation-*.jar"/>
+ </fileset>
+ <fileset dir="${jboss.home}/modules/org/jboss/common-core/main/">
+ <include name="jboss-common-core-*.jar"/>
+ </fileset>
+ <fileset dir="${jboss.home}/modules/org/jboss/logging/main/">
+ <include name="jboss-logging-*.jar"/>
+ </fileset>
+ <fileset dir="${jboss.home}/modules/javax/servlet/api/main/">
+ <include name="jboss-servlet-api_3.0_spec-*.jar"/>
+ </fileset>
+ </path>
+
+ <!--
+ The 's.client.classpath' contains jars that are available in the target container's client directory.
+ There jars apply to all supported stacks. It MUST NOT contains jars from a local thirdparty dir.
+
+ The 'ws.stack.classpath' contains jars that come with a specific stack distribution.
+ The 's.extra.classpath' contains stack specific jars that are needed to run the stack specific tests.
+ -->
+ <path id="integration.target.client.classpath">
+ <pathelement location="${thirdparty.dir}/jboss-as-webservices-tests-integration.jar"/> <!-- included from thirdparty local dir as it's not installed on AS -->
+ <pathelement location="${jboss.home}/jboss-modules.jar"/>
+ <fileset dir="${jboss.home}/modules/org/jboss/logging/main/">
+ <include name="jboss-logging-*.jar"/>
+ </fileset>
+ <fileset dir="${jboss.home}/modules/org/jboss/as/controller/main/">
+ <include name="jboss-as-controller-*.jar"/>
+ </fileset>
+ <fileset dir="${jboss.home}/modules/org/jboss/as/controller-client/main/">
+ <include name="jboss-as-controller-client-*.jar"/>
+ </fileset>
+ <fileset dir="${jboss.home}/modules/org/jboss/as/server/main/">
+ <include name="jboss-as-server-*.jar"/>
+ </fileset>
+ <fileset dir="${jboss.home}/modules/org/jboss/as/protocol/main/">
+ <include name="jboss-as-protocol-*.jar"/>
+ </fileset>
+ <fileset dir="${jboss.home}/modules/org/jboss/dmr/main/">
+ <include name="jboss-dmr-*.jar"/>
+ </fileset>
+ <fileset dir="${jboss.home}/modules/org/jboss/marshalling/main/">
+ <include name="jboss-marshalling-*.jar"/>
+ </fileset>
+ <fileset dir="${jboss.home}/modules/org/slf4j/main/">
+ <include name="slf4j-api-*.jar"/>
+ </fileset>
+ <fileset dir="${jboss.home}/modules/org/slf4j/jcl-over-slf4j/main/">
+ <include name="jcl-over-slf4j-*.jar"/>
+ </fileset>
+ <fileset dir="${jboss.home}/modules/org/slf4j/impl/main/">
+ <include name="slf4j-jboss-logmanager-*.jar"/>
+ </fileset>
+ <fileset dir="${jboss.home}/modules/org/jboss/logmanager/main/">
+ <include name="jboss-logmanager-*.jar"/>
+ </fileset>
+ <fileset dir="${jboss.home}/modules/org/apache/log4j/main/">
+ <include name="log4j-*.jar"/>
+ </fileset>
+ </path>
+ </target>
+
<!-- ================================================================== -->
<!-- Compiling -->
<!-- ================================================================== -->
13 years, 6 months
JBossWS SVN: r13866 - stack/native/trunk/modules/dist/src/main/distro.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-03-08 12:08:29 -0500 (Tue, 08 Mar 2011)
New Revision: 13866
Modified:
stack/native/trunk/modules/dist/src/main/distro/build.xml
Log:
[JBWS-3210] excluding jboss-as-webservices-tests-integration.jar from ws.classpath (required on as7 only)
Modified: stack/native/trunk/modules/dist/src/main/distro/build.xml
===================================================================
--- stack/native/trunk/modules/dist/src/main/distro/build.xml 2011-03-08 17:07:42 UTC (rev 13865)
+++ stack/native/trunk/modules/dist/src/main/distro/build.xml 2011-03-08 17:08:29 UTC (rev 13866)
@@ -65,6 +65,7 @@
<pathelement location="${thirdparty.dir}/saaj-api.jar"/>
<fileset dir="${thirdparty.dir}">
<exclude name="**/jbossws-jboss*.jar"/>
+ <exclude name="**/jboss-as-webservices-tests-integration.jar"/>
</fileset>
</path>
13 years, 6 months
JBossWS SVN: r13865 - in stack/cxf/trunk: modules/dist and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-03-08 12:07:42 -0500 (Tue, 08 Mar 2011)
New Revision: 13865
Modified:
stack/cxf/trunk/modules/dist/pom.xml
stack/cxf/trunk/modules/dist/src/main/distro/build.xml
stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
stack/cxf/trunk/pom.xml
Log:
[JBWS-3210] Preparing binary distribution runs against AS7
Modified: stack/cxf/trunk/modules/dist/pom.xml
===================================================================
--- stack/cxf/trunk/modules/dist/pom.xml 2011-03-08 16:12:56 UTC (rev 13864)
+++ stack/cxf/trunk/modules/dist/pom.xml 2011-03-08 17:07:42 UTC (rev 13865)
@@ -108,24 +108,24 @@
<scope>provided</scope>
</dependency>
- <!--jboss600-->
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss600</artifactId>
- <scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>sun-jaxb</groupId>
- <artifactId>jaxb-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
+ <!--jboss600-->
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss600</artifactId>
+ <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>sun-jaxb</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
- <!--junit-->
+ <!--junit-->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -181,6 +181,9 @@
<xslt style="${basedir}/src/main/distro/test-exclude.xsl" in="../testsuite/pom.xml" out="${basedir}/target/exclude-file/test-excludes-jboss601.txt">
<param name="targetName" expression="jboss601" />
</xslt>
+ <xslt style="${basedir}/src/main/distro/test-exclude.xsl" in="../testsuite/pom.xml" out="${basedir}/target/exclude-file/test-excludes-jboss700.txt">
+ <param name="targetName" expression="jboss700" />
+ </xslt>
</tasks>
</configuration>
<goals>
@@ -205,6 +208,28 @@
<name>bindist</name>
</property>
</activation>
+ <dependencies>
+ <!--Libraries required for running binary distro testsuite and not available on server-->
+ <dependency>
+ <groupId>org.jboss.as</groupId>
+ <artifactId>jboss-as-webservices-tests-integration</artifactId>
+ <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.as</groupId>
+ <artifactId>jboss-as-build-config</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.as</groupId>
+ <artifactId>jboss-as-server</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.marshalling</groupId>
+ <artifactId>jboss-marshalling-river</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
<build>
<plugins>
<plugin>
Modified: stack/cxf/trunk/modules/dist/src/main/distro/build.xml
===================================================================
--- stack/cxf/trunk/modules/dist/src/main/distro/build.xml 2011-03-08 16:12:56 UTC (rev 13864)
+++ stack/cxf/trunk/modules/dist/src/main/distro/build.xml 2011-03-08 17:07:42 UTC (rev 13865)
@@ -53,6 +53,11 @@
<equals arg1="${jbossws.integration.target}" arg2="jboss601"/>
</or>
</condition>
+ <condition property="jbossws.integration.jboss70" value="true">
+ <or>
+ <equals arg1="${jbossws.integration.target}" arg2="jboss700"/>
+ </or>
+ </condition>
<property name="deploy.structure" value="${output.dir}/deploy-${jbossws.integration.target}"/>
<property name="excludesfile" value="${tests.dir}/resources/test-excludes-${jbossws.integration.target}.txt"/>
@@ -63,6 +68,7 @@
<path id="ws.stack.classpath">
<fileset dir="${thirdparty.dir}">
<exclude name="**/jbossws-jboss*.jar"/>
+ <exclude name="**/jboss-as-webservices-tests-integration.jar"/>
</fileset>
</path>
Modified: stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2011-03-08 16:12:56 UTC (rev 13864)
+++ stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2011-03-08 17:07:42 UTC (rev 13865)
@@ -94,6 +94,7 @@
<include>apache-scout:scout:jar</include>
<include>juddi:juddi:jar</include>
<include>org.jboss.ws:jbossws-jboss600:jar</include>
+ <include>org.jboss.as:jboss-as-webservices-tests-integration:jar</include>
</includes>
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
<scope>provided</scope>
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2011-03-08 16:12:56 UTC (rev 13864)
+++ stack/cxf/trunk/pom.xml 2011-03-08 17:07:42 UTC (rev 13865)
@@ -55,6 +55,7 @@
<jbossws.jboss601.version>3.2.1.GA</jbossws.jboss601.version>
-->
<!-- END -->
+ <jboss700.version>7.0.0.Alpha2-SNAPSHOT</jboss700.version>
<cxf.version>2.3.4-SNAPSHOT</cxf.version>
<cxf.stax.version>1.0.1</cxf.stax.version>
<cxf.asm.version>3.3</cxf.asm.version>
@@ -123,6 +124,11 @@
<classifier>resources</classifier>
<type>zip</type>
</dependency>
+ <dependency>
+ <groupId>org.jboss.as</groupId>
+ <artifactId>jboss-as-webservices-tests-integration</artifactId>
+ <version>${jboss700.version}</version>
+ </dependency>
<!-- JBWS-2505 -->
<!-- START -->
<!--
13 years, 6 months