JBossWS SVN: r13945 - hudson/trunk/hudson-home/jobs/MAVEN-REPOSITORY-CLEAN.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-03-25 12:17:45 -0400 (Fri, 25 Mar 2011)
New Revision: 13945
Modified:
hudson/trunk/hudson-home/jobs/MAVEN-REPOSITORY-CLEAN/config.xml
Log:
Just delete contents of the repo, not the repo folder itself
Modified: hudson/trunk/hudson-home/jobs/MAVEN-REPOSITORY-CLEAN/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/MAVEN-REPOSITORY-CLEAN/config.xml 2011-03-25 16:15:14 UTC (rev 13944)
+++ hudson/trunk/hudson-home/jobs/MAVEN-REPOSITORY-CLEAN/config.xml 2011-03-25 16:17:45 UTC (rev 13945)
@@ -14,7 +14,7 @@
rm -rf /home/$USER/.m2/repository/*
fi
if [ -d /data/maven-repos/hudson/repository ]; then
- rm -rf /data/maven-repos/hudson/repository
+ rm -rf /data/maven-repos/hudson/repository/*
fi
</command>
</hudson.tasks.Shell>
13 years, 11 months
- 1
- 0
JBossWS SVN: r13944 - in hudson/trunk/hudson-home: jobs and 10 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-03-25 12:15:14 -0400 (Fri, 25 Mar 2011)
New Revision: 13944
Added:
hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-7.0.0-SPRING-SUN-JDK-6/
hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-7.0.0-SPRING-SUN-JDK-6/config.xml
hudson/trunk/hudson-home/jobs/CXF-CORE-AS-7.0.0-SPRING-SUN-JDK-6/
hudson/trunk/hudson-home/jobs/CXF-CORE-AS-7.0.0-SPRING-SUN-JDK-6/config.xml
hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-7.0.0-SPRING-SUN-JDK-6/
hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-7.0.0-SPRING-SUN-JDK-6/config.xml
hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-7.0.0-SUN-JDK-6/
hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-7.0.0-SUN-JDK-6/config.xml
hudson/trunk/hudson-home/jobs/NATIVE-BINDIST-AS-7.0.0-SUN-JDK-6/
hudson/trunk/hudson-home/jobs/NATIVE-BINDIST-AS-7.0.0-SUN-JDK-6/config.xml
hudson/trunk/hudson-home/jobs/NATIVE-SRCDIST-AS-7.0.0-SUN-JDK-6/
hudson/trunk/hudson-home/jobs/NATIVE-SRCDIST-AS-7.0.0-SUN-JDK-6/config.xml
Modified:
hudson/trunk/hudson-home/config.xml
hudson/trunk/hudson-home/jobs/CXF-ALL/config.xml
hudson/trunk/hudson-home/jobs/CXF-LIGHT/config.xml
hudson/trunk/hudson-home/jobs/NATIVE-ALL/config.xml
hudson/trunk/hudson-home/jobs/NATIVE-LIGHT/config.xml
Log:
[JBWS-3208] Adding AS7 jobs
Modified: hudson/trunk/hudson-home/config.xml
===================================================================
--- hudson/trunk/hudson-home/config.xml 2011-03-25 15:57:05 UTC (rev 13943)
+++ hudson/trunk/hudson-home/config.xml 2011-03-25 16:15:14 UTC (rev 13944)
@@ -54,6 +54,7 @@
<no-comparator/>
<string>AS-ALL</string>
<string>AS-6.0.0</string>
+ <string>AS-7.0.0</string>
</jobNames>
<name>AS Builds</name>
<description>
@@ -91,7 +92,9 @@
<string>NATIVE-CORE-AS-6.0.0-SUN-JDK-6</string>
<string>NATIVE-CORE-AS-7.0.0-SUN-JDK-6</string>
<string>NATIVE-BINDIST-AS-6.0.0-SUN-JDK-6</string>
+ <string>NATIVE-BINDIST-AS-7.0.0-SUN-JDK-6</string>
<string>NATIVE-SRCDIST-AS-6.0.0-SUN-JDK-6</string>
+ <string>NATIVE-SRCDIST-AS-7.0.0-SUN-JDK-6</string>
</jobNames>
<name>Native Tests</name>
<description>
@@ -113,10 +116,15 @@
<string>CXF-CORE-AS-6.0.0-SUN-JDK-6</string>
<string>CXF-CORE-AS-7.0.0-SUN-JDK-6</string>
<string>CXF-CORE-AS-6.0.0-SPRING-SUN-JDK-6</string>
+ <string>CXF-CORE-AS-7.0.0-SPRING-SUN-JDK-6</string>
<string>CXF-BINDIST-AS-6.0.0-SUN-JDK-6</string>
+ <string>CXF-BINDIST-AS-7.0.0-SUN-JDK-6</string>
<string>CXF-BINDIST-AS-6.0.0-SPRING-SUN-JDK-6</string>
+ <string>CXF-BINDIST-AS-7.0.0-SPRING-SUN-JDK-6</string>
<string>CXF-SRCDIST-AS-6.0.0-SUN-JDK-6</string>
+ <string>CXF-SRCDIST-AS-7.0.0-SUN-JDK-6</string>
<string>CXF-SRCDIST-AS-6.0.0-SPRING-SUN-JDK-6</string>
+ <string>CXF-SRCDIST-AS-7.0.0-SPRING-SUN-JDK-6</string>
</jobNames>
<name>CXF Tests</name>
<description>
@@ -137,12 +145,16 @@
<string>CXF-CORE-AS-6.0.0-SUN-JDK-6</string>
<string>CXF-CORE-AS-7.0.0-SUN-JDK-6</string>
<string>CXF-CORE-AS-6.0.0-SPRING-SUN-JDK-6</string>
+ <string>CXF-CORE-AS-7.0.0-SPRING-SUN-JDK-6</string>
<string>CXF-BINDIST-AS-6.0.0-SUN-JDK-6</string>
+ <string>CXF-BINDIST-AS-7.0.0-SUN-JDK-6</string>
<string>CXF-BINDIST-AS-6.0.0-SPRING-SUN-JDK-6</string>
+ <string>CXF-BINDIST-AS-7.0.0-SPRING-SUN-JDK-6</string>
<string>NATIVE-LIGHT</string>
<string>NATIVE-CORE-AS-6.0.0-SUN-JDK-6</string>
<string>NATIVE-CORE-AS-7.0.0-SUN-JDK-6</string>
<string>NATIVE-BINDIST-AS-6.0.0-SUN-JDK-6</string>
+ <string>NATIVE-BINDIST-AS-7.0.0-SUN-JDK-6</string>
</jobNames>
<name>Working Days Tests</name>
<description>
Modified: hudson/trunk/hudson-home/jobs/CXF-ALL/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/CXF-ALL/config.xml 2011-03-25 15:57:05 UTC (rev 13943)
+++ hudson/trunk/hudson-home/jobs/CXF-ALL/config.xml 2011-03-25 16:15:14 UTC (rev 13944)
@@ -10,6 +10,8 @@
, CXF-CORE-AS-7.0.0-SUN-JDK-6
+, CXF-CORE-AS-7.0.0-SPRING-SUN-JDK-6
+
, CXF-BINDIST-AS-6.0.0-SUN-JDK-6
, CXF-BINDIST-AS-6.0.0-SPRING-SUN-JDK-6
@@ -19,6 +21,12 @@
, CXF-SRCDIST-AS-6.0.0-SPRING-SUN-JDK-6
, CXF-BINDIST-AS-7.0.0-SUN-JDK-6
+
+, CXF-BINDIST-AS-7.0.0-SPRING-SUN-JDK-6
+
+, CXF-SRCDIST-AS-7.0.0-SUN-JDK-6
+
+, CXF-SRCDIST-AS-7.0.0-SPRING-SUN-JDK-6
</childProjects>
<threshold>
<name>UNSTABLE</name>
Added: hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-7.0.0-SPRING-SUN-JDK-6/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-7.0.0-SPRING-SUN-JDK-6/config.xml (rev 0)
+++ hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-7.0.0-SPRING-SUN-JDK-6/config.xml 2011-03-25 16:15:14 UTC (rev 13944)
@@ -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-SPRING-SUN-JDK-6
+
+WORKSPACE=`pwd`
+STACK_ID=cxf
+JAVA_HOME=(a)java.home.sun.jdk6@
+SCRIPTS_DIR=$WORKSPACE/hudson-scripts
+STACK_DIR=$WORKSPACE/stack-cxf
+TEST_OPTS=
+JBOSS_TARGET=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
+#
+binaryDistributionTestWithSpring
+
+</command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.junit.JUnitResultArchiver>
+ <testResults>stack-cxf/target/jbossws-cxf-bin-dist/output/test-reports/TEST-*.xml</testResults>
+ </hudson.tasks.junit.JUnitResultArchiver>
+ <hudson.tasks.Mailer>
+ <recipients>@hudson.mail.recipients@</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>true</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.SubversionSCM">
+ <locations>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@jbossws.hudson.url@/scripts</remote>
+ <local>hudson-scripts</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.cxf.url@</remote>
+ <local>stack-cxf</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ </locations>
+ <useUpdate>true</useUpdate>
+ <browser class="hudson.scm.browsers.FishEyeSVN">
+ <url>http://fisheye.jboss.com/browse/JBossWS/</url>
+ <rootModule></rootModule>
+ </browser>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <logRotator>
+ <daysToKeep>14</daysToKeep>
+ <numToKeep>-1</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Build and test jbossws-cxf-(a)version.id@ binary distribution against AS-7.0.0 with SpringFramework libraries available and Sun JDK 6</description>
+ <actions class="vector"/>
+</project>
Added: hudson/trunk/hudson-home/jobs/CXF-CORE-AS-7.0.0-SPRING-SUN-JDK-6/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/CXF-CORE-AS-7.0.0-SPRING-SUN-JDK-6/config.xml (rev 0)
+++ hudson/trunk/hudson-home/jobs/CXF-CORE-AS-7.0.0-SPRING-SUN-JDK-6/config.xml 2011-03-25 16:15:14 UTC (rev 13944)
@@ -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-7.0.0-SPRING-SUN-JDK-6
+
+WORKSPACE=`pwd`
+STACK_ID=cxf
+JAVA_HOME=(a)java.home.sun.jdk6@
+SCRIPTS_DIR=$WORKSPACE/hudson-scripts
+STACK_DIR=$WORKSPACE/stack-cxf
+TEST_OPTS=
+JBOSS_TARGET=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 core tests
+#
+coreTestWithSpring
+
+</command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.junit.JUnitResultArchiver>
+ <testResults>stack-cxf/**/target/surefire-reports/*.xml</testResults>
+ </hudson.tasks.junit.JUnitResultArchiver>
+ <hudson.tasks.Mailer>
+ <recipients>@hudson.mail.recipients@</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>true</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.SubversionSCM">
+ <locations>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@jbossws.hudson.url@/scripts</remote>
+ <local>hudson-scripts</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.cxf.url@</remote>
+ <local>stack-cxf</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ </locations>
+ <useUpdate>true</useUpdate>
+ <browser class="hudson.scm.browsers.FishEyeSVN">
+ <url>http://fisheye.jboss.com/browse/JBossWS/</url>
+ <rootModule></rootModule>
+ </browser>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <logRotator>
+ <daysToKeep>14</daysToKeep>
+ <numToKeep>-1</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Build and test jbossws-cxf-(a)version.id@ against @hudson.jboss700.build@ with SpringFramework libraires available and Sun JDK 6</description>
+ <actions class="vector"/>
+</project>
Modified: hudson/trunk/hudson-home/jobs/CXF-LIGHT/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/CXF-LIGHT/config.xml 2011-03-25 15:57:05 UTC (rev 13943)
+++ hudson/trunk/hudson-home/jobs/CXF-LIGHT/config.xml 2011-03-25 16:15:14 UTC (rev 13944)
@@ -10,11 +10,15 @@
, CXF-CORE-AS-7.0.0-SUN-JDK-6
+, CXF-CORE-AS-7.0.0-SPRING-SUN-JDK-6
+
, 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
+
+, CXF-BINDIST-AS-7.0.0-SPRING-SUN-JDK-6
</childProjects>
<threshold>
<name>UNSTABLE</name>
Added: hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-7.0.0-SPRING-SUN-JDK-6/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-7.0.0-SPRING-SUN-JDK-6/config.xml (rev 0)
+++ hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-7.0.0-SPRING-SUN-JDK-6/config.xml 2011-03-25 16:15:14 UTC (rev 13944)
@@ -0,0 +1,75 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=CXF-SRCDIST-AS-7.0.0-SPRING-SUN-JDK-6
+
+WORKSPACE=`pwd`
+STACK_ID=cxf
+JAVA_HOME=(a)java.home.sun.jdk6@
+SCRIPTS_DIR=$WORKSPACE/hudson-scripts
+STACK_DIR=$WORKSPACE/stack-cxf
+TEST_OPTS=
+JBOSS_TARGET=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 source distribution tests
+#
+sourceDistributionTestWithSpring
+
+</command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.junit.JUnitResultArchiver>
+ <testResults>stack-cxf/target/jbossws-cxf-src-dist/modules/testsuite/**/target/surefire-reports/TEST-*.xml</testResults>
+ </hudson.tasks.junit.JUnitResultArchiver>
+ <hudson.tasks.Mailer>
+ <recipients>@hudson.mail.recipients@</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>true</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.SubversionSCM">
+ <locations>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@jbossws.hudson.url@/scripts</remote>
+ <local>hudson-scripts</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.cxf.url@</remote>
+ <local>stack-cxf</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ </locations>
+ <useUpdate>true</useUpdate>
+ <browser class="hudson.scm.browsers.FishEyeSVN">
+ <url>http://fisheye.jboss.com/browse/JBossWS/</url>
+ <rootModule></rootModule>
+ </browser>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <logRotator>
+ <daysToKeep>14</daysToKeep>
+ <numToKeep>-1</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Build and test jbossws-cxf-(a)version.id@ source distribution against AS-7.0.0 with SpringFramework libraries available and Sun JDK 6</description>
+ <actions class="vector"/>
+</project>
Added: hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-7.0.0-SUN-JDK-6/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-7.0.0-SUN-JDK-6/config.xml (rev 0)
+++ hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-7.0.0-SUN-JDK-6/config.xml 2011-03-25 16:15:14 UTC (rev 13944)
@@ -0,0 +1,75 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=CXF-SRCDIST-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 source distribution tests
+#
+sourceDistributionTest
+
+</command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.junit.JUnitResultArchiver>
+ <testResults>stack-cxf/target/jbossws-cxf-src-dist/modules/testsuite/**/target/surefire-reports/TEST-*.xml</testResults>
+ </hudson.tasks.junit.JUnitResultArchiver>
+ <hudson.tasks.Mailer>
+ <recipients>@hudson.mail.recipients@</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>true</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.SubversionSCM">
+ <locations>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@jbossws.hudson.url@/scripts</remote>
+ <local>hudson-scripts</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.cxf.url@</remote>
+ <local>stack-cxf</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ </locations>
+ <useUpdate>true</useUpdate>
+ <browser class="hudson.scm.browsers.FishEyeSVN">
+ <url>http://fisheye.jboss.com/browse/JBossWS/</url>
+ <rootModule></rootModule>
+ </browser>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <logRotator>
+ <daysToKeep>14</daysToKeep>
+ <numToKeep>-1</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Build and test jbossws-cxf-(a)version.id@ source distribution against AS-7.0.0 with Sun JDK 6</description>
+ <actions class="vector"/>
+</project>
Modified: hudson/trunk/hudson-home/jobs/NATIVE-ALL/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/NATIVE-ALL/config.xml 2011-03-25 15:57:05 UTC (rev 13943)
+++ hudson/trunk/hudson-home/jobs/NATIVE-ALL/config.xml 2011-03-25 16:15:14 UTC (rev 13944)
@@ -11,6 +11,10 @@
, NATIVE-SRCDIST-AS-6.0.0-SUN-JDK-6
, NATIVE-CORE-AS-7.0.0-SUN-JDK-6
+
+, NATIVE-BINDIST-AS-7.0.0-SUN-JDK-6
+
+, NATIVE-SRCDIST-AS-7.0.0-SUN-JDK-6
</childProjects>
<threshold>
<name>UNSTABLE</name>
Added: hudson/trunk/hudson-home/jobs/NATIVE-BINDIST-AS-7.0.0-SUN-JDK-6/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/NATIVE-BINDIST-AS-7.0.0-SUN-JDK-6/config.xml (rev 0)
+++ hudson/trunk/hudson-home/jobs/NATIVE-BINDIST-AS-7.0.0-SUN-JDK-6/config.xml 2011-03-25 16:15:14 UTC (rev 13944)
@@ -0,0 +1,75 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=NATIVE-BINDIST-AS-7.0.0-SUN-JDK-6
+
+WORKSPACE=`pwd`
+STACK_ID=native
+JAVA_HOME=(a)java.home.sun.jdk6@
+SCRIPTS_DIR=$WORKSPACE/hudson-scripts
+STACK_DIR=$WORKSPACE/stack-native
+TEST_OPTS=
+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-native/target/jbossws-native-bin-dist/output/test-reports/TEST-*.xml</testResults>
+ </hudson.tasks.junit.JUnitResultArchiver>
+ <hudson.tasks.Mailer>
+ <recipients>@hudson.mail.recipients@</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>true</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.SubversionSCM">
+ <locations>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@jbossws.hudson.url@/scripts</remote>
+ <local>hudson-scripts</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.native.url@</remote>
+ <local>stack-native</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ </locations>
+ <useUpdate>true</useUpdate>
+ <browser class="hudson.scm.browsers.FishEyeSVN">
+ <url>http://fisheye.jboss.com/browse/JBossWS/</url>
+ <rootModule></rootModule>
+ </browser>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <logRotator>
+ <daysToKeep>14</daysToKeep>
+ <numToKeep>-1</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Build and test jbossws-native-(a)version.id@ binary distribution against AS-7.0.0 with Sun JDK 6</description>
+ <actions class="vector"/>
+</project>
Modified: hudson/trunk/hudson-home/jobs/NATIVE-LIGHT/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/NATIVE-LIGHT/config.xml 2011-03-25 15:57:05 UTC (rev 13943)
+++ hudson/trunk/hudson-home/jobs/NATIVE-LIGHT/config.xml 2011-03-25 16:15:14 UTC (rev 13944)
@@ -9,6 +9,8 @@
, NATIVE-BINDIST-AS-6.0.0-SUN-JDK-6
, NATIVE-CORE-AS-7.0.0-SUN-JDK-6
+
+, NATIVE-BINDIST-AS-7.0.0-SUN-JDK-6
</childProjects>
<threshold>
<name>UNSTABLE</name>
Added: hudson/trunk/hudson-home/jobs/NATIVE-SRCDIST-AS-7.0.0-SUN-JDK-6/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/NATIVE-SRCDIST-AS-7.0.0-SUN-JDK-6/config.xml (rev 0)
+++ hudson/trunk/hudson-home/jobs/NATIVE-SRCDIST-AS-7.0.0-SUN-JDK-6/config.xml 2011-03-25 16:15:14 UTC (rev 13944)
@@ -0,0 +1,75 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=NATIVE-SRCDIST-AS-7.0.0-SUN-JDK-6
+
+WORKSPACE=`pwd`
+STACK_ID=native
+JAVA_HOME=(a)java.home.sun.jdk6@
+SCRIPTS_DIR=$WORKSPACE/hudson-scripts
+STACK_DIR=$WORKSPACE/stack-native
+TEST_OPTS=
+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 source distribution tests
+#
+sourceDistributionTest
+
+</command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.junit.JUnitResultArchiver>
+ <testResults>stack-native/target/jbossws-native-src-dist/modules/testsuite/**/target/surefire-reports/TEST-*.xml</testResults>
+ </hudson.tasks.junit.JUnitResultArchiver>
+ <hudson.tasks.Mailer>
+ <recipients>@hudson.mail.recipients@</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>true</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.SubversionSCM">
+ <locations>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@jbossws.hudson.url@/scripts</remote>
+ <local>hudson-scripts</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.native.url@</remote>
+ <local>stack-native</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ </locations>
+ <useUpdate>true</useUpdate>
+ <browser class="hudson.scm.browsers.FishEyeSVN">
+ <url>http://fisheye.jboss.com/browse/JBossWS/</url>
+ <rootModule></rootModule>
+ </browser>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <logRotator>
+ <daysToKeep>14</daysToKeep>
+ <numToKeep>-1</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Build and test jbossws-native-(a)version.id@ source distribution against AS-7.0.0 with Sun JDK 6</description>
+ <actions class="vector"/>
+</project>
13 years, 11 months
- 1
- 0
JBossWS SVN: r13943 - in stack/cxf/trunk/modules/testsuite: cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-03-25 11:57:05 -0400 (Fri, 25 Mar 2011)
New Revision: 13943
Modified:
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/aegis/AegisTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignEncryptTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/main/java/org/jboss/wsf/test/JBossWSCXFTestSetup.java
Log:
Minor testsuite changing for checking default bus usage
Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/aegis/AegisTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/aegis/AegisTestCase.java 2011-03-25 15:56:54 UTC (rev 13942)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/aegis/AegisTestCase.java 2011-03-25 15:57:05 UTC (rev 13943)
@@ -27,8 +27,8 @@
import org.apache.cxf.aegis.databinding.AegisDatabinding;
import org.apache.cxf.frontend.ClientProxyFactoryBean;
+import org.jboss.wsf.test.JBossWSCXFTestSetup;
import org.jboss.wsf.test.JBossWSTest;
-import org.jboss.wsf.test.JBossWSTestSetup;
public class AegisTestCase extends JBossWSTest
{
@@ -36,7 +36,7 @@
public static Test suite()
{
- return new JBossWSTestSetup(AegisTestCase.class, "jaxws-aegis.war");
+ return new JBossWSCXFTestSetup(AegisTestCase.class, "jaxws-aegis.war");
}
public void testAccess() throws Exception
@@ -46,9 +46,10 @@
proxyFactory.setServiceClass(AegisGroupQuery.class);
proxyFactory.setAddress(endpointURL);
AegisGroupQuery query = (AegisGroupQuery)proxyFactory.create();
+ @SuppressWarnings("unchecked")
Map<Integer, String> members = query.getMembers();
- this.assertEquals(2, members.size());
- this.assertEquals(true, members.containsKey(2));
+ assertEquals(2, members.size());
+ assertEquals(true, members.containsKey(2));
}
}
Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignEncryptTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignEncryptTestCase.java 2011-03-25 15:56:54 UTC (rev 13942)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignEncryptTestCase.java 2011-03-25 15:57:05 UTC (rev 13943)
@@ -38,8 +38,8 @@
import org.apache.cxf.frontend.ClientProxy;
import org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor;
import org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor;
+import org.jboss.wsf.test.JBossWSCXFTestSetup;
import org.jboss.wsf.test.JBossWSTest;
-import org.jboss.wsf.test.JBossWSTestSetup;
/**
* WS-Security sign & encrypt test case
@@ -53,7 +53,7 @@
public static Test suite()
{
- return new JBossWSTestSetup(SignEncryptTestCase.class, "jaxws-samples-wsse-sign-encrypt-client.jar jaxws-samples-wsse-sign-encrypt.war");
+ return new JBossWSCXFTestSetup(SignEncryptTestCase.class, "jaxws-samples-wsse-sign-encrypt-client.jar jaxws-samples-wsse-sign-encrypt.war");
}
public void test() throws Exception
Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignTestCase.java 2011-03-25 15:56:54 UTC (rev 13942)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignTestCase.java 2011-03-25 15:57:05 UTC (rev 13943)
@@ -37,8 +37,8 @@
import org.apache.cxf.frontend.ClientProxy;
import org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor;
import org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor;
+import org.jboss.wsf.test.JBossWSCXFTestSetup;
import org.jboss.wsf.test.JBossWSTest;
-import org.jboss.wsf.test.JBossWSTestSetup;
/**
* WS-Security sign test case
@@ -52,7 +52,7 @@
public static Test suite()
{
- return new JBossWSTestSetup(SignTestCase.class,"jaxws-samples-wsse-sign-client.jar jaxws-samples-wsse-sign.war");
+ return new JBossWSCXFTestSetup(SignTestCase.class,"jaxws-samples-wsse-sign-client.jar jaxws-samples-wsse-sign.war");
}
public void test() throws Exception
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/main/java/org/jboss/wsf/test/JBossWSCXFTestSetup.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/main/java/org/jboss/wsf/test/JBossWSCXFTestSetup.java 2011-03-25 15:56:54 UTC (rev 13942)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/main/java/org/jboss/wsf/test/JBossWSCXFTestSetup.java 2011-03-25 15:57:05 UTC (rev 13943)
@@ -49,8 +49,8 @@
@Override
protected void setUp() throws Exception {
+ defaultBus = BusFactory.getDefaultBus(false);
super.setUp();
- defaultBus = BusFactory.getDefaultBus(false);
}
@Override
13 years, 11 months
- 1
- 0
JBossWS SVN: r13942 - stack/native/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-03-25 11:56:54 -0400 (Fri, 25 Mar 2011)
New Revision: 13942
Modified:
stack/native/trunk/modules/testsuite/pom.xml
Log:
update exclusion accordingly
Modified: stack/native/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/pom.xml 2011-03-25 13:06:17 UTC (rev 13941)
+++ stack/native/trunk/modules/testsuite/pom.xml 2011-03-25 15:56:54 UTC (rev 13942)
@@ -854,6 +854,8 @@
<exclude>org/jboss/test/ws/jaxws/jbws3140/**</exclude>
<!-- # [JBWS-3234] JNDI over RMI not available on AS7 -->
+ <exclude>org/jboss/test/ws/jaxrpc/**</exclude>
+ <exclude>org/jboss/test/ws/benchmark/jaxrpc/**</exclude>
<exclude>org/jboss/test/ws/jaxws/samples/serviceref/**</exclude>
<exclude>org/jboss/test/ws/jaxws/wsaddressing/replyto/**</exclude>
@@ -891,10 +893,6 @@
<!-- JAXR not available -->
<exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude>
-
- <!-- JAXRPC deployments -->
- <exclude>org/jboss/test/ws/jaxrpc/**</exclude>
- <exclude>org/jboss/test/ws/benchmark/jaxrpc/**</exclude>
</excludes>
</configuration>
</plugin>
13 years, 11 months
- 1
- 0
JBossWS SVN: r13941 - stack/native/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-03-25 09:06:17 -0400 (Fri, 25 Mar 2011)
New Revision: 13941
Modified:
stack/native/trunk/modules/testsuite/pom.xml
Log:
excluding tests due to missing EJB3 @Remote support implementation
Modified: stack/native/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/pom.xml 2011-03-25 10:14:36 UTC (rev 13940)
+++ stack/native/trunk/modules/testsuite/pom.xml 2011-03-25 13:06:17 UTC (rev 13941)
@@ -782,6 +782,11 @@
<exclude>org/jboss/test/ws/jaxws/jbws2934/**</exclude> <!-- F java.lang.ArrayIndexOutOfBoundsException -->
<exclude>org/jboss/test/ws/jaxws/jbws3026/**</exclude> <!-- F cannot find WSDL -->
+ <!-- EJB3 support for @Remote views not yet implemented -->
+ <exclude>org/jboss/test/ws/jaxws/jbws1283/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1694/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1799/**</exclude>
+
<!-- EJB3 DD driven deployments -->
<exclude>org/jboss/test/ws/jaxws/jbws1309/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws1841/**</exclude>
13 years, 11 months
- 1
- 0
JBossWS SVN: r13940 - in stack/cxf/trunk/modules: client/src/main/java/org/jboss/wsf/stack/cxf/client/util and 17 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-03-25 06:14:36 -0400 (Fri, 25 Mar 2011)
New Revision: 13940
Added:
stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/util/DelegateClassLoader.java
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/springframework/
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/springframework/spring/
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/springframework/spring/main/
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/springframework/spring/main/module.xml
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SecurityActions.java
Removed:
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/springframework/spring/
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/springframework/spring/main/
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/springframework/spring/main/module.xml
Modified:
stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ProviderImpl.java
stack/cxf/trunk/modules/client/src/test/java/org/jboss/wsf/stack/cxf/client/ProviderImplTest.java
stack/cxf/trunk/modules/dist/src/main/distro/
stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/apache/cxf/main/module.xml
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/main/module.xml
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/server/integration/main/module.xml
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/jaxws-client/main/module.xml
stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
stack/cxf/trunk/modules/resources/src/main/resources/resources/modules-deploy.conf
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringBusHolder.java
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/spring/handler/NamespaceHandlerResolver.java
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/pom.xml
stack/cxf/trunk/modules/testsuite/pom.xml
Log:
Merging r 13889, 13900, 13912 from spring-as7 branch: JBWS-3206 initial WS-* support on AS7 through spring version of cxf [dependencies on spring module still commented out due, pending inclusion of MODULES-80 in AS7]
Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ProviderImpl.java
===================================================================
--- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ProviderImpl.java 2011-03-25 05:12:30 UTC (rev 13939)
+++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ProviderImpl.java 2011-03-25 10:14:36 UTC (rev 13940)
@@ -21,17 +21,11 @@
*/
package org.jboss.wsf.stack.cxf.client;
-import java.io.IOException;
-import java.io.InputStream;
import java.net.URL;
import java.security.AccessController;
import java.security.PrivilegedAction;
-import java.security.SecureClassLoader;
-import java.util.ArrayList;
-import java.util.Enumeration;
import java.util.List;
import java.util.Map;
-import java.util.NoSuchElementException;
import java.util.concurrent.Executor;
import javax.xml.namespace.QName;
@@ -48,6 +42,7 @@
import org.apache.cxf.jaxws.ServiceImpl;
import org.jboss.logging.Logger;
import org.jboss.wsf.stack.cxf.client.configuration.JBossWSBusFactory;
+import org.jboss.wsf.stack.cxf.client.util.DelegateClassLoader;
import org.w3c.dom.Element;
/**
@@ -410,112 +405,4 @@
}
}
- static final class DelegateClassLoader extends SecureClassLoader
- {
- private ClassLoader delegate;
-
- private ClassLoader parent;
-
- public DelegateClassLoader(final ClassLoader delegate, final ClassLoader parent)
- {
- super(parent);
- this.delegate = delegate;
- this.parent = parent;
- }
-
- /** {@inheritDoc} */
- @Override
- public Class<?> loadClass(final String className) throws ClassNotFoundException
- {
- if (parent != null)
- {
- try
- {
- return parent.loadClass(className);
- }
- catch (ClassNotFoundException cnfe)
- {
- //NOOP, use delegate
- }
- }
- return delegate.loadClass(className);
- }
-
- /** {@inheritDoc} */
- @Override
- public URL getResource(final String name)
- {
- URL url = null;
- if (parent != null)
- {
- url = parent.getResource(name);
- }
- return (url == null) ? delegate.getResource(name) : url;
- }
-
- /** {@inheritDoc} */
- @Override
- public Enumeration<URL> getResources(final String name) throws IOException
- {
- final ArrayList<Enumeration<URL>> foundResources = new ArrayList<Enumeration<URL>>();
-
- foundResources.add(delegate.getResources(name));
- if (parent != null)
- {
- foundResources.add(parent.getResources(name));
- }
-
- return new Enumeration<URL>()
- {
- private int position = foundResources.size() - 1;
-
- public boolean hasMoreElements()
- {
- while (position >= 0)
- {
- if (foundResources.get(position).hasMoreElements())
- {
- return true;
- }
- position--;
- }
- return false;
- }
-
- public URL nextElement()
- {
- while (position >= 0)
- {
- try
- {
- return (foundResources.get(position)).nextElement();
- }
- catch (NoSuchElementException e)
- {
- }
- position--;
- }
- throw new NoSuchElementException();
- }
- };
- }
-
- /** {@inheritDoc} */
- @Override
- public InputStream getResourceAsStream(final String name)
- {
- URL foundResource = getResource(name);
- if (foundResource != null)
- {
- try
- {
- return foundResource.openStream();
- }
- catch (IOException e)
- {
- }
- }
- return null;
- }
- };
}
Copied: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/util/DelegateClassLoader.java (from rev 13889, stack/cxf/branches/spring-as7/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/util/DelegateClassLoader.java)
===================================================================
--- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/util/DelegateClassLoader.java (rev 0)
+++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/util/DelegateClassLoader.java 2011-03-25 10:14:36 UTC (rev 13940)
@@ -0,0 +1,145 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.wsf.stack.cxf.client.util;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.security.SecureClassLoader;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.NoSuchElementException;
+
+/**
+ * A delegate classloader
+ *
+ * @author alessio.soldano(a)jboss.com
+ *
+ */
+public class DelegateClassLoader extends SecureClassLoader
+{
+ private ClassLoader delegate;
+
+ private ClassLoader parent;
+
+ public DelegateClassLoader(final ClassLoader delegate, final ClassLoader parent)
+ {
+ super(parent);
+ this.delegate = delegate;
+ this.parent = parent;
+ }
+
+ /** {@inheritDoc} */
+ @Override
+ public Class<?> loadClass(final String className) throws ClassNotFoundException
+ {
+ if (parent != null)
+ {
+ try
+ {
+ return parent.loadClass(className);
+ }
+ catch (ClassNotFoundException cnfe)
+ {
+ //NOOP, use delegate
+ }
+ }
+ return delegate.loadClass(className);
+ }
+
+ /** {@inheritDoc} */
+ @Override
+ public URL getResource(final String name)
+ {
+ URL url = null;
+ if (parent != null)
+ {
+ url = parent.getResource(name);
+ }
+ return (url == null) ? delegate.getResource(name) : url;
+ }
+
+ /** {@inheritDoc} */
+ @Override
+ public Enumeration<URL> getResources(final String name) throws IOException
+ {
+ final ArrayList<Enumeration<URL>> foundResources = new ArrayList<Enumeration<URL>>();
+
+ foundResources.add(delegate.getResources(name));
+ if (parent != null)
+ {
+ foundResources.add(parent.getResources(name));
+ }
+
+ return new Enumeration<URL>()
+ {
+ private int position = foundResources.size() - 1;
+
+ public boolean hasMoreElements()
+ {
+ while (position >= 0)
+ {
+ if (foundResources.get(position).hasMoreElements())
+ {
+ return true;
+ }
+ position--;
+ }
+ return false;
+ }
+
+ public URL nextElement()
+ {
+ while (position >= 0)
+ {
+ try
+ {
+ return (foundResources.get(position)).nextElement();
+ }
+ catch (NoSuchElementException e)
+ {
+ }
+ position--;
+ }
+ throw new NoSuchElementException();
+ }
+ };
+ }
+
+ /** {@inheritDoc} */
+ @Override
+ public InputStream getResourceAsStream(final String name)
+ {
+ URL foundResource = getResource(name);
+ if (foundResource != null)
+ {
+ try
+ {
+ return foundResource.openStream();
+ }
+ catch (IOException e)
+ {
+ }
+ }
+ return null;
+ }
+}
\ No newline at end of file
Modified: stack/cxf/trunk/modules/client/src/test/java/org/jboss/wsf/stack/cxf/client/ProviderImplTest.java
===================================================================
--- stack/cxf/trunk/modules/client/src/test/java/org/jboss/wsf/stack/cxf/client/ProviderImplTest.java 2011-03-25 05:12:30 UTC (rev 13939)
+++ stack/cxf/trunk/modules/client/src/test/java/org/jboss/wsf/stack/cxf/client/ProviderImplTest.java 2011-03-25 10:14:36 UTC (rev 13940)
@@ -34,8 +34,8 @@
import junit.framework.TestCase;
-import org.jboss.wsf.stack.cxf.client.ProviderImpl.DelegateClassLoader;
import org.jboss.wsf.stack.cxf.client.ProviderImpl.DelegateEndpointImpl;
+import org.jboss.wsf.stack.cxf.client.util.DelegateClassLoader;
import org.w3c.dom.Element;
/**
Property changes on: stack/cxf/trunk/modules/dist/src/main/distro
___________________________________________________________________
Deleted: svn:mergeinfo
-
Modified: stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml
===================================================================
--- stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml 2011-03-25 05:12:30 UTC (rev 13939)
+++ stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml 2011-03-25 10:14:36 UTC (rev 13940)
@@ -124,7 +124,7 @@
<echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/>
</target>
- <target name="deploy-jboss700" depends="undeploy-jboss700,deploy-structure-jboss700" description="Deploy jbossws to jboss700">
+ <target name="deploy-jboss700" depends="undeploy-jboss700,deploy-structure-jboss700,check-spring,install-spring-module" description="Deploy jbossws to jboss700">
<fail message="Not available: ${jboss700.available.file}" unless="jboss700.available"/>
<copy todir="${jboss700.home}" overwrite="true" verbose="true">
<fileset dir="${deploy.structure}">
@@ -162,6 +162,13 @@
</antcall>
</target>
+ <target name="install-spring-module" if="spring-required">
+ <antcall target="deploy-spring-module" inheritall="false">
+ <param name="installserver" value="${deploy.structure}"/>
+ <param name="thirdpartydir" value="${deploy.artifacts.dir}"/>
+ </antcall>
+ </target>
+
<!-- ================================================================== -->
<!-- Create jbossws-deploy.conf and jbossws-server-deploy.conf -->
<!-- ================================================================== -->
Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/org/apache/cxf/main/module.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/modules/org/apache/cxf/main/module.xml 2011-03-25 05:12:30 UTC (rev 13939)
+++ stack/cxf/trunk/modules/resources/src/main/resources/modules/org/apache/cxf/main/module.xml 2011-03-25 10:14:36 UTC (rev 13940)
@@ -42,5 +42,8 @@
<module name="javax.xml.ws.api" />
<module name="org.apache.neethi" />
<module name="org.apache.ws.commons.xmlschema" />
+ <module name="org.apache.ws.security" />
+ <module name="org.apache.santuario.xmlsec" />
+<!-- <module name="org.springframework.spring" optional="true"/> -->
</dependencies>
</module>
Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/main/module.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/main/module.xml 2011-03-25 05:12:30 UTC (rev 13939)
+++ stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/main/module.xml 2011-03-25 10:14:36 UTC (rev 13940)
@@ -53,5 +53,6 @@
<module name="org.jboss.ws.jaxws-client" services="import"/>
<module name="org.jboss.ws.cxf.jbossws-cxf-server" services="import"/>
<module name="org.jboss.ws.spi" />
+<!-- <module name="org.springframework.spring" optional="true" /> -->
</dependencies>
</module>
Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/server/integration/main/module.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/server/integration/main/module.xml 2011-03-25 05:12:30 UTC (rev 13939)
+++ stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/server/integration/main/module.xml 2011-03-25 10:14:36 UTC (rev 13940)
@@ -36,34 +36,48 @@
<module name="org.jboss.ws.jaxws-client" services="export" export="true">
<imports>
<include path="META-INF/cxf"/>
+ <include path="META-INF"/>
</imports>
<exports>
<include path="META-INF/cxf"/>
+ <include path="META-INF"/>
</exports>
</module>
<module name="org.jboss.ws.cxf.jbossws-cxf-factories" services="export" export="true"/>
<module name="org.jboss.ws.cxf.jbossws-cxf-transports-httpserver" export="true">
<imports>
<include path="META-INF/cxf"/>
+ <include path="META-INF"/>
</imports>
<exports>
<include path="META-INF/cxf"/>
+ <include path="META-INF"/>
</exports>
</module>
<module name="org.jboss.ws.cxf.jbossws-cxf-server" services="export" export="true"/>
<module name="org.apache.cxf" services="export" export="true">
<imports>
<include path="META-INF/cxf"/>
- <include path="META-INF/spring.*"/>
+ <include path="META-INF"/>
</imports>
<exports>
<include path="META-INF/cxf"/>
- <include path="META-INF/spring.*"/>
+ <include path="META-INF"/>
</exports>
</module>
<module name="org.apache.xalan" services="export" export="true"/>
<module name="org.apache.xerces" services="export" export="true"/>
<module name="org.jboss.as.webservices" services="export" export="true"/>
<module name="com.sun.xml.messaging.saaj" services="export" export="true"/>
+ <module name="org.apache.ws.security" export="true"/>
+ <module name="org.apache.santuario.xmlsec" export="true"/>
+<!-- <module name="org.springframework.spring" optional="true" export="true">
+ <imports>
+ <include path="META-INF"/>
+ </imports>
+ <exports>
+ <include path="META-INF"/>
+ </exports>
+ </module> -->
</dependencies>
</module>
Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml 2011-03-25 05:12:30 UTC (rev 13939)
+++ stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml 2011-03-25 10:14:36 UTC (rev 13940)
@@ -44,16 +44,18 @@
<module name="org.apache.cxf" services="import">
<imports>
<include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF -->
- <include path="META-INF/spring.*"/>
+ <include path="META-INF/"/>
</imports>
</module>
<module name="org.jboss.ws.cxf.jbossws-cxf-transports-httpserver" services="import">
<imports>
<include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF -->
- <include path="META-INF/spring.*"/>
+ <include path="META-INF/"/>
</imports>
</module>
<module name="org.jboss.common-core" />
<module name="org.jboss.logging" />
+ <module name="org.apache.ws.security" />
+<!-- <module name="org.springframework.spring" optional="true" /> -->
</dependencies>
</module>
Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/jaxws-client/main/module.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/jaxws-client/main/module.xml 2011-03-25 05:12:30 UTC (rev 13939)
+++ stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/jaxws-client/main/module.xml 2011-03-25 10:14:36 UTC (rev 13940)
@@ -33,22 +33,24 @@
<module name="javax.xml.bind.api" />
<module name="com.sun.xml.bind" services="import"/>
<module name="javax.xml.ws.api" />
+ <module name="org.jboss.ws.api" />
<module name="org.jboss.ws.spi" />
<module name="org.jboss.ws.common" />
<module name="org.jboss.ws.cxf.jbossws-cxf-factories" services="import"/>
<module name="org.apache.cxf" services="import">
<imports>
<include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF -->
- <include path="META-INF/spring.*"/>
+ <include path="META-INF/"/>
</imports>
</module>
<module name="org.jboss.ws.cxf.jbossws-cxf-transports-httpserver" services="import">
<imports>
<include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF -->
- <include path="META-INF/spring.*"/>
+ <include path="META-INF/"/>
</imports>
</module>
<module name="org.apache.neethi" />
<module name="org.jboss.logging" />
+<!-- <module name="org.springframework.spring" optional="true" /> -->
</dependencies>
</module>
Deleted: stack/cxf/trunk/modules/resources/src/main/resources/modules/org/springframework/spring/main/module.xml
===================================================================
--- stack/cxf/branches/spring-as7/modules/resources/src/main/resources/modules/org/springframework/spring/main/module.xml 2011-03-11 18:26:03 UTC (rev 13889)
+++ stack/cxf/trunk/modules/resources/src/main/resources/modules/org/springframework/spring/main/module.xml 2011-03-25 10:14:36 UTC (rev 13940)
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- ~ JBoss, Home of Professional Open Source.
- ~ Copyright 2011, 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.springframework.spring">
-
- <resources>
- <!-- Insert resources here -->
- </resources>
-
- <dependencies>
- <module name="javax.api" />
- <module name="javax.annotation.api" />
- <module name="org.apache.commons.logging" />
- </dependencies>
-</module>
Copied: stack/cxf/trunk/modules/resources/src/main/resources/modules/org/springframework/spring/main/module.xml (from rev 13889, stack/cxf/branches/spring-as7/modules/resources/src/main/resources/modules/org/springframework/spring/main/module.xml)
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/modules/org/springframework/spring/main/module.xml (rev 0)
+++ stack/cxf/trunk/modules/resources/src/main/resources/modules/org/springframework/spring/main/module.xml 2011-03-25 10:14:36 UTC (rev 13940)
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ~ JBoss, Home of Professional Open Source.
+ ~ Copyright 2011, 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.springframework.spring">
+
+ <resources>
+ <!-- Insert resources here -->
+ </resources>
+
+ <dependencies>
+ <module name="javax.api" />
+ <module name="javax.annotation.api" />
+ <module name="org.apache.commons.logging" />
+ </dependencies>
+</module>
Modified: stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2011-03-25 05:12:30 UTC (rev 13939)
+++ stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2011-03-25 10:14:36 UTC (rev 13940)
@@ -391,6 +391,7 @@
<fileset dir="@{thirdpartydir}/modules">
<include name="**/module.xml"/>
<exclude name="**/jboss/as/webservices/**/module.xml"/>
+ <exclude name="**/spring/**/module.xml"/>
</fileset>
</installModules>
<copy toDir="@{targetdir}">
@@ -445,6 +446,25 @@
<!-- Install Spring -->
<!-- ================================================================== -->
+ <macrodef name="macro-install-spring-modules">
+ <attribute name="thirdpartydir"/>
+ <attribute name="targetdir"/>
+ <sequential>
+ <!-- libraries -->
+ <copy todir="@{targetdir}/org/springframework/spring/main" flatten="false" overwrite="true">
+ <fileset dir="@{thirdpartydir}/lib">
+ <include name="**/spring-*.jar"/>
+ </fileset>
+ </copy>
+ <!-- module.xml files -->
+ <installModules targetDir="@{targetdir}">
+ <fileset dir="@{thirdpartydir}/modules">
+ <include name="**/spring/**/module.xml"/>
+ </fileset>
+ </installModules>
+ </sequential>
+ </macrodef>
+
<macrodef name="macro-install-spring">
<attribute name="thirdpartydir"/>
<attribute name="targetdir"/>
@@ -463,6 +483,12 @@
<macro-install-spring targetdir="${installserver}/common/lib" thirdpartydir="${thirdpartydir}"/>
</target>
+ <target name="deploy-spring-module">
+ <fail message="installserver must be specified" unless="installserver"/>
+ <fail message="thirdpartydir must be specified" unless="thirdpartydir"/>
+ <macro-install-spring-modules targetdir="${installserver}/modules" thirdpartydir="${thirdpartydir}"/>
+ </target>
+
<!-- ================================================================== -->
<!-- Undeploy JBossWS -->
<!-- ================================================================== -->
Modified: stack/cxf/trunk/modules/resources/src/main/resources/resources/modules-deploy.conf
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/resources/modules-deploy.conf 2011-03-25 05:12:30 UTC (rev 13939)
+++ stack/cxf/trunk/modules/resources/src/main/resources/resources/modules-deploy.conf 2011-03-25 10:14:36 UTC (rev 13940)
@@ -1 +1 @@
-org/apache/cxf/**, org/apache/neethi/**, org/apache/ws/commons/xmlschema/**, org/jboss/ws/cxf/**, org/jboss/ws/**
\ No newline at end of file
+org/apache/cxf/**, org/apache/neethi/**, org/apache/ws/commons/xmlschema/**, org/jboss/ws/cxf/**, org/jboss/ws/**, org/springframework/spring/**
\ No newline at end of file
Copied: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SecurityActions.java (from rev 13889, stack/cxf/branches/spring-as7/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SecurityActions.java)
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SecurityActions.java (rev 0)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SecurityActions.java 2011-03-25 10:14:36 UTC (rev 13940)
@@ -0,0 +1,82 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.wsf.stack.cxf.configuration;
+
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+
+/**
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 22-Feb-2011
+ *
+ */
+class SecurityActions
+{
+ /**
+ * Get context classloader.
+ *
+ * @return the current context classloader
+ */
+ static ClassLoader getContextClassLoader()
+ {
+ SecurityManager sm = System.getSecurityManager();
+ if (sm == null)
+ {
+ return Thread.currentThread().getContextClassLoader();
+ }
+ else
+ {
+ return AccessController.doPrivileged(new PrivilegedAction<ClassLoader>() {
+ public ClassLoader run()
+ {
+ return Thread.currentThread().getContextClassLoader();
+ }
+ });
+ }
+ }
+
+ /**
+ * 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;
+ }
+ });
+ }
+ }
+
+}
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringBusHolder.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringBusHolder.java 2011-03-25 05:12:30 UTC (rev 13939)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringBusHolder.java 2011-03-25 10:14:36 UTC (rev 13940)
@@ -34,6 +34,7 @@
import org.apache.cxf.resource.ResourceResolver;
import org.apache.cxf.transport.DestinationFactory;
import org.apache.cxf.transport.servlet.ServletTransportFactory;
+import org.apache.ws.security.WSSConfig;
import org.jboss.logging.Logger;
import org.jboss.wsf.spi.binding.BindingCustomization;
import org.jboss.wsf.spi.deployment.Endpoint;
@@ -133,6 +134,20 @@
}
}
}
+ //try early configuration of xmlsec engine through WSS4J to avoid doing this
+ //later when the TCCL won't have visibility over the xmlsec internals
+ try
+ {
+ WSSConfig.getNewInstance();
+ }
+ catch (Exception e)
+ {
+ log.warn("Could not early initialize security engine!");
+ if (log.isTraceEnabled())
+ {
+ log.trace("Error while getting default WSSConfig: ", e);
+ }
+ }
configured = true;
}
@@ -159,7 +174,7 @@
GenericApplicationContext childCtx = new GenericApplicationContext(ctx);
XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(childCtx);
reader.setValidationMode(XmlBeanDefinitionReader.VALIDATION_XSD);
- reader.setNamespaceHandlerResolver(new NamespaceHandlerResolver());
+ reader.setNamespaceHandlerResolver(new NamespaceHandlerResolver(SecurityActions.getContextClassLoader()));
reader.loadBeanDefinitions(new InputStreamResource(is));
childCtx.refresh();
return childCtx;
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java 2011-03-25 05:12:30 UTC (rev 13939)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java 2011-03-25 10:14:36 UTC (rev 13940)
@@ -36,6 +36,7 @@
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.ResourceResolver;
import org.jboss.wsf.stack.cxf.client.configuration.JBossWSBusFactory;
+import org.jboss.wsf.stack.cxf.client.util.DelegateClassLoader;
import org.jboss.wsf.stack.cxf.configuration.BusHolder;
import org.jboss.wsf.stack.cxf.configuration.NonSpringBusHolder;
import org.jboss.wsf.stack.cxf.configuration.SpringBusHolder;
@@ -63,8 +64,6 @@
BusFactory.setThreadDefaultBus(null);
ArchiveDeployment aDep = (ArchiveDeployment) dep;
- //set the runtime classloader (pointing to the deployment unit) to allow CXF accessing to the classes
- SecurityActions.setContextClassLoader(dep.getRuntimeClassLoader());
ResourceResolver deploymentResolver = aDep.getResourceResolver();
org.apache.cxf.resource.ResourceResolver resolver = new JBossWSResourceResolver(deploymentResolver);
@@ -72,6 +71,8 @@
String jbosswsCxfXml = contextParams == null ? null : contextParams.get(BusHolder.PARAM_CXF_BEANS_URL);
BusHolder holder = null;
+ //set the runtime classloader (pointing to the deployment unit) to allow CXF accessing to the classes
+ SecurityActions.setContextClassLoader(dep.getRuntimeClassLoader());
if (jbosswsCxfXml != null) // Spring available
{
URL cxfServletURL = null;
@@ -114,6 +115,8 @@
}
}
+
+
@Override
public void start(Deployment dep)
{
Property changes on: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java
___________________________________________________________________
Deleted: svn:mergeinfo
-
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/spring/handler/NamespaceHandlerResolver.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/spring/handler/NamespaceHandlerResolver.java 2011-03-25 05:12:30 UTC (rev 13939)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/spring/handler/NamespaceHandlerResolver.java 2011-03-25 10:14:36 UTC (rev 13940)
@@ -62,6 +62,7 @@
public NamespaceHandlerResolver(ClassLoader classLoader)
{
super(classLoader);
+ this.loader = (classLoader != null ? classLoader : ClassUtils.getDefaultClassLoader());
}
public NamespaceHandlerResolver(ClassLoader classLoader, String handlerMappingsLocation)
Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/pom.xml 2011-03-25 05:12:30 UTC (rev 13939)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/pom.xml 2011-03-25 10:14:36 UTC (rev 13940)
@@ -29,6 +29,12 @@
<groupId>org.picketbox</groupId>
<artifactId>picketbox-bare</artifactId>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2011-03-25 05:12:30 UTC (rev 13939)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2011-03-25 10:14:36 UTC (rev 13940)
@@ -869,6 +869,8 @@
<exclude>org/jboss/test/ws/jaxws/samples/webserviceref/**</exclude>
<exclude>org/jboss/test/ws/jaxws/samples/webservicerefsec/**</exclude>
<exclude>org/jboss/test/ws/jaxws/samples/securityDomain/**</exclude>
+ <!-- @SecurityDomain missing -->
+ <exclude>org/jboss/test/ws/jaxws/samples/wsseEJB/EjbEndpointImpl*</exclude>
</testExcludes>
</configuration>
<goals>
@@ -978,6 +980,7 @@
<exclude>org/jboss/test/ws/jaxws/cxf/jbws3060/*EJB3*</exclude>
<exclude>org/jboss/test/ws/jaxws/cxf/logging/**</exclude>
<exclude>org/jboss/test/ws/projectGenerator/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/samples/wsseEJB/WsseEjbTestCase*</exclude>
<!-- # [JBWS-3219] unexpected element 'security-domain' encountered -->
<exclude>org/jboss/test/ws/jaxws/jbws2307/**</exclude>
@@ -1000,6 +1003,7 @@
<!-- # [JBWS-3226] jboss-service.xml not matching AS7 format -->
<exclude>org/jboss/test/ws/jaxws/jbws1854/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/samples/wsseDigest/UsernameDigestTestCase*</exclude>
<!-- # [JBWS-3227] handles config file not found on classpath -->
<exclude>org/jboss/test/ws/jaxws/jbws3034/**</exclude>
@@ -1016,9 +1020,18 @@
<!-- # [JBWS-3234] JNDI over RMI not available on AS7 -->
<exclude>org/jboss/test/ws/jaxws/samples/serviceref/**</exclude>
+
+ <!-- # [JBWS-3248] Unable to lookup AuthenticationManager using JNDI -->
+ <exclude>org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationTestCase*</exclude>
+
+ <!-- # [JBWS-3249] Restore UsernameAuthorizationCustomFileTestCase on AS7 -->
+ <exclude>org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationCustomFileTestCase*</exclude>
<!-- JAXR not available -->
<exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude>
+
+ <!-- @WebServiceRef not implemented yet on AS7 -->
+ <exclude>org/jboss/test/ws/jaxws/cxf/webserviceref/WebServiceRefServletTestCase*</exclude>
<!-- JAXRPC deployments -->
<exclude>org/jboss/test/ws/jaxrpc/**</exclude>
13 years, 11 months
- 1
- 0
JBossWS SVN: r13939 - stack/native/tags.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2011-03-25 01:12:30 -0400 (Fri, 25 Mar 2011)
New Revision: 13939
Added:
stack/native/tags/jbossws-native-3.4.0.SP1/
Log:
Tag 3.4.0.SP1
13 years, 11 months
- 1
- 0
JBossWS SVN: r13938 - stack/native/tags.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2011-03-25 01:11:15 -0400 (Fri, 25 Mar 2011)
New Revision: 13938
Removed:
stack/native/tags/jbossws-native-3.4.0.SP1/
Log:
Remove tag
13 years, 11 months
- 1
- 0
JBossWS SVN: r13937 - stack/native/branches/jbossws-native-3.4.0.SP1/modules/core/src/main/java/org/jboss/ws/core/soap.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2011-03-25 01:07:03 -0400 (Fri, 25 Mar 2011)
New Revision: 13937
Modified:
stack/native/branches/jbossws-native-3.4.0.SP1/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPElementImpl.java
Log:
Minor change:format code
Modified: stack/native/branches/jbossws-native-3.4.0.SP1/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPElementImpl.java
===================================================================
--- stack/native/branches/jbossws-native-3.4.0.SP1/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPElementImpl.java 2011-03-25 05:05:57 UTC (rev 13936)
+++ stack/native/branches/jbossws-native-3.4.0.SP1/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPElementImpl.java 2011-03-25 05:07:03 UTC (rev 13937)
@@ -187,7 +187,7 @@
*/
public SOAPElement addChildElement(String name) throws SOAPException
{
- Name nameImp = new NameImpl(name);
+ Name nameImp = new NameImpl(name);
return addChildElement(nameImp);
}
@@ -220,8 +220,8 @@
*/
public SOAPElement addChildElement(String localName, String prefix, String uri) throws SOAPException
{
- Name nameImpl = new NameImpl(localName, prefix, uri);
- return addChildElement(nameImpl);
+ Name nameImpl = new NameImpl(localName, prefix, uri);
+ return addChildElement(nameImpl);
}
/**
@@ -232,18 +232,19 @@
* @throws javax.xml.soap.SOAPException if there is an error in creating the SOAPElement object
*/
public SOAPElement addChildElement(Name name) throws SOAPException
- {
- Document doc = this.element.getOwnerDocument();
- Element childEle = null;
- if (name.getPrefix() == null || name.getPrefix().length() == 0)
- {
- childEle = doc.createElementNS(name.getURI(), name.getLocalName());
- } else
- {
- childEle = doc.createElementNS(name.getURI(), name.getPrefix() + ":" + name.getLocalName());
- }
-
- SOAPElement child = new SOAPElementImpl(childEle);
+ {
+ Document doc = this.element.getOwnerDocument();
+ Element childEle = null;
+ if (name.getPrefix() == null || name.getPrefix().length() == 0)
+ {
+ childEle = doc.createElementNS(name.getURI(), name.getLocalName());
+ }
+ else
+ {
+ childEle = doc.createElementNS(name.getURI(), name.getPrefix() + ":" + name.getLocalName());
+ }
+
+ SOAPElement child = new SOAPElementImpl(childEle);
return addChildElement(child);
}
13 years, 11 months
- 1
- 0
JBossWS SVN: r13936 - stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2011-03-25 01:05:57 -0400 (Fri, 25 Mar 2011)
New Revision: 13936
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPElementImpl.java
Log:
[JBWS-3251]:directly use element's owner document to create child
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPElementImpl.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPElementImpl.java 2011-03-25 04:49:52 UTC (rev 13935)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPElementImpl.java 2011-03-25 05:05:57 UTC (rev 13936)
@@ -75,7 +75,7 @@
public SOAPElementImpl(String localPart, String prefix, String nsURI)
{
super(DOMUtils.createElement(localPart, prefix, nsURI));
- this.element = (Element)domNode;
+ this.element = (Element)domNode;
}
/** Called by SOAPFactory */
@@ -83,6 +83,13 @@
{
this(name.getLocalName(), name.getPrefix(), name.getURI());
}
+
+ /** Called by addChild */
+ private SOAPElementImpl(Element element)
+ {
+ super(element);
+ this.element = element;
+ }
/** Called by SOAPFactory */
public SOAPElementImpl(QName qname)
@@ -180,9 +187,8 @@
*/
public SOAPElement addChildElement(String name) throws SOAPException
{
- SOAPElement soapElement = new SOAPElementImpl(name);
- soapElement = addChildElement(soapElement);
- return soapElement;
+ Name nameImp = new NameImpl(name);
+ return addChildElement(nameImp);
}
/**
@@ -199,9 +205,8 @@
if (nsURI == null)
throw new IllegalArgumentException("Cannot obtain namespace URI for prefix: " + prefix);
- SOAPElement soapElement = new SOAPElementImpl(localName, prefix, nsURI);
- soapElement = addChildElement(soapElement);
- return soapElement;
+ Name nameImp = new NameImpl(localName, prefix, nsURI);
+ return addChildElement(nameImp);
}
/**
@@ -215,9 +220,8 @@
*/
public SOAPElement addChildElement(String localName, String prefix, String uri) throws SOAPException
{
- SOAPElement soapElement = new SOAPElementImpl(localName, prefix, uri);
- soapElement = addChildElement(soapElement);
- return soapElement;
+ Name nameImpl = new NameImpl(localName, prefix, uri);
+ return addChildElement(nameImpl);
}
/**
@@ -229,9 +233,19 @@
*/
public SOAPElement addChildElement(Name name) throws SOAPException
{
- SOAPElement soapElement = new SOAPElementImpl(name);
- soapElement = addChildElement(soapElement);
- return soapElement;
+ Document doc = this.element.getOwnerDocument();
+ Element childEle = null;
+ if (name.getPrefix() == null || name.getPrefix().length() == 0)
+ {
+ childEle = doc.createElementNS(name.getURI(), name.getLocalName());
+ }
+ else
+ {
+ childEle = doc.createElementNS(name.getURI(), name.getPrefix() + ":" + name.getLocalName());
+ }
+
+ SOAPElement child = new SOAPElementImpl(childEle);
+ return addChildElement(child);
}
public SOAPElement addChildElement(QName qname) throws SOAPException
13 years, 11 months
- 1
- 0