April 2013 - jbossws-commits - Jboss List Archives

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

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2013-04-30 08:59:22 -0400 (Tue, 30 Apr 2013) New Revision: 17526 Modified: stack/cxf/trunk/modules/testsuite/pom.xml Log: [JBWS-3620] Restoring some passing tests Modified: stack/cxf/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/pom.xml 2013-04-30 12:55:51 UTC (rev 17525) +++ stack/cxf/trunk/modules/testsuite/pom.xml 2013-04-30 12:59:22 UTC (rev 17526) @@ -835,8 +835,6 @@ <exclude>org/jboss/test/ws/jaxws/jbws2978/**</exclude>  - <exclude>org/jboss/test/ws/jaxws/samples/securityDomain/PermitAllTestCase*</exclude> - <exclude>org/jboss/test/ws/jaxws/samples/webservicerefsec/WebServiceRefSecTestCase*</exclude> <exclude>org/jboss/test/ws/jaxws/cxf/httpauth/HelloDigestTestCase*</exclude>

11 years, 8 months

1
0
0 / 0

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

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2013-04-30 08:55:51 -0400 (Tue, 30 Apr 2013) New Revision: 17525 Modified: stack/cxf/trunk/modules/testsuite/pom.xml Log: [AS7-537] Enabling test Modified: stack/cxf/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/pom.xml 2013-04-30 11:15:18 UTC (rev 17524) +++ stack/cxf/trunk/modules/testsuite/pom.xml 2013-04-30 12:55:51 UTC (rev 17525) @@ -841,9 +841,6 @@  <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustPicketLinkTestCase*</exclude> - -  - <exclude>org/jboss/test/ws/jaxws/cxf/noIntegration/AS7537TestCase**</exclude> </excludes> </configuration> </plugin>

11 years, 8 months

1
0
0 / 0

JBossWS SVN: r17524 - stack/cxf/trunk/modules/dist/src/main/distro.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2013-04-30 07:15:18 -0400 (Tue, 30 Apr 2013) New Revision: 17524 Modified: stack/cxf/trunk/modules/dist/src/main/distro/build.xml Log: [JBWS-3627] Fix classpath in binary distro testsuites Modified: stack/cxf/trunk/modules/dist/src/main/distro/build.xml =================================================================== --- stack/cxf/trunk/modules/dist/src/main/distro/build.xml 2013-04-30 10:03:32 UTC (rev 17523) +++ stack/cxf/trunk/modules/dist/src/main/distro/build.xml 2013-04-30 11:15:18 UTC (rev 17524) @@ -88,6 +88,7 @@ <include name="**/jbossws*.jar"/> <exclude name="**/jbossws-native-services.jar"/> <exclude name="**/jbossws-jboss*.jar"/> + <exclude name="**/jbossws-wildfly*.jar"/> </fileset> <fileset dir="${thirdparty.dir}"> <exclude name="**/jbossws*.jar"/>

11 years, 8 months

1
0
0 / 0

JBossWS SVN: r17523 - in hudson/trunk/hudson-home: jobs and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2013-04-30 06:03:32 -0400 (Tue, 30 Apr 2013) New Revision: 17523 Removed: hudson/trunk/hudson-home/jobs/NATIVE-CORE-AS-8.0.0-SUN-JDK-6/ Modified: hudson/trunk/hudson-home/config.xml hudson/trunk/hudson-home/jobs/NATIVE-LIGHT/config.xml Log: Removing native core job run against AS8, JAXRPC pruned from EE7 Modified: hudson/trunk/hudson-home/config.xml =================================================================== --- hudson/trunk/hudson-home/config.xml 2013-04-29 14:47:21 UTC (rev 17522) +++ hudson/trunk/hudson-home/config.xml 2013-04-30 10:03:32 UTC (rev 17523) @@ -76,7 +76,6 @@ <no-comparator/> <string>NATIVE-LIGHT</string> <string>NATIVE-CORE-AS-7.2.0-SUN-JDK-6</string> - <string>NATIVE-CORE-AS-8.0.0-SUN-JDK-6</string> </jobNames> <name>Native Tests</name> <description> @@ -154,7 +153,6 @@ <string>CXF-BINDIST-AS-8.0.0-SPRING-SUN-JDK-6</string> <string>NATIVE-LIGHT</string> <string>NATIVE-CORE-AS-7.2.0-SUN-JDK-6</string> - <string>NATIVE-CORE-AS-8.0.0-SUN-JDK-6</string> </jobNames> <name>Working Days Tests</name> <description> Modified: hudson/trunk/hudson-home/jobs/NATIVE-LIGHT/config.xml =================================================================== --- hudson/trunk/hudson-home/jobs/NATIVE-LIGHT/config.xml 2013-04-29 14:47:21 UTC (rev 17522) +++ hudson/trunk/hudson-home/jobs/NATIVE-LIGHT/config.xml 2013-04-30 10:03:32 UTC (rev 17523) @@ -5,8 +5,6 @@ <hudson.tasks.BuildTrigger> <childProjects> NATIVE-CORE-AS-7.2.0-SUN-JDK-6 - -, NATIVE-CORE-AS-8.0.0-SUN-JDK-6 </childProjects> <threshold> <name>UNSTABLE</name>

