Author: ropalka
Date: 2012-02-23 07:58:36 -0500 (Thu, 23 Feb 2012)
New Revision: 15712
Modified:
stack/cxf/branches/jbossws-cxf-4.0.x/
stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/pom.xml
Log:
Merged revisions 15711 via svnmerge from
https://svn.jboss.org/repos/jbossws/stack/cxf/trunk
.......
r15711 | ropalka | 2012-02-23 13:56:22 +0100 (Thu, 23 Feb 2012) | 1 line
reorder jbossws-native-core jars - first should be the override
.......
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,15675,15682,15695-15697,15708
+ /stack/cxf/branches/asoldano:14032-14050,14068
/stack/cxf/trunk:15658,15668,15675,15682,15695-15697,15708,15711
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-02-23 12:56:22 UTC
(rev 15711)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/pom.xml 2012-02-23 12:58:36 UTC
(rev 15712)
@@ -1084,10 +1084,10 @@
<!-- TODO: replace with maven dependencies -->
<additionalClasspathElements>
<!-- Lib below required just for jaxrpc tests; listed here to prevent
CXF stack from depending on Native stack -->
+ <!-- JBossWS Native Core version overwritten by jbossws-native stack
install -->
+
<additionalClasspathElement>${jboss.home}/modules/org/jboss/ws/native/jbossws-native-core/main/jbossws-native-core.jar</additionalClasspathElement>
<!-- JBossWS Native Core version available on 710 -->
<additionalClasspathElement>${jboss.home}/modules/org/jboss/ws/native/jbossws-native-core/main/jbossws-native-core-4.0.1.GA.jar</additionalClasspathElement>
- <!-- JBossWS Native Core version overwritten by jbossws-native stack
install -->
-
<additionalClasspathElement>${jboss.home}/modules/org/jboss/ws/native/jbossws-native-core/main/jbossws-native-core.jar</additionalClasspathElement>
<!-- JBossWS Native Core version specified through system property
-->
<additionalClasspathElement>${jboss.home}/modules/org/jboss/ws/native/jbossws-native-core/main/${jbossws-native-core.filename}</additionalClasspathElement>
</additionalClasspathElements>
@@ -1306,10 +1306,10 @@
<!-- TODO: replace with maven dependencies -->
<additionalClasspathElements>
<!-- Lib below required just for jaxrpc tests; listed here to prevent
CXF stack from depending on Native stack -->
+ <!-- JBossWS Native Core version overwritten by jbossws-native stack
install -->
+
<additionalClasspathElement>${jboss.home}/modules/org/jboss/ws/native/jbossws-native-core/main/jbossws-native-core.jar</additionalClasspathElement>
<!-- JBossWS Native Core version available on 711 -->
<additionalClasspathElement>${jboss.home}/modules/org/jboss/ws/native/jbossws-native-core/main/jbossws-native-core-4.0.1.GA.jar</additionalClasspathElement>
- <!-- JBossWS Native Core version overwritten by jbossws-native stack
install -->
-
<additionalClasspathElement>${jboss.home}/modules/org/jboss/ws/native/jbossws-native-core/main/jbossws-native-core.jar</additionalClasspathElement>
<!-- JBossWS Native Core version specified through system property
-->
<additionalClasspathElement>${jboss.home}/modules/org/jboss/ws/native/jbossws-native-core/main/${jbossws-native-core.filename}</additionalClasspathElement>
</additionalClasspathElements>