JBossWS SVN: r11114 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2009-11-13 04:01:58 -0500 (Fri, 13 Nov 2009)
New Revision: 11114
Modified:
stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt
Log:
Removed my wrong commit and reverted to previous revision
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2009-11-13 06:35:54 UTC (rev 11113)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2009-11-13 09:01:58 UTC (rev 11114)
@@ -44,8 +44,3 @@
# [JBWS-2809] Investigate why MemoryBufferRecorderTestCase is failing
org/jboss/test/ws/management/recording/MemoryBufferRecorderTestCase.*
-
-#org/jboss/test/ws/jaxws/cxf/interop/wstrust10/**
-
-#org/jboss/test/ws/jaxws/samples/serviceref/**
-org/jboss/test/ws/jaxws/samples/webserviceref/**
14 years, 5 months
JBossWS SVN: r11113 - framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1666.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2009-11-13 01:35:54 -0500 (Fri, 13 Nov 2009)
New Revision: 11113
Modified:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1666/JBWS1666TestCase.java
Log:
[JBWS-2817]:Removed the sleep code, it is not helpful for CopyJob to copy the command execution result
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1666/JBWS1666TestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1666/JBWS1666TestCase.java 2009-11-13 06:29:26 UTC (rev 11112)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1666/JBWS1666TestCase.java 2009-11-13 06:35:54 UTC (rev 11113)
@@ -93,8 +93,6 @@
String command = javaCmd + " -Djava.endorsed.dirs=" + jbl + FS + "endorsed -cp " + cp + " " + TestClient.class.getName() + " " + getServerHost();
ByteArrayOutputStream bout = new ByteArrayOutputStream();
executeCommand(command, bout);
- //wait the CopyJob to copy the process.inputStream
- Thread.sleep(3000);
String res = null;
if (bout.toByteArray() != null) {
String output = new String(bout.toByteArray());
14 years, 5 months
JBossWS SVN: r11112 - stack/metro/trunk.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2009-11-13 01:29:26 -0500 (Fri, 13 Nov 2009)
New Revision: 11112
Modified:
stack/metro/trunk/pom.xml
Log:
[JBWS-2827]:Update common to 1.3.0 snapshot
Modified: stack/metro/trunk/pom.xml
===================================================================
--- stack/metro/trunk/pom.xml 2009-11-13 06:27:00 UTC (rev 11111)
+++ stack/metro/trunk/pom.xml 2009-11-13 06:29:26 UTC (rev 11112)
@@ -44,7 +44,7 @@
<!-- Properties -->
<properties>
- <jbossws.common.version>1.2.1.GA</jbossws.common.version>
+ <jbossws.common.version>1.3.0-SNAPSHOT</jbossws.common.version>
<jbossws.framework.version>3.2.2-SNAPSHOT</jbossws.framework.version>
<jbossws.spi.version>1.2.1.GA</jbossws.spi.version>
<jbossws.jboss500.version>3.2.1.GA</jbossws.jboss500.version>
14 years, 5 months
JBossWS SVN: r11111 - in stack/cxf/trunk: modules/testsuite and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2009-11-13 01:27:00 -0500 (Fri, 13 Nov 2009)
New Revision: 11111
Modified:
stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt
stack/cxf/trunk/pom.xml
Log:
[JBWS-2827]:Update common to 1.3.0 snapshot
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2009-11-13 06:16:33 UTC (rev 11110)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2009-11-13 06:27:00 UTC (rev 11111)
@@ -44,3 +44,8 @@
# [JBWS-2809] Investigate why MemoryBufferRecorderTestCase is failing
org/jboss/test/ws/management/recording/MemoryBufferRecorderTestCase.*
+
+#org/jboss/test/ws/jaxws/cxf/interop/wstrust10/**
+
+#org/jboss/test/ws/jaxws/samples/serviceref/**
+org/jboss/test/ws/jaxws/samples/webserviceref/**
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2009-11-13 06:16:33 UTC (rev 11110)
+++ stack/cxf/trunk/pom.xml 2009-11-13 06:27:00 UTC (rev 11111)
@@ -43,7 +43,7 @@
<!-- Properties -->
<properties>
- <jbossws.common.version>1.2.1.GA</jbossws.common.version>
+ <jbossws.common.version>1.3.0-SNAPSHOT</jbossws.common.version>
<jbossws.framework.version>3.2.2-SNAPSHOT</jbossws.framework.version>
<jbossws.spi.version>1.2.1.GA</jbossws.spi.version>
<jbossws.jboss500.version>3.2.1.GA</jbossws.jboss500.version>
14 years, 5 months
JBossWS SVN: r11110 - common/trunk/src/main/java/org/jboss/wsf/test.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2009-11-13 01:16:33 -0500 (Fri, 13 Nov 2009)
New Revision: 11110
Modified:
common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTest.java
Log:
[JBWS-2826]:Add thread.join in executeCommand method
Modified: common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTest.java
===================================================================
--- common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTest.java 2009-11-13 03:11:18 UTC (rev 11109)
+++ common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTest.java 2009-11-13 06:16:33 UTC (rev 11110)
@@ -172,10 +172,14 @@
// unfortunately the following threads are needed because of Windows behavior
System.out.println("Process input stream:");
System.err.println("Process error stream:");
- new Thread( inputStreamJob ).start();
- new Thread( errorStreamJob ).start();
+ Thread inputJob = new Thread(inputStreamJob);
+ Thread outputJob = new Thread(errorStreamJob);
try
- {
+ {
+ inputJob.start();
+ inputJob.join(5000);
+ outputJob.start();
+ outputJob.join(5000);
int statusCode = p.waitFor();
String fallbackMessage = "Process did exit with status " + statusCode;
assertTrue(message != null ? message : fallbackMessage, statusCode == 0);
14 years, 5 months
JBossWS SVN: r11109 - stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2009-11-12 22:11:18 -0500 (Thu, 12 Nov 2009)
New Revision: 11109
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario10-client-config.xml
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario2-client-config.xml
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario5-client-config.xml
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario6-client-config.xml
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario9-client-config.xml
Log:
[JBWS-2816]:Added the comment to explain the fix for running on Windows
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario10-client-config.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario10-client-config.xml 2009-11-12 12:37:02 UTC (rev 11108)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario10-client-config.xml 2009-11-13 03:11:18 UTC (rev 11109)
@@ -61,6 +61,7 @@
<entry key="ws-security.encryption.properties.sct" value="META-INF/etc/bob.properties"/>
</jaxws:properties>
</jaxws:client>
+ <!--Add disable chunk mode for running on Windows -->
<http:conduit name="*.http-conduit">
<http:client AllowChunking="false"/>
</http:conduit>
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario2-client-config.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario2-client-config.xml 2009-11-12 12:37:02 UTC (rev 11108)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario2-client-config.xml 2009-11-13 03:11:18 UTC (rev 11109)
@@ -36,6 +36,7 @@
</map>
</property>
</bean>
+ <!--Add disable chunk mode for running on Windows -->
<http:conduit name="*.http-conduit">
<http:client AllowChunking="false"/>
</http:conduit>
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario5-client-config.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario5-client-config.xml 2009-11-12 12:37:02 UTC (rev 11108)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario5-client-config.xml 2009-11-13 03:11:18 UTC (rev 11109)
@@ -60,6 +60,7 @@
<entry key="ws-security.encryption.properties" value="META-INF/etc/bob.properties"/>
</jaxws:properties>
</jaxws:client>
+ <!--Add disable chunk mode for running on Windows -->
<http:conduit name="*.http-conduit">
<http:client AllowChunking="false"/>
</http:conduit>
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario6-client-config.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario6-client-config.xml 2009-11-12 12:37:02 UTC (rev 11108)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario6-client-config.xml 2009-11-13 03:11:18 UTC (rev 11109)
@@ -60,6 +60,7 @@
<entry key="ws-security.encryption.properties.sct" value="META-INF/etc/bob.properties"/>
</jaxws:properties>
</jaxws:client>
+ <!--Add disable chunk mode for running on Windows -->
<http:conduit name="*.http-conduit">
<http:client AllowChunking="false"/>
</http:conduit>
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario9-client-config.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario9-client-config.xml 2009-11-12 12:37:02 UTC (rev 11108)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario9-client-config.xml 2009-11-13 03:11:18 UTC (rev 11109)
@@ -61,6 +61,7 @@
<entry key="ws-security.encryption.properties" value="META-INF/etc/bob.properties"/>
</jaxws:properties>
</jaxws:client>
+ <!--Add disable chunk mode for running on Windows -->
<http:conduit name="*.http-conduit">
<http:client AllowChunking="false"/>
</http:conduit>
14 years, 5 months
JBossWS SVN: r11108 - stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2009-11-12 07:37:02 -0500 (Thu, 12 Nov 2009)
New Revision: 11108
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario10-client-config.xml
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario2-client-config.xml
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario5-client-config.xml
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario6-client-config.xml
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario9-client-config.xml
Log:
[JBWS-2816]:Disabled the chunk mode
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario10-client-config.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario10-client-config.xml 2009-11-11 18:42:13 UTC (rev 11107)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario10-client-config.xml 2009-11-12 12:37:02 UTC (rev 11108)
@@ -61,4 +61,7 @@
<entry key="ws-security.encryption.properties.sct" value="META-INF/etc/bob.properties"/>
</jaxws:properties>
</jaxws:client>
+ <http:conduit name="*.http-conduit">
+ <http:client AllowChunking="false"/>
+ </http:conduit>
</beans>
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario2-client-config.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario2-client-config.xml 2009-11-11 18:42:13 UTC (rev 11107)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario2-client-config.xml 2009-11-12 12:37:02 UTC (rev 11108)
@@ -36,4 +36,7 @@
</map>
</property>
</bean>
+ <http:conduit name="*.http-conduit">
+ <http:client AllowChunking="false"/>
+ </http:conduit>
</beans>
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario5-client-config.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario5-client-config.xml 2009-11-11 18:42:13 UTC (rev 11107)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario5-client-config.xml 2009-11-12 12:37:02 UTC (rev 11108)
@@ -60,4 +60,7 @@
<entry key="ws-security.encryption.properties" value="META-INF/etc/bob.properties"/>
</jaxws:properties>
</jaxws:client>
+ <http:conduit name="*.http-conduit">
+ <http:client AllowChunking="false"/>
+ </http:conduit>
</beans>
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario6-client-config.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario6-client-config.xml 2009-11-11 18:42:13 UTC (rev 11107)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario6-client-config.xml 2009-11-12 12:37:02 UTC (rev 11108)
@@ -60,4 +60,7 @@
<entry key="ws-security.encryption.properties.sct" value="META-INF/etc/bob.properties"/>
</jaxws:properties>
</jaxws:client>
+ <http:conduit name="*.http-conduit">
+ <http:client AllowChunking="false"/>
+ </http:conduit>
</beans>
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario9-client-config.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario9-client-config.xml 2009-11-11 18:42:13 UTC (rev 11107)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/scenario9-client-config.xml 2009-11-12 12:37:02 UTC (rev 11108)
@@ -61,4 +61,7 @@
<entry key="ws-security.encryption.properties" value="META-INF/etc/bob.properties"/>
</jaxws:properties>
</jaxws:client>
+ <http:conduit name="*.http-conduit">
+ <http:client AllowChunking="false"/>
+ </http:conduit>
</beans>
14 years, 5 months
JBossWS SVN: r11107 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-11-11 13:42:13 -0500 (Wed, 11 Nov 2009)
New Revision: 11107
Modified:
stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss520.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt
Log:
[JBWS-2770] Removing excludes
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt 2009-11-11 18:36:57 UTC (rev 11106)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt 2009-11-11 18:42:13 UTC (rev 11107)
@@ -42,8 +42,5 @@
# [JBWS-2397] Fix jbws1797 testcase
org/jboss/test/ws/jaxws/jbws1797/**
-# [JBWS-2770] Rewrite org.jboss.test.ws.jaxws.binding testcase
-org/jboss/test/ws/jaxws/binding/**
-
# [JBWS-2809] Investigate why MemoryBufferRecorderTestCase is failing
org/jboss/test/ws/management/recording/MemoryBufferRecorderTestCase.*
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2009-11-11 18:36:57 UTC (rev 11106)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2009-11-11 18:42:13 UTC (rev 11107)
@@ -42,8 +42,5 @@
# [JBWS-2397] Fix jbws1797 testcase
org/jboss/test/ws/jaxws/jbws1797/**
-# [JBWS-2770] Rewrite org.jboss.test.ws.jaxws.binding testcase
-org/jboss/test/ws/jaxws/binding/**
-
# [JBWS-2809] Investigate why MemoryBufferRecorderTestCase is failing
org/jboss/test/ws/management/recording/MemoryBufferRecorderTestCase.*
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2009-11-11 18:36:57 UTC (rev 11106)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2009-11-11 18:42:13 UTC (rev 11107)
@@ -42,8 +42,5 @@
# [JBWS-2397] Fix jbws1797 testcase
org/jboss/test/ws/jaxws/jbws1797/**
-# [JBWS-2770] Rewrite org.jboss.test.ws.jaxws.binding testcase
-org/jboss/test/ws/jaxws/binding/**
-
# [JBWS-2809] Investigate why MemoryBufferRecorderTestCase is failing
org/jboss/test/ws/management/recording/MemoryBufferRecorderTestCase.*
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss520.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss520.txt 2009-11-11 18:36:57 UTC (rev 11106)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss520.txt 2009-11-11 18:42:13 UTC (rev 11107)
@@ -48,8 +48,5 @@
# [JBWS-2397] Fix jbws1797 testcase
org/jboss/test/ws/jaxws/jbws1797/**
-# [JBWS-2770] Rewrite org.jboss.test.ws.jaxws.binding testcase
-org/jboss/test/ws/jaxws/binding/**
-
# [JBWS-2809] Investigate why MemoryBufferRecorderTestCase is failing
org/jboss/test/ws/management/recording/MemoryBufferRecorderTestCase.*
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2009-11-11 18:36:57 UTC (rev 11106)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2009-11-11 18:42:13 UTC (rev 11107)
@@ -42,8 +42,5 @@
# [JBWS-2397] Fix jbws1797 testcase
org/jboss/test/ws/jaxws/jbws1797/**
-# [JBWS-2770] Rewrite org.jboss.test.ws.jaxws.binding testcase
-org/jboss/test/ws/jaxws/binding/**
-
# [JBWS-2809] Investigate why MemoryBufferRecorderTestCase is failing
org/jboss/test/ws/management/recording/MemoryBufferRecorderTestCase.*
14 years, 5 months
JBossWS SVN: r11106 - in framework/trunk/testsuite/test: java/org/jboss/test/ws/jaxws/binding and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-11-11 13:36:57 -0500 (Wed, 11 Nov 2009)
New Revision: 11106
Added:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/binding/ServerHandler.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/binding/jaxws-server-handlers.xml
Modified:
framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/binding/ClientHandler2.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/binding/SOAPBindingTestCase.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/binding/SOAPEndpointBean.java
Log:
- [JBWS-2770] Rewrite org.jboss.test.ws.jaxws.binding testcase to get SOAPMessageContext from handlers
- Adding fixme for https://issues.apache.org/jira/browse/CXF-2531
Modified: framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml
===================================================================
--- framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml 2009-11-10 18:24:18 UTC (rev 11105)
+++ framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml 2009-11-11 18:36:57 UTC (rev 11106)
@@ -49,6 +49,8 @@
<classes dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/binding/SOAPEndpointBean.class"/>
<include name="org/jboss/test/ws/jaxws/binding/SOAPEndpoint.class"/>
+ <include name="org/jboss/test/ws/jaxws/binding/ServerHandler.class"/>
+ <include name="org/jboss/test/ws/jaxws/binding/jaxws-server-handlers.xml"/>
</classes>
</war>
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/binding/ClientHandler2.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/binding/ClientHandler2.java 2009-11-10 18:24:18 UTC (rev 11105)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/binding/ClientHandler2.java 2009-11-11 18:36:57 UTC (rev 11106)
@@ -46,19 +46,27 @@
{
log.info("handleInbound");
- SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage();
+ try
+ {
+ SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage();
+ soapMessage.saveChanges(); // force changes save to make sure headers are copied to the message
- MimeHeaders mimeHeaders = soapMessage.getMimeHeaders();
- String[] ct = mimeHeaders.getHeader("Content-Type");
- if (ct != null)
- {
- for (int i = 0; i < ct.length; i++)
+ MimeHeaders mimeHeaders = soapMessage.getMimeHeaders();
+ String[] ct = mimeHeaders.getHeader("Content-Type");
+ if (ct != null)
{
- if (ct[i].startsWith(SOAPConstants.SOAP_1_2_CONTENT_TYPE))
- return true;
+ for (int i = 0; i < ct.length; i++)
+ {
+ if (ct[i].startsWith(SOAPConstants.SOAP_1_2_CONTENT_TYPE))
+ return true;
+ }
}
+ return false;
}
- return false;
+ catch (SOAPException ex)
+ {
+ throw new WebServiceException(ex);
+ }
}
protected boolean handleOutbound(MessageContext msgContext)
@@ -68,7 +76,7 @@
try
{
SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage();
- soapMessage.saveChanges();
+ soapMessage.saveChanges(); // force changes save to make sure headers are copied to the message
MimeHeaders mimeHeaders = soapMessage.getMimeHeaders();
String[] ct = mimeHeaders.getHeader("Content-Type");
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/binding/SOAPBindingTestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/binding/SOAPBindingTestCase.java 2009-11-10 18:24:18 UTC (rev 11105)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/binding/SOAPBindingTestCase.java 2009-11-11 18:36:57 UTC (rev 11106)
@@ -65,11 +65,12 @@
WSDLReader wsdlReader = WSDLFactory.newInstance().newWSDLReader();
Definition wsdl = wsdlReader.readWSDL(wsdlURL.toString());
+
+ String port = "SOAPEndpointPort";
+ QName serviceQName = new QName("http://org.jboss.ws/jaxws/binding", "SOAPEndpointService");
+ Binding wsdlBinding = wsdl.getService(serviceQName).getPort(port).getBinding();
+ assertNotNull("Cannot find binding for port: " + port, wsdlBinding);
- QName qname = new QName("http://org.jboss.ws/jaxws/binding", "SOAPEndpointBinding");
- Binding wsdlBinding = wsdl.getBinding(qname);
- assertNotNull("Cannot find: " + qname, wsdlBinding);
-
String transport = null;
List<ExtensibilityElement> extList = wsdlBinding.getExtensibilityElements();
for (ExtensibilityElement ext : extList)
@@ -84,13 +85,20 @@
transport = soapBinding.getTransportURI();
}
}
- assertEquals("Invalid transport uri", "http://schemas.xmlsoap.org/soap/http", transport);
+ if (isIntegrationCXF())
+ {
+ System.out.println("FIXME: [CXF-2531] Wrong \"transport\" attribute in soap12:binding");
+ }
+ else
+ {
+ assertEquals("Invalid transport uri", "http://schemas.xmlsoap.org/soap/http", transport);
+ }
}
public void testClientAccess() throws Exception
{
URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl");
- QName qname = new QName("http://org.jboss.ws/jaxws/binding", "SOAPEndpointBeanService");
+ QName qname = new QName("http://org.jboss.ws/jaxws/binding", "SOAPEndpointService");
Service service = Service.create(wsdlURL, qname);
SOAPEndpoint port = (SOAPEndpoint)service.getPort(SOAPEndpoint.class);
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/binding/SOAPEndpointBean.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/binding/SOAPEndpointBean.java 2009-11-10 18:24:18 UTC (rev 11105)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/binding/SOAPEndpointBean.java 2009-11-11 18:36:57 UTC (rev 11106)
@@ -24,20 +24,19 @@
import static javax.xml.ws.soap.SOAPBinding.SOAP12HTTP_BINDING;
import javax.annotation.Resource;
+import javax.jws.HandlerChain;
import javax.jws.WebService;
-import javax.xml.soap.SOAPEnvelope;
-import javax.xml.soap.SOAPException;
-import javax.xml.soap.SOAPMessage;
import javax.xml.ws.BindingType;
import javax.xml.ws.WebServiceContext;
-import javax.xml.ws.WebServiceException;
-import javax.xml.ws.handler.soap.SOAPMessageContext;
import org.jboss.logging.Logger;
@WebService(name="SOAPEndpoint", targetNamespace="http://org.jboss.ws/jaxws/binding",
+ portName="SOAPEndpointPort",
+ serviceName="SOAPEndpointService",
endpointInterface = "org.jboss.test.ws.jaxws.binding.SOAPEndpoint")
@BindingType(SOAP12HTTP_BINDING)
+@HandlerChain(file = "jaxws-server-handlers.xml")
public class SOAPEndpointBean implements SOAPEndpoint
{
private static Logger log = Logger.getLogger(SOAPEndpointBean.class);
@@ -48,20 +47,12 @@
public String namespace()
{
- try
- {
- SOAPMessageContext msgContext = (SOAPMessageContext)context.getMessageContext();
- SOAPMessage soapMessage = msgContext.getMessage();
- SOAPEnvelope soapEnvelope = (SOAPEnvelope)soapMessage.getSOAPPart().getEnvelope();
- String nsURI = soapEnvelope.getNamespaceURI();
+ //Get the nsUri in the received message that was analyzed in the server handler
+ //just a trick for this test, not to be used with real world apps
+ String nsURI = ServerHandler.getNsURI();
- log.info(nsURI);
+ log.info(nsURI);
- return nsURI;
- }
- catch (SOAPException ex)
- {
- throw new WebServiceException(ex);
- }
+ return nsURI;
}
}
Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/binding/ServerHandler.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/binding/ServerHandler.java (rev 0)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/binding/ServerHandler.java 2009-11-11 18:36:57 UTC (rev 11106)
@@ -0,0 +1,64 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, 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.binding;
+
+import javax.xml.soap.SOAPEnvelope;
+import javax.xml.soap.SOAPException;
+import javax.xml.soap.SOAPMessage;
+import javax.xml.ws.WebServiceException;
+import javax.xml.ws.handler.MessageContext;
+import javax.xml.ws.handler.soap.SOAPMessageContext;
+
+import org.jboss.wsf.common.handler.GenericSOAPHandler;
+
+/**
+ * A server side handler
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 11-Nov-2009
+ */
+@SuppressWarnings("unchecked")
+public class ServerHandler extends GenericSOAPHandler
+{
+ private static String nsURI = null;
+
+ public boolean handleInbound(MessageContext msgContext)
+ {
+ try
+ {
+ SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage();
+ SOAPEnvelope soapEnvelope = (SOAPEnvelope)soapMessage.getSOAPPart().getEnvelope();
+ nsURI = soapEnvelope.getNamespaceURI();
+
+ return true;
+ }
+ catch (SOAPException ex)
+ {
+ throw new WebServiceException(ex);
+ }
+ }
+
+ public static String getNsURI()
+ {
+ return nsURI;
+ }
+}
Property changes on: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/binding/ServerHandler.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/binding/jaxws-server-handlers.xml
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/binding/jaxws-server-handlers.xml (rev 0)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/binding/jaxws-server-handlers.xml 2009-11-11 18:36:57 UTC (rev 11106)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<handler-chains xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee javaee_web_services_1_2.xsd">
+
+ <handler-chain>
+ <protocol-bindings>##SOAP11_HTTP ##SOAP12_HTTP</protocol-bindings>
+ <handler>
+ <handler-name>Application Server Handler</handler-name>
+ <handler-class>org.jboss.test.ws.jaxws.binding.ServerHandler</handler-class>
+ </handler>
+ </handler-chain>
+</handler-chains>
\ No newline at end of file
Property changes on: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/binding/jaxws-server-handlers.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
14 years, 5 months