JBossWS SVN: r12585 - in stack/cxf/trunk: modules/client/src/main/resources/META-INF/cxf and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-07-06 03:36:49 -0400 (Tue, 06 Jul 2010)
New Revision: 12585
Modified:
stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/jbossws-cxf.xml
stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt
stack/cxf/trunk/pom.xml
Log:
[JBWS-3039] Fixing issue + moving to Spring 3.0.3
Modified: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/jbossws-cxf.xml
===================================================================
--- stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/jbossws-cxf.xml 2010-07-05 18:01:23 UTC (rev 12584)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/jbossws-cxf.xml 2010-07-06 07:36:49 UTC (rev 12585)
@@ -39,7 +39,8 @@
<list>
<bean class="org.apache.cxf.resource.ClasspathResolver"/>
<bean class="org.apache.cxf.resource.ClassLoaderResolver"/>
- <!-- <bean class="org.apache.cxf.bus.spring.BusApplicationContextResourceResolver"/> --> <!-- Restore once JBWS-3039 is solved -->
+ <!-- The following can be commented on AS 6 when not using Spring 3.0.3 or greater; see JBWS-3039 -->
+ <bean class="org.apache.cxf.bus.spring.BusApplicationContextResourceResolver"/>
</list>
</property>
<property name="bus" ref="cxf"/>
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2010-07-05 18:01:23 UTC (rev 12584)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2010-07-06 07:36:49 UTC (rev 12585)
@@ -52,6 +52,3 @@
# [JBWS-3001] Verify @PostConstruct and @PreDestroy annotations support for POJO based endpoints
org/jboss/test/ws/jaxws/jbws2268/**
-# [JBWS-3039] Spring 3 classpath scanning fails on AS 6
-org/jboss/test/ws/jaxws/cxf/webserviceref/WebServiceRefServletTestCase.*
-
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt 2010-07-05 18:01:23 UTC (rev 12584)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt 2010-07-06 07:36:49 UTC (rev 12585)
@@ -52,6 +52,3 @@
# [JBWS-3001] Verify @PostConstruct and @PreDestroy annotations support for POJO based endpoints
org/jboss/test/ws/jaxws/jbws2268/**
-# [JBWS-3039] Spring 3 classpath scanning fails on AS 6
-org/jboss/test/ws/jaxws/cxf/webserviceref/WebServiceRefServletTestCase.*
-
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2010-07-05 18:01:23 UTC (rev 12584)
+++ stack/cxf/trunk/pom.xml 2010-07-06 07:36:49 UTC (rev 12585)
@@ -85,7 +85,7 @@
<xerces.version>2.9.1</xerces.version>
<xmlsec.version>1.4.3</xmlsec.version>
<wstx.version>3.2.9</wstx.version>
- <spring.version>3.0.1.RELEASE</spring.version>
+ <spring.version>3.0.3.RELEASE</spring.version>
</properties>
13 years, 10 months
JBossWS SVN: r12584 - in framework/trunk/hudson/hudson-home/jobs: SWITCH-ALL and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-07-05 14:01:23 -0400 (Mon, 05 Jul 2010)
New Revision: 12584
Added:
framework/trunk/hudson/hudson-home/jobs/SWITCH-ALL/
framework/trunk/hudson/hudson-home/jobs/SWITCH-ALL/config.xml
Modified:
framework/trunk/hudson/hudson-home/jobs/WEEKEND-MATRIX/config.xml
Log:
[JBWS-3049] Adding job for running all the stack switch jobs and including that in the weekend matrix
Added: framework/trunk/hudson/hudson-home/jobs/SWITCH-ALL/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/SWITCH-ALL/config.xml (rev 0)
+++ framework/trunk/hudson/hudson-home/jobs/SWITCH-ALL/config.xml 2010-07-05 18:01:23 UTC (rev 12584)
@@ -0,0 +1,23 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector"/>
+ <publishers class="vector">
+ <hudson.tasks.BuildTrigger>
+ <childProjects>SWITCH-BINDIST-AS-5.0.1, SWITCH-BINDIST-AS-5.1.0, SWITCH-BINDIST-AS-6.0.0, SWITCH-BINDIST-AS-6.0.1</childProjects>
+ </hudson.tasks.BuildTrigger>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.NullSCM"/>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <logRotator>
+ <daysToKeep>14</daysToKeep>
+ <numToKeep>-1</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Run all the stack switch tests</description>
+ <actions class="vector"/>
+</project>
Property changes on: framework/trunk/hudson/hudson-home/jobs/SWITCH-ALL/config.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: framework/trunk/hudson/hudson-home/jobs/WEEKEND-MATRIX/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/WEEKEND-MATRIX/config.xml 2010-07-05 17:56:50 UTC (rev 12583)
+++ framework/trunk/hudson/hudson-home/jobs/WEEKEND-MATRIX/config.xml 2010-07-05 18:01:23 UTC (rev 12584)
@@ -3,7 +3,7 @@
<builders class="vector"/>
<publishers class="vector">
<hudson.tasks.BuildTrigger>
- <childProjects>AS-ALL, AS-TESTS-ALL, NATIVE-ALL, CXF-ALL, METRO-ALL</childProjects>
+ <childProjects>AS-ALL, AS-TESTS-ALL, NATIVE-ALL, CXF-ALL, METRO-ALL, SWITCH-ALL</childProjects>
</hudson.tasks.BuildTrigger>
</publishers>
<buildWrappers class="vector"/>
13 years, 10 months
JBossWS SVN: r12583 - stack/native/branches/dlofthouse.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2010-07-05 13:56:50 -0400 (Mon, 05 Jul 2010)
New Revision: 12583
Removed:
stack/native/branches/dlofthouse/JBWS-3070/
Log:
No longer required.
13 years, 10 months
JBossWS SVN: r12582 - in framework/trunk/hudson/hudson-home/jobs: SWITCH-BINDIST-AS-5.1.0 and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-07-05 13:55:19 -0400 (Mon, 05 Jul 2010)
New Revision: 12582
Modified:
framework/trunk/hudson/hudson-home/jobs/SWITCH-BINDIST-AS-5.0.1/config.xml
framework/trunk/hudson/hudson-home/jobs/SWITCH-BINDIST-AS-5.1.0/config.xml
Log:
[JBWS-3049] Fixing paths for AS 5.x
Modified: framework/trunk/hudson/hudson-home/jobs/SWITCH-BINDIST-AS-5.0.1/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/SWITCH-BINDIST-AS-5.0.1/config.xml 2010-07-05 17:50:52 UTC (rev 12581)
+++ framework/trunk/hudson/hudson-home/jobs/SWITCH-BINDIST-AS-5.0.1/config.xml 2010-07-05 17:55:19 UTC (rev 12582)
@@ -15,7 +15,7 @@
JBOSS_TARGET=jboss501
JBOSS_BIND_ADDRESS=(a)jboss.bind.address@
JBOSS_CONFIG=(a)jboss.server.instance@
-JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0.1/workspace/JBossAS-5.0.1/build/target/(a)hudson.jboss501.build@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0.1/workspace/JBossAS-5.0.1/build/output/(a)hudson.jboss501.build@
CXF_BIN_DIST_DIR=@hudson.home(a)/jobs/CXF-BINDIST-AS-5.0.1-SUN-JDK-6/workspace/stack-cxf/
METRO_BIN_DIST_DIR=@hudson.home(a)/jobs/METRO-BINDIST-AS-5.0.1-SUN-JDK-6/workspace/stack-metro/
NATIVE_BIN_DIST_DIR=@hudson.home(a)/jobs/NATIVE-BINDIST-AS-5.0.1-SUN-JDK-6/workspace/stack-native/
Modified: framework/trunk/hudson/hudson-home/jobs/SWITCH-BINDIST-AS-5.1.0/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/SWITCH-BINDIST-AS-5.1.0/config.xml 2010-07-05 17:50:52 UTC (rev 12581)
+++ framework/trunk/hudson/hudson-home/jobs/SWITCH-BINDIST-AS-5.1.0/config.xml 2010-07-05 17:55:19 UTC (rev 12582)
@@ -15,7 +15,7 @@
JBOSS_TARGET=jboss510
JBOSS_BIND_ADDRESS=(a)jboss.bind.address@
JBOSS_CONFIG=(a)jboss.server.instance@
-JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.1.0/workspace/JBossAS-5.1.0/build/target/(a)hudson.jboss510.build@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.1.0/workspace/JBossAS-5.1.0/build/output/(a)hudson.jboss510.build@
CXF_BIN_DIST_DIR=@hudson.home(a)/jobs/CXF-BINDIST-AS-5.1.0-SUN-JDK-6/workspace/stack-cxf/
METRO_BIN_DIST_DIR=@hudson.home(a)/jobs/METRO-BINDIST-AS-5.1.0-SUN-JDK-6/workspace/stack-metro/
NATIVE_BIN_DIST_DIR=@hudson.home(a)/jobs/NATIVE-BINDIST-AS-5.1.0-SUN-JDK-6/workspace/stack-native/
13 years, 10 months
JBossWS SVN: r12581 - in framework/trunk/hudson/hudson-home/jobs: SWITCH-BINDIST-AS-5.0.1 and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-07-05 13:50:52 -0400 (Mon, 05 Jul 2010)
New Revision: 12581
Added:
framework/trunk/hudson/hudson-home/jobs/SWITCH-BINDIST-AS-5.0.1/
framework/trunk/hudson/hudson-home/jobs/SWITCH-BINDIST-AS-5.0.1/config.xml
framework/trunk/hudson/hudson-home/jobs/SWITCH-BINDIST-AS-5.1.0/
framework/trunk/hudson/hudson-home/jobs/SWITCH-BINDIST-AS-5.1.0/config.xml
framework/trunk/hudson/hudson-home/jobs/SWITCH-BINDIST-AS-6.0.1/
framework/trunk/hudson/hudson-home/jobs/SWITCH-BINDIST-AS-6.0.1/config.xml
Log:
[JBWS-3049] Adding switch bindist jobs for other containers
Added: framework/trunk/hudson/hudson-home/jobs/SWITCH-BINDIST-AS-5.0.1/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/SWITCH-BINDIST-AS-5.0.1/config.xml (rev 0)
+++ framework/trunk/hudson/hudson-home/jobs/SWITCH-BINDIST-AS-5.0.1/config.xml 2010-07-05 17:50:52 UTC (rev 12581)
@@ -0,0 +1,154 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=SWITCH-BINDIST-AS-5.0.1
+
+WORKSPACE=`pwd`
+JAVA_HOME=(a)java.home.sun.jdk6@
+HUDSON_DIR=$WORKSPACE/framework-hudson
+TEST_OPTS=
+JBOSS_TARGET=jboss501
+JBOSS_BIND_ADDRESS=(a)jboss.bind.address@
+JBOSS_CONFIG=(a)jboss.server.instance@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0.1/workspace/JBossAS-5.0.1/build/target/(a)hudson.jboss501.build@
+CXF_BIN_DIST_DIR=@hudson.home(a)/jobs/CXF-BINDIST-AS-5.0.1-SUN-JDK-6/workspace/stack-cxf/
+METRO_BIN_DIST_DIR=@hudson.home(a)/jobs/METRO-BINDIST-AS-5.0.1-SUN-JDK-6/workspace/stack-metro/
+NATIVE_BIN_DIST_DIR=@hudson.home(a)/jobs/NATIVE-BINDIST-AS-5.0.1-SUN-JDK-6/workspace/stack-native/
+CXF_AS_HOME=$WORKSPACE/cxf-as
+NATIVE_AS_HOME=$WORKSPACE/native-as
+METRO_AS_HOME=$WORKSPACE/metro-as
+
+#
+# load test functions
+#
+. $HUDSON_DIR/jboss/bin/jbossws-qa.sh
+
+
+rm -rf $WORKSPACE/*.diff
+rm -rf $WORKSPACE/modified-as
+
+rm -rf $CXF_AS_HOME
+cp -r $JBOSS_INSTANCE $CXF_AS_HOME
+JBOSS_HOME=$CXF_AS_HOME
+STACK_DIR=$CXF_BIN_DIST_DIR
+STACK_ID=cxf
+setupEnv
+redeployBinaryDistribution
+
+rm -rf $NATIVE_AS_HOME
+cp -r $JBOSS_INSTANCE $NATIVE_AS_HOME
+JBOSS_HOME=$NATIVE_AS_HOME
+STACK_DIR=$NATIVE_BIN_DIST_DIR
+STACK_ID=native
+setupEnv
+redeployBinaryDistribution
+
+rm -rf $METRO_AS_HOME
+cp -r $JBOSS_INSTANCE $METRO_AS_HOME
+JBOSS_HOME=$METRO_AS_HOME
+STACK_DIR=$METRO_BIN_DIST_DIR
+STACK_ID=metro
+setupEnv
+redeployBinaryDistribution
+
+JBOSS_HOME=$WORKSPACE/modified-as
+
+#------------------------------------- CXF stack checks -------------------------------------
+
+cp -r $METRO_AS_HOME $JBOSS_HOME
+STACK_DIR=$CXF_BIN_DIST_DIR
+STACK_ID=cxf
+setupEnv
+redeployBinaryDistribution
+diff -r $CXF_AS_HOME $JBOSS_HOME > $WORKSPACE/cxf_vs_cxfOverMetro.diff
+rm -rf $JBOSS_HOME
+cp -r $NATIVE_AS_HOME $JBOSS_HOME
+STACK_DIR=$CXF_BIN_DIST_DIR
+STACK_ID=cxf
+setupEnv
+redeployBinaryDistribution
+diff -r $CXF_AS_HOME $JBOSS_HOME > $WORKSPACE/cxf_vs_cxfOverNative.diff
+rm -rf $JBOSS_HOME
+
+
+#------------------------------------- NATIVE stack checks -------------------------------------
+
+cp -r $METRO_AS_HOME $JBOSS_HOME
+STACK_DIR=$NATIVE_BIN_DIST_DIR
+STACK_ID=native
+setupEnv
+redeployBinaryDistribution
+diff -r $NATIVE_AS_HOME $JBOSS_HOME > $WORKSPACE/native_vs_nativeOverMetro.diff
+rm -rf $JBOSS_HOME
+cp -r $CXF_AS_HOME $JBOSS_HOME
+STACK_DIR=$NATIVE_BIN_DIST_DIR
+STACK_ID=native
+setupEnv
+redeployBinaryDistribution
+diff -r $NATIVE_AS_HOME $JBOSS_HOME > $WORKSPACE/native_vs_nativeOverCxf.diff
+rm -rf $JBOSS_HOME
+
+
+#------------------------------------- METRO stack checks -------------------------------------
+
+cp -r $CXF_AS_HOME $JBOSS_HOME
+STACK_DIR=$METRO_BIN_DIST_DIR
+STACK_ID=metro
+setupEnv
+redeployBinaryDistribution
+diff -r $METRO_AS_HOME $JBOSS_HOME > $WORKSPACE/metro_vs_metroOverCxf.diff
+rm -rf $JBOSS_HOME
+cp -r $NATIVE_AS_HOME $JBOSS_HOME
+STACK_DIR=$METRO_BIN_DIST_DIR
+STACK_ID=metro
+setupEnv
+redeployBinaryDistribution
+diff -r $METRO_AS_HOME $JBOSS_HOME > $WORKSPACE/metro_vs_metroOverNative.diff
+rm -rf $JBOSS_HOME
+
+rm -rf $CXF_AS_HOME
+rm -rf $NATIVE_AS_HOME
+rm -rf $METRO_AS_HOME
+
+</command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.Mailer>
+ <recipients>@hudson.mail.recipients@</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>true</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.SubversionSCM">
+ <locations>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.framework.url@/hudson</remote>
+ <local>framework-hudson</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ </locations>
+ <useUpdate>true</useUpdate>
+ <browser class="hudson.scm.browsers.FishEyeSVN">
+ <url>http://fisheye.jboss.com/browse/JBossWS/</url>
+ <rootModule></rootModule>
+ </browser>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <logRotator>
+ <daysToKeep>14</daysToKeep>
+ <numToKeep>-1</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Test jbossws bindist stack switch against AS 6.0.1</description>
+ <actions class="vector"/>
+</project>
Property changes on: framework/trunk/hudson/hudson-home/jobs/SWITCH-BINDIST-AS-5.0.1/config.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: framework/trunk/hudson/hudson-home/jobs/SWITCH-BINDIST-AS-5.1.0/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/SWITCH-BINDIST-AS-5.1.0/config.xml (rev 0)
+++ framework/trunk/hudson/hudson-home/jobs/SWITCH-BINDIST-AS-5.1.0/config.xml 2010-07-05 17:50:52 UTC (rev 12581)
@@ -0,0 +1,154 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=SWITCH-BINDIST-AS-5.1.0
+
+WORKSPACE=`pwd`
+JAVA_HOME=(a)java.home.sun.jdk6@
+HUDSON_DIR=$WORKSPACE/framework-hudson
+TEST_OPTS=
+JBOSS_TARGET=jboss510
+JBOSS_BIND_ADDRESS=(a)jboss.bind.address@
+JBOSS_CONFIG=(a)jboss.server.instance@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.1.0/workspace/JBossAS-5.1.0/build/target/(a)hudson.jboss510.build@
+CXF_BIN_DIST_DIR=@hudson.home(a)/jobs/CXF-BINDIST-AS-5.1.0-SUN-JDK-6/workspace/stack-cxf/
+METRO_BIN_DIST_DIR=@hudson.home(a)/jobs/METRO-BINDIST-AS-5.1.0-SUN-JDK-6/workspace/stack-metro/
+NATIVE_BIN_DIST_DIR=@hudson.home(a)/jobs/NATIVE-BINDIST-AS-5.1.0-SUN-JDK-6/workspace/stack-native/
+CXF_AS_HOME=$WORKSPACE/cxf-as
+NATIVE_AS_HOME=$WORKSPACE/native-as
+METRO_AS_HOME=$WORKSPACE/metro-as
+
+#
+# load test functions
+#
+. $HUDSON_DIR/jboss/bin/jbossws-qa.sh
+
+
+rm -rf $WORKSPACE/*.diff
+rm -rf $WORKSPACE/modified-as
+
+rm -rf $CXF_AS_HOME
+cp -r $JBOSS_INSTANCE $CXF_AS_HOME
+JBOSS_HOME=$CXF_AS_HOME
+STACK_DIR=$CXF_BIN_DIST_DIR
+STACK_ID=cxf
+setupEnv
+redeployBinaryDistribution
+
+rm -rf $NATIVE_AS_HOME
+cp -r $JBOSS_INSTANCE $NATIVE_AS_HOME
+JBOSS_HOME=$NATIVE_AS_HOME
+STACK_DIR=$NATIVE_BIN_DIST_DIR
+STACK_ID=native
+setupEnv
+redeployBinaryDistribution
+
+rm -rf $METRO_AS_HOME
+cp -r $JBOSS_INSTANCE $METRO_AS_HOME
+JBOSS_HOME=$METRO_AS_HOME
+STACK_DIR=$METRO_BIN_DIST_DIR
+STACK_ID=metro
+setupEnv
+redeployBinaryDistribution
+
+JBOSS_HOME=$WORKSPACE/modified-as
+
+#------------------------------------- CXF stack checks -------------------------------------
+
+cp -r $METRO_AS_HOME $JBOSS_HOME
+STACK_DIR=$CXF_BIN_DIST_DIR
+STACK_ID=cxf
+setupEnv
+redeployBinaryDistribution
+diff -r $CXF_AS_HOME $JBOSS_HOME > $WORKSPACE/cxf_vs_cxfOverMetro.diff
+rm -rf $JBOSS_HOME
+cp -r $NATIVE_AS_HOME $JBOSS_HOME
+STACK_DIR=$CXF_BIN_DIST_DIR
+STACK_ID=cxf
+setupEnv
+redeployBinaryDistribution
+diff -r $CXF_AS_HOME $JBOSS_HOME > $WORKSPACE/cxf_vs_cxfOverNative.diff
+rm -rf $JBOSS_HOME
+
+
+#------------------------------------- NATIVE stack checks -------------------------------------
+
+cp -r $METRO_AS_HOME $JBOSS_HOME
+STACK_DIR=$NATIVE_BIN_DIST_DIR
+STACK_ID=native
+setupEnv
+redeployBinaryDistribution
+diff -r $NATIVE_AS_HOME $JBOSS_HOME > $WORKSPACE/native_vs_nativeOverMetro.diff
+rm -rf $JBOSS_HOME
+cp -r $CXF_AS_HOME $JBOSS_HOME
+STACK_DIR=$NATIVE_BIN_DIST_DIR
+STACK_ID=native
+setupEnv
+redeployBinaryDistribution
+diff -r $NATIVE_AS_HOME $JBOSS_HOME > $WORKSPACE/native_vs_nativeOverCxf.diff
+rm -rf $JBOSS_HOME
+
+
+#------------------------------------- METRO stack checks -------------------------------------
+
+cp -r $CXF_AS_HOME $JBOSS_HOME
+STACK_DIR=$METRO_BIN_DIST_DIR
+STACK_ID=metro
+setupEnv
+redeployBinaryDistribution
+diff -r $METRO_AS_HOME $JBOSS_HOME > $WORKSPACE/metro_vs_metroOverCxf.diff
+rm -rf $JBOSS_HOME
+cp -r $NATIVE_AS_HOME $JBOSS_HOME
+STACK_DIR=$METRO_BIN_DIST_DIR
+STACK_ID=metro
+setupEnv
+redeployBinaryDistribution
+diff -r $METRO_AS_HOME $JBOSS_HOME > $WORKSPACE/metro_vs_metroOverNative.diff
+rm -rf $JBOSS_HOME
+
+rm -rf $CXF_AS_HOME
+rm -rf $NATIVE_AS_HOME
+rm -rf $METRO_AS_HOME
+
+</command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.Mailer>
+ <recipients>@hudson.mail.recipients@</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>true</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.SubversionSCM">
+ <locations>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.framework.url@/hudson</remote>
+ <local>framework-hudson</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ </locations>
+ <useUpdate>true</useUpdate>
+ <browser class="hudson.scm.browsers.FishEyeSVN">
+ <url>http://fisheye.jboss.com/browse/JBossWS/</url>
+ <rootModule></rootModule>
+ </browser>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <logRotator>
+ <daysToKeep>14</daysToKeep>
+ <numToKeep>-1</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Test jbossws bindist stack switch against AS 6.0.1</description>
+ <actions class="vector"/>
+</project>
Property changes on: framework/trunk/hudson/hudson-home/jobs/SWITCH-BINDIST-AS-5.1.0/config.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: framework/trunk/hudson/hudson-home/jobs/SWITCH-BINDIST-AS-6.0.1/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/SWITCH-BINDIST-AS-6.0.1/config.xml (rev 0)
+++ framework/trunk/hudson/hudson-home/jobs/SWITCH-BINDIST-AS-6.0.1/config.xml 2010-07-05 17:50:52 UTC (rev 12581)
@@ -0,0 +1,154 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=SWITCH-BINDIST-AS-6.0.1
+
+WORKSPACE=`pwd`
+JAVA_HOME=(a)java.home.sun.jdk6@
+HUDSON_DIR=$WORKSPACE/framework-hudson
+TEST_OPTS=
+JBOSS_TARGET=jboss601
+JBOSS_BIND_ADDRESS=(a)jboss.bind.address@
+JBOSS_CONFIG=(a)jboss.server.instance@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-6.0.1/workspace/JBossAS-6.0.1/build/target/(a)hudson.jboss601.build@
+CXF_BIN_DIST_DIR=@hudson.home(a)/jobs/CXF-BINDIST-AS-6.0.1-SUN-JDK-6/workspace/stack-cxf/
+METRO_BIN_DIST_DIR=@hudson.home(a)/jobs/METRO-BINDIST-AS-6.0.1-SUN-JDK-6/workspace/stack-metro/
+NATIVE_BIN_DIST_DIR=@hudson.home(a)/jobs/NATIVE-BINDIST-AS-6.0.1-SUN-JDK-6/workspace/stack-native/
+CXF_AS_HOME=$WORKSPACE/cxf-as
+NATIVE_AS_HOME=$WORKSPACE/native-as
+METRO_AS_HOME=$WORKSPACE/metro-as
+
+#
+# load test functions
+#
+. $HUDSON_DIR/jboss/bin/jbossws-qa.sh
+
+
+rm -rf $WORKSPACE/*.diff
+rm -rf $WORKSPACE/modified-as
+
+rm -rf $CXF_AS_HOME
+cp -r $JBOSS_INSTANCE $CXF_AS_HOME
+JBOSS_HOME=$CXF_AS_HOME
+STACK_DIR=$CXF_BIN_DIST_DIR
+STACK_ID=cxf
+setupEnv
+redeployBinaryDistribution
+
+rm -rf $NATIVE_AS_HOME
+cp -r $JBOSS_INSTANCE $NATIVE_AS_HOME
+JBOSS_HOME=$NATIVE_AS_HOME
+STACK_DIR=$NATIVE_BIN_DIST_DIR
+STACK_ID=native
+setupEnv
+redeployBinaryDistribution
+
+rm -rf $METRO_AS_HOME
+cp -r $JBOSS_INSTANCE $METRO_AS_HOME
+JBOSS_HOME=$METRO_AS_HOME
+STACK_DIR=$METRO_BIN_DIST_DIR
+STACK_ID=metro
+setupEnv
+redeployBinaryDistribution
+
+JBOSS_HOME=$WORKSPACE/modified-as
+
+#------------------------------------- CXF stack checks -------------------------------------
+
+cp -r $METRO_AS_HOME $JBOSS_HOME
+STACK_DIR=$CXF_BIN_DIST_DIR
+STACK_ID=cxf
+setupEnv
+redeployBinaryDistribution
+diff -r $CXF_AS_HOME $JBOSS_HOME > $WORKSPACE/cxf_vs_cxfOverMetro.diff
+rm -rf $JBOSS_HOME
+cp -r $NATIVE_AS_HOME $JBOSS_HOME
+STACK_DIR=$CXF_BIN_DIST_DIR
+STACK_ID=cxf
+setupEnv
+redeployBinaryDistribution
+diff -r $CXF_AS_HOME $JBOSS_HOME -x jbossws-native-core.jar > $WORKSPACE/cxf_vs_cxfOverNative.diff
+rm -rf $JBOSS_HOME
+
+
+#------------------------------------- NATIVE stack checks -------------------------------------
+
+cp -r $METRO_AS_HOME $JBOSS_HOME
+STACK_DIR=$NATIVE_BIN_DIST_DIR
+STACK_ID=native
+setupEnv
+redeployBinaryDistribution
+diff -r $NATIVE_AS_HOME $JBOSS_HOME > $WORKSPACE/native_vs_nativeOverMetro.diff
+rm -rf $JBOSS_HOME
+cp -r $CXF_AS_HOME $JBOSS_HOME
+STACK_DIR=$NATIVE_BIN_DIST_DIR
+STACK_ID=native
+setupEnv
+redeployBinaryDistribution
+diff -r $NATIVE_AS_HOME $JBOSS_HOME > $WORKSPACE/native_vs_nativeOverCxf.diff
+rm -rf $JBOSS_HOME
+
+
+#------------------------------------- METRO stack checks -------------------------------------
+
+cp -r $CXF_AS_HOME $JBOSS_HOME
+STACK_DIR=$METRO_BIN_DIST_DIR
+STACK_ID=metro
+setupEnv
+redeployBinaryDistribution
+diff -r $METRO_AS_HOME $JBOSS_HOME > $WORKSPACE/metro_vs_metroOverCxf.diff
+rm -rf $JBOSS_HOME
+cp -r $NATIVE_AS_HOME $JBOSS_HOME
+STACK_DIR=$METRO_BIN_DIST_DIR
+STACK_ID=metro
+setupEnv
+redeployBinaryDistribution
+diff -r $METRO_AS_HOME $JBOSS_HOME -x jbossws-native-core.jar > $WORKSPACE/metro_vs_metroOverNative.diff
+rm -rf $JBOSS_HOME
+
+rm -rf $CXF_AS_HOME
+rm -rf $NATIVE_AS_HOME
+rm -rf $METRO_AS_HOME
+
+</command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.Mailer>
+ <recipients>@hudson.mail.recipients@</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>true</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.SubversionSCM">
+ <locations>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.framework.url@/hudson</remote>
+ <local>framework-hudson</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ </locations>
+ <useUpdate>true</useUpdate>
+ <browser class="hudson.scm.browsers.FishEyeSVN">
+ <url>http://fisheye.jboss.com/browse/JBossWS/</url>
+ <rootModule></rootModule>
+ </browser>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <logRotator>
+ <daysToKeep>14</daysToKeep>
+ <numToKeep>-1</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Test jbossws bindist stack switch against AS 6.0.1</description>
+ <actions class="vector"/>
+</project>
Property changes on: framework/trunk/hudson/hudson-home/jobs/SWITCH-BINDIST-AS-6.0.1/config.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
13 years, 10 months
JBossWS SVN: r12580 - in stack/native/trunk/modules: testsuite/native-tests/scripts and 11 other directories.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2010-07-05 13:36:12 -0400 (Mon, 05 Jul 2010)
New Revision: 12580
Added:
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3070/
stack/native/trunk/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/TestEndpoint.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3070/TestEndpointImpl.java
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/
stack/native/trunk/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/wsdl/
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/a/
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/a/wsdl/
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/a/wsdl/b/
stack/native/trunk/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/xsd/
stack/native/trunk/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/b/
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/b/schema2.xsd
Removed:
stack/native/trunk/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/TestEndpoint.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3070/TestEndpointImpl.java
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/
stack/native/trunk/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/wsdl/
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/a/
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/a/wsdl/
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/a/wsdl/b/
stack/native/trunk/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/xsd/
stack/native/trunk/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/b/
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/b/schema2.xsd
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java
stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml
Log:
[JBWS-3070] Secondary import of XSD contains incorrect path.
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java 2010-07-05 17:34:22 UTC (rev 12579)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java 2010-07-05 17:36:12 UTC (rev 12580)
@@ -205,25 +205,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/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2010-07-05 17:34:22 UTC (rev 12579)
+++ stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2010-07-05 17:36:12 UTC (rev 12580)
@@ -636,6 +636,18 @@
</classes>
</war>
+ <!-- jaxws-jbws3070 -->
+ <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>
+
<!-- jaxws-webserviceref -->
<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">
Copied: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3070 (from rev 12577, stack/native/branches/dlofthouse/JBWS-3070/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3070)
Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3070/JBWS3070TestCase.java
===================================================================
--- stack/native/branches/dlofthouse/JBWS-3070/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3070/JBWS3070TestCase.java 2010-07-05 16:33:19 UTC (rev 12577)
+++ 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)
@@ -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/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3070/JBWS3070TestCase.java (from rev 12577, stack/native/branches/dlofthouse/JBWS-3070/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 (rev 0)
+++ 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)
@@ -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/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3070/TestEndpoint.java
===================================================================
--- stack/native/branches/dlofthouse/JBWS-3070/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3070/TestEndpoint.java 2010-07-05 16:33:19 UTC (rev 12577)
+++ 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)
@@ -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/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3070/TestEndpoint.java (from rev 12577, stack/native/branches/dlofthouse/JBWS-3070/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 (rev 0)
+++ 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)
@@ -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/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3070/TestEndpointImpl.java
===================================================================
--- stack/native/branches/dlofthouse/JBWS-3070/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3070/TestEndpointImpl.java 2010-07-05 16:33:19 UTC (rev 12577)
+++ 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)
@@ -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/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3070/TestEndpointImpl.java (from rev 12577, stack/native/branches/dlofthouse/JBWS-3070/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 (rev 0)
+++ 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)
@@ -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/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070 (from rev 12577, stack/native/branches/dlofthouse/JBWS-3070/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070)
Copied: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF (from rev 12577, stack/native/branches/dlofthouse/JBWS-3070/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF)
Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/web.xml
===================================================================
--- stack/native/branches/dlofthouse/JBWS-3070/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/web.xml 2010-07-05 16:33:19 UTC (rev 12577)
+++ 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)
@@ -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/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/web.xml (from rev 12577, stack/native/branches/dlofthouse/JBWS-3070/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 (rev 0)
+++ 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)
@@ -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/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl (from rev 12577, stack/native/branches/dlofthouse/JBWS-3070/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl)
Copied: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/a (from rev 12577, stack/native/branches/dlofthouse/JBWS-3070/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/a)
Copied: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/a/wsdl (from rev 12577, stack/native/branches/dlofthouse/JBWS-3070/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/a/wsdl)
Copied: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/a/wsdl/b (from rev 12577, stack/native/branches/dlofthouse/JBWS-3070/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/a/wsdl/b)
Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/a/wsdl/b/TestService.wsdl
===================================================================
--- stack/native/branches/dlofthouse/JBWS-3070/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/a/wsdl/b/TestService.wsdl 2010-07-05 16:33:19 UTC (rev 12577)
+++ 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)
@@ -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/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/a/wsdl/b/TestService.wsdl (from rev 12577, stack/native/branches/dlofthouse/JBWS-3070/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 (rev 0)
+++ 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)
@@ -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/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/a/xsd (from rev 12577, stack/native/branches/dlofthouse/JBWS-3070/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/a/xsd)
Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/a/xsd/schema1.xsd
===================================================================
--- stack/native/branches/dlofthouse/JBWS-3070/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/a/xsd/schema1.xsd 2010-07-05 16:33:19 UTC (rev 12577)
+++ 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)
@@ -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/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/a/xsd/schema1.xsd (from rev 12577, stack/native/branches/dlofthouse/JBWS-3070/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 (rev 0)
+++ 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)
@@ -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/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/b (from rev 12577, stack/native/branches/dlofthouse/JBWS-3070/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/b)
Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/b/schema2.xsd
===================================================================
--- stack/native/branches/dlofthouse/JBWS-3070/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/b/schema2.xsd 2010-07-05 16:33:19 UTC (rev 12577)
+++ 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)
@@ -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/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/b/schema2.xsd (from rev 12577, stack/native/branches/dlofthouse/JBWS-3070/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 (rev 0)
+++ 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)
@@ -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
JBossWS SVN: r12579 - framework/trunk/hudson/hudson-home/jobs/SWITCH-BINDIST-AS-6.0.0.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-07-05 13:34:22 -0400 (Mon, 05 Jul 2010)
New Revision: 12579
Modified:
framework/trunk/hudson/hudson-home/jobs/SWITCH-BINDIST-AS-6.0.0/config.xml
Log:
[JBWS-3049] Simplifying script
Modified: framework/trunk/hudson/hudson-home/jobs/SWITCH-BINDIST-AS-6.0.0/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/SWITCH-BINDIST-AS-6.0.0/config.xml 2010-07-05 16:42:51 UTC (rev 12578)
+++ framework/trunk/hudson/hudson-home/jobs/SWITCH-BINDIST-AS-6.0.0/config.xml 2010-07-05 17:34:22 UTC (rev 12579)
@@ -28,6 +28,10 @@
#
. $HUDSON_DIR/jboss/bin/jbossws-qa.sh
+
+rm -rf $WORKSPACE/*.diff
+rm -rf $WORKSPACE/modified-as
+
rm -rf $CXF_AS_HOME
cp -r $JBOSS_INSTANCE $CXF_AS_HOME
JBOSS_HOME=$CXF_AS_HOME
@@ -52,12 +56,8 @@
setupEnv
redeployBinaryDistribution
-rm -rf $WORKSPACE/modified-as
JBOSS_HOME=$WORKSPACE/modified-as
-rm -rf result.txt
-touch result.txt
-
#------------------------------------- CXF stack checks -------------------------------------
cp -r $METRO_AS_HOME $JBOSS_HOME
@@ -65,16 +65,14 @@
STACK_ID=cxf
setupEnv
redeployBinaryDistribution
-diff -r $CXF_AS_HOME $JBOSS_HOME |grep -v "jbossws-native-core.jar" > $WORKSPACE/cxf_vs_cxfOverMetro.diff
-cat $WORKSPACE/cxf_vs_cxfOverMetro.diff >> $WORKSPACE/result.txt
+diff -r $CXF_AS_HOME $JBOSS_HOME > $WORKSPACE/cxf_vs_cxfOverMetro.diff
rm -rf $JBOSS_HOME
cp -r $NATIVE_AS_HOME $JBOSS_HOME
STACK_DIR=$CXF_BIN_DIST_DIR
STACK_ID=cxf
setupEnv
redeployBinaryDistribution
-diff -r $CXF_AS_HOME $JBOSS_HOME |grep -v "jbossws-native-core.jar" > $WORKSPACE/cxf_vs_cxfOverNative.diff
-cat $WORKSPACE/cxf_vs_cxfOverNative.diff >> $WORKSPACE/result.txt
+diff -r $CXF_AS_HOME $JBOSS_HOME -x jbossws-native-core.jar > $WORKSPACE/cxf_vs_cxfOverNative.diff
rm -rf $JBOSS_HOME
@@ -85,16 +83,14 @@
STACK_ID=native
setupEnv
redeployBinaryDistribution
-diff -r $NATIVE_AS_HOME $JBOSS_HOME |grep -v "jbossws-native-core.jar" > $WORKSPACE/native_vs_nativeOverMetro.diff
-cat $WORKSPACE/native_vs_nativeOverMetro.diff >> $WORKSPACE/result.txt
+diff -r $NATIVE_AS_HOME $JBOSS_HOME > $WORKSPACE/native_vs_nativeOverMetro.diff
rm -rf $JBOSS_HOME
cp -r $CXF_AS_HOME $JBOSS_HOME
STACK_DIR=$NATIVE_BIN_DIST_DIR
STACK_ID=native
setupEnv
redeployBinaryDistribution
-diff -r $NATIVE_AS_HOME $JBOSS_HOME |grep -v "jbossws-native-core.jar" > $WORKSPACE/native_vs_nativeOverCxf.diff
-cat $WORKSPACE/native_vs_nativeOverCxf.diff >> $WORKSPACE/result.txt
+diff -r $NATIVE_AS_HOME $JBOSS_HOME > $WORKSPACE/native_vs_nativeOverCxf.diff
rm -rf $JBOSS_HOME
@@ -106,28 +102,19 @@
setupEnv
redeployBinaryDistribution
diff -r $METRO_AS_HOME $JBOSS_HOME > $WORKSPACE/metro_vs_metroOverCxf.diff
-cat $WORKSPACE/metro_vs_metroOverCxf.diff >> $WORKSPACE/result.txt
rm -rf $JBOSS_HOME
cp -r $NATIVE_AS_HOME $JBOSS_HOME
STACK_DIR=$METRO_BIN_DIST_DIR
STACK_ID=metro
setupEnv
redeployBinaryDistribution
-diff -r $METRO_AS_HOME $JBOSS_HOME > $WORKSPACE/metro_vs_metroOverNative.diff
-cat $WORKSPACE/metro_vs_metroOverNative.diff >> $WORKSPACE/result.txt
+diff -r $METRO_AS_HOME $JBOSS_HOME -x jbossws-native-core.jar > $WORKSPACE/metro_vs_metroOverNative.diff
rm -rf $JBOSS_HOME
-
rm -rf $CXF_AS_HOME
rm -rf $NATIVE_AS_HOME
rm -rf $METRO_AS_HOME
-cd $WORKSPACE
-if [ -s $WORKSPACE/result.txt ]; then
- echo "Differences detected"
- exit 1
-fi
-
</command>
</hudson.tasks.Shell>
</builders>
13 years, 10 months
JBossWS SVN: r12578 - framework/trunk/hudson/hudson-home/jobs/SWITCH-BINDIST-AS-6.0.0.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-07-05 12:42:51 -0400 (Mon, 05 Jul 2010)
New Revision: 12578
Modified:
framework/trunk/hudson/hudson-home/jobs/SWITCH-BINDIST-AS-6.0.0/config.xml
Log:
[JBWS-3049] Exclude jbossws-native-core.jar from stack switch comparisons when installing jbossws-cxf and jbossws-metro
Modified: framework/trunk/hudson/hudson-home/jobs/SWITCH-BINDIST-AS-6.0.0/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/SWITCH-BINDIST-AS-6.0.0/config.xml 2010-07-05 16:33:19 UTC (rev 12577)
+++ framework/trunk/hudson/hudson-home/jobs/SWITCH-BINDIST-AS-6.0.0/config.xml 2010-07-05 16:42:51 UTC (rev 12578)
@@ -65,7 +65,7 @@
STACK_ID=cxf
setupEnv
redeployBinaryDistribution
-diff -r $CXF_AS_HOME $JBOSS_HOME > $WORKSPACE/cxf_vs_cxfOverMetro.diff
+diff -r $CXF_AS_HOME $JBOSS_HOME |grep -v "jbossws-native-core.jar" > $WORKSPACE/cxf_vs_cxfOverMetro.diff
cat $WORKSPACE/cxf_vs_cxfOverMetro.diff >> $WORKSPACE/result.txt
rm -rf $JBOSS_HOME
cp -r $NATIVE_AS_HOME $JBOSS_HOME
@@ -73,8 +73,9 @@
STACK_ID=cxf
setupEnv
redeployBinaryDistribution
-diff -r $CXF_AS_HOME $JBOSS_HOME > $WORKSPACE/cxf_vs_cxfOverNative.diff
+diff -r $CXF_AS_HOME $JBOSS_HOME |grep -v "jbossws-native-core.jar" > $WORKSPACE/cxf_vs_cxfOverNative.diff
cat $WORKSPACE/cxf_vs_cxfOverNative.diff >> $WORKSPACE/result.txt
+rm -rf $JBOSS_HOME
#------------------------------------- NATIVE stack checks -------------------------------------
@@ -84,7 +85,7 @@
STACK_ID=native
setupEnv
redeployBinaryDistribution
-diff -r $NATIVE_AS_HOME $JBOSS_HOME > $WORKSPACE/native_vs_nativeOverMetro.diff
+diff -r $NATIVE_AS_HOME $JBOSS_HOME |grep -v "jbossws-native-core.jar" > $WORKSPACE/native_vs_nativeOverMetro.diff
cat $WORKSPACE/native_vs_nativeOverMetro.diff >> $WORKSPACE/result.txt
rm -rf $JBOSS_HOME
cp -r $CXF_AS_HOME $JBOSS_HOME
@@ -92,8 +93,9 @@
STACK_ID=native
setupEnv
redeployBinaryDistribution
-diff -r $NATIVE_AS_HOME $JBOSS_HOME > $WORKSPACE/native_vs_nativeOverCxf.diff
+diff -r $NATIVE_AS_HOME $JBOSS_HOME |grep -v "jbossws-native-core.jar" > $WORKSPACE/native_vs_nativeOverCxf.diff
cat $WORKSPACE/native_vs_nativeOverCxf.diff >> $WORKSPACE/result.txt
+rm -rf $JBOSS_HOME
#------------------------------------- METRO stack checks -------------------------------------
@@ -113,9 +115,9 @@
redeployBinaryDistribution
diff -r $METRO_AS_HOME $JBOSS_HOME > $WORKSPACE/metro_vs_metroOverNative.diff
cat $WORKSPACE/metro_vs_metroOverNative.diff >> $WORKSPACE/result.txt
+rm -rf $JBOSS_HOME
-rm -rf $JBOSS_HOME
rm -rf $CXF_AS_HOME
rm -rf $NATIVE_AS_HOME
rm -rf $METRO_AS_HOME
13 years, 10 months
JBossWS SVN: r12577 - stack/native/branches/dlofthouse/JBWS-3070/modules/core/src/main/java/org/jboss/ws/core/server.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2010-07-05 12:33:19 -0400 (Mon, 05 Jul 2010)
New Revision: 12577
Modified:
stack/native/branches/dlofthouse/JBWS-3070/modules/core/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java
Log:
Added the fix
Modified: stack/native/branches/dlofthouse/JBWS-3070/modules/core/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java
===================================================================
--- stack/native/branches/dlofthouse/JBWS-3070/modules/core/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java 2010-07-05 16:29:27 UTC (rev 12576)
+++ stack/native/branches/dlofthouse/JBWS-3070/modules/core/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java 2010-07-05 16:33:19 UTC (rev 12577)
@@ -205,25 +205,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();
13 years, 10 months
JBossWS SVN: r12576 - framework/trunk/hudson/hudson-home/jobs/SWITCH-BINDIST-AS-6.0.0.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-07-05 12:29:27 -0400 (Mon, 05 Jul 2010)
New Revision: 12576
Modified:
framework/trunk/hudson/hudson-home/jobs/SWITCH-BINDIST-AS-6.0.0/config.xml
Log:
[JBWS-3049] Fix env vars
Modified: framework/trunk/hudson/hudson-home/jobs/SWITCH-BINDIST-AS-6.0.0/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/SWITCH-BINDIST-AS-6.0.0/config.xml 2010-07-05 16:23:10 UTC (rev 12575)
+++ framework/trunk/hudson/hudson-home/jobs/SWITCH-BINDIST-AS-6.0.0/config.xml 2010-07-05 16:29:27 UTC (rev 12576)
@@ -17,8 +17,8 @@
JBOSS_CONFIG=(a)jboss.server.instance@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-6.0.0/workspace/JBossAS-6.0.0/build/target/(a)hudson.jboss600.build@
CXF_BIN_DIST_DIR=@hudson.home(a)/jobs/CXF-BINDIST-AS-6.0.0-SUN-JDK-6/workspace/stack-cxf/
-METRO_BIN_DIST_DIR=@hudson.home(a)/jobs/METRO-BINDIST-AS-6.0.0-SUN-JDK-6/workspace/stack-cxf/
-NATIVE_BIN_DIST_DIR=@hudson.home(a)/jobs/NATIVE-BINDIST-AS-6.0.0-SUN-JDK-6/workspace/stack-cxf/
+METRO_BIN_DIST_DIR=@hudson.home(a)/jobs/METRO-BINDIST-AS-6.0.0-SUN-JDK-6/workspace/stack-metro/
+NATIVE_BIN_DIST_DIR=@hudson.home(a)/jobs/NATIVE-BINDIST-AS-6.0.0-SUN-JDK-6/workspace/stack-native/
CXF_AS_HOME=$WORKSPACE/cxf-as
NATIVE_AS_HOME=$WORKSPACE/native-as
METRO_AS_HOME=$WORKSPACE/metro-as
@@ -47,7 +47,7 @@
rm -rf $METRO_AS_HOME
cp -r $JBOSS_INSTANCE $METRO_AS_HOME
JBOSS_HOME=$METRO_AS_HOME
-STACK_DIR=$CXF_BIN_DIST_DIR
+STACK_DIR=$METRO_BIN_DIST_DIR
STACK_ID=metro
setupEnv
redeployBinaryDistribution
13 years, 10 months