Author: ropalka
Date: 2012-04-10 07:49:04 -0400 (Tue, 10 Apr 2012)
New Revision: 16146
Modified:
stack/cxf/branches/jbossws-cxf-4.0.x/
stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/pom.xml
stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/src/test/resources/jboss712/appclient-ws.xml
Log:
[JBPAPP-8667] Merged revisions 16067,16086 via svnmerge from
https://svn.jboss.org/repos/jbossws/stack/cxf/trunk
.......
r16067 | ropalka | 2012-03-29 14:05:33 +0200 (Thu, 29 Mar 2012) | 1 line
[JBWS-3474] updating excludes
.......
r16086 | ropalka | 2012-04-04 07:20:26 +0200 (Wed, 04 Apr 2012) | 1 line
upgrade config version
.......
Property changes on: stack/cxf/branches/jbossws-cxf-4.0.x
___________________________________________________________________
Modified: svnmerge-integrated
-
https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:1-15635,15658,15668,1...
+
https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:1-15635,15658,15668,1...
Modified: svn:mergeinfo
- /stack/cxf/branches/asoldano:14032-14050,14068
/stack/cxf/trunk:15658,15668,15674-15675,15682,15695-15697,15708,15711,15713,15719,15723-15730,15738,15743,15748,15750-15751,15754-15757,15765-15766,15768,15773,15780-15781,15784,15794,15806-15808,15824,15835,15837-15857,15859,15866,15879-15881,15886-15889,15896,15900-15920,15936,15965,15967,15973
+ /stack/cxf/branches/asoldano:14032-14050,14068
/stack/cxf/trunk:15658,15668,15674-15675,15682,15695-15697,15708,15711,15713,15719,15723-15730,15738,15743,15748,15750-15751,15754-15757,15765-15766,15768,15773,15780-15781,15784,15794,15806-15808,15824,15835,15837-15857,15859,15866,15879-15881,15886-15889,15896,15900-15920,15936,15965,15967,15973,16067,16086
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/pom.xml 2012-04-10 11:17:33 UTC
(rev 16145)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/pom.xml 2012-04-10 11:49:04 UTC
(rev 16146)
@@ -788,6 +788,10 @@
<!-- # TODO: JAXR not available -->
<exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude>
+
+ <!-- # Tests migrated from JBossWS-Native specific testsuite which
are meant to pass with JBossWS-CXF too, but are still to be fixed -->
+ <exclude>org/jboss/test/ws/jaxws/jbws2978/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws3124/**</exclude>
</excludes>
</configuration>
</plugin>
Modified:
stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/src/test/resources/jboss712/appclient-ws.xml
===================================================================
---
stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/src/test/resources/jboss712/appclient-ws.xml 2012-04-10
11:17:33 UTC (rev 16145)
+++
stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/src/test/resources/jboss712/appclient-ws.xml 2012-04-10
11:49:04 UTC (rev 16146)
@@ -20,7 +20,7 @@
~ 02110-1301 USA, or see the FSF site:
http://www.fsf.org.
-->
-<server xmlns="urn:jboss:domain:1.2">
+<server xmlns="urn:jboss:domain:1.3">
<extensions>
<extension module="org.jboss.as.connector"/>