[jbossws-commits] JBossWS SVN: r15897 - in stack/cxf/branches/jbossws-cxf-4.0.x: modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/util and 4 other directories.

jbossws-commits at lists.jboss.org jbossws-commits at lists.jboss.org
Wed Mar 7 03:15:27 EST 2012 

Author: ropalka
Date: 2012-03-07 03:15:26 -0500 (Wed, 07 Mar 2012)
New Revision: 15897

Removed:
   stack/cxf/branches/jbossws-cxf-4.0.x/etc/
   stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/src/test/resources/jboss710/
Modified:
   stack/cxf/branches/jbossws-cxf-4.0.x/
   stack/cxf/branches/jbossws-cxf-4.0.x/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/util/SpringUtils.java
   stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/apache/cxf/main/module.xml
   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/jboss711/appclient.xml
   stack/cxf/branches/jbossws-cxf-4.0.x/pom.xml
Log:
Merged revisions 15837,15841,15857,15879,15881,15886,15888,15896 via svnmerge from 
https://svn.jboss.org/repos/jbossws/stack/cxf/trunk

.......
  r15837 | ropalka | 2012-03-05 09:20:51 +0100 (Mon, 05 Mar 2012) | 1 line
  
  sync. with AS7 upstream
.......
  r15841 | ropalka | 2012-03-05 09:46:33 +0100 (Mon, 05 Mar 2012) | 1 line
  
  sync. appclient config with AS7 upstream + remove support for AS 710 Final
.......
  r15857 | alessio.soldano at jboss.com | 2012-03-05 11:01:33 +0100 (Mon, 05 Mar 2012) | 2 lines
  
  Moving to new jbossws component snapshots
.......
  r15879 | alessio.soldano at jboss.com | 2012-03-06 14:29:47 +0100 (Tue, 06 Mar 2012) | 2 lines
  
  [JBWS-3390] Synch with AS 7.1.x
.......
  r15881 | alessio.soldano at jboss.com | 2012-03-06 14:50:02 +0100 (Tue, 06 Mar 2012) | 2 lines
  
  Synch with AS7.1.1
.......
  r15886 | alessio.soldano at jboss.com | 2012-03-06 15:34:54 +0100 (Tue, 06 Mar 2012) | 2 lines
  
  Removing default mgmt-user.properties
.......
  r15888 | alessio.soldano at jboss.com | 2012-03-06 16:48:09 +0100 (Tue, 06 Mar 2012) | 2 lines
  
  Removing static member which is not used and quite misleading
.......
  r15896 | ropalka | 2012-03-07 09:06:11 +0100 (Wed, 07 Mar 2012) | 1 line
  
  [JBWS-3435] use exact remote naming version we wanna use