11 years, 8 months

1
0
0 / 0

JBossWS SVN: r17522 - in hudson/trunk: hudson-home/jobs/CXF-BINDIST-AS-8.0.0-SPRING-SUN-JDK-6 and 5 other directories.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2013-04-29 10:47:21 -0400 (Mon, 29 Apr 2013) New Revision: 17522 Modified: hudson/trunk/ant.properties.example hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-8.0.0-SPRING-SUN-JDK-6/config.xml hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-8.0.0-SUN-JDK-6/config.xml hudson/trunk/hudson-home/jobs/CXF-CORE-AS-8.0.0-SPRING-SUN-JDK-6/config.xml hudson/trunk/hudson-home/jobs/CXF-CORE-AS-8.0.0-SUN-JDK-6/config.xml hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-8.0.0-SPRING-SUN-JDK-6/config.xml hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-8.0.0-SUN-JDK-6/config.xml Log: [JBWS-3627] JBoss AS -> WildFly Modified: hudson/trunk/ant.properties.example =================================================================== --- hudson/trunk/ant.properties.example 2013-04-29 14:36:24 UTC (rev 17521) +++ hudson/trunk/ant.properties.example 2013-04-29 14:47:21 UTC (rev 17522) @@ -32,8 +32,8 @@ hudson.jboss720.build=jboss-as-7.2.0.Final hudson.jboss720.rev=7.2.0.Final-prerelease1 -hudson.jboss800.url=https://github.com/jbossas/jboss-as -hudson.jboss800.build=jboss-as-8.0.0.Alpha1-SNAPSHOT +hudson.jboss800.url=https://github.com/wildfly/wildfly +hudson.jboss800.build=wildfly-8.0.0.Alpha1-SNAPSHOT hudson.jboss800.rev=master hudson.mail.recipients= Modified: hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-8.0.0-SPRING-SUN-JDK-6/config.xml =================================================================== --- hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-8.0.0-SPRING-SUN-JDK-6/config.xml 2013-04-29 14:36:24 UTC (rev 17521) +++ hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-8.0.0-SPRING-SUN-JDK-6/config.xml 2013-04-29 14:47:21 UTC (rev 17522) @@ -14,7 +14,7 @@ SCRIPTS_DIR=$WORKSPACE/hudson-scripts STACK_DIR=$WORKSPACE/stack-cxf TEST_OPTS= -JBOSS_TARGET=jboss800 +JBOSS_TARGET=wildfly800 JBOSS_BIND_ADDRESS=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-8.0.0/workspace/build/target/(a)hudson.jboss800.build@ Modified: hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-8.0.0-SUN-JDK-6/config.xml =================================================================== --- hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-8.0.0-SUN-JDK-6/config.xml 2013-04-29 14:36:24 UTC (rev 17521) +++ hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-8.0.0-SUN-JDK-6/config.xml 2013-04-29 14:47:21 UTC (rev 17522) @@ -14,7 +14,7 @@ SCRIPTS_DIR=$WORKSPACE/hudson-scripts STACK_DIR=$WORKSPACE/stack-cxf TEST_OPTS= -JBOSS_TARGET=jboss800 +JBOSS_TARGET=wildfly800 JBOSS_BIND_ADDRESS=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-8.0.0/workspace/build/target/(a)hudson.jboss800.build@ Modified: hudson/trunk/hudson-home/jobs/CXF-CORE-AS-8.0.0-SPRING-SUN-JDK-6/config.xml =================================================================== --- hudson/trunk/hudson-home/jobs/CXF-CORE-AS-8.0.0-SPRING-SUN-JDK-6/config.xml 2013-04-29 14:36:24 UTC (rev 17521) +++ hudson/trunk/hudson-home/jobs/CXF-CORE-AS-8.0.0-SPRING-SUN-JDK-6/config.xml 2013-04-29 14:47:21 UTC (rev 17522) @@ -14,7 +14,7 @@ SCRIPTS_DIR=$WORKSPACE/hudson-scripts STACK_DIR=$WORKSPACE/stack-cxf TEST_OPTS= -JBOSS_TARGET=jboss800 +JBOSS_TARGET=wildfly800 JBOSS_BIND_ADDRESS=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-8.0.0/workspace/build/target/(a)hudson.jboss800.build@ Modified: hudson/trunk/hudson-home/jobs/CXF-CORE-AS-8.0.0-SUN-JDK-6/config.xml =================================================================== --- hudson/trunk/hudson-home/jobs/CXF-CORE-AS-8.0.0-SUN-JDK-6/config.xml 2013-04-29 14:36:24 UTC (rev 17521) +++ hudson/trunk/hudson-home/jobs/CXF-CORE-AS-8.0.0-SUN-JDK-6/config.xml 2013-04-29 14:47:21 UTC (rev 17522) @@ -14,7 +14,7 @@ SCRIPTS_DIR=$WORKSPACE/hudson-scripts STACK_DIR=$WORKSPACE/stack-cxf TEST_OPTS= -JBOSS_TARGET=jboss800 +JBOSS_TARGET=wildfly800 JBOSS_BIND_ADDRESS=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-8.0.0/workspace/build/target/(a)hudson.jboss800.build@ Modified: hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-8.0.0-SPRING-SUN-JDK-6/config.xml =================================================================== --- hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-8.0.0-SPRING-SUN-JDK-6/config.xml 2013-04-29 14:36:24 UTC (rev 17521) +++ hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-8.0.0-SPRING-SUN-JDK-6/config.xml 2013-04-29 14:47:21 UTC (rev 17522) @@ -14,7 +14,7 @@ SCRIPTS_DIR=$WORKSPACE/hudson-scripts STACK_DIR=$WORKSPACE/stack-cxf TEST_OPTS= -JBOSS_TARGET=jboss800 +JBOSS_TARGET=wildfly800 JBOSS_BIND_ADDRESS=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-8.0.0/workspace/build/target/(a)hudson.jboss800.build@ Modified: hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-8.0.0-SUN-JDK-6/config.xml =================================================================== --- hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-8.0.0-SUN-JDK-6/config.xml 2013-04-29 14:36:24 UTC (rev 17521) +++ hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-8.0.0-SUN-JDK-6/config.xml 2013-04-29 14:47:21 UTC (rev 17522) @@ -14,7 +14,7 @@ SCRIPTS_DIR=$WORKSPACE/hudson-scripts STACK_DIR=$WORKSPACE/stack-cxf TEST_OPTS= -JBOSS_TARGET=jboss800 +JBOSS_TARGET=wildfly800 JBOSS_BIND_ADDRESS=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-8.0.0/workspace/build/target/(a)hudson.jboss800.build@

