July 2010 - jbossws-commits - Jboss List Archives

JBossWS SVN: r12595 - container/jboss50/tags.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2010-07-08 03:59:20 -0400 (Thu, 08 Jul 2010) New Revision: 12595 Added: container/jboss50/tags/jbossws-jboss501-3.4.0.Beta1/ Log: Tagging jbossws-jboss501 3.4.0.Beta1 Copied: container/jboss50/tags/jbossws-jboss501-3.4.0.Beta1 (from rev 12594, container/jboss50/branches/jbossws-jboss501)

13 years, 10 months

1
0
0 / 0

JBossWS SVN: r12594 - common/trunk.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2010-07-08 03:57:14 -0400 (Thu, 08 Jul 2010) New Revision: 12594 Modified: common/trunk/pom.xml Log: Udating parent Modified: common/trunk/pom.xml =================================================================== --- common/trunk/pom.xml 2010-07-08 07:55:47 UTC (rev 12593) +++ common/trunk/pom.xml 2010-07-08 07:57:14 UTC (rev 12594) @@ -15,7 +15,7 @@ <parent> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-parent</artifactId> - <version>1.0.6.GA</version> + <version>1.0.7.GA</version> </parent>

13 years, 10 months

1
0
0 / 0

JBossWS SVN: r12593 - common/tags/jbossws-common-1.4.0.Beta1.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2010-07-08 03:55:47 -0400 (Thu, 08 Jul 2010) New Revision: 12593 Modified: common/tags/jbossws-common-1.4.0.Beta1/pom.xml Log: Updating pom.xml Modified: common/tags/jbossws-common-1.4.0.Beta1/pom.xml =================================================================== --- common/tags/jbossws-common-1.4.0.Beta1/pom.xml 2010-07-08 07:53:24 UTC (rev 12592) +++ common/tags/jbossws-common-1.4.0.Beta1/pom.xml 2010-07-08 07:55:47 UTC (rev 12593) @@ -9,20 +9,20 @@ <packaging>jar</packaging> <description>JBossWS Common</description> - <version>1.4.0-SNAPSHOT</version> + <version>1.4.0.Beta1</version>  <parent> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-parent</artifactId> - <version>1.0.6.GA</version> + <version>1.0.7.GA</version> </parent>  <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/common/trunk</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/common/trunk</developerConnection> - <url>http://fisheye.jboss.com/viewrep/JBossWS/common/trunk</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/common/tags/jbossws-common...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/common/tags/jbossws-common-1....</developerConnection> + <url>http://fisheye.jboss.com/viewrep/JBossWS/common/tags/jbossws-common-1.4.0...</url> </scm>  @@ -33,7 +33,7 @@ <jboss.ejb.api.version>3.0.0.GA</jboss.ejb.api.version> <jboss.microcontainer.version>2.0.8.GA</jboss.microcontainer.version> <jboss.web.version>2.1.3.GA</jboss.web.version> - <jbossws.spi.version>1.4.0-SNAPSHOT</jbossws.spi.version> + <jbossws.spi.version>1.4.0.Beta1</jbossws.spi.version> <junit.version>3.8.2</junit.version> <wsdl4j.version>1.6.2</wsdl4j.version> </properties>

13 years, 10 months

1
0
0 / 0

JBossWS SVN: r12592 - common/tags.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2010-07-08 03:53:24 -0400 (Thu, 08 Jul 2010) New Revision: 12592 Added: common/tags/jbossws-common-1.4.0.Beta1/ Log: Tagging jbossws-common-1.4.0.Beta1 Copied: common/tags/jbossws-common-1.4.0.Beta1 (from rev 12591, common/trunk)

13 years, 10 months

1
0
0 / 0