.......



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,15674-15675,15682,15695-15697,15708,15711,15713,15719,15723-15730,15738,15743,15748-15757,15765-15766,15768,15770-15773,15780-15781,15784,15794,15806-15808,15824,15835,15859,15866
   + https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:1-15635,15658,15668,15674-15675,15682,15695-15697,15708,15711,15713,15719,15723-15730,15738,15743,15748-15757,15765-15766,15768,15770-15773,15780-15781,15784,15794,15806-15808,15824,15835,15837-15883,15885-15888,15890-15896
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,15859,15866
   + /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-15888,15896

Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/util/SpringUtils.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/util/SpringUtils.java	2012-03-07 08:06:11 UTC (rev 15896)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/util/SpringUtils.java	2012-03-07 08:15:26 UTC (rev 15897)
@@ -30,13 +30,6 @@
  */
 public class SpringUtils
 {
-   public static final boolean SPRING_AVAILABLE;
-   static 
-   {
-      SPRING_AVAILABLE = 
-         isSpringAvailable(SpringUtils.class.getClassLoader(), 
-                           SecurityActions.getContextClassLoader());
-   }
    /**
     * Check if Spring is available using the provided classloader
     * 

Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/apache/cxf/main/module.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/apache/cxf/main/module.xml	2012-03-07 08:06:11 UTC (rev 15896)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/apache/cxf/main/module.xml	2012-03-07 08:15:26 UTC (rev 15897)
@@ -46,6 +46,7 @@
         <module name="org.apache.commons.lang" />
         <module name="org.apache.neethi" />
         <module name="org.apache.velocity" />
+        <module name="org.apache.xml-resolver" />
         <module name="org.apache.ws.xmlschema" />
         <module name="org.apache.ws.security" />
         <module name="org.apache.santuario.xmlsec" />

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-03-07 08:06:11 UTC (rev 15896)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/pom.xml	2012-03-07 08:15:26 UTC (rev 15897)
@@ -1147,16 +1147,25 @@
               <groupId>org.jboss.remoting3</groupId>
               <artifactId>jboss-remoting</artifactId>
             </exclusion>
+            <exclusion>
+              <groupId>org.jboss</groupId>
+              <artifactId>jboss-remote-naming</artifactId>
+            </exclusion>
           </exclusions>
         </dependency>
         <dependency>
+          <groupId>org.jboss</groupId>
+          <artifactId>jboss-remote-naming</artifactId>
+          <version>1.0.1.Final</version>
+        </dependency>
+        <dependency>
           <groupId>javax.mail</groupId>
           <artifactId>mail</artifactId>
         </dependency>
         <dependency>
           <groupId>org.jboss</groupId>
           <artifactId>jboss-ejb-client</artifactId>
-          <version>1.0.3.Final</version>
+          <version>1.0.4.Final</version>
           <exclusions>
             <exclusion>
               <groupId>org.jboss.remoting3</groupId>
@@ -1286,7 +1295,7 @@
                 <!-- 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>
+                <additionalClasspathElement>${jboss.home}/modules/org/jboss/ws/native/jbossws-native-core/main/jbossws-native-core-4.0.2.GA.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>

Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/src/test/resources/jboss711/appclient.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/src/test/resources/jboss711/appclient.xml	2012-03-07 08:06:11 UTC (rev 15896)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/src/test/resources/jboss711/appclient.xml	2012-03-07 08:15:26 UTC (rev 15897)
@@ -20,7 +20,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<server xmlns="urn:jboss:domain:1.1">
+<server xmlns="urn:jboss:domain:1.2">
 
     <extensions>
         <extension module="org.jboss.as.connector"/>

Modified: stack/cxf/branches/jbossws-cxf-4.0.x/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/pom.xml	2012-03-07 08:06:11 UTC (rev 15896)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/pom.xml	2012-03-07 08:15:26 UTC (rev 15897)
@@ -60,13 +60,13 @@
   <!-- Properties -->
   <properties>
     <jbossws.api.version>1.0.0.GA</jbossws.api.version>
-    <jbossws.spi.version>2.0.3-SNAPSHOT</jbossws.spi.version>
-    <jbossws.common.version>2.0.2-SNAPSHOT</jbossws.common.version>
+    <jbossws.spi.version>2.0.4-SNAPSHOT</jbossws.spi.version>
+    <jbossws.common.version>2.0.3-SNAPSHOT</jbossws.common.version>
     <jbossws.common.tools.version>1.0.0.GA</jbossws.common.tools.version>
-    <jbossws.shared.testsuite.version>4.0.2-SNAPSHOT</jbossws.shared.testsuite.version>
+    <jbossws.shared.testsuite.version>4.0.3-SNAPSHOT</jbossws.shared.testsuite.version>
     <jbossws.jboss701.version>4.0.1.GA</jbossws.jboss701.version>
     <jbossws.jboss702.version>4.0.1.GA</jbossws.jboss702.version>
-    <jbossws.jboss710.version>4.0.2-SNAPSHOT</jbossws.jboss710.version>
+    <jbossws.jboss710.version>4.0.3-SNAPSHOT</jbossws.jboss710.version>
     <jboss701.version>7.0.1.Final</jboss701.version>
     <jboss702.version>7.0.2.Final</jboss702.version>
     <jboss710.version>7.1.0.Final</jboss710.version>
@@ -82,7 +82,7 @@
     <jboss.security.sx.version>2.0.4</jboss.security.sx.version>
     <jboss.xb.version>2.0.3.GA</jboss.xb.version>
     <picketbox.version>4.0.6.Beta1</picketbox.version>
-    <jaxws-jboss-httpserver-httpspi.version>1.0.1-SNAPSHOT</jaxws-jboss-httpserver-httpspi.version>
+    <jaxws-jboss-httpserver-httpspi.version>1.0.2-SNAPSHOT</jaxws-jboss-httpserver-httpspi.version>
     <httpserver.version>1.0.0.Final</httpserver.version>
     <jaxb.api.version>1.0.3.Final</jaxb.api.version>
     <jaxb.impl.version>2.2.4</jaxb.impl.version>

More information about the jbossws-commits mailing list