11 years, 8 months

1
0
0 / 0

JBossWS SVN: r17521 - in stack/cxf/trunk: modules/dist and 10 other directories.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2013-04-29 10:36:24 -0400 (Mon, 29 Apr 2013) New Revision: 17521 Added: stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/ stack/cxf/trunk/modules/testsuite/src/test/resources/wildfly800/ Removed: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/jboss/as/webservices/server/jaxrpc-integration/ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/jboss/ws/native/ stack/cxf/trunk/modules/testsuite/src/test/resources/jboss800/ Modified: stack/cxf/trunk/build.xml stack/cxf/trunk/modules/dist/pom.xml stack/cxf/trunk/modules/dist/src/main/distro/Install.txt stack/cxf/trunk/modules/dist/src/main/distro/ant.properties.example stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml stack/cxf/trunk/modules/dist/src/main/distro/build-setup.xml stack/cxf/trunk/modules/dist/src/main/distro/build.xml stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml stack/cxf/trunk/modules/resources/pom.xml stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/noIntegration/embedded/WEB-INF/jboss-deployment-structure.xml stack/cxf/trunk/modules/testsuite/pom.xml stack/cxf/trunk/pom.xml Log: [JBWS-3627] JBoss AS -> WildFly Modified: stack/cxf/trunk/build.xml =================================================================== --- stack/cxf/trunk/build.xml 2013-04-29 14:32:18 UTC (rev 17520) +++ stack/cxf/trunk/build.xml 2013-04-29 14:36:24 UTC (rev 17521) @@ -77,12 +77,12 @@ <condition property="jboss720.home" value="${profiles.profile.properties.jboss720.home}"> <isset property="profiles.profile.properties.jboss720.home"/> </condition> - <condition property="jboss800.home" value="${profiles.profile.properties.jboss800.home}"> - <isset property="profiles.profile.properties.jboss800.home"/> + <condition property="wildfly800.home" value="${profiles.profile.properties.wildfly800.home}"> + <isset property="profiles.profile.properties.wildfly800.home"/> </condition> - <fail message="jboss home not set, jboss712.home=value, jboss713.home=value, jboss720.home=value or jboss800.home=value to set"> + <fail message="Application server home not set, jboss712.home=value, jboss713.home=value, jboss720.home=value or wildfly800.home=value to set"> <condition> <and> <not> @@ -95,7 +95,7 @@ <isset property="jboss720.home"/> </not> <not> - <isset property="jboss800.home"/> + <isset property="wildfly800.home"/> </not> </and> </condition> @@ -105,7 +105,7 @@ <echo message="jboss712.home=${jboss712.home}"/> <echo message="jboss713.home=${jboss713.home}"/> <echo message="jboss720.home=${jboss720.home}"/> - <echo message="jboss800.home=${jboss800.home}"/> + <echo message="wildfly800.home=${wildfly800.home}"/> </target> <target name="init" depends="mvn-settings,prepare,os-init"> Modified: stack/cxf/trunk/modules/dist/pom.xml =================================================================== --- stack/cxf/trunk/modules/dist/pom.xml 2013-04-29 14:32:18 UTC (rev 17520) +++ stack/cxf/trunk/modules/dist/pom.xml 2013-04-29 14:36:24 UTC (rev 17521) @@ -53,7 +53,7 @@ <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf-resources</artifactId> <version>${project.version}</version> - <classifier>jboss800</classifier> + <classifier>wildfly800</classifier> </dependency> <dependency> @@ -208,8 +208,8 @@ <xslt style="${basedir}/src/main/distro/test-exclude.xsl" in="../testsuite/pom.xml" out="${basedir}/target/exclude-file/test-excludes-jboss720.txt"> <param name="targetName" expression="jboss720" /> </xslt> - <xslt style="${basedir}/src/main/distro/test-exclude.xsl" in="../testsuite/pom.xml" out="${basedir}/target/exclude-file/test-excludes-jboss800.txt"> - <param name="targetName" expression="jboss800" /> + <xslt style="${basedir}/src/main/distro/test-exclude.xsl" in="../testsuite/pom.xml" out="${basedir}/target/exclude-file/test-excludes-wildfly800.txt"> + <param name="targetName" expression="wildfly800" /> </xslt> </target> </configuration> Modified: stack/cxf/trunk/modules/dist/src/main/distro/Install.txt =================================================================== --- stack/cxf/trunk/modules/dist/src/main/distro/Install.txt 2013-04-29 14:32:18 UTC (rev 17520) +++ stack/cxf/trunk/modules/dist/src/main/distro/Install.txt 2013-04-29 14:36:24 UTC (rev 17521) @@ -16,7 +16,7 @@ ant deploy-jboss712 ant deploy-jboss713 ant deploy-jboss720 - ant deploy-jboss800 + ant deploy-wildfly800 By default Spring Framework libraries are not installed to application server. In order to do that, please add the -Dspring=true property option when Modified: stack/cxf/trunk/modules/dist/src/main/distro/ant.properties.example =================================================================== --- stack/cxf/trunk/modules/dist/src/main/distro/ant.properties.example 2013-04-29 14:32:18 UTC (rev 17520) +++ stack/cxf/trunk/modules/dist/src/main/distro/ant.properties.example 2013-04-29 14:36:24 UTC (rev 17521) @@ -6,9 +6,9 @@ jboss712.home=(a)jboss712.home@ jboss713.home=(a)jboss713.home@ jboss720.home=(a)jboss720.home@ -jboss800.home=(a)jboss800.home@ +wildfly800.home=(a)wildfly800.home@ -# The JBoss server under test. This can be [jboss712|jboss713|jboss720|jboss800] +# The JBoss server under test. This can be [jboss712|jboss713|jboss720|wildfly800] jbossws.integration.target=jboss713 # The JBoss settings Modified: stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml =================================================================== --- stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml 2013-04-29 14:32:18 UTC (rev 17520) +++ stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml 2013-04-29 14:36:24 UTC (rev 17521) @@ -180,10 +180,10 @@ </target>  -  +   - <target name="deploy-structure-jboss80x" depends="prepare-deploy"> + <target name="deploy-structure-wildfly80x" depends="prepare-deploy"> <delete dir="${deploy.structure}"/> <path id="jboss.ant.tasks.classpath"> @@ -204,10 +204,10 @@ <param name="installserver" value="${deploy.structure}/modules/system/layers/base"/> <param name="thirdpartydir" value="${deploy.artifacts.dir}"/> <param name="jbossid" value="${jbossws.integration.target}"/> - <param name="modules-jbossid" value="jboss800"/> + <param name="modules-jbossid" value="wildfly800"/> </antcall> <copy toDir="${deploy.structure}/modules/system/layers/base"> - <fileset dir="${deploy.artifacts.dir}/modules/jboss800"> + <fileset dir="${deploy.artifacts.dir}/modules/wildfly800"> <include name="**/jboss/as/webservices/main/module.xml"/> <include name="**/jboss/as/webservices/server/integration/main/module.xml"/> </fileset> @@ -215,32 +215,32 @@ </target>  -  +   - <target name="target-jboss800"> - <property name="jbossws.integration.target" value="jboss800"/> + <target name="target-wildfly800"> + <property name="jbossws.integration.target" value="wildfly800"/> <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/> </target> - <target name="deploy-jboss800" depends="undeploy-jboss800,deploy-structure-jboss80x,check-spring,install-spring-module80x" description="Deploy jbossws to jboss800"> - <fail message="Not available: ${jboss800.available.file}" unless="jboss800.available"/> - <copy todir="${jboss800.home}" overwrite="true" verbose="true"> + <target name="deploy-wildfly800" depends="undeploy-wildfly800,deploy-structure-wildfly80x,check-spring,install-spring-module80x" description="Deploy jbossws to wildfly800"> + <fail message="Not available: ${wildfly800.available.file}" unless="wildfly800.available"/> + <copy todir="${wildfly800.home}" overwrite="true" verbose="true"> <fileset dir="${deploy.structure}"> <exclude name="**/jboss/as/webservices/**/module.xml"/> </fileset> </copy>  - <installModules targetDir="${jboss800.home}/modules/system/layers/base/"> + <installModules targetDir="${wildfly800.home}/modules/system/layers/base/"> <fileset dir="${deploy.structure}/modules/system/layers/base"> <include name="**/jboss/as/webservices/**/module.xml"/> </fileset> </installModules> </target> - <target name="undeploy-jboss800" depends="target-jboss800,init" description="Remove jbossws from jboss800"> - <fail message="Not available: ${jboss800.available.file}" unless="jboss800.available"/> - <macro-undeploy-jbossws-modules targetdir="${jboss800.home}/modules/system/layers/base" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="false"/> + <target name="undeploy-wildfly800" depends="target-wildfly800,init" description="Remove jbossws from wildfly800"> + <fail message="Not available: ${wildfly800.available.file}" unless="wildfly800.available"/> + <macro-undeploy-jbossws-modules targetdir="${wildfly800.home}/modules/system/layers/base" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="false"/> </target>  @@ -274,7 +274,7 @@ <antcall target="deploy-spring-module" inheritall="false"> <param name="installserver" value="${deploy.structure}/modules/system/layers/base"/> <param name="thirdpartydir" value="${deploy.artifacts.dir}"/> - <param name="modules-jbossid" value="jboss800"/> + <param name="modules-jbossid" value="wildfly800"/> </antcall> </target> Modified: stack/cxf/trunk/modules/dist/src/main/distro/build-setup.xml =================================================================== --- stack/cxf/trunk/modules/dist/src/main/distro/build-setup.xml 2013-04-29 14:32:18 UTC (rev 17520) +++ stack/cxf/trunk/modules/dist/src/main/distro/build-setup.xml 2013-04-29 14:36:24 UTC (rev 17521) @@ -36,12 +36,12 @@ <property name="jboss712.available.file" value="${jboss712.home}/jboss-modules.jar"/> <property name="jboss713.available.file" value="${jboss713.home}/jboss-modules.jar"/> <property name="jboss720.available.file" value="${jboss720.home}/jboss-modules.jar"/> - <property name="jboss800.available.file" value="${jboss800.home}/jboss-modules.jar"/> + <property name="wildfly800.available.file" value="${wildfly800.home}/jboss-modules.jar"/> <available property="jboss712.available" file="${jboss712.available.file}"/> <available property="jboss713.available" file="${jboss713.available.file}"/> <available property="jboss720.available" file="${jboss720.available.file}"/> - <available property="jboss800.available" file="${jboss800.available.file}"/> + <available property="wildfly800.available" file="${wildfly800.available.file}"/> <tstamp> <format property="build.id" pattern="yyyyMMddHHmm"/> Modified: stack/cxf/trunk/modules/dist/src/main/distro/build.xml =================================================================== --- stack/cxf/trunk/modules/dist/src/main/distro/build.xml 2013-04-29 14:32:18 UTC (rev 17520) +++ stack/cxf/trunk/modules/dist/src/main/distro/build.xml 2013-04-29 14:36:24 UTC (rev 17521) @@ -70,9 +70,9 @@ </or> </condition> - <condition property="jbossws.integration.jboss80x" value="true"> + <condition property="jbossws.integration.wildfly80x" value="true"> <or> - <equals arg1="${jbossws.integration.target}" arg2="jboss800"/> + <equals arg1="${jbossws.integration.target}" arg2="wildfly800"/> </or> </condition> 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 2013-04-29 14:32:18 UTC (rev 17520) +++ stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2013-04-29 14:36:24 UTC (rev 17521) @@ -90,6 +90,7 @@ <unpack>false</unpack> <includes> <include>org.jboss.ws:jbossws-jboss*-tests-integration:jar</include> + <include>org.jboss.ws:jbossws-wildlfy*-tests-integration:jar</include> </includes> <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping> <scope>provided</scope> @@ -103,7 +104,7 @@ <includes> <include>org.jboss.as:jboss-as-webservices-tests-integration:jar</include> </includes> - <outputFileNameMapping>jbossws-jboss800-tests-integration.jar</outputFileNameMapping> + <outputFileNameMapping>jbossws-wildfly800-tests-integration.jar</outputFileNameMapping> <scope>provided</scope> <useProjectArtifact>false</useProjectArtifact> </dependencySet> @@ -113,6 +114,7 @@ <unpack>false</unpack> <includes> <include>org.jboss.ws:jbossws-jboss*-server-integration:jar</include> + <include>org.jboss.ws:jbossws-wildfly*-server-integration:jar</include> </includes> <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping> <scope>provided</scope> @@ -124,6 +126,7 @@ <unpack>false</unpack> <includes> <include>org.jboss.ws.cxf:jbossws-cxf-resources:jar:*:jboss*</include> + <include>org.jboss.ws.cxf:jbossws-cxf-resources:jar:*:wildfly*</include> </includes> <outputFileNameMapping>${artifact.artifactId}${dashClassifier}.${artifact.extension}</outputFileNameMapping> <useProjectArtifact>false</useProjectArtifact> Modified: stack/cxf/trunk/modules/resources/pom.xml =================================================================== --- stack/cxf/trunk/modules/resources/pom.xml 2013-04-29 14:32:18 UTC (rev 17520) +++ stack/cxf/trunk/modules/resources/pom.xml 2013-04-29 14:36:24 UTC (rev 17521) @@ -78,12 +78,12 @@ </configuration> </execution> <execution> - <id>jboss800</id> + <id>wildfly800</id> <goals><goal>jar</goal></goals> <phase>package</phase> <configuration> - <classifier>jboss800</classifier> - <classesDirectory>${project.build.directory}/classes/resources/jbossws-jboss800/jbossws.beans</classesDirectory> + <classifier>wildfly800</classifier> + <classesDirectory>${project.build.directory}/classes/resources/jbossws-wildfly800/jbossws.beans</classesDirectory> </configuration> </execution> </executions> Modified: stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml =================================================================== --- stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2013-04-29 14:32:18 UTC (rev 17520) +++ stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2013-04-29 14:36:24 UTC (rev 17521) @@ -58,7 +58,7 @@ <copy file="${src.dir}/jbossws-cxf-config-as8.xml" - tofile="${dest.dir}/jbossws-jboss800/jbossws.beans/META-INF/stack-specific-deployment-aspects.xml" + tofile="${dest.dir}/jbossws-wildfly800/jbossws.beans/META-INF/stack-specific-deployment-aspects.xml" /> </target> Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/noIntegration/embedded/WEB-INF/jboss-deployment-structure.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/noIntegration/embedded/WEB-INF/jboss-deployment-structure.xml 2013-04-29 14:32:18 UTC (rev 17520) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/noIntegration/embedded/WEB-INF/jboss-deployment-structure.xml 2013-04-29 14:36:24 UTC (rev 17521) @@ -3,6 +3,7 @@ <deployment> <exclude-subsystems> <subsystem name="webservices" /> + <subsystem name="weld" />  </exclude-subsystems>  <dependencies> Modified: stack/cxf/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/pom.xml 2013-04-29 14:32:18 UTC (rev 17520) +++ stack/cxf/trunk/modules/testsuite/pom.xml 2013-04-29 14:36:24 UTC (rev 17521) @@ -785,14 +785,14 @@ </profile>  <profile> - <id>jboss800</id> + <id>wildfly800</id> <properties> - <jboss.version>${jboss800.version}</jboss.version> - <jbossws.integration.target>jboss800</jbossws.integration.target> + <jboss.version>${wildfly800.version}</jboss.version> + <jbossws.integration.target>wildfly800</jbossws.integration.target> </properties> <dependencies> <dependency> Modified: stack/cxf/trunk/pom.xml =================================================================== --- stack/cxf/trunk/pom.xml 2013-04-29 14:32:18 UTC (rev 17520) +++ stack/cxf/trunk/pom.xml 2013-04-29 14:36:24 UTC (rev 17521) @@ -71,7 +71,7 @@ <jboss712.version>7.1.2.Final</jboss712.version> <jboss713.version>7.1.3.Final</jboss713.version> <jboss720.version>7.2.0.Final</jboss720.version> - <jboss800.version>8.0.0.Alpha1-SNAPSHOT</jboss800.version> + <wildfly800.version>8.0.0.Alpha1-SNAPSHOT</wildfly800.version> <ejb.api.version>1.0.1.Final</ejb.api.version> <cxf.version>2.7.4</cxf.version> <cxf.asm.version>3.3.1</cxf.asm.version> @@ -181,7 +181,7 @@ <dependency> <groupId>org.jboss.as</groupId> <artifactId>jboss-as-webservices-tests-integration</artifactId> - <version>${jboss800.version}</version> + <version>${wildfly800.version}</version> </dependency> <dependency> <groupId>org.jboss.ws.projects</groupId> @@ -1382,14 +1382,14 @@ </profile>  <profile> - <id>jboss800</id> + <id>wildfly800</id> <properties> - <jbossws.integration.target>jboss800</jbossws.integration.target> - <jboss.home>${jboss800.home}</jboss.home> + <jbossws.integration.target>wildfly800</jbossws.integration.target> + <jboss.home>${wildfly800.home}</jboss.home> </properties> </profile>