JBossWS SVN: r12591 - in framework/trunk/hudson: hudson-home/jobs/AS-TESTS-AS-5.1.0 and 51 other directories.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2010-07-06 09:44:12 -0400 (Tue, 06 Jul 2010) New Revision: 12591 Modified: framework/trunk/hudson/hudson-home/jobs/AS-TESTS-AS-5.0.1/config.xml framework/trunk/hudson/hudson-home/jobs/AS-TESTS-AS-5.1.0/config.xml framework/trunk/hudson/hudson-home/jobs/AS-TESTS-AS-6.0.0/config.xml framework/trunk/hudson/hudson-home/jobs/AS-TESTS-AS-6.0.1/config.xml framework/trunk/hudson/hudson-home/jobs/CXF-BINDIST-AS-5.0.1-SPRING-SUN-JDK-6/config.xml framework/trunk/hudson/hudson-home/jobs/CXF-BINDIST-AS-5.0.1-SUN-JDK-6/config.xml framework/trunk/hudson/hudson-home/jobs/CXF-BINDIST-AS-5.1.0-SPRING-SUN-JDK-6/config.xml framework/trunk/hudson/hudson-home/jobs/CXF-BINDIST-AS-5.1.0-SUN-JDK-6/config.xml framework/trunk/hudson/hudson-home/jobs/CXF-BINDIST-AS-6.0.0-SPRING-SUN-JDK-6/config.xml framework/trunk/hudson/hudson-home/jobs/CXF-BINDIST-AS-6.0.0-SUN-JDK-6/config.xml framework/trunk/hudson/hudson-home/jobs/CXF-BINDIST-AS-6.0.1-SPRING-SUN-JDK-6/config.xml framework/trunk/hudson/hudson-home/jobs/CXF-BINDIST-AS-6.0.1-SUN-JDK-6/config.xml framework/trunk/hudson/hudson-home/jobs/CXF-CORE-AS-5.0.1-SPRING-SUN-JDK-6/config.xml framework/trunk/hudson/hudson-home/jobs/CXF-CORE-AS-5.0.1-SUN-JDK-6/config.xml framework/trunk/hudson/hudson-home/jobs/CXF-CORE-AS-5.1.0-SPRING-SUN-JDK-6/config.xml framework/trunk/hudson/hudson-home/jobs/CXF-CORE-AS-5.1.0-SUN-JDK-6/config.xml framework/trunk/hudson/hudson-home/jobs/CXF-CORE-AS-6.0.0-SPRING-SUN-JDK-6/config.xml framework/trunk/hudson/hudson-home/jobs/CXF-CORE-AS-6.0.0-SUN-JDK-6/config.xml framework/trunk/hudson/hudson-home/jobs/CXF-CORE-AS-6.0.1-SPRING-SUN-JDK-6/config.xml framework/trunk/hudson/hudson-home/jobs/CXF-CORE-AS-6.0.1-SUN-JDK-6/config.xml framework/trunk/hudson/hudson-home/jobs/CXF-SRCDIST-AS-5.0.1-SPRING-SUN-JDK-6/config.xml framework/trunk/hudson/hudson-home/jobs/CXF-SRCDIST-AS-5.0.1-SUN-JDK-6/config.xml framework/trunk/hudson/hudson-home/jobs/CXF-SRCDIST-AS-5.1.0-SPRING-SUN-JDK-6/config.xml framework/trunk/hudson/hudson-home/jobs/CXF-SRCDIST-AS-5.1.0-SUN-JDK-6/config.xml framework/trunk/hudson/hudson-home/jobs/CXF-SRCDIST-AS-6.0.0-SPRING-SUN-JDK-6/config.xml framework/trunk/hudson/hudson-home/jobs/CXF-SRCDIST-AS-6.0.0-SUN-JDK-6/config.xml framework/trunk/hudson/hudson-home/jobs/CXF-SRCDIST-AS-6.0.1-SPRING-SUN-JDK-6/config.xml framework/trunk/hudson/hudson-home/jobs/CXF-SRCDIST-AS-6.0.1-SUN-JDK-6/config.xml framework/trunk/hudson/hudson-home/jobs/METRO-BINDIST-AS-5.0.1-SUN-JDK-6/config.xml framework/trunk/hudson/hudson-home/jobs/METRO-BINDIST-AS-5.1.0-SUN-JDK-6/config.xml framework/trunk/hudson/hudson-home/jobs/METRO-BINDIST-AS-6.0.0-SUN-JDK-6/config.xml framework/trunk/hudson/hudson-home/jobs/METRO-BINDIST-AS-6.0.1-SUN-JDK-6/config.xml framework/trunk/hudson/hudson-home/jobs/METRO-CORE-AS-5.0.1-SUN-JDK-6/config.xml framework/trunk/hudson/hudson-home/jobs/METRO-CORE-AS-5.1.0-SUN-JDK-6/config.xml framework/trunk/hudson/hudson-home/jobs/METRO-CORE-AS-6.0.0-SUN-JDK-6/config.xml framework/trunk/hudson/hudson-home/jobs/METRO-CORE-AS-6.0.1-SUN-JDK-6/config.xml framework/trunk/hudson/hudson-home/jobs/METRO-SRCDIST-AS-5.0.1-SUN-JDK-6/config.xml framework/trunk/hudson/hudson-home/jobs/METRO-SRCDIST-AS-5.1.0-SUN-JDK-6/config.xml framework/trunk/hudson/hudson-home/jobs/METRO-SRCDIST-AS-6.0.0-SUN-JDK-6/config.xml framework/trunk/hudson/hudson-home/jobs/METRO-SRCDIST-AS-6.0.1-SUN-JDK-6/config.xml framework/trunk/hudson/hudson-home/jobs/NATIVE-BINDIST-AS-5.0.1-SUN-JDK-6/config.xml framework/trunk/hudson/hudson-home/jobs/NATIVE-BINDIST-AS-5.1.0-SUN-JDK-6/config.xml framework/trunk/hudson/hudson-home/jobs/NATIVE-BINDIST-AS-6.0.0-SUN-JDK-6/config.xml framework/trunk/hudson/hudson-home/jobs/NATIVE-BINDIST-AS-6.0.1-SUN-JDK-6/config.xml framework/trunk/hudson/hudson-home/jobs/NATIVE-CORE-AS-5.0.1-SUN-JDK-6/config.xml framework/trunk/hudson/hudson-home/jobs/NATIVE-CORE-AS-5.1.0-SUN-JDK-6/config.xml framework/trunk/hudson/hudson-home/jobs/NATIVE-CORE-AS-6.0.0-SUN-JDK-6/config.xml framework/trunk/hudson/hudson-home/jobs/NATIVE-CORE-AS-6.0.1-SUN-JDK-6/config.xml framework/trunk/hudson/hudson-home/jobs/NATIVE-SRCDIST-AS-5.0.1-SUN-JDK-6/config.xml framework/trunk/hudson/hudson-home/jobs/NATIVE-SRCDIST-AS-5.1.0-SUN-JDK-6/config.xml framework/trunk/hudson/hudson-home/jobs/NATIVE-SRCDIST-AS-6.0.0-SUN-JDK-6/config.xml framework/trunk/hudson/hudson-home/jobs/NATIVE-SRCDIST-AS-6.0.1-SUN-JDK-6/config.xml framework/trunk/hudson/jboss/bin/jbossws-qa.sh Log: Hudson configuration: just checkout the hudson part of jbossws-framework for every jobs; saves space on disk and time for updates Modified: framework/trunk/hudson/hudson-home/jobs/AS-TESTS-AS-5.0.1/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/AS-TESTS-AS-5.0.1/config.xml 2010-07-06 12:01:51 UTC (rev 12590) +++ framework/trunk/hudson/hudson-home/jobs/AS-TESTS-AS-5.0.1/config.xml 2010-07-06 13:44:12 UTC (rev 12591) @@ -9,7 +9,7 @@ MODULE=AS-TESTS-AS-5.0.1 WORKSPACE=`pwd` -FRAMEWORK_DIR=$WORKSPACE/framework +HUDSON_DIR=$WORKSPACE/framework-hudson STACK_DIR=$WORKSPACE/stack-native JBOSS_TARGET=jboss501 JBOSS_BIND_ADDRESS=(a)jboss.bind.address@ @@ -24,7 +24,7 @@ # # stop jbossas # -$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_HOME stop +$HUDSON_DIR/jboss/bin/jboss.sh $JBOSS_HOME stop # # build and deploy @@ -41,13 +41,13 @@ # # start jbossas # -$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_HOME start $JBOSS_BIND_ADDRESS +$HUDSON_DIR/jboss/bin/jboss.sh $JBOSS_HOME start $JBOSS_BIND_ADDRESS # Was it successfully started? -$FRAMEWORK_DIR/hudson/jboss/bin/http-spider.sh $JBOSS_BIND_ADDRESS:8080 $WORKSPACE +$HUDSON_DIR/jboss/bin/http-spider.sh $JBOSS_BIND_ADDRESS:8080 $WORKSPACE if [ -e $WORKSPACE/spider.failed ]; then tail -n 100 $JBOSS_HOME/server/@jboss.server.instance(a)/log/server.log - $FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_HOME stop $JBOSS_BIND_ADDRESS + $HUDSON_DIR/jboss/bin/jboss.sh $JBOSS_HOME stop $JBOSS_BIND_ADDRESS exit 1 fi @@ -74,7 +74,7 @@ # # stop jbossas # -$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_HOME stop +$HUDSON_DIR/jboss/bin/jboss.sh $JBOSS_HOME stop cp $JBOSS_HOME/server/@jboss.server.instance(a)/log/boot.log $WORKSPACE/jboss-boot.log cp $JBOSS_HOME/server/@jboss.server.instance(a)/log/server.log $WORKSPACE/jboss-server.log rm -rf $JBOSS_HOME @@ -96,8 +96,8 @@ <scm class="hudson.scm.SubversionSCM"> <locations> <hudson.scm.SubversionSCM-ModuleLocation> - <remote>@hudson.framework.url@</remote> - <local>framework</local> + <remote>@hudson.framework.url@/hudson</remote> + <local>framework-hudson</local> </hudson.scm.SubversionSCM-ModuleLocation> <hudson.scm.SubversionSCM-ModuleLocation> <remote>@hudson.native.url@</remote> Modified: framework/trunk/hudson/hudson-home/jobs/AS-TESTS-AS-5.1.0/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/AS-TESTS-AS-5.1.0/config.xml 2010-07-06 12:01:51 UTC (rev 12590) +++ framework/trunk/hudson/hudson-home/jobs/AS-TESTS-AS-5.1.0/config.xml 2010-07-06 13:44:12 UTC (rev 12591) @@ -9,7 +9,7 @@ MODULE=AS-TESTS-AS-5.1.0 WORKSPACE=`pwd` -FRAMEWORK_DIR=$WORKSPACE/framework +HUDSON_DIR=$WORKSPACE/framework-hudson STACK_DIR=$WORKSPACE/stack-native JBOSS_TARGET=jboss510 JBOSS_BIND_ADDRESS=(a)jboss.bind.address@ @@ -24,7 +24,7 @@ # # stop jbossas # -$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_HOME stop +$HUDSON_DIR/jboss/bin/jboss.sh $JBOSS_HOME stop # # build and deploy @@ -41,13 +41,13 @@ # # start jbossas # -$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_HOME start $JBOSS_BIND_ADDRESS +$HUDSON_DIR/jboss/bin/jboss.sh $JBOSS_HOME start $JBOSS_BIND_ADDRESS # Was it successfully started? -$FRAMEWORK_DIR/hudson/jboss/bin/http-spider.sh $JBOSS_BIND_ADDRESS:8080 $WORKSPACE +$HUDSON_DIR/jboss/bin/http-spider.sh $JBOSS_BIND_ADDRESS:8080 $WORKSPACE if [ -e $WORKSPACE/spider.failed ]; then tail -n 100 $JBOSS_HOME/server/@jboss.server.instance(a)/log/server.log - $FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_HOME stop $JBOSS_BIND_ADDRESS + $HUDSON_DIR/jboss/bin/jboss.sh $JBOSS_HOME stop $JBOSS_BIND_ADDRESS exit 1 fi @@ -74,7 +74,7 @@ # # stop jbossas # -$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_HOME stop +$HUDSON_DIR/jboss/bin/jboss.sh $JBOSS_HOME stop cp $JBOSS_HOME/server/@jboss.server.instance(a)/log/boot.log $WORKSPACE/jboss-boot.log cp $JBOSS_HOME/server/@jboss.server.instance(a)/log/server.log $WORKSPACE/jboss-server.log rm -rf $JBOSS_HOME @@ -96,8 +96,8 @@ <scm class="hudson.scm.SubversionSCM"> <locations> <hudson.scm.SubversionSCM-ModuleLocation> - <remote>@hudson.framework.url@</remote> - <local>framework</local> + <remote>@hudson.framework.url@/hudson</remote> + <local>framework-hudson</local> </hudson.scm.SubversionSCM-ModuleLocation> <hudson.scm.SubversionSCM-ModuleLocation> <remote>@hudson.native.url@</remote> Modified: framework/trunk/hudson/hudson-home/jobs/AS-TESTS-AS-6.0.0/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/AS-TESTS-AS-6.0.0/config.xml 2010-07-06 12:01:51 UTC (rev 12590) +++ framework/trunk/hudson/hudson-home/jobs/AS-TESTS-AS-6.0.0/config.xml 2010-07-06 13:44:12 UTC (rev 12591) @@ -9,7 +9,7 @@ MODULE=AS-TESTS-AS-6.0.0 WORKSPACE=`pwd` -FRAMEWORK_DIR=$WORKSPACE/framework +HUDSON_DIR=$WORKSPACE/framework-hudson STACK_DIR=$WORKSPACE/stack-native JBOSS_TARGET=jboss600 JBOSS_BIND_ADDRESS=(a)jboss.bind.address@ @@ -24,7 +24,7 @@ # # stop jbossas # -$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_HOME stop +$HUDSON_DIR/jboss/bin/jboss.sh $JBOSS_HOME stop # # build and deploy @@ -41,13 +41,13 @@ # # start jbossas # -$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_HOME start $JBOSS_BIND_ADDRESS +$HUDSON_DIR/jboss/bin/jboss.sh $JBOSS_HOME start $JBOSS_BIND_ADDRESS # Was it successfully started? -$FRAMEWORK_DIR/hudson/jboss/bin/http-spider.sh $JBOSS_BIND_ADDRESS:8080 $WORKSPACE +$HUDSON_DIR/jboss/bin/http-spider.sh $JBOSS_BIND_ADDRESS:8080 $WORKSPACE if [ -e $WORKSPACE/spider.failed ]; then tail -n 100 $JBOSS_HOME/server/@jboss.server.instance(a)/log/server.log - $FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_HOME stop $JBOSS_BIND_ADDRESS + $HUDSON_DIR/jboss/bin/jboss.sh $JBOSS_HOME stop $JBOSS_BIND_ADDRESS exit 1 fi @@ -74,7 +74,7 @@ # # stop jbossas # -$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_HOME stop +$HUDSON_DIR/jboss/bin/jboss.sh $JBOSS_HOME stop cp $JBOSS_HOME/server/@jboss.server.instance(a)/log/boot.log $WORKSPACE/jboss-boot.log cp $JBOSS_HOME/server/@jboss.server.instance(a)/log/server.log $WORKSPACE/jboss-server.log rm -rf $JBOSS_HOME @@ -96,8 +96,8 @@ <scm class="hudson.scm.SubversionSCM"> <locations> <hudson.scm.SubversionSCM-ModuleLocation> - <remote>@hudson.framework.url@</remote> - <local>framework</local> + <remote>@hudson.framework.url@/hudson</remote> + <local>framework-hudson</local> </hudson.scm.SubversionSCM-ModuleLocation> <hudson.scm.SubversionSCM-ModuleLocation> <remote>@hudson.native.url@</remote> Modified: framework/trunk/hudson/hudson-home/jobs/AS-TESTS-AS-6.0.1/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/AS-TESTS-AS-6.0.1/config.xml 2010-07-06 12:01:51 UTC (rev 12590) +++ framework/trunk/hudson/hudson-home/jobs/AS-TESTS-AS-6.0.1/config.xml 2010-07-06 13:44:12 UTC (rev 12591) @@ -9,7 +9,7 @@ MODULE=AS-TESTS-AS-6.0.1 WORKSPACE=`pwd` -FRAMEWORK_DIR=$WORKSPACE/framework +HUDSON_DIR=$WORKSPACE/framework-hudson STACK_DIR=$WORKSPACE/stack-cxf JBOSS_TARGET=jboss601 JBOSS_BIND_ADDRESS=(a)jboss.bind.address@ @@ -24,7 +24,7 @@ # # stop jbossas # -$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_HOME stop +$HUDSON_DIR/jboss/bin/jboss.sh $JBOSS_HOME stop # # build and deploy @@ -41,13 +41,13 @@ # # start jbossas # -$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_HOME start $JBOSS_BIND_ADDRESS +$HUDSON_DIR/jboss/bin/jboss.sh $JBOSS_HOME start $JBOSS_BIND_ADDRESS # Was it successfully started? -$FRAMEWORK_DIR/hudson/jboss/bin/http-spider.sh $JBOSS_BIND_ADDRESS:8080 $WORKSPACE +$HUDSON_DIR/jboss/bin/http-spider.sh $JBOSS_BIND_ADDRESS:8080 $WORKSPACE if [ -e $WORKSPACE/spider.failed ]; then tail -n 100 $JBOSS_HOME/server/@jboss.server.instance(a)/log/server.log - $FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_HOME stop $JBOSS_BIND_ADDRESS + $HUDSON_DIR/jboss/bin/jboss.sh $JBOSS_HOME stop $JBOSS_BIND_ADDRESS exit 1 fi @@ -74,7 +74,7 @@ # # stop jbossas # -$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_HOME stop +$HUDSON_DIR/jboss/bin/jboss.sh $JBOSS_HOME stop cp $JBOSS_HOME/server/@jboss.server.instance(a)/log/boot.log $WORKSPACE/jboss-boot.log cp $JBOSS_HOME/server/@jboss.server.instance(a)/log/server.log $WORKSPACE/jboss-server.log rm -rf $JBOSS_HOME @@ -96,8 +96,8 @@ <scm class="hudson.scm.SubversionSCM"> <locations> <hudson.scm.SubversionSCM-ModuleLocation> - <remote>@hudson.framework.url@</remote> - <local>framework</local> + <remote>@hudson.framework.url@/hudson</remote> + <local>framework-hudson</local> </hudson.scm.SubversionSCM-ModuleLocation> <hudson.scm.SubversionSCM-ModuleLocation> <remote>@hudson.cxf.url@</remote> Modified: framework/trunk/hudson/hudson-home/jobs/CXF-BINDIST-AS-5.0.1-SPRING-SUN-JDK-6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/CXF-BINDIST-AS-5.0.1-SPRING-SUN-JDK-6/config.xml 2010-07-06 12:01:51 UTC (rev 12590) +++ framework/trunk/hudson/hudson-home/jobs/CXF-BINDIST-AS-5.0.1-SPRING-SUN-JDK-6/config.xml 2010-07-06 13:44:12 UTC (rev 12591) @@ -11,7 +11,7 @@ WORKSPACE=`pwd` STACK_ID=cxf JAVA_HOME=(a)java.home.sun.jdk6@ -FRAMEWORK_DIR=$WORKSPACE/framework +HUDSON_DIR=$WORKSPACE/framework-hudson STACK_DIR=$WORKSPACE/stack-cxf TEST_OPTS= JBOSS_TARGET=jboss501 @@ -22,7 +22,7 @@ # # load test functions # -. $FRAMEWORK_DIR/hudson/jboss/bin/jbossws-qa.sh +. $HUDSON_DIR/jboss/bin/jbossws-qa.sh # # execute binary distribution tests @@ -46,8 +46,8 @@ <scm class="hudson.scm.SubversionSCM"> <locations> <hudson.scm.SubversionSCM-ModuleLocation> - <remote>@hudson.framework.url@</remote> - <local>framework</local> + <remote>@hudson.framework.url@/hudson</remote> + <local>framework-hudson</local> </hudson.scm.SubversionSCM-ModuleLocation> <hudson.scm.SubversionSCM-ModuleLocation> <remote>@hudson.cxf.url@</remote> Modified: framework/trunk/hudson/hudson-home/jobs/CXF-BINDIST-AS-5.0.1-SUN-JDK-6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/CXF-BINDIST-AS-5.0.1-SUN-JDK-6/config.xml 2010-07-06 12:01:51 UTC (rev 12590) +++ framework/trunk/hudson/hudson-home/jobs/CXF-BINDIST-AS-5.0.1-SUN-JDK-6/config.xml 2010-07-06 13:44:12 UTC (rev 12591) @@ -11,7 +11,7 @@ WORKSPACE=`pwd` STACK_ID=cxf JAVA_HOME=(a)java.home.sun.jdk6@ -FRAMEWORK_DIR=$WORKSPACE/framework +HUDSON_DIR=$WORKSPACE/framework-hudson STACK_DIR=$WORKSPACE/stack-cxf TEST_OPTS= JBOSS_TARGET=jboss501 @@ -22,7 +22,7 @@ # # load test functions # -. $FRAMEWORK_DIR/hudson/jboss/bin/jbossws-qa.sh +. $HUDSON_DIR/jboss/bin/jbossws-qa.sh # # execute binary distribution tests @@ -46,8 +46,8 @@ <scm class="hudson.scm.SubversionSCM"> <locations> <hudson.scm.SubversionSCM-ModuleLocation> - <remote>@hudson.framework.url@</remote> - <local>framework</local> + <remote>@hudson.framework.url@/hudson</remote> + <local>framework-hudson</local> </hudson.scm.SubversionSCM-ModuleLocation> <hudson.scm.SubversionSCM-ModuleLocation> <remote>@hudson.cxf.url@</remote> Modified: framework/trunk/hudson/hudson-home/jobs/CXF-BINDIST-AS-5.1.0-SPRING-SUN-JDK-6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/CXF-BINDIST-AS-5.1.0-SPRING-SUN-JDK-6/config.xml 2010-07-06 12:01:51 UTC (rev 12590) +++ framework/trunk/hudson/hudson-home/jobs/CXF-BINDIST-AS-5.1.0-SPRING-SUN-JDK-6/config.xml 2010-07-06 13:44:12 UTC (rev 12591) @@ -11,7 +11,7 @@ WORKSPACE=`pwd` STACK_ID=cxf JAVA_HOME=(a)java.home.sun.jdk6@ -FRAMEWORK_DIR=$WORKSPACE/framework +HUDSON_DIR=$WORKSPACE/framework-hudson STACK_DIR=$WORKSPACE/stack-cxf TEST_OPTS= JBOSS_TARGET=jboss510 @@ -22,7 +22,7 @@ # # load test functions # -. $FRAMEWORK_DIR/hudson/jboss/bin/jbossws-qa.sh +. $HUDSON_DIR/jboss/bin/jbossws-qa.sh # # execute binary distribution tests @@ -46,8 +46,8 @@ <scm class="hudson.scm.SubversionSCM"> <locations> <hudson.scm.SubversionSCM-ModuleLocation> - <remote>@hudson.framework.url@</remote> - <local>framework</local> + <remote>@hudson.framework.url@/hudson</remote> + <local>framework-hudson</local> </hudson.scm.SubversionSCM-ModuleLocation> <hudson.scm.SubversionSCM-ModuleLocation> <remote>@hudson.cxf.url@</remote> Modified: framework/trunk/hudson/hudson-home/jobs/CXF-BINDIST-AS-5.1.0-SUN-JDK-6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/CXF-BINDIST-AS-5.1.0-SUN-JDK-6/config.xml 2010-07-06 12:01:51 UTC (rev 12590) +++ framework/trunk/hudson/hudson-home/jobs/CXF-BINDIST-AS-5.1.0-SUN-JDK-6/config.xml 2010-07-06 13:44:12 UTC (rev 12591) @@ -11,7 +11,7 @@ WORKSPACE=`pwd` STACK_ID=cxf JAVA_HOME=(a)java.home.sun.jdk6@ -FRAMEWORK_DIR=$WORKSPACE/framework +HUDSON_DIR=$WORKSPACE/framework-hudson STACK_DIR=$WORKSPACE/stack-cxf TEST_OPTS= JBOSS_TARGET=jboss510 @@ -22,7 +22,7 @@ # # load test functions # -. $FRAMEWORK_DIR/hudson/jboss/bin/jbossws-qa.sh +. $HUDSON_DIR/jboss/bin/jbossws-qa.sh # # execute binary distribution tests @@ -46,8 +46,8 @@ <scm class="hudson.scm.SubversionSCM"> <locations> <hudson.scm.SubversionSCM-ModuleLocation> - <remote>@hudson.framework.url@</remote> - <local>framework</local> + <remote>@hudson.framework.url@/hudson</remote> + <local>framework-hudson</local> </hudson.scm.SubversionSCM-ModuleLocation> <hudson.scm.SubversionSCM-ModuleLocation> <remote>@hudson.cxf.url@</remote> Modified: framework/trunk/hudson/hudson-home/jobs/CXF-BINDIST-AS-6.0.0-SPRING-SUN-JDK-6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/CXF-BINDIST-AS-6.0.0-SPRING-SUN-JDK-6/config.xml 2010-07-06 12:01:51 UTC (rev 12590) +++ framework/trunk/hudson/hudson-home/jobs/CXF-BINDIST-AS-6.0.0-SPRING-SUN-JDK-6/config.xml 2010-07-06 13:44:12 UTC (rev 12591) @@ -11,7 +11,7 @@ WORKSPACE=`pwd` STACK_ID=cxf JAVA_HOME=(a)java.home.sun.jdk6@ -FRAMEWORK_DIR=$WORKSPACE/framework +HUDSON_DIR=$WORKSPACE/framework-hudson STACK_DIR=$WORKSPACE/stack-cxf TEST_OPTS= JBOSS_TARGET=jboss600 @@ -22,7 +22,7 @@ # # load test functions # -. $FRAMEWORK_DIR/hudson/jboss/bin/jbossws-qa.sh +. $HUDSON_DIR/jboss/bin/jbossws-qa.sh # # execute binary distribution tests @@ -46,8 +46,8 @@ <scm class="hudson.scm.SubversionSCM"> <locations> <hudson.scm.SubversionSCM-ModuleLocation> - <remote>@hudson.framework.url@</remote> - <local>framework</local> + <remote>@hudson.framework.url@/hudson</remote> + <local>framework-hudson</local> </hudson.scm.SubversionSCM-ModuleLocation> <hudson.scm.SubversionSCM-ModuleLocation> <remote>@hudson.cxf.url@</remote> Modified: framework/trunk/hudson/hudson-home/jobs/CXF-BINDIST-AS-6.0.0-SUN-JDK-6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/CXF-BINDIST-AS-6.0.0-SUN-JDK-6/config.xml 2010-07-06 12:01:51 UTC (rev 12590) +++ framework/trunk/hudson/hudson-home/jobs/CXF-BINDIST-AS-6.0.0-SUN-JDK-6/config.xml 2010-07-06 13:44:12 UTC (rev 12591) @@ -11,7 +11,7 @@ WORKSPACE=`pwd` STACK_ID=cxf JAVA_HOME=(a)java.home.sun.jdk6@ -FRAMEWORK_DIR=$WORKSPACE/framework +HUDSON_DIR=$WORKSPACE/framework-hudson STACK_DIR=$WORKSPACE/stack-cxf TEST_OPTS= JBOSS_TARGET=jboss600 @@ -22,7 +22,7 @@ # # load test functions # -. $FRAMEWORK_DIR/hudson/jboss/bin/jbossws-qa.sh +. $HUDSON_DIR/jboss/bin/jbossws-qa.sh # # execute binary distribution tests @@ -46,8 +46,8 @@ <scm class="hudson.scm.SubversionSCM"> <locations> <hudson.scm.SubversionSCM-ModuleLocation> - <remote>@hudson.framework.url@</remote> - <local>framework</local> + <remote>@hudson.framework.url@/hudson</remote> + <local>framework-hudson</local> </hudson.scm.SubversionSCM-ModuleLocation> <hudson.scm.SubversionSCM-ModuleLocation> <remote>@hudson.cxf.url@</remote> Modified: framework/trunk/hudson/hudson-home/jobs/CXF-BINDIST-AS-6.0.1-SPRING-SUN-JDK-6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/CXF-BINDIST-AS-6.0.1-SPRING-SUN-JDK-6/config.xml 2010-07-06 12:01:51 UTC (rev 12590) +++ framework/trunk/hudson/hudson-home/jobs/CXF-BINDIST-AS-6.0.1-SPRING-SUN-JDK-6/config.xml 2010-07-06 13:44:12 UTC (rev 12591) @@ -11,7 +11,7 @@ WORKSPACE=`pwd` STACK_ID=cxf JAVA_HOME=(a)java.home.sun.jdk6@ -FRAMEWORK_DIR=$WORKSPACE/framework +HUDSON_DIR=$WORKSPACE/framework-hudson STACK_DIR=$WORKSPACE/stack-cxf TEST_OPTS= JBOSS_TARGET=jboss601 @@ -22,7 +22,7 @@ # # load test functions # -. $FRAMEWORK_DIR/hudson/jboss/bin/jbossws-qa.sh +. $HUDSON_DIR/jboss/bin/jbossws-qa.sh # # execute binary distribution tests @@ -46,8 +46,8 @@ <scm class="hudson.scm.SubversionSCM"> <locations> <hudson.scm.SubversionSCM-ModuleLocation> - <remote>@hudson.framework.url@</remote> - <local>framework</local> + <remote>@hudson.framework.url@/hudson</remote> + <local>framework-hudson</local> </hudson.scm.SubversionSCM-ModuleLocation> <hudson.scm.SubversionSCM-ModuleLocation> <remote>@hudson.cxf.url@</remote> Modified: framework/trunk/hudson/hudson-home/jobs/CXF-BINDIST-AS-6.0.1-SUN-JDK-6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/CXF-BINDIST-AS-6.0.1-SUN-JDK-6/config.xml 2010-07-06 12:01:51 UTC (rev 12590) +++ framework/trunk/hudson/hudson-home/jobs/CXF-BINDIST-AS-6.0.1-SUN-JDK-6/config.xml 2010-07-06 13:44:12 UTC (rev 12591) @@ -11,7 +11,7 @@ WORKSPACE=`pwd` STACK_ID=cxf JAVA_HOME=(a)java.home.sun.jdk6@ -FRAMEWORK_DIR=$WORKSPACE/framework +HUDSON_DIR=$WORKSPACE/framework-hudson STACK_DIR=$WORKSPACE/stack-cxf TEST_OPTS= JBOSS_TARGET=jboss601 @@ -22,7 +22,7 @@ # # load test functions # -. $FRAMEWORK_DIR/hudson/jboss/bin/jbossws-qa.sh +. $HUDSON_DIR/jboss/bin/jbossws-qa.sh # # execute binary distribution tests @@ -46,8 +46,8 @@ <scm class="hudson.scm.SubversionSCM"> <locations> <hudson.scm.SubversionSCM-ModuleLocation> - <remote>@hudson.framework.url@</remote> - <local>framework</local> + <remote>@hudson.framework.url@/hudson</remote> + <local>framework-hudson</local> </hudson.scm.SubversionSCM-ModuleLocation> <hudson.scm.SubversionSCM-ModuleLocation> <remote>@hudson.cxf.url@</remote> Modified: framework/trunk/hudson/hudson-home/jobs/CXF-CORE-AS-5.0.1-SPRING-SUN-JDK-6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/CXF-CORE-AS-5.0.1-SPRING-SUN-JDK-6/config.xml 2010-07-06 12:01:51 UTC (rev 12590) +++ framework/trunk/hudson/hudson-home/jobs/CXF-CORE-AS-5.0.1-SPRING-SUN-JDK-6/config.xml 2010-07-06 13:44:12 UTC (rev 12591) @@ -11,7 +11,7 @@ WORKSPACE=`pwd` STACK_ID=cxf JAVA_HOME=(a)java.home.sun.jdk6@ -FRAMEWORK_DIR=$WORKSPACE/framework +HUDSON_DIR=$WORKSPACE/framework-hudson STACK_DIR=$WORKSPACE/stack-cxf TEST_OPTS= JBOSS_TARGET=jboss501 @@ -22,7 +22,7 @@ # # load test functions # -. $FRAMEWORK_DIR/hudson/jboss/bin/jbossws-qa.sh +. $HUDSON_DIR/jboss/bin/jbossws-qa.sh # # execute core tests @@ -46,8 +46,8 @@ <scm class="hudson.scm.SubversionSCM"> <locations> <hudson.scm.SubversionSCM-ModuleLocation> - <remote>@hudson.framework.url@</remote> - <local>framework</local> + <remote>@hudson.framework.url@/hudson</remote> + <local>framework-hudson</local> </hudson.scm.SubversionSCM-ModuleLocation> <hudson.scm.SubversionSCM-ModuleLocation> <remote>@hudson.cxf.url@</remote> Modified: framework/trunk/hudson/hudson-home/jobs/CXF-CORE-AS-5.0.1-SUN-JDK-6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/CXF-CORE-AS-5.0.1-SUN-JDK-6/config.xml 2010-07-06 12:01:51 UTC (rev 12590) +++ framework/trunk/hudson/hudson-home/jobs/CXF-CORE-AS-5.0.1-SUN-JDK-6/config.xml 2010-07-06 13:44:12 UTC (rev 12591) @@ -11,7 +11,7 @@ WORKSPACE=`pwd` STACK_ID=cxf JAVA_HOME=(a)java.home.sun.jdk6@ -FRAMEWORK_DIR=$WORKSPACE/framework +HUDSON_DIR=$WORKSPACE/framework-hudson STACK_DIR=$WORKSPACE/stack-cxf TEST_OPTS= JBOSS_TARGET=jboss501 @@ -22,7 +22,7 @@ # # load test functions # -. $FRAMEWORK_DIR/hudson/jboss/bin/jbossws-qa.sh +. $HUDSON_DIR/jboss/bin/jbossws-qa.sh # # execute core tests @@ -46,8 +46,8 @@ <scm class="hudson.scm.SubversionSCM"> <locations> <hudson.scm.SubversionSCM-ModuleLocation> - <remote>@hudson.framework.url@</remote> - <local>framework</local> + <remote>@hudson.framework.url@/hudson</remote> + <local>framework-hudson</local> </hudson.scm.SubversionSCM-ModuleLocation> <hudson.scm.SubversionSCM-ModuleLocation> <remote>@hudson.cxf.url@</remote> Modified: framework/trunk/hudson/hudson-home/jobs/CXF-CORE-AS-5.1.0-SPRING-SUN-JDK-6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/CXF-CORE-AS-5.1.0-SPRING-SUN-JDK-6/config.xml 2010-07-06 12:01:51 UTC (rev 12590) +++ framework/trunk/hudson/hudson-home/jobs/CXF-CORE-AS-5.1.0-SPRING-SUN-JDK-6/config.xml 2010-07-06 13:44:12 UTC (rev 12591) @@ -11,7 +11,7 @@ WORKSPACE=`pwd` STACK_ID=cxf JAVA_HOME=(a)java.home.sun.jdk6@ -FRAMEWORK_DIR=$WORKSPACE/framework +HUDSON_DIR=$WORKSPACE/framework-hudson STACK_DIR=$WORKSPACE/stack-cxf TEST_OPTS= JBOSS_TARGET=jboss510 @@ -22,7 +22,7 @@ # # load test functions # -. $FRAMEWORK_DIR/hudson/jboss/bin/jbossws-qa.sh +. $HUDSON_DIR/jboss/bin/jbossws-qa.sh # # execute core tests @@ -46,8 +46,8 @@ <scm class="hudson.scm.SubversionSCM"> <locations> <hudson.scm.SubversionSCM-ModuleLocation> - <remote>@hudson.framework.url@</remote> - <local>framework</local> + <remote>@hudson.framework.url@/hudson</remote> + <local>framework-hudson</local> </hudson.scm.SubversionSCM-ModuleLocation> <hudson.scm.SubversionSCM-ModuleLocation> <remote>@hudson.cxf.url@</remote> Modified: framework/trunk/hudson/hudson-home/jobs/CXF-CORE-AS-5.1.0-SUN-JDK-6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/CXF-CORE-AS-5.1.0-SUN-JDK-6/config.xml 2010-07-06 12:01:51 UTC (rev 12590) +++ framework/trunk/hudson/hudson-home/jobs/CXF-CORE-AS-5.1.0-SUN-JDK-6/config.xml 2010-07-06 13:44:12 UTC (rev 12591) @@ -11,7 +11,7 @@ WORKSPACE=`pwd` STACK_ID=cxf JAVA_HOME=(a)java.home.sun.jdk6@ -FRAMEWORK_DIR=$WORKSPACE/framework +HUDSON_DIR=$WORKSPACE/framework-hudson STACK_DIR=$WORKSPACE/stack-cxf TEST_OPTS= JBOSS_TARGET=jboss510 @@ -22,7 +22,7 @@ # # load test functions # -. $FRAMEWORK_DIR/hudson/jboss/bin/jbossws-qa.sh +. $HUDSON_DIR/jboss/bin/jbossws-qa.sh # # execute core tests @@ -46,8 +46,8 @@ <scm class="hudson.scm.SubversionSCM"> <locations> <hudson.scm.SubversionSCM-ModuleLocation> - <remote>@hudson.framework.url@</remote> - <local>framework</local> + <remote>@hudson.framework.url@/hudson</remote> + <local>framework-hudson</local> </hudson.scm.SubversionSCM-ModuleLocation> <hudson.scm.SubversionSCM-ModuleLocation> <remote>@hudson.cxf.url@</remote> Modified: framework/trunk/hudson/hudson-home/jobs/CXF-CORE-AS-6.0.0-SPRING-SUN-JDK-6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/CXF-CORE-AS-6.0.0-SPRING-SUN-JDK-6/config.xml 2010-07-06 12:01:51 UTC (rev 12590) +++ framework/trunk/hudson/hudson-home/jobs/CXF-CORE-AS-6.0.0-SPRING-SUN-JDK-6/config.xml 2010-07-06 13:44:12 UTC (rev 12591) @@ -11,7 +11,7 @@ WORKSPACE=`pwd` STACK_ID=cxf JAVA_HOME=(a)java.home.sun.jdk6@ -FRAMEWORK_DIR=$WORKSPACE/framework +HUDSON_DIR=$WORKSPACE/framework-hudson STACK_DIR=$WORKSPACE/stack-cxf TEST_OPTS= JBOSS_TARGET=jboss600 @@ -22,7 +22,7 @@ # # load test functions # -. $FRAMEWORK_DIR/hudson/jboss/bin/jbossws-qa.sh +. $HUDSON_DIR/jboss/bin/jbossws-qa.sh # # execute core tests @@ -46,8 +46,8 @@ <scm class="hudson.scm.SubversionSCM"> <locations> <hudson.scm.SubversionSCM-ModuleLocation> - <remote>@hudson.framework.url@</remote> - <local>framework</local> + <remote>@hudson.framework.url@/hudson</remote> + <local>framework-hudson</local> </hudson.scm.SubversionSCM-ModuleLocation> <hudson.scm.SubversionSCM-ModuleLocation> <remote>@hudson.cxf.url@</remote> Modified: framework/trunk/hudson/hudson-home/jobs/CXF-CORE-AS-6.0.0-SUN-JDK-6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/CXF-CORE-AS-6.0.0-SUN-JDK-6/config.xml 2010-07-06 12:01:51 UTC (rev 12590) +++ framework/trunk/hudson/hudson-home/jobs/CXF-CORE-AS-6.0.0-SUN-JDK-6/config.xml 2010-07-06 13:44:12 UTC (rev 12591) @@ -11,7 +11,7 @@ WORKSPACE=`pwd` STACK_ID=cxf JAVA_HOME=(a)java.home.sun.jdk6@ -FRAMEWORK_DIR=$WORKSPACE/framework +HUDSON_DIR=$WORKSPACE/framework-hudson STACK_DIR=$WORKSPACE/stack-cxf TEST_OPTS= JBOSS_TARGET=jboss600 @@ -22,7 +22,7 @@ # # load test functions # -. $FRAMEWORK_DIR/hudson/jboss/bin/jbossws-qa.sh +. $HUDSON_DIR/jboss/bin/jbossws-qa.sh # # execute core tests @@ -46,8 +46,8 @@ <scm class="hudson.scm.SubversionSCM"> <locations> <hudson.scm.SubversionSCM-ModuleLocation> - <remote>@hudson.framework.url@</remote> - <local>framework</local> + <remote>@hudson.framework.url@/hudson</remote> + <local>framework-hudson</local> </hudson.scm.SubversionSCM-ModuleLocation> <hudson.scm.SubversionSCM-ModuleLocation> <remote>@hudson.cxf.url@</remote> Modified: framework/trunk/hudson/hudson-home/jobs/CXF-CORE-AS-6.0.1-SPRING-SUN-JDK-6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/CXF-CORE-AS-6.0.1-SPRING-SUN-JDK-6/config.xml 2010-07-06 12:01:51 UTC (rev 12590) +++ framework/trunk/hudson/hudson-home/jobs/CXF-CORE-AS-6.0.1-SPRING-SUN-JDK-6/config.xml 2010-07-06 13:44:12 UTC (rev 12591) @@ -11,7 +11,7 @@ WORKSPACE=`pwd` STACK_ID=cxf JAVA_HOME=(a)java.home.sun.jdk6@ -FRAMEWORK_DIR=$WORKSPACE/framework +HUDSON_DIR=$WORKSPACE/framework-hudson STACK_DIR=$WORKSPACE/stack-cxf TEST_OPTS= JBOSS_TARGET=jboss601 @@ -22,7 +22,7 @@ # # load test functions # -. $FRAMEWORK_DIR/hudson/jboss/bin/jbossws-qa.sh +. $HUDSON_DIR/jboss/bin/jbossws-qa.sh # # execute core tests @@ -46,8 +46,8 @@ <scm class="hudson.scm.SubversionSCM"> <locations> <hudson.scm.SubversionSCM-ModuleLocation> - <remote>@hudson.framework.url@</remote> - <local>framework</local> + <remote>@hudson.framework.url@/hudson</remote> + <local>framework-hudson</local> </hudson.scm.SubversionSCM-ModuleLocation> <hudson.scm.SubversionSCM-ModuleLocation> <remote>@hudson.cxf.url@</remote> Modified: framework/trunk/hudson/hudson-home/jobs/CXF-CORE-AS-6.0.1-SUN-JDK-6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/CXF-CORE-AS-6.0.1-SUN-JDK-6/config.xml 2010-07-06 12:01:51 UTC (rev 12590) +++ framework/trunk/hudson/hudson-home/jobs/CXF-CORE-AS-6.0.1-SUN-JDK-6/config.xml 2010-07-06 13:44:12 UTC (rev 12591) @@ -11,7 +11,7 @@ WORKSPACE=`pwd` STACK_ID=cxf JAVA_HOME=(a)java.home.sun.jdk6@ -FRAMEWORK_DIR=$WORKSPACE/framework +HUDSON_DIR=$WORKSPACE/framework-hudson STACK_DIR=$WORKSPACE/stack-cxf TEST_OPTS= JBOSS_TARGET=jboss601 @@ -22,7 +22,7 @@ # # load test functions # -. $FRAMEWORK_DIR/hudson/jboss/bin/jbossws-qa.sh +. $HUDSON_DIR/jboss/bin/jbossws-qa.sh # # execute core tests @@ -46,8 +46,8 @@ <scm class="hudson.scm.SubversionSCM"> <locations> <hudson.scm.SubversionSCM-ModuleLocation> - <remote>@hudson.framework.url@</remote> - <local>framework</local> + <remote>@hudson.framework.url@/hudson</remote> + <local>framework-hudson</local> </hudson.scm.SubversionSCM-ModuleLocation> <hudson.scm.SubversionSCM-ModuleLocation> <remote>@hudson.cxf.url@</remote> Modified: framework/trunk/hudson/hudson-home/jobs/CXF-SRCDIST-AS-5.0.1-SPRING-SUN-JDK-6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/CXF-SRCDIST-AS-5.0.1-SPRING-SUN-JDK-6/config.xml 2010-07-06 12:01:51 UTC (rev 12590) +++ framework/trunk/hudson/hudson-home/jobs/CXF-SRCDIST-AS-5.0.1-SPRING-SUN-JDK-6/config.xml 2010-07-06 13:44:12 UTC (rev 12591) @@ -11,7 +11,7 @@ WORKSPACE=`pwd` STACK_ID=cxf JAVA_HOME=(a)java.home.sun.jdk6@ -FRAMEWORK_DIR=$WORKSPACE/framework +HUDSON_DIR=$WORKSPACE/framework-hudson STACK_DIR=$WORKSPACE/stack-cxf TEST_OPTS= JBOSS_TARGET=jboss501 @@ -22,7 +22,7 @@ # # load test functions # -. $FRAMEWORK_DIR/hudson/jboss/bin/jbossws-qa.sh +. $HUDSON_DIR/jboss/bin/jbossws-qa.sh # # execute source distribution tests @@ -46,8 +46,8 @@ <scm class="hudson.scm.SubversionSCM"> <locations> <hudson.scm.SubversionSCM-ModuleLocation> - <remote>@hudson.framework.url@</remote> - <local>framework</local> + <remote>@hudson.framework.url@/hudson</remote> + <local>framework-hudson</local> </hudson.scm.SubversionSCM-ModuleLocation> <hudson.scm.SubversionSCM-ModuleLocation> <remote>@hudson.cxf.url@</remote> Modified: framework/trunk/hudson/hudson-home/jobs/CXF-SRCDIST-AS-5.0.1-SUN-JDK-6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/CXF-SRCDIST-AS-5.0.1-SUN-JDK-6/config.xml 2010-07-06 12:01:51 UTC (rev 12590) +++ framework/trunk/hudson/hudson-home/jobs/CXF-SRCDIST-AS-5.0.1-SUN-JDK-6/config.xml 2010-07-06 13:44:12 UTC (rev 12591) @@ -11,7 +11,7 @@ WORKSPACE=`pwd` STACK_ID=cxf JAVA_HOME=(a)java.home.sun.jdk6@ -FRAMEWORK_DIR=$WORKSPACE/framework +HUDSON_DIR=$WORKSPACE/framework-hudson STACK_DIR=$WORKSPACE/stack-cxf TEST_OPTS= JBOSS_TARGET=jboss501 @@ -22,7 +22,7 @@ # # load test functions # -. $FRAMEWORK_DIR/hudson/jboss/bin/jbossws-qa.sh +. $HUDSON_DIR/jboss/bin/jbossws-qa.sh # # execute source distribution tests @@ -46,8 +46,8 @@ <scm class="hudson.scm.SubversionSCM"> <locations> <hudson.scm.SubversionSCM-ModuleLocation> - <remote>@hudson.framework.url@</remote> - <local>framework</local> + <remote>@hudson.framework.url@/hudson</remote> + <local>framework-hudson</local> </hudson.scm.SubversionSCM-ModuleLocation> <hudson.scm.SubversionSCM-ModuleLocation> <remote>@hudson.cxf.url@</remote> Modified: framework/trunk/hudson/hudson-home/jobs/CXF-SRCDIST-AS-5.1.0-SPRING-SUN-JDK-6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/CXF-SRCDIST-AS-5.1.0-SPRING-SUN-JDK-6/config.xml 2010-07-06 12:01:51 UTC (rev 12590) +++ framework/trunk/hudson/hudson-home/jobs/CXF-SRCDIST-AS-5.1.0-SPRING-SUN-JDK-6/config.xml 2010-07-06 13:44:12 UTC (rev 12591) @@ -11,7 +11,7 @@ WORKSPACE=`pwd` STACK_ID=cxf JAVA_HOME=(a)java.home.sun.jdk6@ -FRAMEWORK_DIR=$WORKSPACE/framework +HUDSON_DIR=$WORKSPACE/framework-hudson STACK_DIR=$WORKSPACE/stack-cxf TEST_OPTS= JBOSS_TARGET=jboss510 @@ -22,7 +22,7 @@ # # load test functions # -. $FRAMEWORK_DIR/hudson/jboss/bin/jbossws-qa.sh +. $HUDSON_DIR/jboss/bin/jbossws-qa.sh # # execute source distribution tests @@ -46,8 +46,8 @@ <scm class="hudson.scm.SubversionSCM"> <locations> <hudson.scm.SubversionSCM-ModuleLocation> - <remote>@hudson.framework.url@</remote> - <local>framework</local> + <remote>@hudson.framework.url@/hudson</remote> + <local>framework-hudson</local> </hudson.scm.SubversionSCM-ModuleLocation> <hudson.scm.SubversionSCM-ModuleLocation> <remote>@hudson.cxf.url@</remote> Modified: framework/trunk/hudson/hudson-home/jobs/CXF-SRCDIST-AS-5.1.0-SUN-JDK-6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/CXF-SRCDIST-AS-5.1.0-SUN-JDK-6/config.xml 2010-07-06 12:01:51 UTC (rev 12590) +++ framework/trunk/hudson/hudson-home/jobs/CXF-SRCDIST-AS-5.1.0-SUN-JDK-6/config.xml 2010-07-06 13:44:12 UTC (rev 12591) @@ -11,7 +11,7 @@ WORKSPACE=`pwd` STACK_ID=cxf JAVA_HOME=(a)java.home.sun.jdk6@ -FRAMEWORK_DIR=$WORKSPACE/framework +HUDSON_DIR=$WORKSPACE/framework-hudson STACK_DIR=$WORKSPACE/stack-cxf TEST_OPTS= JBOSS_TARGET=jboss510 @@ -22,7 +22,7 @@ # # load test functions # -. $FRAMEWORK_DIR/hudson/jboss/bin/jbossws-qa.sh +. $HUDSON_DIR/jboss/bin/jbossws-qa.sh # # execute source distribution tests @@ -46,8 +46,8 @@ <scm class="hudson.scm.SubversionSCM"> <locations> <hudson.scm.SubversionSCM-ModuleLocation> - <remote>@hudson.framework.url@</remote> - <local>framework</local> + <remote>@hudson.framework.url@/hudson</remote> + <local>framework-hudson</local> </hudson.scm.SubversionSCM-ModuleLocation> <hudson.scm.SubversionSCM-ModuleLocation> <remote>@hudson.cxf.url@</remote> Modified: framework/trunk/hudson/hudson-home/jobs/CXF-SRCDIST-AS-6.0.0-SPRING-SUN-JDK-6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/CXF-SRCDIST-AS-6.0.0-SPRING-SUN-JDK-6/config.xml 2010-07-06 12:01:51 UTC (rev 12590) +++ framework/trunk/hudson/hudson-home/jobs/CXF-SRCDIST-AS-6.0.0-SPRING-SUN-JDK-6/config.xml 2010-07-06 13:44:12 UTC (rev 12591) @@ -11,7 +11,7 @@ WORKSPACE=`pwd` STACK_ID=cxf JAVA_HOME=(a)java.home.sun.jdk6@ -FRAMEWORK_DIR=$WORKSPACE/framework +HUDSON_DIR=$WORKSPACE/framework-hudson STACK_DIR=$WORKSPACE/stack-cxf TEST_OPTS= JBOSS_TARGET=jboss600 @@ -22,7 +22,7 @@ # # load test functions # -. $FRAMEWORK_DIR/hudson/jboss/bin/jbossws-qa.sh +. $HUDSON_DIR/jboss/bin/jbossws-qa.sh # # execute source distribution tests @@ -46,8 +46,8 @@ <scm class="hudson.scm.SubversionSCM"> <locations> <hudson.scm.SubversionSCM-ModuleLocation> - <remote>@hudson.framework.url@</remote> - <local>framework</local> + <remote>@hudson.framework.url@/hudson</remote> + <local>framework-hudson</local> </hudson.scm.SubversionSCM-ModuleLocation> <hudson.scm.SubversionSCM-ModuleLocation> <remote>@hudson.cxf.url@</remote> Modified: framework/trunk/hudson/hudson-home/jobs/CXF-SRCDIST-AS-6.0.0-SUN-JDK-6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/CXF-SRCDIST-AS-6.0.0-SUN-JDK-6/config.xml 2010-07-06 12:01:51 UTC (rev 12590) +++ framework/trunk/hudson/hudson-home/jobs/CXF-SRCDIST-AS-6.0.0-SUN-JDK-6/config.xml 2010-07-06 13:44:12 UTC (rev 12591) @@ -11,7 +11,7 @@ WORKSPACE=`pwd` STACK_ID=cxf JAVA_HOME=(a)java.home.sun.jdk6@ -FRAMEWORK_DIR=$WORKSPACE/framework +HUDSON_DIR=$WORKSPACE/framework-hudson STACK_DIR=$WORKSPACE/stack-cxf TEST_OPTS= JBOSS_TARGET=jboss600 @@ -22,7 +22,7 @@ # # load test functions # -. $FRAMEWORK_DIR/hudson/jboss/bin/jbossws-qa.sh +. $HUDSON_DIR/jboss/bin/jbossws-qa.sh # # execute source distribution tests @@ -46,8 +46,8 @@ <scm class="hudson.scm.SubversionSCM"> <locations> <hudson.scm.SubversionSCM-ModuleLocation> - <remote>@hudson.framework.url@</remote> - <local>framework</local> + <remote>@hudson.framework.url@/hudson</remote> + <local>framework-hudson</local> </hudson.scm.SubversionSCM-ModuleLocation> <hudson.scm.SubversionSCM-ModuleLocation> <remote>@hudson.cxf.url@</remote> Modified: framework/trunk/hudson/hudson-home/jobs/CXF-SRCDIST-AS-6.0.1-SPRING-SUN-JDK-6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/CXF-SRCDIST-AS-6.0.1-SPRING-SUN-JDK-6/config.xml 2010-07-06 12:01:51 UTC (rev 12590) +++ framework/trunk/hudson/hudson-home/jobs/CXF-SRCDIST-AS-6.0.1-SPRING-SUN-JDK-6/config.xml 2010-07-06 13:44:12 UTC (rev 12591) @@ -11,7 +11,7 @@ WORKSPACE=`pwd` STACK_ID=cxf JAVA_HOME=(a)java.home.sun.jdk6@ -FRAMEWORK_DIR=$WORKSPACE/framework +HUDSON_DIR=$WORKSPACE/framework-hudson STACK_DIR=$WORKSPACE/stack-cxf TEST_OPTS= JBOSS_TARGET=jboss601 @@ -22,7 +22,7 @@ # # load test functions # -. $FRAMEWORK_DIR/hudson/jboss/bin/jbossws-qa.sh +. $HUDSON_DIR/jboss/bin/jbossws-qa.sh # # execute source distribution tests @@ -46,8 +46,8 @@ <scm class="hudson.scm.SubversionSCM"> <locations> <hudson.scm.SubversionSCM-ModuleLocation> - <remote>@hudson.framework.url@</remote> - <local>framework</local> + <remote>@hudson.framework.url@/hudson</remote> + <local>framework-hudson</local> </hudson.scm.SubversionSCM-ModuleLocation> <hudson.scm.SubversionSCM-ModuleLocation> <remote>@hudson.cxf.url@</remote> Modified: framework/trunk/hudson/hudson-home/jobs/CXF-SRCDIST-AS-6.0.1-SUN-JDK-6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/CXF-SRCDIST-AS-6.0.1-SUN-JDK-6/config.xml 2010-07-06 12:01:51 UTC (rev 12590) +++ framework/trunk/hudson/hudson-home/jobs/CXF-SRCDIST-AS-6.0.1-SUN-JDK-6/config.xml 2010-07-06 13:44:12 UTC (rev 12591) @@ -11,7 +11,7 @@ WORKSPACE=`pwd` STACK_ID=cxf JAVA_HOME=(a)java.home.sun.jdk6@ -FRAMEWORK_DIR=$WORKSPACE/framework +HUDSON_DIR=$WORKSPACE/framework-hudson STACK_DIR=$WORKSPACE/stack-cxf TEST_OPTS= JBOSS_TARGET=jboss601 @@ -22,7 +22,7 @@ # # load test functions # -. $FRAMEWORK_DIR/hudson/jboss/bin/jbossws-qa.sh +. $HUDSON_DIR/jboss/bin/jbossws-qa.sh # # execute source distribution tests @@ -46,8 +46,8 @@ <scm class="hudson.scm.SubversionSCM"> <locations> <hudson.scm.SubversionSCM-ModuleLocation> - <remote>@hudson.framework.url@</remote> - <local>framework</local> + <remote>@hudson.framework.url@/hudson</remote> + <local>framework-hudson</local> </hudson.scm.SubversionSCM-ModuleLocation> <hudson.scm.SubversionSCM-ModuleLocation> <remote>@hudson.cxf.url@</remote> Modified: framework/trunk/hudson/hudson-home/jobs/METRO-BINDIST-AS-5.0.1-SUN-JDK-6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/METRO-BINDIST-AS-5.0.1-SUN-JDK-6/config.xml 2010-07-06 12:01:51 UTC (rev 12590) +++ framework/trunk/hudson/hudson-home/jobs/METRO-BINDIST-AS-5.0.1-SUN-JDK-6/config.xml 2010-07-06 13:44:12 UTC (rev 12591) @@ -11,7 +11,7 @@ WORKSPACE=`pwd` STACK_ID=metro JAVA_HOME=(a)java.home.sun.jdk6@ -FRAMEWORK_DIR=$WORKSPACE/framework +HUDSON_DIR=$WORKSPACE/framework-hudson STACK_DIR=$WORKSPACE/stack-metro TEST_OPTS= JBOSS_TARGET=jboss501 @@ -22,7 +22,7 @@ # # load test functions # -. $FRAMEWORK_DIR/hudson/jboss/bin/jbossws-qa.sh +. $HUDSON_DIR/jboss/bin/jbossws-qa.sh # # execute binary distribution tests @@ -46,8 +46,8 @@ <scm class="hudson.scm.SubversionSCM"> <locations> <hudson.scm.SubversionSCM-ModuleLocation> - <remote>@hudson.framework.url@</remote> - <local>framework</local> + <remote>@hudson.framework.url@/hudson</remote> + <local>framework-hudson</local> </hudson.scm.SubversionSCM-ModuleLocation> <hudson.scm.SubversionSCM-ModuleLocation> <remote>@hudson.metro.url@</remote> Modified: framework/trunk/hudson/hudson-home/jobs/METRO-BINDIST-AS-5.1.0-SUN-JDK-6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/METRO-BINDIST-AS-5.1.0-SUN-JDK-6/config.xml 2010-07-06 12:01:51 UTC (rev 12590) +++ framework/trunk/hudson/hudson-home/jobs/METRO-BINDIST-AS-5.1.0-SUN-JDK-6/config.xml 2010-07-06 13:44:12 UTC (rev 12591) @@ -11,7 +11,7 @@ WORKSPACE=`pwd` STACK_ID=metro JAVA_HOME=(a)java.home.sun.jdk6@ -FRAMEWORK_DIR=$WORKSPACE/framework +HUDSON_DIR=$WORKSPACE/framework-hudson STACK_DIR=$WORKSPACE/stack-metro TEST_OPTS= JBOSS_TARGET=jboss510 @@ -22,7 +22,7 @@ # # load test functions # -. $FRAMEWORK_DIR/hudson/jboss/bin/jbossws-qa.sh +. $HUDSON_DIR/jboss/bin/jbossws-qa.sh # # execute binary distribution tests @@ -46,8 +46,8 @@ <scm class="hudson.scm.SubversionSCM"> <locations> <hudson.scm.SubversionSCM-ModuleLocation> - <remote>@hudson.framework.url@</remote> - <local>framework</local> + <remote>@hudson.framework.url@/hudson</remote> + <local>framework-hudson</local> </hudson.scm.SubversionSCM-ModuleLocation> <hudson.scm.SubversionSCM-ModuleLocation> <remote>@hudson.metro.url@</remote> Modified: framework/trunk/hudson/hudson-home/jobs/METRO-BINDIST-AS-6.0.0-SUN-JDK-6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/METRO-BINDIST-AS-6.0.0-SUN-JDK-6/config.xml 2010-07-06 12:01:51 UTC (rev 12590) +++ framework/trunk/hudson/hudson-home/jobs/METRO-BINDIST-AS-6.0.0-SUN-JDK-6/config.xml 2010-07-06 13:44:12 UTC (rev 12591) @@ -11,7 +11,7 @@ WORKSPACE=`pwd` STACK_ID=metro JAVA_HOME=(a)java.home.sun.jdk6@ -FRAMEWORK_DIR=$WORKSPACE/framework +HUDSON_DIR=$WORKSPACE/framework-hudson STACK_DIR=$WORKSPACE/stack-metro TEST_OPTS= JBOSS_TARGET=jboss600 @@ -22,7 +22,7 @@ # # load test functions # -. $FRAMEWORK_DIR/hudson/jboss/bin/jbossws-qa.sh +. $HUDSON_DIR/jboss/bin/jbossws-qa.sh # # execute binary distribution tests @@ -46,8 +46,8 @@ <scm class="hudson.scm.SubversionSCM"> <locations> <hudson.scm.SubversionSCM-ModuleLocation> - <remote>@hudson.framework.url@</remote> - <local>framework</local> + <remote>@hudson.framework.url@/hudson</remote> + <local>framework-hudson</local> </hudson.scm.SubversionSCM-ModuleLocation> <hudson.scm.SubversionSCM-ModuleLocation> <remote>@hudson.metro.url@</remote> Modified: framework/trunk/hudson/hudson-home/jobs/METRO-BINDIST-AS-6.0.1-SUN-JDK-6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/METRO-BINDIST-AS-6.0.1-SUN-JDK-6/config.xml 2010-07-06 12:01:51 UTC (rev 12590) +++ framework/trunk/hudson/hudson-home/jobs/METRO-BINDIST-AS-6.0.1-SUN-JDK-6/config.xml 2010-07-06 13:44:12 UTC (rev 12591) @@ -11,7 +11,7 @@ WORKSPACE=`pwd` STACK_ID=metro JAVA_HOME=(a)java.home.sun.jdk6@ -FRAMEWORK_DIR=$WORKSPACE/framework +HUDSON_DIR=$WORKSPACE/framework-hudson STACK_DIR=$WORKSPACE/stack-metro TEST_OPTS= JBOSS_TARGET=jboss601 @@ -22,7 +22,7 @@ # # load test functions # -. $FRAMEWORK_DIR/hudson/jboss/bin/jbossws-qa.sh +. $HUDSON_DIR/jboss/bin/jbossws-qa.sh # # execute binary distribution tests @@ -46,8 +46,8 @@ <scm class="hudson.scm.SubversionSCM"> <locations> <hudson.scm.SubversionSCM-ModuleLocation> - <remote>@hudson.framework.url@</remote> - <local>framework</local> + <remote>@hudson.framework.url@/hudson</remote> + <local>framework-hudson</local> </hudson.scm.SubversionSCM-ModuleLocation> <hudson.scm.SubversionSCM-ModuleLocation> <remote>@hudson.metro.url@</remote> Modified: framework/trunk/hudson/hudson-home/jobs/METRO-CORE-AS-5.0.1-SUN-JDK-6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/METRO-CORE-AS-5.0.1-SUN-JDK-6/config.xml 2010-07-06 12:01:51 UTC (rev 12590) +++ framework/trunk/hudson/hudson-home/jobs/METRO-CORE-AS-5.0.1-SUN-JDK-6/config.xml 2010-07-06 13:44:12 UTC (rev 12591) @@ -11,7 +11,7 @@ WORKSPACE=`pwd` STACK_ID=metro JAVA_HOME=(a)java.home.sun.jdk6@ -FRAMEWORK_DIR=$WORKSPACE/framework +HUDSON_DIR=$WORKSPACE/framework-hudson STACK_DIR=$WORKSPACE/stack-metro TEST_OPTS= JBOSS_TARGET=jboss501 @@ -22,7 +22,7 @@ # # load test functions # -. $FRAMEWORK_DIR/hudson/jboss/bin/jbossws-qa.sh +. $HUDSON_DIR/jboss/bin/jbossws-qa.sh # # execute core tests @@ -46,8 +46,8 @@ <scm class="hudson.scm.SubversionSCM"> <locations> <hudson.scm.SubversionSCM-ModuleLocation> - <remote>@hudson.framework.url@</remote> - <local>framework</local> + <remote>@hudson.framework.url@/hudson</remote> + <local>framework-hudson</local> </hudson.scm.SubversionSCM-ModuleLocation> <hudson.scm.SubversionSCM-ModuleLocation> <remote>@hudson.metro.url@</remote> Modified: framework/trunk/hudson/hudson-home/jobs/METRO-CORE-AS-5.1.0-SUN-JDK-6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/METRO-CORE-AS-5.1.0-SUN-JDK-6/config.xml 2010-07-06 12:01:51 UTC (rev 12590) +++ framework/trunk/hudson/hudson-home/jobs/METRO-CORE-AS-5.1.0-SUN-JDK-6/config.xml 2010-07-06 13:44:12 UTC (rev 12591) @@ -11,7 +11,7 @@ WORKSPACE=`pwd` STACK_ID=metro JAVA_HOME=(a)java.home.sun.jdk6@ -FRAMEWORK_DIR=$WORKSPACE/framework +HUDSON_DIR=$WORKSPACE/framework-hudson STACK_DIR=$WORKSPACE/stack-metro TEST_OPTS= JBOSS_TARGET=jboss510 @@ -22,7 +22,7 @@ # # load test functions # -. $FRAMEWORK_DIR/hudson/jboss/bin/jbossws-qa.sh +. $HUDSON_DIR/jboss/bin/jbossws-qa.sh # # execute core tests @@ -46,8 +46,8 @@ <scm class="hudson.scm.SubversionSCM"> <locations> <hudson.scm.SubversionSCM-ModuleLocation> - <remote>@hudson.framework.url@</remote> - <local>framework</local> + <remote>@hudson.framework.url@/hudson</remote> + <local>framework-hudson</local> </hudson.scm.SubversionSCM-ModuleLocation> <hudson.scm.SubversionSCM-ModuleLocation> <remote>@hudson.metro.url@</remote> Modified: framework/trunk/hudson/hudson-home/jobs/METRO-CORE-AS-6.0.0-SUN-JDK-6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/METRO-CORE-AS-6.0.0-SUN-JDK-6/config.xml 2010-07-06 12:01:51 UTC (rev 12590) +++ framework/trunk/hudson/hudson-home/jobs/METRO-CORE-AS-6.0.0-SUN-JDK-6/config.xml 2010-07-06 13:44:12 UTC (rev 12591) @@ -11,7 +11,7 @@ WORKSPACE=`pwd` STACK_ID=metro JAVA_HOME=(a)java.home.sun.jdk6@ -FRAMEWORK_DIR=$WORKSPACE/framework +HUDSON_DIR=$WORKSPACE/framework-hudson STACK_DIR=$WORKSPACE/stack-metro TEST_OPTS= JBOSS_TARGET=jboss600 @@ -22,7 +22,7 @@ # # load test functions # -. $FRAMEWORK_DIR/hudson/jboss/bin/jbossws-qa.sh +. $HUDSON_DIR/jboss/bin/jbossws-qa.sh # # execute core tests @@ -46,8 +46,8 @@ <scm class="hudson.scm.SubversionSCM"> <locations> <hudson.scm.SubversionSCM-ModuleLocation> - <remote>@hudson.framework.url@</remote> - <local>framework</local> + <remote>@hudson.framework.url@/hudson</remote> + <local>framework-hudson</local> </hudson.scm.SubversionSCM-ModuleLocation> <hudson.scm.SubversionSCM-ModuleLocation> <remote>@hudson.metro.url@</remote> Modified: framework/trunk/hudson/hudson-home/jobs/METRO-CORE-AS-6.0.1-SUN-JDK-6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/METRO-CORE-AS-6.0.1-SUN-JDK-6/config.xml 2010-07-06 12:01:51 UTC (rev 12590) +++ framework/trunk/hudson/hudson-home/jobs/METRO-CORE-AS-6.0.1-SUN-JDK-6/config.xml 2010-07-06 13:44:12 UTC (rev 12591) @@ -11,7 +11,7 @@ WORKSPACE=`pwd` STACK_ID=metro JAVA_HOME=(a)java.home.sun.jdk6@ -FRAMEWORK_DIR=$WORKSPACE/framework +HUDSON_DIR=$WORKSPACE/framework-hudson STACK_DIR=$WORKSPACE/stack-metro TEST_OPTS= JBOSS_TARGET=jboss601 @@ -22,7 +22,7 @@ # # load test functions # -. $FRAMEWORK_DIR/hudson/jboss/bin/jbossws-qa.sh +. $HUDSON_DIR/jboss/bin/jbossws-qa.sh # # execute core tests @@ -46,8 +46,8 @@ <scm class="hudson.scm.SubversionSCM"> <locations> <hudson.scm.SubversionSCM-ModuleLocation> - <remote>@hudson.framework.url@</remote> - <local>framework</local> + <remote>@hudson.framework.url@/hudson</remote> + <local>framework-hudson</local> </hudson.scm.SubversionSCM-ModuleLocation> <hudson.scm.SubversionSCM-ModuleLocation> <remote>@hudson.metro.url@</remote> Modified: framework/trunk/hudson/hudson-home/jobs/METRO-SRCDIST-AS-5.0.1-SUN-JDK-6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/METRO-SRCDIST-AS-5.0.1-SUN-JDK-6/config.xml 2010-07-06 12:01:51 UTC (rev 12590) +++ framework/trunk/hudson/hudson-home/jobs/METRO-SRCDIST-AS-5.0.1-SUN-JDK-6/config.xml 2010-07-06 13:44:12 UTC (rev 12591) @@ -11,7 +11,7 @@ WORKSPACE=`pwd` STACK_ID=metro JAVA_HOME=(a)java.home.sun.jdk6@ -FRAMEWORK_DIR=$WORKSPACE/framework +HUDSON_DIR=$WORKSPACE/framework-hudson STACK_DIR=$WORKSPACE/stack-metro TEST_OPTS= JBOSS_TARGET=jboss501 @@ -22,7 +22,7 @@ # # load test functions # -. $FRAMEWORK_DIR/hudson/jboss/bin/jbossws-qa.sh +. $HUDSON_DIR/jboss/bin/jbossws-qa.sh # # execute source distribution tests @@ -46,8 +46,8 @@ <scm class="hudson.scm.SubversionSCM"> <locations> <hudson.scm.SubversionSCM-ModuleLocation> - <remote>@hudson.framework.url@</remote> - <local>framework</local> + <remote>@hudson.framework.url@/hudson</remote> + <local>framework-hudson</local> </hudson.scm.SubversionSCM-ModuleLocation> <hudson.scm.SubversionSCM-ModuleLocation> <remote>@hudson.metro.url@</remote> Modified: framework/trunk/hudson/hudson-home/jobs/METRO-SRCDIST-AS-5.1.0-SUN-JDK-6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/METRO-SRCDIST-AS-5.1.0-SUN-JDK-6/config.xml 2010-07-06 12:01:51 UTC (rev 12590) +++ framework/trunk/hudson/hudson-home/jobs/METRO-SRCDIST-AS-5.1.0-SUN-JDK-6/config.xml 2010-07-06 13:44:12 UTC (rev 12591) @@ -11,7 +11,7 @@ WORKSPACE=`pwd` STACK_ID=metro JAVA_HOME=(a)java.home.sun.jdk6@ -FRAMEWORK_DIR=$WORKSPACE/framework +HUDSON_DIR=$WORKSPACE/framework-hudson STACK_DIR=$WORKSPACE/stack-metro TEST_OPTS= JBOSS_TARGET=jboss510 @@ -22,7 +22,7 @@ # # load test functions # -. $FRAMEWORK_DIR/hudson/jboss/bin/jbossws-qa.sh +. $HUDSON_DIR/jboss/bin/jbossws-qa.sh # # execute source distribution tests @@ -46,8 +46,8 @@ <scm class="hudson.scm.SubversionSCM"> <locations> <hudson.scm.SubversionSCM-ModuleLocation> - <remote>@hudson.framework.url@</remote> - <local>framework</local> + <remote>@hudson.framework.url@/hudson</remote> + <local>framework-hudson</local> </hudson.scm.SubversionSCM-ModuleLocation> <hudson.scm.SubversionSCM-ModuleLocation> <remote>@hudson.metro.url@</remote> Modified: framework/trunk/hudson/hudson-home/jobs/METRO-SRCDIST-AS-6.0.0-SUN-JDK-6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/METRO-SRCDIST-AS-6.0.0-SUN-JDK-6/config.xml 2010-07-06 12:01:51 UTC (rev 12590) +++ framework/trunk/hudson/hudson-home/jobs/METRO-SRCDIST-AS-6.0.0-SUN-JDK-6/config.xml 2010-07-06 13:44:12 UTC (rev 12591) @@ -11,7 +11,7 @@ WORKSPACE=`pwd` STACK_ID=metro JAVA_HOME=(a)java.home.sun.jdk6@ -FRAMEWORK_DIR=$WORKSPACE/framework +HUDSON_DIR=$WORKSPACE/framework-hudson STACK_DIR=$WORKSPACE/stack-metro TEST_OPTS= JBOSS_TARGET=jboss600 @@ -22,7 +22,7 @@ # # load test functions # -. $FRAMEWORK_DIR/hudson/jboss/bin/jbossws-qa.sh +. $HUDSON_DIR/jboss/bin/jbossws-qa.sh # # execute source distribution tests @@ -46,8 +46,8 @@ <scm class="hudson.scm.SubversionSCM"> <locations> <hudson.scm.SubversionSCM-ModuleLocation> - <remote>@hudson.framework.url@</remote> - <local>framework</local> + <remote>@hudson.framework.url@/hudson</remote> + <local>framework-hudson</local> </hudson.scm.SubversionSCM-ModuleLocation> <hudson.scm.SubversionSCM-ModuleLocation> <remote>@hudson.metro.url@</remote> Modified: framework/trunk/hudson/hudson-home/jobs/METRO-SRCDIST-AS-6.0.1-SUN-JDK-6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/METRO-SRCDIST-AS-6.0.1-SUN-JDK-6/config.xml 2010-07-06 12:01:51 UTC (rev 12590) +++ framework/trunk/hudson/hudson-home/jobs/METRO-SRCDIST-AS-6.0.1-SUN-JDK-6/config.xml 2010-07-06 13:44:12 UTC (rev 12591) @@ -11,7 +11,7 @@ WORKSPACE=`pwd` STACK_ID=metro JAVA_HOME=(a)java.home.sun.jdk6@ -FRAMEWORK_DIR=$WORKSPACE/framework +HUDSON_DIR=$WORKSPACE/framework-hudson STACK_DIR=$WORKSPACE/stack-metro TEST_OPTS= JBOSS_TARGET=jboss601 @@ -22,7 +22,7 @@ # # load test functions # -. $FRAMEWORK_DIR/hudson/jboss/bin/jbossws-qa.sh +. $HUDSON_DIR/jboss/bin/jbossws-qa.sh # # execute source distribution tests @@ -46,8 +46,8 @@ <scm class="hudson.scm.SubversionSCM"> <locations> <hudson.scm.SubversionSCM-ModuleLocation> - <remote>@hudson.framework.url@</remote> - <local>framework</local> + <remote>@hudson.framework.url@/hudson</remote> + <local>framework-hudson</local> </hudson.scm.SubversionSCM-ModuleLocation> <hudson.scm.SubversionSCM-ModuleLocation> <remote>@hudson.metro.url@</remote> Modified: framework/trunk/hudson/hudson-home/jobs/NATIVE-BINDIST-AS-5.0.1-SUN-JDK-6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/NATIVE-BINDIST-AS-5.0.1-SUN-JDK-6/config.xml 2010-07-06 12:01:51 UTC (rev 12590) +++ framework/trunk/hudson/hudson-home/jobs/NATIVE-BINDIST-AS-5.0.1-SUN-JDK-6/config.xml 2010-07-06 13:44:12 UTC (rev 12591) @@ -11,7 +11,7 @@ WORKSPACE=`pwd` STACK_ID=native JAVA_HOME=(a)java.home.sun.jdk6@ -FRAMEWORK_DIR=$WORKSPACE/framework +HUDSON_DIR=$WORKSPACE/framework-hudson STACK_DIR=$WORKSPACE/stack-native TEST_OPTS= JBOSS_TARGET=jboss501 @@ -22,7 +22,7 @@ # # load test functions # -. $FRAMEWORK_DIR/hudson/jboss/bin/jbossws-qa.sh +. $HUDSON_DIR/jboss/bin/jbossws-qa.sh # # execute binary distribution tests @@ -46,8 +46,8 @@ <scm class="hudson.scm.SubversionSCM"> <locations> <hudson.scm.SubversionSCM-ModuleLocation> - <remote>@hudson.framework.url@</remote> - <local>framework</local> + <remote>@hudson.framework.url@/hudson</remote> + <local>framework-hudson</local> </hudson.scm.SubversionSCM-ModuleLocation> <hudson.scm.SubversionSCM-ModuleLocation> <remote>@hudson.native.url@</remote> Modified: framework/trunk/hudson/hudson-home/jobs/NATIVE-BINDIST-AS-5.1.0-SUN-JDK-6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/NATIVE-BINDIST-AS-5.1.0-SUN-JDK-6/config.xml 2010-07-06 12:01:51 UTC (rev 12590) +++ framework/trunk/hudson/hudson-home/jobs/NATIVE-BINDIST-AS-5.1.0-SUN-JDK-6/config.xml 2010-07-06 13:44:12 UTC (rev 12591) @@ -11,7 +11,7 @@ WORKSPACE=`pwd` STACK_ID=native JAVA_HOME=(a)java.home.sun.jdk6@ -FRAMEWORK_DIR=$WORKSPACE/framework +HUDSON_DIR=$WORKSPACE/framework-hudson STACK_DIR=$WORKSPACE/stack-native TEST_OPTS= JBOSS_TARGET=jboss510 @@ -22,7 +22,7 @@ # # load test functions # -. $FRAMEWORK_DIR/hudson/jboss/bin/jbossws-qa.sh +. $HUDSON_DIR/jboss/bin/jbossws-qa.sh # # execute binary distribution tests @@ -46,8 +46,8 @@ <scm class="hudson.scm.SubversionSCM"> <locations> <hudson.scm.SubversionSCM-ModuleLocation> - <remote>@hudson.framework.url@</remote> - <local>framework</local> + <remote>@hudson.framework.url@/hudson</remote> + <local>framework-hudson</local> </hudson.scm.SubversionSCM-ModuleLocation> <hudson.scm.SubversionSCM-ModuleLocation> <remote>@hudson.native.url@</remote> Modified: framework/trunk/hudson/hudson-home/jobs/NATIVE-BINDIST-AS-6.0.0-SUN-JDK-6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/NATIVE-BINDIST-AS-6.0.0-SUN-JDK-6/config.xml 2010-07-06 12:01:51 UTC (rev 12590) +++ framework/trunk/hudson/hudson-home/jobs/NATIVE-BINDIST-AS-6.0.0-SUN-JDK-6/config.xml 2010-07-06 13:44:12 UTC (rev 12591) @@ -11,7 +11,7 @@ WORKSPACE=`pwd` STACK_ID=native JAVA_HOME=(a)java.home.sun.jdk6@ -FRAMEWORK_DIR=$WORKSPACE/framework +HUDSON_DIR=$WORKSPACE/framework-hudson STACK_DIR=$WORKSPACE/stack-native TEST_OPTS= JBOSS_TARGET=jboss600 @@ -22,7 +22,7 @@ # # load test functions # -. $FRAMEWORK_DIR/hudson/jboss/bin/jbossws-qa.sh +. $HUDSON_DIR/jboss/bin/jbossws-qa.sh # # execute binary distribution tests @@ -46,8 +46,8 @@ <scm class="hudson.scm.SubversionSCM"> <locations> <hudson.scm.SubversionSCM-ModuleLocation> - <remote>@hudson.framework.url@</remote> - <local>framework</local> + <remote>@hudson.framework.url@/hudson</remote> + <local>framework-hudson</local> </hudson.scm.SubversionSCM-ModuleLocation> <hudson.scm.SubversionSCM-ModuleLocation> <remote>@hudson.native.url@</remote> Modified: framework/trunk/hudson/hudson-home/jobs/NATIVE-BINDIST-AS-6.0.1-SUN-JDK-6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/NATIVE-BINDIST-AS-6.0.1-SUN-JDK-6/config.xml 2010-07-06 12:01:51 UTC (rev 12590) +++ framework/trunk/hudson/hudson-home/jobs/NATIVE-BINDIST-AS-6.0.1-SUN-JDK-6/config.xml 2010-07-06 13:44:12 UTC (rev 12591) @@ -11,7 +11,7 @@ WORKSPACE=`pwd` STACK_ID=native JAVA_HOME=(a)java.home.sun.jdk6@ -FRAMEWORK_DIR=$WORKSPACE/framework +HUDSON_DIR=$WORKSPACE/framework-hudson STACK_DIR=$WORKSPACE/stack-native TEST_OPTS= JBOSS_TARGET=jboss601 @@ -22,7 +22,7 @@ # # load test functions # -. $FRAMEWORK_DIR/hudson/jboss/bin/jbossws-qa.sh +. $HUDSON_DIR/jboss/bin/jbossws-qa.sh # # execute binary distribution tests @@ -46,8 +46,8 @@ <scm class="hudson.scm.SubversionSCM"> <locations> <hudson.scm.SubversionSCM-ModuleLocation> - <remote>@hudson.framework.url@</remote> - <local>framework</local> + <remote>@hudson.framework.url@/hudson</remote> + <local>framework-hudson</local> </hudson.scm.SubversionSCM-ModuleLocation> <hudson.scm.SubversionSCM-ModuleLocation> <remote>@hudson.native.url@</remote> Modified: framework/trunk/hudson/hudson-home/jobs/NATIVE-CORE-AS-5.0.1-SUN-JDK-6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/NATIVE-CORE-AS-5.0.1-SUN-JDK-6/config.xml 2010-07-06 12:01:51 UTC (rev 12590) +++ framework/trunk/hudson/hudson-home/jobs/NATIVE-CORE-AS-5.0.1-SUN-JDK-6/config.xml 2010-07-06 13:44:12 UTC (rev 12591) @@ -11,7 +11,7 @@ WORKSPACE=`pwd` STACK_ID=native JAVA_HOME=(a)java.home.sun.jdk6@ -FRAMEWORK_DIR=$WORKSPACE/framework +HUDSON_DIR=$WORKSPACE/framework-hudson STACK_DIR=$WORKSPACE/stack-native TEST_OPTS="-Dinterop=true" JBOSS_TARGET=jboss501 @@ -22,7 +22,7 @@ # # load test functions # -. $FRAMEWORK_DIR/hudson/jboss/bin/jbossws-qa.sh +. $HUDSON_DIR/jboss/bin/jbossws-qa.sh # # execute core tests @@ -46,8 +46,8 @@ <scm class="hudson.scm.SubversionSCM"> <locations> <hudson.scm.SubversionSCM-ModuleLocation> - <remote>@hudson.framework.url@</remote> - <local>framework</local> + <remote>@hudson.framework.url@/hudson</remote> + <local>framework-hudson</local> </hudson.scm.SubversionSCM-ModuleLocation> <hudson.scm.SubversionSCM-ModuleLocation> <remote>@hudson.native.url@</remote> Modified: framework/trunk/hudson/hudson-home/jobs/NATIVE-CORE-AS-5.1.0-SUN-JDK-6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/NATIVE-CORE-AS-5.1.0-SUN-JDK-6/config.xml 2010-07-06 12:01:51 UTC (rev 12590) +++ framework/trunk/hudson/hudson-home/jobs/NATIVE-CORE-AS-5.1.0-SUN-JDK-6/config.xml 2010-07-06 13:44:12 UTC (rev 12591) @@ -11,7 +11,7 @@ WORKSPACE=`pwd` STACK_ID=native JAVA_HOME=(a)java.home.sun.jdk6@ -FRAMEWORK_DIR=$WORKSPACE/framework +HUDSON_DIR=$WORKSPACE/framework-hudson STACK_DIR=$WORKSPACE/stack-native TEST_OPTS="-Dinterop=true" JBOSS_TARGET=jboss510 @@ -22,7 +22,7 @@ # # load test functions # -. $FRAMEWORK_DIR/hudson/jboss/bin/jbossws-qa.sh +. $HUDSON_DIR/jboss/bin/jbossws-qa.sh # # execute core tests @@ -46,8 +46,8 @@ <scm class="hudson.scm.SubversionSCM"> <locations> <hudson.scm.SubversionSCM-ModuleLocation> - <remote>@hudson.framework.url@</remote> - <local>framework</local> + <remote>@hudson.framework.url@/hudson</remote> + <local>framework-hudson</local> </hudson.scm.SubversionSCM-ModuleLocation> <hudson.scm.SubversionSCM-ModuleLocation> <remote>@hudson.native.url@</remote> Modified: framework/trunk/hudson/hudson-home/jobs/NATIVE-CORE-AS-6.0.0-SUN-JDK-6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/NATIVE-CORE-AS-6.0.0-SUN-JDK-6/config.xml 2010-07-06 12:01:51 UTC (rev 12590) +++ framework/trunk/hudson/hudson-home/jobs/NATIVE-CORE-AS-6.0.0-SUN-JDK-6/config.xml 2010-07-06 13:44:12 UTC (rev 12591) @@ -11,7 +11,7 @@ WORKSPACE=`pwd` STACK_ID=native JAVA_HOME=(a)java.home.sun.jdk6@ -FRAMEWORK_DIR=$WORKSPACE/framework +HUDSON_DIR=$WORKSPACE/framework-hudson STACK_DIR=$WORKSPACE/stack-native TEST_OPTS="-Dinterop=true" JBOSS_TARGET=jboss600 @@ -22,7 +22,7 @@ # # load test functions # -. $FRAMEWORK_DIR/hudson/jboss/bin/jbossws-qa.sh +. $HUDSON_DIR/jboss/bin/jbossws-qa.sh # # execute core tests @@ -46,8 +46,8 @@ <scm class="hudson.scm.SubversionSCM"> <locations> <hudson.scm.SubversionSCM-ModuleLocation> - <remote>@hudson.framework.url@</remote> - <local>framework</local> + <remote>@hudson.framework.url@/hudson</remote> + <local>framework-hudson</local> </hudson.scm.SubversionSCM-ModuleLocation> <hudson.scm.SubversionSCM-ModuleLocation> <remote>@hudson.native.url@</remote> Modified: framework/trunk/hudson/hudson-home/jobs/NATIVE-CORE-AS-6.0.1-SUN-JDK-6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/NATIVE-CORE-AS-6.0.1-SUN-JDK-6/config.xml 2010-07-06 12:01:51 UTC (rev 12590) +++ framework/trunk/hudson/hudson-home/jobs/NATIVE-CORE-AS-6.0.1-SUN-JDK-6/config.xml 2010-07-06 13:44:12 UTC (rev 12591) @@ -11,7 +11,7 @@ WORKSPACE=`pwd` STACK_ID=native JAVA_HOME=(a)java.home.sun.jdk6@ -FRAMEWORK_DIR=$WORKSPACE/framework +HUDSON_DIR=$WORKSPACE/framework-hudson STACK_DIR=$WORKSPACE/stack-native TEST_OPTS="-Dinterop=true" JBOSS_TARGET=jboss601 @@ -22,7 +22,7 @@ # # load test functions # -. $FRAMEWORK_DIR/hudson/jboss/bin/jbossws-qa.sh +. $HUDSON_DIR/jboss/bin/jbossws-qa.sh # # execute core tests @@ -46,8 +46,8 @@ <scm class="hudson.scm.SubversionSCM"> <locations> <hudson.scm.SubversionSCM-ModuleLocation> - <remote>@hudson.framework.url@</remote> - <local>framework</local> + <remote>@hudson.framework.url@/hudson</remote> + <local>framework-hudson</local> </hudson.scm.SubversionSCM-ModuleLocation> <hudson.scm.SubversionSCM-ModuleLocation> <remote>@hudson.native.url@</remote> Modified: framework/trunk/hudson/hudson-home/jobs/NATIVE-SRCDIST-AS-5.0.1-SUN-JDK-6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/NATIVE-SRCDIST-AS-5.0.1-SUN-JDK-6/config.xml 2010-07-06 12:01:51 UTC (rev 12590) +++ framework/trunk/hudson/hudson-home/jobs/NATIVE-SRCDIST-AS-5.0.1-SUN-JDK-6/config.xml 2010-07-06 13:44:12 UTC (rev 12591) @@ -11,7 +11,7 @@ WORKSPACE=`pwd` STACK_ID=native JAVA_HOME=(a)java.home.sun.jdk6@ -FRAMEWORK_DIR=$WORKSPACE/framework +HUDSON_DIR=$WORKSPACE/framework-hudson STACK_DIR=$WORKSPACE/stack-native TEST_OPTS= JBOSS_TARGET=jboss501 @@ -22,7 +22,7 @@ # # load test functions # -. $FRAMEWORK_DIR/hudson/jboss/bin/jbossws-qa.sh +. $HUDSON_DIR/jboss/bin/jbossws-qa.sh # # execute source distribution tests @@ -46,8 +46,8 @@ <scm class="hudson.scm.SubversionSCM"> <locations> <hudson.scm.SubversionSCM-ModuleLocation> - <remote>@hudson.framework.url@</remote> - <local>framework</local> + <remote>@hudson.framework.url@/hudson</remote> + <local>framework-hudson</local> </hudson.scm.SubversionSCM-ModuleLocation> <hudson.scm.SubversionSCM-ModuleLocation> <remote>@hudson.native.url@</remote> Modified: framework/trunk/hudson/hudson-home/jobs/NATIVE-SRCDIST-AS-5.1.0-SUN-JDK-6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/NATIVE-SRCDIST-AS-5.1.0-SUN-JDK-6/config.xml 2010-07-06 12:01:51 UTC (rev 12590) +++ framework/trunk/hudson/hudson-home/jobs/NATIVE-SRCDIST-AS-5.1.0-SUN-JDK-6/config.xml 2010-07-06 13:44:12 UTC (rev 12591) @@ -11,7 +11,7 @@ WORKSPACE=`pwd` STACK_ID=native JAVA_HOME=(a)java.home.sun.jdk6@ -FRAMEWORK_DIR=$WORKSPACE/framework +HUDSON_DIR=$WORKSPACE/framework-hudson STACK_DIR=$WORKSPACE/stack-native TEST_OPTS= JBOSS_TARGET=jboss510 @@ -22,7 +22,7 @@ # # load test functions # -. $FRAMEWORK_DIR/hudson/jboss/bin/jbossws-qa.sh +. $HUDSON_DIR/jboss/bin/jbossws-qa.sh # # execute source distribution tests @@ -46,8 +46,8 @@ <scm class="hudson.scm.SubversionSCM"> <locations> <hudson.scm.SubversionSCM-ModuleLocation> - <remote>@hudson.framework.url@</remote> - <local>framework</local> + <remote>@hudson.framework.url@/hudson</remote> + <local>framework-hudson</local> </hudson.scm.SubversionSCM-ModuleLocation> <hudson.scm.SubversionSCM-ModuleLocation> <remote>@hudson.native.url@</remote> Modified: framework/trunk/hudson/hudson-home/jobs/NATIVE-SRCDIST-AS-6.0.0-SUN-JDK-6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/NATIVE-SRCDIST-AS-6.0.0-SUN-JDK-6/config.xml 2010-07-06 12:01:51 UTC (rev 12590) +++ framework/trunk/hudson/hudson-home/jobs/NATIVE-SRCDIST-AS-6.0.0-SUN-JDK-6/config.xml 2010-07-06 13:44:12 UTC (rev 12591) @@ -11,7 +11,7 @@ WORKSPACE=`pwd` STACK_ID=native JAVA_HOME=(a)java.home.sun.jdk6@ -FRAMEWORK_DIR=$WORKSPACE/framework +HUDSON_DIR=$WORKSPACE/framework-hudson STACK_DIR=$WORKSPACE/stack-native TEST_OPTS= JBOSS_TARGET=jboss600 @@ -22,7 +22,7 @@ # # load test functions # -. $FRAMEWORK_DIR/hudson/jboss/bin/jbossws-qa.sh +. $HUDSON_DIR/jboss/bin/jbossws-qa.sh # # execute source distribution tests @@ -46,8 +46,8 @@ <scm class="hudson.scm.SubversionSCM"> <locations> <hudson.scm.SubversionSCM-ModuleLocation> - <remote>@hudson.framework.url@</remote> - <local>framework</local> + <remote>@hudson.framework.url@/hudson</remote> + <local>framework-hudson</local> </hudson.scm.SubversionSCM-ModuleLocation> <hudson.scm.SubversionSCM-ModuleLocation> <remote>@hudson.native.url@</remote> Modified: framework/trunk/hudson/hudson-home/jobs/NATIVE-SRCDIST-AS-6.0.1-SUN-JDK-6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/NATIVE-SRCDIST-AS-6.0.1-SUN-JDK-6/config.xml 2010-07-06 12:01:51 UTC (rev 12590) +++ framework/trunk/hudson/hudson-home/jobs/NATIVE-SRCDIST-AS-6.0.1-SUN-JDK-6/config.xml 2010-07-06 13:44:12 UTC (rev 12591) @@ -11,7 +11,7 @@ WORKSPACE=`pwd` STACK_ID=native JAVA_HOME=(a)java.home.sun.jdk6@ -FRAMEWORK_DIR=$WORKSPACE/framework +HUDSON_DIR=$WORKSPACE/framework-hudson STACK_DIR=$WORKSPACE/stack-native TEST_OPTS= JBOSS_TARGET=jboss601 @@ -22,7 +22,7 @@ # # load test functions # -. $FRAMEWORK_DIR/hudson/jboss/bin/jbossws-qa.sh +. $HUDSON_DIR/jboss/bin/jbossws-qa.sh # # execute source distribution tests @@ -46,8 +46,8 @@ <scm class="hudson.scm.SubversionSCM"> <locations> <hudson.scm.SubversionSCM-ModuleLocation> - <remote>@hudson.framework.url@</remote> - <local>framework</local> + <remote>@hudson.framework.url@/hudson</remote> + <local>framework-hudson</local> </hudson.scm.SubversionSCM-ModuleLocation> <hudson.scm.SubversionSCM-ModuleLocation> <remote>@hudson.native.url@</remote> Modified: framework/trunk/hudson/jboss/bin/jbossws-qa.sh =================================================================== --- framework/trunk/hudson/jboss/bin/jbossws-qa.sh 2010-07-06 12:01:51 UTC (rev 12590) +++ framework/trunk/hudson/jboss/bin/jbossws-qa.sh 2010-07-06 13:44:12 UTC (rev 12591) @@ -28,11 +28,11 @@ } stopJBoss() { - $FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_HOME stop $JBOSS_BIND_ADDRESS + $HUDSON_DIR/jboss/bin/jboss.sh $JBOSS_HOME stop $JBOSS_BIND_ADDRESS } startJBoss() { - $FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_HOME start $JBOSS_BIND_ADDRESS + $HUDSON_DIR/jboss/bin/jboss.sh $JBOSS_HOME start $JBOSS_BIND_ADDRESS } copyJBossLogs() { @@ -51,7 +51,7 @@ } ensureRunningJBoss() { - $FRAMEWORK_DIR/hudson/jboss/bin/http-spider.sh $JBOSS_BIND_ADDRESS:8080 $WORKSPACE + $HUDSON_DIR/jboss/bin/http-spider.sh $JBOSS_BIND_ADDRESS:8080 $WORKSPACE if [ -e $WORKSPACE/spider.failed ]; then tail -n 100 $JBOSS_HOME/server/$JBOSS_CONFIG/log/server.log stopJBoss

