cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject svn commit: r1341455 - in /cxf/branches/2.4.x-fixes: ./ rt/core/src/main/java/org/apache/cxf/clustering/blueprint/ rt/core/src/main/resources/META-INF/ rt/core/src/main/resources/OSGI-INF/blueprint/ rt/core/src/main/resources/schemas/ systests/uncatego...
Date Tue, 22 May 2012 12:55:23 GMT
Author: ningjiang
Date: Tue May 22 12:55:22 2012
New Revision: 1341455

URL: http://svn.apache.org/viewvc?rev=1341455&view=rev
Log:
Merged revisions 1341353,1341363 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes

........
  r1341353 | ningjiang | 2012-05-22 16:49:40 +0800 (Tue, 22 May 2012) | 1 line
  
  CXF-4326, CXF-4327 added blueprint support on the cxf clustering
........
  r1341363 | ningjiang | 2012-05-22 16:56:35 +0800 (Tue, 22 May 2012) | 1 line
  
  CXF-4327 updated the namespace of blueprint handler
........

Added:
    cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/clustering/blueprint/
      - copied from r1341363, cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/clustering/blueprint/
    cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/clustering/blueprint/ClusteringBPNamespaceHandler.java
      - copied unchanged from r1341363, cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/clustering/blueprint/ClusteringBPNamespaceHandler.java
    cxf/branches/2.4.x-fixes/rt/core/src/main/resources/OSGI-INF/blueprint/cxf-clustering.xml
      - copied unchanged from r1341363, cxf/branches/2.5.x-fixes/rt/core/src/main/resources/OSGI-INF/blueprint/cxf-clustering.xml
    cxf/branches/2.4.x-fixes/rt/core/src/main/resources/schemas/clustering.xsd
      - copied unchanged from r1341363, cxf/branches/2.5.x-fixes/rt/core/src/main/resources/schemas/clustering.xsd
Modified:
    cxf/branches/2.4.x-fixes/   (props changed)
    cxf/branches/2.4.x-fixes/rt/core/src/main/resources/META-INF/spring.schemas
    cxf/branches/2.4.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/failover.xml
    cxf/branches/2.4.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/failover_address_override.xml
    cxf/branches/2.4.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/load_distributor.xml
    cxf/branches/2.4.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/load_distributor_address_override.xml

Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
  Merged /cxf/branches/2.5.x-fixes:r1341353-1341363

Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.4.x-fixes/rt/core/src/main/resources/META-INF/spring.schemas
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/core/src/main/resources/META-INF/spring.schemas?rev=1341455&r1=1341454&r2=1341455&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/core/src/main/resources/META-INF/spring.schemas (original)
+++ cxf/branches/2.4.x-fixes/rt/core/src/main/resources/META-INF/spring.schemas Tue May 22
12:55:22 2012
@@ -18,4 +18,5 @@
 #    under the License.
 #
 #
-http\://cxf.apache.org/schemas/core.xsd=schemas/core.xsd
\ No newline at end of file
+http\://cxf.apache.org/schemas/core.xsd=schemas/core.xsd
+http\://cxf.apache.org/schemas/clustering.xsd=schemas/clustering.xsd
\ No newline at end of file

Modified: cxf/branches/2.4.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/failover.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/failover.xml?rev=1341455&r1=1341454&r2=1341455&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/failover.xml
(original)
+++ cxf/branches/2.4.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/failover.xml
Tue May 22 12:55:22 2012
@@ -23,6 +23,7 @@
        xmlns:clustering="http://cxf.apache.org/clustering"
        xsi:schemaLocation="
 http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd
+http://cxf.apache.org/clustering http://cxf.apache.org/schemas/clustering.xsd
 http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
     
     <bean id="Sequential" class="org.apache.cxf.clustering.SequentialStrategy"/>

Modified: cxf/branches/2.4.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/failover_address_override.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/failover_address_override.xml?rev=1341455&r1=1341454&r2=1341455&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/failover_address_override.xml
(original)
+++ cxf/branches/2.4.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/failover_address_override.xml
Tue May 22 12:55:22 2012
@@ -24,6 +24,7 @@
        xmlns:util="http://www.springframework.org/schema/util"
        xsi:schemaLocation="
 http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd
+http://cxf.apache.org/clustering http://cxf.apache.org/schemas/clustering.xsd
 http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
 http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
     <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>

Modified: cxf/branches/2.4.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/load_distributor.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/load_distributor.xml?rev=1341455&r1=1341454&r2=1341455&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/load_distributor.xml
(original)
+++ cxf/branches/2.4.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/load_distributor.xml
Tue May 22 12:55:22 2012
@@ -23,6 +23,7 @@
        xmlns:clustering="http://cxf.apache.org/clustering"
        xsi:schemaLocation="
 http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd
+http://cxf.apache.org/clustering http://cxf.apache.org/schemas/clustering.xsd
 http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
     
     <bean id="Sequential" class="org.apache.cxf.systest.clustering.LoadDistributorSequentialStrategy"/>

Modified: cxf/branches/2.4.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/load_distributor_address_override.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/load_distributor_address_override.xml?rev=1341455&r1=1341454&r2=1341455&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/load_distributor_address_override.xml
(original)
+++ cxf/branches/2.4.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/load_distributor_address_override.xml
Tue May 22 12:55:22 2012
@@ -24,6 +24,7 @@
        xmlns:util="http://www.springframework.org/schema/util"
        xsi:schemaLocation="
 http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd
+http://cxf.apache.org/clustering http://cxf.apache.org/schemas/clustering.xsd
 http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
 http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
 



Mime
View raw message