11 years, 8 months

1
0
0 / 0

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

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2013-04-29 10:32:18 -0400 (Mon, 29 Apr 2013) New Revision: 17520 Modified: shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestSetup.java shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml Log: [JBWS-3627] JBoss AS -> WildFly Modified: shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java =================================================================== --- shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2013-04-28 07:35:00 UTC (rev 17519) +++ shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2013-04-29 14:32:18 UTC (rev 17520) @@ -1,6 +1,6 @@ /* * JBoss, Home of Professional Open Source. - * Copyright 2011, Red Hat Middleware LLC, and individual contributors + * Copyright 2013, 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. * @@ -40,7 +40,6 @@ import javax.xml.ws.Service.Mode; import javax.xml.ws.soap.SOAPBinding; -import org.jboss.logging.Logger; import org.jboss.wsf.spi.SPIProvider; import org.jboss.wsf.spi.SPIProviderResolver; import org.jboss.wsf.spi.deployer.Deployer; @@ -54,8 +53,6 @@ */ public class JBossWSTestHelper { - private static final Logger LOGGER = Logger.getLogger(JBossWSTestHelper.class); - private static final String SYSPROP_JBOSSWS_INTEGRATION_TARGET = "jbossws.integration.target"; private static final String SYSPROP_JBOSS_BIND_ADDRESS = "jboss.bind.address"; private static final String SYSPROP_TEST_ARCHIVE_DIRECTORY = "test.archive.directory"; @@ -145,16 +142,28 @@ return target.startsWith("jboss72"); } + @Deprecated public static boolean isTargetJBoss8() { + return isTargetJBoss8(); + } + + public static boolean isTargetWildFly8() + { String target = getIntegrationTarget(); - return target.startsWith("jboss8"); + return target.startsWith("wildfly8"); } + @Deprecated public static boolean isTargetJBoss80() { + return isTargetWildFly80(); + } + + public static boolean isTargetWildFly80() + { String target = getIntegrationTarget(); - return target.startsWith("jboss80"); + return target.startsWith("wildfly80"); } public static boolean isIntegrationNative() @@ -191,11 +200,6 @@ return obj; } - private static String getImplementationPackage() - { - return getImplementationObject().getClass().getPackage().getName(); - } - /** * Get the JBoss server host from system property "jboss.bind.address" * This defaults to "localhost" @@ -240,7 +244,7 @@ if (server == null) { String integrationTarget = getIntegrationTarget(); - if (integrationTarget.startsWith("jboss7") || integrationTarget.startsWith("jboss8")) + if (integrationTarget.startsWith("jboss7") || integrationTarget.startsWith("wildfly8") || integrationTarget.startsWith("jboss8")) { server = getAS7ServerConnection(integrationTarget); } @@ -361,9 +365,9 @@ getDeployer().removeSecurityDomain(name); } - public static void addHttpsConnector(Map<String, String> sslOptions) throws Exception + public static void addHttpsConnector(Map<String, String> options) throws Exception { - getDeployer().addHttpsConnector(sslOptions); + getDeployer().addHttpsConnector(options); } public static void removeHttpsConnector() throws Exception Modified: shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestSetup.java =================================================================== --- shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestSetup.java 2013-04-28 07:35:00 UTC (rev 17519) +++ shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestSetup.java 2013-04-29 14:32:18 UTC (rev 17520) @@ -64,7 +64,7 @@ private ClassLoader originalClassLoader; private Map<String, Map<String, String>> securityDomains; private boolean defaultSecurityDomainRequirement = false; - private Map<String, String> httpsConnSslOptions; + private Map<String, String> httpsConnOptions; private CleanupOperation cleanupOp; public JBossWSTestSetup(Class<?> testClass, String archiveList) @@ -211,8 +211,8 @@ log.warn("Could not add default security domain!", e); } } - if (httpsConnSslOptions != null) { - JBossWSTestHelper.addHttpsConnector(httpsConnSslOptions); + if (httpsConnOptions != null) { + JBossWSTestHelper.addHttpsConnector(httpsConnOptions); } List<URL> clientJars = new ArrayList<URL>(); @@ -308,7 +308,7 @@ { JBossWSTestHelper.removeSecurityDomain(JBOSSWS_SEC_DOMAIN); } - if (httpsConnSslOptions != null) + if (httpsConnOptions != null) { JBossWSTestHelper.removeHttpsConnector(); } @@ -338,7 +338,7 @@ this.defaultSecurityDomainRequirement = defaultSecurityDomainRequirement; } - public void setHttpsConnectorRequirement(Map<String, String> sslOptions) { - httpsConnSslOptions = sslOptions; + public void setHttpsConnectorRequirement(Map<String, String> options) { + httpsConnOptions = options; } } Modified: shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml =================================================================== --- shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml 2013-04-28 07:35:00 UTC (rev 17519) +++ shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml 2013-04-29 14:32:18 UTC (rev 17520) @@ -40,8 +40,8 @@ <condition property="jboss.home" value="${jboss720.home}"> <equals arg1="${jbossws.integration.target}" arg2="jboss720"/> </condition> - <condition property="jboss.home" value="${jboss800.home}"> - <equals arg1="${jbossws.integration.target}" arg2="jboss800"/> + <condition property="jboss.home" value="${wildfly800.home}"> + <equals arg1="${jbossws.integration.target}" arg2="wildfly800"/> </condition>  @@ -120,7 +120,7 @@ </tstamp> </target> - <target name="tests-classpath" depends="tests-classpath-jboss71x,tests-classpath-jboss72x,tests-classpath-jboss80x"> + <target name="tests-classpath" depends="tests-classpath-jboss71x,tests-classpath-jboss72x,tests-classpath-wildfly80x"> <path id="tests.javac.classpath"> <path refid="ws.stack.classpath"/> <path refid="integration.target.javac.classpath"/> @@ -459,7 +459,7 @@ </path> </target> - <target name="tests-classpath-jboss80x" depends="tests-prepare" if="jbossws.integration.jboss80x"> + <target name="tests-classpath-wildfly80x" depends="tests-prepare" if="jbossws.integration.wildfly80x">  <condition property="endorsed.dirs" value="${jboss.home}/modules/system/layers/base/javax/xml/ws/api/main/">

11 years, 8 months

1
0
0 / 0

JBossWS SVN: r17519 - shared-testsuite/branches/jbossws-shared-testsuite-4.1.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/securityDomain.

by jbossws-commits＠lists.jboss.org

Author: jim.ma Date: 2013-04-28 03:35:00 -0400 (Sun, 28 Apr 2013) New Revision: 17519 Modified: shared-testsuite/branches/jbossws-shared-testsuite-4.1.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/securityDomain/SecurityDomainTestCase.java Log: Minor update to know what the exception is Modified: shared-testsuite/branches/jbossws-shared-testsuite-4.1.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/securityDomain/SecurityDomainTestCase.java =================================================================== --- shared-testsuite/branches/jbossws-shared-testsuite-4.1.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/securityDomain/SecurityDomainTestCase.java 2013-04-28 07:13:22 UTC (rev 17518) +++ shared-testsuite/branches/jbossws-shared-testsuite-4.1.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/securityDomain/SecurityDomainTestCase.java 2013-04-28 07:35:00 UTC (rev 17519) @@ -137,6 +137,7 @@ fail("Authentication exception expected!"); } catch (Exception e) { //expected web layer exception + e.printStackTrace(); assertTrue(e.getMessage().contains("Could not send Message")); assertTrue("Exception Cause message: " + e.getCause().getMessage(), e.getCause().getMessage().contains("401: Unauthorized")); }

11 years, 8 months

1
0
0 / 0

JBossWS SVN: r17518 - shared-testsuite/branches/jbossws-shared-testsuite-4.1.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/webfault.

by jbossws-commits＠lists.jboss.org

Author: jim.ma Date: 2013-04-28 03:13:22 -0400 (Sun, 28 Apr 2013) New Revision: 17518 Modified: shared-testsuite/branches/jbossws-shared-testsuite-4.1.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/webfault/WebFaultTestCase.java Log: Minor update:refactor the test to get the exception info Modified: shared-testsuite/branches/jbossws-shared-testsuite-4.1.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/webfault/WebFaultTestCase.java =================================================================== --- shared-testsuite/branches/jbossws-shared-testsuite-4.1.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/webfault/WebFaultTestCase.java 2013-04-26 17:09:58 UTC (rev 17517) +++ shared-testsuite/branches/jbossws-shared-testsuite-4.1.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/webfault/WebFaultTestCase.java 2013-04-28 07:13:22 UTC (rev 17518) @@ -161,7 +161,8 @@ } catch (Exception e) { - fail("Wrong exception caught!"); + e.printStackTrace(); + fail("Wrong exception caught : " + e.getMessage()); } try {

11 years, 8 months

1
0
0 / 0

JBossWS SVN: r17517 - in stack/cxf/branches/jbossws-cxf-3.1.2: modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssePolicy and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2013-04-26 13:09:58 -0400 (Fri, 26 Apr 2013) New Revision: 17517 Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssePolicy/SignEncryptGCMTestCase.java stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml Log: [JBPAPP-10708] Adding a testcase and moving to latest cxf Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssePolicy/SignEncryptGCMTestCase.java =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssePolicy/SignEncryptGCMTestCase.java 2013-04-26 17:07:26 UTC (rev 17516) +++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssePolicy/SignEncryptGCMTestCase.java 2013-04-26 17:09:58 UTC (rev 17517) @@ -66,6 +66,25 @@ } } + public void testCVE20125575() throws Exception + { + QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wssecuritypolicy", "SecurityService"); + URL wsdlURL = getResourceURL("jaxws/samples/wssePolicy/sign-encrypt/WEB-INF/wsdl/SecurityService.wsdl"); + Service service = Service.create(wsdlURL, serviceName); + ServiceIface proxy = (ServiceIface)service.getPort(ServiceIface.class); + ((BindingProvider)proxy).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, serviceURL); + setupWsse(proxy); + try + { + proxy.sayHello(); + fail("Exception expected!"); + } + catch (SOAPFaultException e) + { + assertTrue(e.getMessage().contains("An error was discovered processing the <wsse:Security> header")); + } + } + private void setupWsse(ServiceIface proxy) { ((BindingProvider)proxy).getRequestContext().put(SecurityConstants.CALLBACK_HANDLER, new KeystorePasswordCallback()); Modified: stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml 2013-04-26 17:07:26 UTC (rev 17516) +++ stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml 2013-04-26 17:09:58 UTC (rev 17517) @@ -53,7 +53,7 @@ <jbossws.jboss510.version>3.1.0-SNAPSHOT</jbossws.jboss510.version> -->  - <cxf.version>2.2.12-patch-06-SNAPSHOT</cxf.version> + <cxf.version>2.2.12-patch-07-SNAPSHOT</cxf.version> <cxf.spring.version>2.5.6.SEC02</cxf.spring.version> <cxf.stax.version>1.0.1</cxf.stax.version> <cxf.asm.version>3.1</cxf.asm.version>

11 years, 8 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits April 2013