13 years, 10 months

1
0
0 / 0

JBossWS SVN: r12590 - in stack/native/branches/jbossws-native-3.1.2/modules: testsuite/native-tests/scripts and 11 other directories.

by jbossws-commits＠lists.jboss.org

Author: darran.lofthouse(a)jboss.com Date: 2010-07-06 08:01:51 -0400 (Tue, 06 Jul 2010) New Revision: 12590 Added: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3070/ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3070/JBWS3070TestCase.java stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3070/TestEndpoint.java stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3070/TestEndpointImpl.java stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/web.xml stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/a/ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/a/wsdl/ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/a/wsdl/b/ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/a/wsdl/b/TestService.wsdl stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/a/xsd/ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/a/xsd/schema1.xsd stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/b/ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/b/schema2.xsd Removed: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3070/JBWS3070TestCase.java stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3070/TestEndpoint.java stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3070/TestEndpointImpl.java stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/web.xml stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/a/ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/a/wsdl/ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/a/wsdl/b/ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/a/wsdl/b/TestService.wsdl stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/a/xsd/ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/a/xsd/schema1.xsd stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/b/ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/b/schema2.xsd Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml Log: [JBPAPP-4506] Secondary import of XSD contains incorrect path. Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java 2010-07-06 11:21:36 UTC (rev 12589) +++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java 2010-07-06 12:01:51 UTC (rev 12590) @@ -161,25 +161,35 @@ String resParent = resPath.substring(0, resPath.lastIndexOf("/")); // replace parent traversal, results in resParent == null when successfully executed - while (orgLocation.startsWith("../") && resParent != null) + if (orgLocation.startsWith("../") && resParent != null) { - if (resParent.indexOf("/") > 0) + // replace parent traversal, results in resParent == null when successfully executed + while (orgLocation.startsWith("../") && resParent != null) { - resParent = resParent.substring(0, resParent.lastIndexOf("/")); - orgLocation = orgLocation.substring(3); - newResourcePath = resParent + "/" + orgLocation; + if (resParent.endsWith("..")) + { + newResourcePath = resParent + "/" + orgLocation; + resParent = null; + } + else if (resParent.indexOf("/") > 0) + { + resParent = resParent.substring(0, resParent.lastIndexOf("/")); + orgLocation = orgLocation.substring(3); + newResourcePath = resParent + "/" + orgLocation; + } + else + { + orgLocation = orgLocation.substring(3); + newResourcePath = orgLocation; + resParent = null; + } } - else - { - orgLocation = orgLocation.substring(3); - newResourcePath = orgLocation; - resParent = null; - } + } - - // no parent traversal happend - if(resParent!=null) - newResourcePath = resParent +"/"+ orgLocation; + else + { + newResourcePath = resParent + "/" + orgLocation; + } } String reqPath = reqURL.getPath(); Modified: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2010-07-06 11:21:36 UTC (rev 12589) +++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2010-07-06 12:01:51 UTC (rev 12590) @@ -525,19 +525,19 @@ <exclude name="org/jboss/test/ws/jaxws/jbws2486/*TestCase.class" /> </classes> </war> - -  - <war warfile="${tests.output.dir}/test-libs/jaxws-jbws2526.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2526/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws2526/*.class"/> - <exclude name="org/jboss/test/ws/jaxws/jbws2526/JBWS2526TestCase.class"/> - <include name="org/jboss/test/ws/jaxws/jbws2526/server-handlers.xml"/> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws2526/WEB-INF"> - <include name="wsdl/**"/> - </webinf> - </war> +  + <war warfile="${tests.output.dir}/test-libs/jaxws-jbws2526.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2526/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/jbws2526/*.class"/> + <exclude name="org/jboss/test/ws/jaxws/jbws2526/JBWS2526TestCase.class"/> + <include name="org/jboss/test/ws/jaxws/jbws2526/server-handlers.xml"/> + </classes> + <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws2526/WEB-INF"> + <include name="wsdl/**"/> + </webinf> + </war> +  <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws2565.jar"> <fileset dir="${tests.output.dir}/test-classes"> @@ -597,90 +597,102 @@ </metainf> </jar> -  - <war warfile="${tests.output.dir}/test-libs/jaxws-jbws2845.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2845/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws2845/*.class"/> - <exclude name="org/jboss/test/ws/jaxws/jbws2845/JBWS2845TestCase.class"/> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws2845/WEB-INF"> - <include name="jboss-web.xml"/> - </webinf> - </war> +  + <war warfile="${tests.output.dir}/test-libs/jaxws-jbws2845.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2845/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/jbws2845/*.class"/> + <exclude name="org/jboss/test/ws/jaxws/jbws2845/JBWS2845TestCase.class"/> + </classes> + <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws2845/WEB-INF"> + <include name="jboss-web.xml"/> + </webinf> + </war> -  - <war warfile="${tests.output.dir}/test-libs/jaxws-jbws2927.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2927/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws2927/*.class"/> - <exclude name="org/jboss/test/ws/jaxws/jbws2927/JBWS2927TestCase.class"/> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws2927/WEB-INF"> - <include name="jboss-web.xml"/> - </webinf> - </war> - -  - <war warfile="${tests.output.dir}/test-libs/jaxws-jbws2949.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2949/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws2949/*.class"/> - <include name="org/jboss/test/ws/jaxws/jbws2949/server-handlers.xml"/> - <exclude name="org/jboss/test/ws/jaxws/jbws2949/JBWS2949TestCase.class"/> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws2949/WEB-INF"> - <include name="jboss-web.xml"/> - </webinf> - </war> +  + <war warfile="${tests.output.dir}/test-libs/jaxws-jbws2927.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2927/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/jbws2927/*.class"/> + <exclude name="org/jboss/test/ws/jaxws/jbws2927/JBWS2927TestCase.class"/> + </classes> + <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws2927/WEB-INF"> + <include name="jboss-web.xml"/> + </webinf> + </war> -  - <war warfile="${tests.output.dir}/test-libs/jaxws-jbws2969.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2969/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws2969/*.class"/> - <exclude name="org/jboss/test/ws/jaxws/jbws2969/JBWS2969TestCase.class"/> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws2969/WEB-INF"> - <include name="jboss-web.xml"/> - </webinf> - </war> - - -  - <war warfile="${tests.output.dir}/test-libs/jaxws-jbws2977.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2977/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws2977/AddNumbersImpl.class"/> - <include name="org/jboss/test/ws/jaxws/jbws2977/AddNumbersException.class"/> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws2977/WEB-INF"> - <include name="jboss-web.xml"/> - </webinf> - </war> +  + <war warfile="${tests.output.dir}/test-libs/jaxws-jbws2949.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2949/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/jbws2949/*.class"/> + <include name="org/jboss/test/ws/jaxws/jbws2949/server-handlers.xml"/> + <exclude name="org/jboss/test/ws/jaxws/jbws2949/JBWS2949TestCase.class"/> + </classes> + <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws2949/WEB-INF"> + <include name="jboss-web.xml"/> + </webinf> + </war> -  - <war warfile="${tests.output.dir}/test-libs/jaxws-jbws2978.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2978/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws2978/AddNumbers.class"/> - <include name="org/jboss/test/ws/jaxws/jbws2978/AddNumbersImpl.class"/> - <include name="org/jboss/test/ws/jaxws/jbws2978/AddNumbersRequest.class"/> - <include name="org/jboss/test/ws/jaxws/jbws2978/AddNumbersResponse.class"/> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws2978/WEB-INF"> - <include name="jboss-web.xml"/> - </webinf> - </war> - -  - <war warfile="${tests.output.dir}/test-libs/jaxws-jbws2982.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2982/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws2982/*.class" /> - <exclude name="org/jboss/test/ws/jaxws/jbws2982/*TestCase*.class" /> - </classes> - </war> +  + <war warfile="${tests.output.dir}/test-libs/jaxws-jbws2969.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2969/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/jbws2969/*.class"/> + <exclude name="org/jboss/test/ws/jaxws/jbws2969/JBWS2969TestCase.class"/> + </classes> + <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws2969/WEB-INF"> + <include name="jboss-web.xml"/> + </webinf> + </war> + +  + <war warfile="${tests.output.dir}/test-libs/jaxws-jbws2977.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2977/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/jbws2977/AddNumbersImpl.class"/> + <include name="org/jboss/test/ws/jaxws/jbws2977/AddNumbersException.class"/> + </classes> + <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws2977/WEB-INF"> + <include name="jboss-web.xml"/> + </webinf> + </war> + +  + <war warfile="${tests.output.dir}/test-libs/jaxws-jbws2978.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2978/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/jbws2978/AddNumbers.class"/> + <include name="org/jboss/test/ws/jaxws/jbws2978/AddNumbersImpl.class"/> + <include name="org/jboss/test/ws/jaxws/jbws2978/AddNumbersRequest.class"/> + <include name="org/jboss/test/ws/jaxws/jbws2978/AddNumbersResponse.class"/> + </classes> + <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws2978/WEB-INF"> + <include name="jboss-web.xml"/> + </webinf> + </war> + +  + <war warfile="${tests.output.dir}/test-libs/jaxws-jbws2982.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2982/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/jbws2982/*.class" /> + <exclude name="org/jboss/test/ws/jaxws/jbws2982/*TestCase*.class" /> + </classes> + </war> + +  + <war warfile="${tests.output.dir}/test-libs/jaxws-jbws3070.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws3070/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/jbws3070/*.class" /> + <exclude name="org/jboss/test/ws/jaxws/jbws3070/*TestCase*.class" /> + </classes> + <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws3070/WEB-INF"> + <include name="**/*.wsdl" /> + <include name="**/*.xsd" /> + </webinf> + </war> +  <war warfile="${tests.output.dir}/test-libs/jaxws-webserviceref.war" webxml="${tests.output.dir}/test-resources/jaxws/webserviceref/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpointImpl.class" /> </classes> - </war> + </war> <jar destfile="${tests.output.dir}/test-libs/jaxws-webserviceref-client.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpointClientOne.class" /> Copied: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3070 (from rev 12580, stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3070) Deleted: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3070/JBWS3070TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3070/JBWS3070TestCase.java 2010-07-05 17:36:12 UTC (rev 12580) +++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3070/JBWS3070TestCase.java 2010-07-06 12:01:51 UTC (rev 12590) @@ -1,66 +0,0 @@ -/* -* JBoss, Home of Professional Open Source. -* Copyright 2010, Red Hat Middleware LLC, and individual contributors -* as indicated by the @author tags. See the copyright.txt file in the -* distribution for a full listing of individual contributors. -* -* This is free software; you can redistribute it and/or modify it -* under the terms of the GNU Lesser General Public License as -* published by the Free Software Foundation; either version 2.1 of -* the License, or (at your option) any later version. -* -* This software is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this software; if not, write to the Free -* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -*/ -package org.jboss.test.ws.jaxws.jbws3070; - -import java.net.URL; - -import javax.xml.namespace.QName; -import javax.xml.ws.Service; - -import junit.framework.Test; - -import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestSetup; - -/** - * Test case to test JBWS-3070 for the correct publising of imported schemas. - * - * @author darran.lofthouse(a)jboss.com - * @since 24th June 2010 - */ -public class JBWS3070TestCase extends JBossWSTest -{ - - public static Test suite() throws Exception - { - return new JBossWSTestSetup(JBWS3070TestCase.class, "jaxws-jbws3070.war"); - } - - private TestEndpoint getPort() throws Exception - { - - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws3070?wsdl"); - QName serviceName = new QName("http://org.jboss.test.ws/jbws3070", "TestEndpointService"); - - Service service = Service.create(wsdlURL, serviceName); - - return service.getPort(TestEndpoint.class); - } - - public void testCall() throws Exception - { - String message = "Hi"; - String response = getPort().echo(message); - assertEquals(message, response); - } - -} Copied: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3070/JBWS3070TestCase.java (from rev 12580, stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3070/JBWS3070TestCase.java) =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3070/JBWS3070TestCase.java (rev 0) +++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3070/JBWS3070TestCase.java 2010-07-06 12:01:51 UTC (rev 12590) @@ -0,0 +1,66 @@ +/* +* JBoss, Home of Professional Open Source. +* Copyright 2010, Red Hat Middleware LLC, and individual contributors +* as indicated by the @author tags. See the copyright.txt file in the +* distribution for a full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ +package org.jboss.test.ws.jaxws.jbws3070; + +import java.net.URL; + +import javax.xml.namespace.QName; +import javax.xml.ws.Service; + +import junit.framework.Test; + +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; + +/** + * Test case to test JBWS-3070 for the correct publising of imported schemas. + * + * @author darran.lofthouse(a)jboss.com + * @since 24th June 2010 + */ +public class JBWS3070TestCase extends JBossWSTest +{ + + public static Test suite() throws Exception + { + return new JBossWSTestSetup(JBWS3070TestCase.class, "jaxws-jbws3070.war"); + } + + private TestEndpoint getPort() throws Exception + { + + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws3070?wsdl"); + QName serviceName = new QName("http://org.jboss.test.ws/jbws3070", "TestEndpointService"); + + Service service = Service.create(wsdlURL, serviceName); + + return service.getPort(TestEndpoint.class); + } + + public void testCall() throws Exception + { + String message = "Hi"; + String response = getPort().echo(message); + assertEquals(message, response); + } + +} Deleted: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3070/TestEndpoint.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3070/TestEndpoint.java 2010-07-05 17:36:12 UTC (rev 12580) +++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3070/TestEndpoint.java 2010-07-06 12:01:51 UTC (rev 12590) @@ -1,37 +0,0 @@ -/* -* JBoss, Home of Professional Open Source. -* Copyright 2010, Red Hat Middleware LLC, and individual contributors -* as indicated by the @author tags. See the copyright.txt file in the -* distribution for a full listing of individual contributors. -* -* This is free software; you can redistribute it and/or modify it -* under the terms of the GNU Lesser General Public License as -* published by the Free Software Foundation; either version 2.1 of -* the License, or (at your option) any later version. -* -* This software is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this software; if not, write to the Free -* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -*/ -package org.jboss.test.ws.jaxws.jbws3070; - -import javax.jws.WebService; - -/** - * - * @author darran.lofthouse(a)jboss.com - * @since 24th June 2010 - */ -@WebService(name = "TestEndpoint", targetNamespace = "http://org.jboss.test.ws/jbws3070") -public interface TestEndpoint -{ - - public String echo(final String message); - -} Copied: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3070/TestEndpoint.java (from rev 12580, stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3070/TestEndpoint.java) =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3070/TestEndpoint.java (rev 0) +++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3070/TestEndpoint.java 2010-07-06 12:01:51 UTC (rev 12590) @@ -0,0 +1,37 @@ +/* +* JBoss, Home of Professional Open Source. +* Copyright 2010, Red Hat Middleware LLC, and individual contributors +* as indicated by the @author tags. See the copyright.txt file in the +* distribution for a full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ +package org.jboss.test.ws.jaxws.jbws3070; + +import javax.jws.WebService; + +/** + * + * @author darran.lofthouse(a)jboss.com + * @since 24th June 2010 + */ +@WebService(name = "TestEndpoint", targetNamespace = "http://org.jboss.test.ws/jbws3070") +public interface TestEndpoint +{ + + public String echo(final String message); + +} Deleted: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3070/TestEndpointImpl.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3070/TestEndpointImpl.java 2010-07-05 17:36:12 UTC (rev 12580) +++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3070/TestEndpointImpl.java 2010-07-06 12:01:51 UTC (rev 12590) @@ -1,40 +0,0 @@ -/* -* JBoss, Home of Professional Open Source. -* Copyright 2010, Red Hat Middleware LLC, and individual contributors -* as indicated by the @author tags. See the copyright.txt file in the -* distribution for a full listing of individual contributors. -* -* This is free software; you can redistribute it and/or modify it -* under the terms of the GNU Lesser General Public License as -* published by the Free Software Foundation; either version 2.1 of -* the License, or (at your option) any later version. -* -* This software is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this software; if not, write to the Free -* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -*/ -package org.jboss.test.ws.jaxws.jbws3070; - -import javax.jws.WebService; - -/** - * - * @author darran.lofthouse(a)jboss.com - * @since 24th June 2010 - */ -@WebService(name = "TestEndpoint", serviceName="TestEndpointService", targetNamespace = "http://org.jboss.test.ws/jbws3070", wsdlLocation="WEB-INF/wsdl/a/wsdl/b/TestService.wsdl") -public class TestEndpointImpl implements TestEndpoint -{ - - public String echo(String message) - { - return message; - } - -} Copied: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3070/TestEndpointImpl.java (from rev 12580, stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3070/TestEndpointImpl.java) =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3070/TestEndpointImpl.java (rev 0) +++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3070/TestEndpointImpl.java 2010-07-06 12:01:51 UTC (rev 12590) @@ -0,0 +1,40 @@ +/* +* JBoss, Home of Professional Open Source. +* Copyright 2010, Red Hat Middleware LLC, and individual contributors +* as indicated by the @author tags. See the copyright.txt file in the +* distribution for a full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ +package org.jboss.test.ws.jaxws.jbws3070; + +import javax.jws.WebService; + +/** + * + * @author darran.lofthouse(a)jboss.com + * @since 24th June 2010 + */ +@WebService(name = "TestEndpoint", serviceName="TestEndpointService", targetNamespace = "http://org.jboss.test.ws/jbws3070", wsdlLocation="WEB-INF/wsdl/a/wsdl/b/TestService.wsdl") +public class TestEndpointImpl implements TestEndpoint +{ + + public String echo(String message) + { + return message; + } + +} Copied: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070 (from rev 12580, stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070) Copied: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF (from rev 12580, stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF) Deleted: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/web.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/web.xml 2010-07-05 17:36:12 UTC (rev 12580) +++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/web.xml 2010-07-06 12:01:51 UTC (rev 12590) @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"> - - <servlet> - <servlet-name>TestEndpoint</servlet-name> - <servlet-class>org.jboss.test.ws.jaxws.jbws3070.TestEndpointImpl</servlet-class> - </servlet> - - <servlet-mapping> - <servlet-name>TestEndpoint</servlet-name> - <url-pattern>/*</url-pattern> - </servlet-mapping> - -</web-app> \ No newline at end of file Copied: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/web.xml (from rev 12580, stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/web.xml) =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/web.xml (rev 0) +++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/web.xml 2010-07-06 12:01:51 UTC (rev 12590) @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"> + + <servlet> + <servlet-name>TestEndpoint</servlet-name> + <servlet-class>org.jboss.test.ws.jaxws.jbws3070.TestEndpointImpl</servlet-class> + </servlet> + + <servlet-mapping> + <servlet-name>TestEndpoint</servlet-name> + <url-pattern>/*</url-pattern> + </servlet-mapping> + +</web-app> \ No newline at end of file Copied: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl (from rev 12580, stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl) Copied: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/a (from rev 12580, stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/a) Copied: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/a/wsdl (from rev 12580, stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/a/wsdl) Copied: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/a/wsdl/b (from rev 12580, stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/a/wsdl/b) Deleted: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/a/wsdl/b/TestService.wsdl =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/a/wsdl/b/TestService.wsdl 2010-07-05 17:36:12 UTC (rev 12580) +++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/a/wsdl/b/TestService.wsdl 2010-07-06 12:01:51 UTC (rev 12590) @@ -1,50 +0,0 @@ -<definitions name='TestEndpointService' targetNamespace='http://org.jboss.test.ws/jbws3070' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.test.ws/jbws3070' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <types> - <xs:schema targetNamespace='http://org.jboss.test.ws/jbws3070' version='1.0' xmlns:tns='http://org.jboss.test.ws/jbws3070' xmlns:xs='http://www.w3.org/2001/XMLSchema'> - - <xs:import namespace="http://org.jboss.test.ws/jbws3070/schema1" schemaLocation="../../xsd/schema1.xsd"/> - - <xs:element name='echo' type='tns:echo'/> - <xs:element name='echoResponse' type='tns:echoResponse'/> - <xs:complexType name='echo'> - <xs:sequence> - <xs:element minOccurs='0' name='arg0' type='xs:string'/> - </xs:sequence> - </xs:complexType> - <xs:complexType name='echoResponse'> - <xs:sequence> - <xs:element minOccurs='0' name='return' type='xs:string'/> - </xs:sequence> - </xs:complexType> - </xs:schema> - </types> - <message name='TestEndpoint_echoResponse'> - <part element='tns:echoResponse' name='echoResponse'></part> - </message> - <message name='TestEndpoint_echo'> - <part element='tns:echo' name='echo'></part> - </message> - <portType name='TestEndpoint'> - <operation name='echo' parameterOrder='echo'> - <input message='tns:TestEndpoint_echo'></input> - <output message='tns:TestEndpoint_echoResponse'></output> - </operation> - </portType> - <binding name='TestEndpointBinding' type='tns:TestEndpoint'> - <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='echo'> - <soap:operation soapAction=''/> - <input> - <soap:body use='literal'/> - </input> - <output> - <soap:body use='literal'/> - </output> - </operation> - </binding> - <service name='TestEndpointService'> - <port binding='tns:TestEndpointBinding' name='TestEndpointPort'> - <soap:address location='http://127.0.0.1:8080/jaxws-jbws3070'/> - </port> - </service> -</definitions> \ No newline at end of file Copied: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/a/wsdl/b/TestService.wsdl (from rev 12580, stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/a/wsdl/b/TestService.wsdl) =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/a/wsdl/b/TestService.wsdl (rev 0) +++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/a/wsdl/b/TestService.wsdl 2010-07-06 12:01:51 UTC (rev 12590) @@ -0,0 +1,50 @@ +<definitions name='TestEndpointService' targetNamespace='http://org.jboss.test.ws/jbws3070' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.test.ws/jbws3070' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + <types> + <xs:schema targetNamespace='http://org.jboss.test.ws/jbws3070' version='1.0' xmlns:tns='http://org.jboss.test.ws/jbws3070' xmlns:xs='http://www.w3.org/2001/XMLSchema'> + + <xs:import namespace="http://org.jboss.test.ws/jbws3070/schema1" schemaLocation="../../xsd/schema1.xsd"/> + + <xs:element name='echo' type='tns:echo'/> + <xs:element name='echoResponse' type='tns:echoResponse'/> + <xs:complexType name='echo'> + <xs:sequence> + <xs:element minOccurs='0' name='arg0' type='xs:string'/> + </xs:sequence> + </xs:complexType> + <xs:complexType name='echoResponse'> + <xs:sequence> + <xs:element minOccurs='0' name='return' type='xs:string'/> + </xs:sequence> + </xs:complexType> + </xs:schema> + </types> + <message name='TestEndpoint_echoResponse'> + <part element='tns:echoResponse' name='echoResponse'></part> + </message> + <message name='TestEndpoint_echo'> + <part element='tns:echo' name='echo'></part> + </message> + <portType name='TestEndpoint'> + <operation name='echo' parameterOrder='echo'> + <input message='tns:TestEndpoint_echo'></input> + <output message='tns:TestEndpoint_echoResponse'></output> + </operation> + </portType> + <binding name='TestEndpointBinding' type='tns:TestEndpoint'> + <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> + <operation name='echo'> + <soap:operation soapAction=''/> + <input> + <soap:body use='literal'/> + </input> + <output> + <soap:body use='literal'/> + </output> + </operation> + </binding> + <service name='TestEndpointService'> + <port binding='tns:TestEndpointBinding' name='TestEndpointPort'> + <soap:address location='http://127.0.0.1:8080/jaxws-jbws3070'/> + </port> + </service> +</definitions> \ No newline at end of file Copied: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/a/xsd (from rev 12580, stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/a/xsd) Deleted: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/a/xsd/schema1.xsd =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/a/xsd/schema1.xsd 2010-07-05 17:36:12 UTC (rev 12580) +++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/a/xsd/schema1.xsd 2010-07-06 12:01:51 UTC (rev 12590) @@ -1,4 +0,0 @@ -<schema targetNamespace='http://org.jboss.test.ws/jbws3070/schema1' - xmlns='http://www.w3.org/2001/XMLSchema'> - <import namespace="http://org.jboss.test.ws/jbws3070/schema2" schemaLocation="../../b/schema2.xsd"/> -</schema> \ No newline at end of file Copied: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/a/xsd/schema1.xsd (from rev 12580, stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/a/xsd/schema1.xsd) =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/a/xsd/schema1.xsd (rev 0) +++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/a/xsd/schema1.xsd 2010-07-06 12:01:51 UTC (rev 12590) @@ -0,0 +1,4 @@ +<schema targetNamespace='http://org.jboss.test.ws/jbws3070/schema1' + xmlns='http://www.w3.org/2001/XMLSchema'> + <import namespace="http://org.jboss.test.ws/jbws3070/schema2" schemaLocation="../../b/schema2.xsd"/> +</schema> \ No newline at end of file Copied: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/b (from rev 12580, stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/b) Deleted: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/b/schema2.xsd =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/b/schema2.xsd 2010-07-05 17:36:12 UTC (rev 12580) +++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/b/schema2.xsd 2010-07-06 12:01:51 UTC (rev 12590) @@ -1,4 +0,0 @@ -<schema targetNamespace='http://org.jboss.test.ws/jbws2412/schema2' - xmlns='http://www.w3.org/2001/XMLSchema'> - -</schema> \ No newline at end of file Copied: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/b/schema2.xsd (from rev 12580, stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/b/schema2.xsd) =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/b/schema2.xsd (rev 0) +++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/b/schema2.xsd 2010-07-06 12:01:51 UTC (rev 12590) @@ -0,0 +1,4 @@ +<schema targetNamespace='http://org.jboss.test.ws/jbws2412/schema2' + xmlns='http://www.w3.org/2001/XMLSchema'> + +</schema> \ No newline at end of file

13 years, 10 months

1
0
0 / 0

JBossWS SVN: r12589 - in stack/native/trunk: src/main/scripts and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2010-07-06 07:21:36 -0400 (Tue, 06 Jul 2010) New Revision: 12589 Modified: stack/native/trunk/build.xml stack/native/trunk/pom.xml stack/native/trunk/src/main/scripts/assembly-bin-dist.xml stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml stack/native/trunk/src/main/scripts/assembly-src-dist.xml Log: [JBWS-3083] Avoid double maven lifecycle run for building src and bin dist Modified: stack/native/trunk/build.xml =================================================================== --- stack/native/trunk/build.xml 2010-07-06 11:19:18 UTC (rev 12588) +++ stack/native/trunk/build.xml 2010-07-06 11:21:36 UTC (rev 12589) @@ -19,7 +19,7 @@ <property name="stack.distro.dir" value="${stack.dir}/src/main/distro"/> <property name="stack.output.dir" value="${stack.dir}/target"/> <property name="stack.resources.dir" value="${stack.dir}/modules/resources/src/main/resources"/> - <property name="deploy.artifacts.dir" value="${stack.output.dir}/deploy-artifacts"/> + <property name="deploy.artifacts.dir" value="${stack.output.dir}/assembly/deploy-artifacts"/> <import file="${stack.distro.dir}/build-setup.xml"/> <import file="${stack.distro.dir}/build-deploy.xml"/> @@ -110,7 +110,10 @@ </exec> </target> - <target name="build-bin-dist" depends="prepare-deploy,os-init" description="Build the binary distribution"> + <target name="build-bin-dist" depends="prepare,os-init" description="Build the binary distribution"> +  + <property name="maven.opts" value=""/> + <echo/> <echo message="${mvn} ${maven.opts} -Pbindist package assembly:directory"/> <echo/> @@ -122,13 +125,16 @@ <zip destfile="${stack.output.dir}/jbossws-native-bin-dist.zip"> <zipfileset - dir="${stack.output.dir}/jbossws-native-bin-dist" + dir="${stack.output.dir}/assembly/jbossws-native-bin-dist" includes="build/ deploy/ docs/ tests/ build.xml ant.properties.example" prefix="jbossws-native-bin-dist"/> </zip> </target> - <target name="build-src-dist" depends="prepare-deploy,os-init" description="Build the source distribution"> + <target name="build-src-dist" depends="prepare,os-init" description="Build the source distribution"> +  + <property name="maven.opts" value=""/> + <echo/> <echo message="${mvn} ${maven.opts} -Psrcdist package assembly:directory"/> <echo/> @@ -140,7 +146,7 @@ <zip destfile="${stack.output.dir}/jbossws-native-src-dist.zip"> <zipfileset - dir="${stack.output.dir}/jbossws-native-src-dist" + dir="${stack.output.dir}/assembly/jbossws-native-src-dist" includes="modules/ src/ eclipse/ build.xml pom.xml profiles.xml.example .classpath .project " prefix="jbossws-native-src-dist"/> </zip> Modified: stack/native/trunk/pom.xml =================================================================== --- stack/native/trunk/pom.xml 2010-07-06 11:19:18 UTC (rev 12588) +++ stack/native/trunk/pom.xml 2010-07-06 11:21:36 UTC (rev 12589) @@ -425,7 +425,7 @@ <plugin> <artifactId>maven-assembly-plugin</artifactId> <configuration> - <finalName>deploy-artifacts</finalName> + <finalName>assembly</finalName> <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions> <appendAssemblyId>false</appendAssemblyId>  <fileSet> <directory>src/main/distro</directory> - <outputDirectory>/</outputDirectory> + <outputDirectory>jbossws-native-bin-dist/</outputDirectory> <includes> <include>build.xml</include> </includes> </fileSet> <fileSet> <directory>src/main/distro</directory> - <outputDirectory>/</outputDirectory> + <outputDirectory>jbossws-native-bin-dist/</outputDirectory> <filtered>true</filtered> <includes> <include>ant.properties.example</include> @@ -27,7 +27,7 @@  <fileSet> <directory>src/main/distro</directory> - <outputDirectory>build</outputDirectory> + <outputDirectory>jbossws-native-bin-dist/build</outputDirectory> <includes> <include>build-deploy.xml</include> <include>build-setup.xml</include> @@ -37,7 +37,7 @@ </fileSet> <fileSet> <directory>modules/resources/src/main/resources/resources</directory> - <outputDirectory>build</outputDirectory> + <outputDirectory>jbossws-native-bin-dist/build</outputDirectory> <includes> <include>deploy.conf</include> <include>server-deploy.conf</include> @@ -47,7 +47,7 @@  <fileSet> <directory>src/main/distro</directory> - <outputDirectory>docs</outputDirectory> + <outputDirectory>jbossws-native-bin-dist/docs</outputDirectory> <filtered>true</filtered> <includes> <include>Install.txt</include> @@ -57,13 +57,13 @@ </fileSet>  <fileSet> - <directory>target/deploy-artifacts</directory> - <outputDirectory>deploy</outputDirectory> + <directory>target/assembly/deploy-artifacts</directory> + <outputDirectory>jbossws-native-bin-dist/deploy</outputDirectory> </fileSet>  <fileSet> <directory>modules/testsuite/native-tests/src/test</directory> - <outputDirectory>tests</outputDirectory> + <outputDirectory>jbossws-native-bin-dist/tests</outputDirectory> <includes> <include>etc/**</include> </includes> @@ -71,7 +71,7 @@  <fileSet> <directory>modules/testsuite</directory> - <outputDirectory>tests/resources</outputDirectory> + <outputDirectory>jbossws-native-bin-dist/tests/resources</outputDirectory> <includes> <include>test-excludes-*.txt</include> </includes> @@ -87,7 +87,7 @@ <binaries> <dependencySets> <dependencySet> - <outputDirectory>tests</outputDirectory> + <outputDirectory>jbossws-native-bin-dist/tests</outputDirectory> <useStrictFiltering>true</useStrictFiltering> <scope>provided</scope> <unpack>true</unpack> Modified: stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2010-07-06 11:19:18 UTC (rev 12588) +++ stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2010-07-06 11:21:36 UTC (rev 12589) @@ -14,7 +14,7 @@ <include>org.jboss.ws.native:jbossws-native-client</include> </includes> <binaries> - <outputDirectory>lib</outputDirectory> + <outputDirectory>deploy-artifacts/lib</outputDirectory> <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> <unpack>false</unpack> <dependencySets> @@ -34,7 +34,7 @@ <include>org.jboss.ws.native:jbossws-native-core</include> </includes> <binaries> - <outputDirectory>lib</outputDirectory> + <outputDirectory>deploy-artifacts/lib</outputDirectory> <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> <unpack>false</unpack> <dependencySets> @@ -107,13 +107,13 @@ <include>org.jboss.ws.native:jbossws-native-management</include> </includes> <binaries> - <outputDirectory>lib</outputDirectory> + <outputDirectory>deploy-artifacts/lib</outputDirectory> <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> <includeDependencies>false</includeDependencies> <unpack>false</unpack> <dependencySets> <dependencySet> - <outputDirectory>lib</outputDirectory> + <outputDirectory>deploy-artifacts/lib</outputDirectory> <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> <useStrictFiltering>true</useStrictFiltering> <scope>provided</scope> @@ -126,7 +126,7 @@ </includes> </dependencySet> <dependencySet> - <outputDirectory>lib</outputDirectory> + <outputDirectory>deploy-artifacts/lib</outputDirectory> <outputFileNameMapping>jbossws-jboss501.${module.extension}</outputFileNameMapping> <useStrictFiltering>true</useStrictFiltering> <scope>provided</scope> @@ -136,7 +136,7 @@ </includes> </dependencySet> <dependencySet> - <outputDirectory>lib</outputDirectory> + <outputDirectory>deploy-artifacts/lib</outputDirectory> <outputFileNameMapping>jbossws-jboss510.${module.extension}</outputFileNameMapping> <useStrictFiltering>true</useStrictFiltering> <scope>provided</scope> @@ -146,7 +146,7 @@ </includes> </dependencySet> <dependencySet> - <outputDirectory>lib</outputDirectory> + <outputDirectory>deploy-artifacts/lib</outputDirectory> <outputFileNameMapping>jbossws-jboss600.${module.extension}</outputFileNameMapping> <useStrictFiltering>true</useStrictFiltering> <scope>provided</scope> @@ -159,7 +159,7 @@   <fileSet> <directory>modules/resources/src/main/resources/bin</directory> - <outputDirectory>bin</outputDirectory> + <outputDirectory>deploy-artifacts/bin</outputDirectory> <includes> <include>wsconsume.*</include> <include>wsprovide.*</include> @@ -191,7 +191,7 @@  <fileSet> <directory>modules/core/target/resources</directory> - <outputDirectory>resources</outputDirectory> + <outputDirectory>deploy-artifacts/resources</outputDirectory> <includes> <include>jbossws-*/**</include> </includes> Modified: stack/native/trunk/src/main/scripts/assembly-src-dist.xml =================================================================== --- stack/native/trunk/src/main/scripts/assembly-src-dist.xml 2010-07-06 11:19:18 UTC (rev 12588) +++ stack/native/trunk/src/main/scripts/assembly-src-dist.xml 2010-07-06 11:21:36 UTC (rev 12589) @@ -10,15 +10,15 @@ <fileSets> <fileSet> <directory>eclipse/</directory> - <outputDirectory>eclipse/</outputDirectory> + <outputDirectory>jbossws-native-src-dist/eclipse/</outputDirectory> </fileSet> <fileSet> <directory>src/</directory> - <outputDirectory>src/</outputDirectory> + <outputDirectory>jbossws-native-src-dist/src/</outputDirectory> </fileSet> <fileSet> <directory>modules/</directory> - <outputDirectory>modules/</outputDirectory> + <outputDirectory>jbossws-native-src-dist/modules/</outputDirectory> <excludes> <exclude>**/target/**</exclude> <exclude>**/framework-tests/**</exclude> @@ -26,7 +26,7 @@ </fileSet> <fileSet> <directory>modules/testsuite/framework-tests</directory> - <outputDirectory>modules/testsuite/framework-tests</outputDirectory> + <outputDirectory>jbossws-native-src-dist/modules/testsuite/framework-tests</outputDirectory> <includes> <include>src/test/etc/</include> <include>scripts/</include> @@ -35,7 +35,7 @@ </fileSet> <fileSet> <directory></directory> - <outputDirectory>/</outputDirectory> + <outputDirectory>jbossws-native-src-dist/</outputDirectory> <includes> <include>.classpath</include> <include>.project</include> @@ -55,7 +55,7 @@ <binaries> <dependencySets> <dependencySet> - <outputDirectory>modules/testsuite/framework-tests/src/test</outputDirectory> + <outputDirectory>jbossws-native-src-dist/modules/testsuite/framework-tests/src/test</outputDirectory> <useStrictFiltering>true</useStrictFiltering> <scope>provided</scope> <unpack>true</unpack>

13 years, 10 months

1
0
0 / 0

JBossWS SVN: r12588 - in stack/metro/trunk: src/main/scripts and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2010-07-06 07:19:18 -0400 (Tue, 06 Jul 2010) New Revision: 12588 Modified: stack/metro/trunk/build.xml stack/metro/trunk/pom.xml stack/metro/trunk/src/main/scripts/assembly-bin-dist.xml stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml stack/metro/trunk/src/main/scripts/assembly-src-dist.xml Log: [JBWS-3083] Avoid double maven lifecycle run for building src and bin dist Modified: stack/metro/trunk/build.xml =================================================================== --- stack/metro/trunk/build.xml 2010-07-06 10:50:52 UTC (rev 12587) +++ stack/metro/trunk/build.xml 2010-07-06 11:19:18 UTC (rev 12588) @@ -23,7 +23,7 @@ <property name="stack.client.dir" value="${stack.modules.dir}/client"/> <property name="stack.server.dir" value="${stack.modules.dir}/server"/> <property name="stack.resources.dir" value="${stack.dir}/modules/resources/src/main/resources"/> - <property name="deploy.artifacts.dir" value="${stack.output.dir}/deploy-artifacts"/> + <property name="deploy.artifacts.dir" value="${stack.output.dir}/assembly/deploy-artifacts"/> <import file="${stack.distro.dir}/build-setup.xml"/> <import file="${stack.distro.dir}/build-deploy.xml"/> @@ -112,8 +112,11 @@ </exec> </target> - <target name="build-bin-dist" depends="prepare-deploy,os-init" description="Build the binary distribution"> + <target name="build-bin-dist" depends="prepare,os-init" description="Build the binary distribution"> +  + <property name="maven.opts" value=""/> + <echo/> <echo message="${mvn} ${maven.opts} -Pbindist package assembly:directory"/> <echo/> @@ -125,13 +128,16 @@ <zip destfile="${stack.output.dir}/jbossws-metro-bin-dist.zip"> <zipfileset - dir="${stack.output.dir}/jbossws-metro-bin-dist" + dir="${stack.output.dir}/assembly/jbossws-metro-bin-dist" includes="build/ deploy/ docs/ tests/ build.xml ant.properties.example" prefix="jbossws-metro-bin-dist"/> </zip> </target> - <target name="build-src-dist" depends="prepare-deploy,os-init" description="Build the source distribution"> + <target name="build-src-dist" depends="prepare,os-init" description="Build the source distribution"> +  + <property name="maven.opts" value=""/> + <echo/> <echo message="${mvn} ${maven.opts} -Psrcdist package assembly:directory"/> <echo/> @@ -143,7 +149,7 @@ <zip destfile="${stack.output.dir}/jbossws-metro-src-dist.zip"> <zipfileset - dir="${stack.output.dir}/jbossws-metro-src-dist" + dir="${stack.output.dir}/assembly/jbossws-metro-src-dist" includes="modules/ src/ eclipse/ build.xml pom.xml profiles.xml.example .classpath .project" prefix="jbossws-metro-src-dist"/> </zip> Modified: stack/metro/trunk/pom.xml =================================================================== --- stack/metro/trunk/pom.xml 2010-07-06 10:50:52 UTC (rev 12587) +++ stack/metro/trunk/pom.xml 2010-07-06 11:19:18 UTC (rev 12588) @@ -404,7 +404,7 @@ <plugin> <artifactId>maven-assembly-plugin</artifactId> <configuration> - <finalName>deploy-artifacts</finalName> + <finalName>assembly</finalName> <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions> <appendAssemblyId>false</appendAssemblyId>  <fileSet> <directory>src/main/distro</directory> - <outputDirectory>/</outputDirectory> + <outputDirectory>jbossws-metro-bin-dist/</outputDirectory> <includes> <include>build.xml</include> </includes> </fileSet> <fileSet> <directory>src/main/distro</directory> - <outputDirectory>/</outputDirectory> + <outputDirectory>jbossws-metro-bin-dist/</outputDirectory> <filtered>true</filtered> <includes> <include>ant.properties.example</include> @@ -27,7 +27,7 @@  <fileSet> <directory>src/main/distro</directory> - <outputDirectory>build</outputDirectory> + <outputDirectory>jbossws-metro-bin-dist/build</outputDirectory> <includes> <include>build-deploy.xml</include> <include>build-setup.xml</include> @@ -37,7 +37,7 @@ </fileSet> <fileSet> <directory>modules/resources/src/main/resources/resources</directory> - <outputDirectory>build</outputDirectory> + <outputDirectory>jbossws-metro-bin-dist/build</outputDirectory> <includes> <include>deploy.conf</include> <include>server-deploy.conf</include> @@ -47,7 +47,7 @@  <fileSet> <directory>src/main/distro</directory> - <outputDirectory>docs</outputDirectory> + <outputDirectory>jbossws-metro-bin-dist/docs</outputDirectory> <filtered>true</filtered> <includes> <include>Install.txt</include> @@ -57,13 +57,13 @@ </fileSet>  <fileSet> - <directory>target/deploy-artifacts</directory> - <outputDirectory>deploy</outputDirectory> + <directory>target/assembly/deploy-artifacts</directory> + <outputDirectory>jbossws-metro-bin-dist/deploy</outputDirectory> </fileSet>  <fileSet> <directory>modules/testsuite/metro-tests/src/test</directory> - <outputDirectory>tests</outputDirectory> + <outputDirectory>jbossws-metro-bin-dist/tests</outputDirectory> <includes> <include>etc/**</include> </includes> @@ -71,7 +71,7 @@  <fileSet> <directory>modules/testsuite</directory> - <outputDirectory>tests/resources</outputDirectory> + <outputDirectory>jbossws-metro-bin-dist/tests/resources</outputDirectory> <includes> <include>test-excludes-*.txt</include> </includes> @@ -87,7 +87,7 @@ <binaries> <dependencySets> <dependencySet> - <outputDirectory>tests</outputDirectory> + <outputDirectory>jbossws-metro-bin-dist/tests</outputDirectory> <useStrictFiltering>true</useStrictFiltering> <scope>provided</scope> <unpack>true</unpack> Modified: stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2010-07-06 10:50:52 UTC (rev 12587) +++ stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2010-07-06 11:19:18 UTC (rev 12588) @@ -14,7 +14,7 @@ <include>org.jboss.ws.metro:jbossws-metro-server</include> </includes> <binaries> - <outputDirectory>lib</outputDirectory> + <outputDirectory>deploy-artifacts/lib</outputDirectory> <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> <unpack>false</unpack> <dependencySets> @@ -84,13 +84,13 @@ <include>org.jboss.ws.metro:jbossws-metro-management</include> </includes> <binaries> - <outputDirectory>lib</outputDirectory> + <outputDirectory>deploy-artifacts/lib</outputDirectory> <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> <includeDependencies>false</includeDependencies> <unpack>false</unpack> <dependencySets> <dependencySet> - <outputDirectory>lib</outputDirectory> + <outputDirectory>deploy-artifacts/lib</outputDirectory> <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> <useStrictFiltering>true</useStrictFiltering> <scope>provided</scope> @@ -103,7 +103,7 @@ </includes> </dependencySet> <dependencySet> - <outputDirectory>lib</outputDirectory> + <outputDirectory>deploy-artifacts/lib</outputDirectory> <outputFileNameMapping>jbossws-jboss501.${module.extension}</outputFileNameMapping> <useStrictFiltering>true</useStrictFiltering> <scope>provided</scope> @@ -113,7 +113,7 @@ </includes> </dependencySet> <dependencySet> - <outputDirectory>lib</outputDirectory> + <outputDirectory>deploy-artifacts/lib</outputDirectory> <outputFileNameMapping>jbossws-jboss510.${module.extension}</outputFileNameMapping> <useStrictFiltering>true</useStrictFiltering> <scope>provided</scope> @@ -123,7 +123,7 @@ </includes> </dependencySet> <dependencySet> - <outputDirectory>lib</outputDirectory> + <outputDirectory>deploy-artifacts/lib</outputDirectory> <outputFileNameMapping>jbossws-jboss600.${module.extension}</outputFileNameMapping> <useStrictFiltering>true</useStrictFiltering> <scope>provided</scope> @@ -136,7 +136,7 @@   <fileSet> <directory>modules/resources/src/main/resources/bin</directory> - <outputDirectory>bin</outputDirectory> + <outputDirectory>deploy-artifacts/bin</outputDirectory> <includes> <include>wsconsume.*</include> <include>wsprovide.*</include> @@ -181,7 +181,7 @@  <fileSet> <directory>modules/server/target/resources</directory> - <outputDirectory>resources</outputDirectory> + <outputDirectory>deploy-artifacts/resources</outputDirectory> <includes> <include>jbossws-*/**</include> </includes> @@ -190,7 +190,7 @@  <fileSet> <directory>modules/management/target</directory> - <outputDirectory>lib</outputDirectory> + <outputDirectory>deploy-artifacts/lib</outputDirectory> <includes> <include>jbossws-metro-management.war</include> <include>jbossws-metro-management-pcl.war</include> @@ -201,12 +201,12 @@  <files> <file> - <outputDirectory>lib</outputDirectory> + <outputDirectory>deploy-artifacts/lib</outputDirectory> <source>modules/wsit/target/jbossws-metro-wsit-${project.version}-rt.jar</source> <destName>jbossws-metro-wsit-rt.jar</destName> </file> <file> - <outputDirectory>lib</outputDirectory> + <outputDirectory>deploy-artifacts/lib</outputDirectory> <source>modules/wsit/target/jbossws-metro-wsit-${project.version}-tools.jar</source> <destName>jbossws-metro-wsit-tools.jar</destName> </file> Modified: stack/metro/trunk/src/main/scripts/assembly-src-dist.xml =================================================================== --- stack/metro/trunk/src/main/scripts/assembly-src-dist.xml 2010-07-06 10:50:52 UTC (rev 12587) +++ stack/metro/trunk/src/main/scripts/assembly-src-dist.xml 2010-07-06 11:19:18 UTC (rev 12588) @@ -10,15 +10,15 @@ <fileSets> <fileSet> <directory>eclipse/</directory> - <outputDirectory>eclipse/</outputDirectory> + <outputDirectory>jbossws-metro-src-dist/eclipse/</outputDirectory> </fileSet> <fileSet> <directory>src/</directory> - <outputDirectory>src/</outputDirectory> + <outputDirectory>jbossws-metro-src-dist/src/</outputDirectory> </fileSet> <fileSet> <directory>modules/</directory> - <outputDirectory>modules/</outputDirectory> + <outputDirectory>jbossws-metro-src-dist/modules/</outputDirectory> <excludes> <exclude>**/target/**</exclude> <exclude>**/framework-tests/**</exclude> @@ -26,7 +26,7 @@ </fileSet> <fileSet> <directory>modules/testsuite/framework-tests</directory> - <outputDirectory>modules/testsuite/framework-tests</outputDirectory> + <outputDirectory>jbossws-metro-src-dist/modules/testsuite/framework-tests</outputDirectory> <includes> <include>src/test/etc/</include> <include>scripts/</include> @@ -35,7 +35,7 @@ </fileSet> <fileSet> <directory></directory> - <outputDirectory>/</outputDirectory> + <outputDirectory>jbossws-metro-src-dist/</outputDirectory> <includes> <include>.classpath</include> <include>.project</include> @@ -55,7 +55,7 @@ <binaries> <dependencySets> <dependencySet> - <outputDirectory>modules/testsuite/framework-tests/src/test</outputDirectory> + <outputDirectory>jbossws-metro-src-dist/modules/testsuite/framework-tests/src/test</outputDirectory> <useStrictFiltering>true</useStrictFiltering> <scope>provided</scope> <unpack>true</unpack>

13 years, 10 months

1
0
0 / 0

JBossWS SVN: r12587 - in stack/cxf/trunk: src/main/scripts and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2010-07-06 06:50:52 -0400 (Tue, 06 Jul 2010) New Revision: 12587 Modified: stack/cxf/trunk/build.xml stack/cxf/trunk/pom.xml stack/cxf/trunk/src/main/scripts/assembly-bin-dist.xml stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml stack/cxf/trunk/src/main/scripts/assembly-src-dist.xml Log: [JBWS-3083] Avoid double maven lifecycle run for building src and bin dist Modified: stack/cxf/trunk/build.xml =================================================================== --- stack/cxf/trunk/build.xml 2010-07-06 08:34:37 UTC (rev 12586) +++ stack/cxf/trunk/build.xml 2010-07-06 10:50:52 UTC (rev 12587) @@ -23,7 +23,7 @@ <property name="stack.client.dir" value="${stack.modules.dir}/client"/> <property name="stack.server.dir" value="${stack.modules.dir}/server"/> <property name="stack.resources.dir" value="${stack.dir}/modules/resources/src/main/resources"/> - <property name="deploy.artifacts.dir" value="${stack.output.dir}/deploy-artifacts"/> + <property name="deploy.artifacts.dir" value="${stack.output.dir}/assembly/deploy-artifacts"/> <import file="${stack.distro.dir}/build-setup.xml"/> <import file="${stack.distro.dir}/build-deploy.xml"/> @@ -113,8 +113,10 @@ </exec> </target> - <target name="build-bin-dist" depends="prepare-deploy,os-init" description="Build the binary distribution"> - + <target name="build-bin-dist" depends="prepare,os-init" description="Build the binary distribution"> + +  + <property name="maven.opts" value=""/> <echo/> <echo message="${mvn} ${maven.opts} -Pbindist package assembly:directory"/> <echo/> @@ -126,14 +128,16 @@ <zip destfile="${stack.output.dir}/jbossws-cxf-bin-dist.zip"> <zipfileset - dir="${stack.output.dir}/jbossws-cxf-bin-dist" + dir="${stack.output.dir}/assembly/jbossws-cxf-bin-dist" includes="build/ deploy/ docs/ tests/ build.xml ant.properties.example" prefix="jbossws-cxf-bin-dist"/> </zip> </target> - <target name="build-src-dist" depends="prepare-deploy,os-init" description="Build the source distribution"> + <target name="build-src-dist" depends="prepare,os-init" description="Build the source distribution"> +  + <property name="maven.opts" value=""/> <echo/> <echo message="${mvn} ${maven.opts} -Psrcdist package assembly:directory"/> <echo/> @@ -145,7 +149,7 @@ <zip destfile="${stack.output.dir}/jbossws-cxf-src-dist.zip"> <zipfileset - dir="${stack.output.dir}/jbossws-cxf-src-dist" + dir="${stack.output.dir}/assembly/jbossws-cxf-src-dist" includes="modules/ src/ eclipse/ build.xml pom.xml profiles.xml.example .classpath .project" prefix="jbossws-cxf-src-dist"/> </zip> Modified: stack/cxf/trunk/pom.xml =================================================================== --- stack/cxf/trunk/pom.xml 2010-07-06 08:34:37 UTC (rev 12586) +++ stack/cxf/trunk/pom.xml 2010-07-06 10:50:52 UTC (rev 12587) @@ -1205,7 +1205,7 @@ <plugin> <artifactId>maven-assembly-plugin</artifactId> <configuration> - <finalName>deploy-artifacts</finalName> + <finalName>assembly</finalName> <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions> <appendAssemblyId>false</appendAssemblyId>  <fileSet> <directory>src/main/distro</directory> - <outputDirectory>/</outputDirectory> + <outputDirectory>jbossws-cxf-bin-dist</outputDirectory> <includes> <include>build.xml</include> </includes> </fileSet> <fileSet> <directory>src/main/distro</directory> - <outputDirectory>/</outputDirectory> + <outputDirectory>jbossws-cxf-bin-dist</outputDirectory> <filtered>true</filtered> <includes> <include>ant.properties.example</include> @@ -27,7 +27,7 @@  <fileSet> <directory>src/main/distro</directory> - <outputDirectory>build</outputDirectory> + <outputDirectory>jbossws-cxf-bin-dist/build</outputDirectory> <includes> <include>build-deploy.xml</include> <include>build-setup.xml</include> @@ -37,7 +37,7 @@ </fileSet> <fileSet> <directory>modules/resources/src/main/resources/resources</directory> - <outputDirectory>build</outputDirectory> + <outputDirectory>jbossws-cxf-bin-dist/build</outputDirectory> <includes> <include>deploy.conf</include> <include>server-deploy.conf</include> @@ -47,7 +47,7 @@  <fileSet> <directory>src/main/distro</directory> - <outputDirectory>docs</outputDirectory> + <outputDirectory>jbossws-cxf-bin-dist/docs</outputDirectory> <filtered>true</filtered> <includes> <include>Install.txt</include> @@ -57,13 +57,13 @@ </fileSet>  <fileSet> - <directory>target/deploy-artifacts</directory> - <outputDirectory>deploy</outputDirectory> + <directory>target/assembly/deploy-artifacts</directory> + <outputDirectory>jbossws-cxf-bin-dist/deploy</outputDirectory> </fileSet>  <fileSet> <directory>modules/testsuite/cxf-tests/src/test</directory> - <outputDirectory>tests</outputDirectory> + <outputDirectory>jbossws-cxf-bin-dist/tests</outputDirectory> <includes> <include>etc/**</include> </includes> @@ -71,7 +71,7 @@  <fileSet> <directory>modules/testsuite</directory> - <outputDirectory>tests/resources</outputDirectory> + <outputDirectory>jbossws-cxf-bin-dist/tests/resources</outputDirectory> <includes> <include>test-excludes-*.txt</include> </includes> @@ -87,7 +87,7 @@ <binaries> <dependencySets> <dependencySet> - <outputDirectory>tests</outputDirectory> + <outputDirectory>jbossws-cxf-bin-dist/tests</outputDirectory> <useStrictFiltering>true</useStrictFiltering> <scope>provided</scope> <unpack>true</unpack> Modified: stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2010-07-06 08:34:37 UTC (rev 12586) +++ stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2010-07-06 10:50:52 UTC (rev 12587) @@ -14,7 +14,7 @@ <include>org.jboss.ws.cxf:jbossws-cxf-server</include> </includes> <binaries> - <outputDirectory>lib</outputDirectory> + <outputDirectory>deploy-artifacts/lib</outputDirectory> <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> <unpack>false</unpack> <dependencySets> @@ -88,7 +88,7 @@ <include>org.jboss.ws.cxf:jbossws-cxf-server</include> </includes> <binaries> - <outputDirectory>lib</outputDirectory> + <outputDirectory>deploy-artifacts/lib</outputDirectory> <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> <unpack>false</unpack> <dependencySets> @@ -115,13 +115,13 @@ <include>org.jboss.ws.cxf:jbossws-cxf-management</include> </includes> <binaries> - <outputDirectory>lib</outputDirectory> + <outputDirectory>deploy-artifacts/lib</outputDirectory> <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> <includeDependencies>false</includeDependencies> <unpack>false</unpack> <dependencySets> <dependencySet> - <outputDirectory>lib</outputDirectory> + <outputDirectory>deploy-artifacts/lib</outputDirectory> <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> <useStrictFiltering>true</useStrictFiltering> <scope>provided</scope> @@ -134,7 +134,7 @@ </includes> </dependencySet> <dependencySet> - <outputDirectory>lib</outputDirectory> + <outputDirectory>deploy-artifacts/lib</outputDirectory> <outputFileNameMapping>jbossws-jboss501.${module.extension}</outputFileNameMapping> <useStrictFiltering>true</useStrictFiltering> <scope>provided</scope> @@ -144,7 +144,7 @@ </includes> </dependencySet> <dependencySet> - <outputDirectory>lib</outputDirectory> + <outputDirectory>deploy-artifacts/lib</outputDirectory> <outputFileNameMapping>jbossws-jboss510.${module.extension}</outputFileNameMapping> <useStrictFiltering>true</useStrictFiltering> <scope>provided</scope> @@ -154,7 +154,7 @@ </includes> </dependencySet> <dependencySet> - <outputDirectory>lib</outputDirectory> + <outputDirectory>deploy-artifacts/lib</outputDirectory> <outputFileNameMapping>jbossws-jboss600.${module.extension}</outputFileNameMapping> <useStrictFiltering>true</useStrictFiltering> <scope>provided</scope> @@ -167,7 +167,7 @@   <fileSet> <directory>modules/resources/src/main/resources/bin</directory> - <outputDirectory>bin</outputDirectory> + <outputDirectory>deploy-artifacts/bin</outputDirectory> <includes> <include>wsconsume.*</include> <include>wsprovide.*</include> @@ -198,7 +198,7 @@  <fileSet> <directory>modules/server/target/resources</directory> - <outputDirectory>resources</outputDirectory> + <outputDirectory>deploy-artifacts/resources</outputDirectory> <includes> <include>jbossws-*/**</include> </includes> @@ -207,7 +207,7 @@  <fileSet> <directory>modules/management/target</directory> - <outputDirectory>lib</outputDirectory> + <outputDirectory>deploy-artifacts/lib</outputDirectory> <includes> <include>jbossws-cxf-management.war</include> <include>jbossws-cxf-management-pcl.war</include> Modified: stack/cxf/trunk/src/main/scripts/assembly-src-dist.xml =================================================================== --- stack/cxf/trunk/src/main/scripts/assembly-src-dist.xml 2010-07-06 08:34:37 UTC (rev 12586) +++ stack/cxf/trunk/src/main/scripts/assembly-src-dist.xml 2010-07-06 10:50:52 UTC (rev 12587) @@ -10,15 +10,15 @@ <fileSets> <fileSet> <directory>eclipse/</directory> - <outputDirectory>eclipse/</outputDirectory> + <outputDirectory>jbossws-cxf-src-dist/eclipse/</outputDirectory> </fileSet> <fileSet> <directory>src/</directory> - <outputDirectory>src/</outputDirectory> + <outputDirectory>jbossws-cxf-src-dist/src/</outputDirectory> </fileSet> <fileSet> <directory>modules/</directory> - <outputDirectory>modules/</outputDirectory> + <outputDirectory>jbossws-cxf-src-dist/modules/</outputDirectory> <excludes> <exclude>**/target/**</exclude> <exclude>**/framework-tests/**</exclude> @@ -26,7 +26,7 @@ </fileSet> <fileSet> <directory>modules/testsuite/framework-tests</directory> - <outputDirectory>modules/testsuite/framework-tests</outputDirectory> + <outputDirectory>jbossws-cxf-src-dist/modules/testsuite/framework-tests</outputDirectory> <includes> <include>src/test/etc/</include> <include>scripts/</include> @@ -35,7 +35,7 @@ </fileSet> <fileSet> <directory></directory> - <outputDirectory>/</outputDirectory> + <outputDirectory>jbossws-cxf-src-dist/</outputDirectory> <includes> <include>.classpath</include> <include>.project</include> @@ -55,7 +55,7 @@ <binaries> <dependencySets> <dependencySet> - <outputDirectory>modules/testsuite/framework-tests/src/test</outputDirectory> + <outputDirectory>jbossws-cxf-src-dist/modules/testsuite/framework-tests/src/test</outputDirectory> <useStrictFiltering>true</useStrictFiltering> <scope>provided</scope> <unpack>true</unpack>

13 years, 10 months

1
0
0 / 0

JBossWS SVN: r12586 - framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2010-07-06 04:34:37 -0400 (Tue, 06 Jul 2010) New Revision: 12586 Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBase.java Log: [JBWS-3082] Fixing test, early returning for non-native stacks Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBase.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBase.java 2010-07-06 07:36:49 UTC (rev 12585) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBase.java 2010-07-06 08:34:37 UTC (rev 12586) @@ -140,6 +140,12 @@ public void testAttachmentpartSwap() throws Exception { + if (!isIntegrationNative()) + { + //early return for non-native stack integration, as the test basically + //check for native stack specific implementation details + return; + } getBinding().setMTOMEnabled(true); DataHandler dh = new DataHandler(new GeneratorDataSource(1024 * 128)); @@ -148,7 +154,7 @@ assertNotNull(response.getDataHandler().getContent()); File tmpDir = new File(System.getProperty("jboss.home") + FS + "server" + FS + System.getProperty("jboss.server.instance") + FS + "tmp" + FS + "jbossws"); - assertTrue("Temp dir doesn't exist", tmpDir.exists()); + assertTrue("Temp dir doesn't exist: " + tmpDir, tmpDir.exists()); //[JBWS-2834]: windows file delete issue /*for (String fileName : tmpDir.list())

13 years, 10 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 July 2010