cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dand...@apache.org
Subject svn commit: r551172 - in /incubator/cxf/trunk/rt/core/src: main/java/org/apache/cxf/bus/spring/ main/resources/META-INF/ main/resources/schemas/ test/java/org/apache/cxf/bus/spring/
Date Wed, 27 Jun 2007 14:21:42 GMT
Author: dandiep
Date: Wed Jun 27 07:21:40 2007
New Revision: 551172

URL: http://svn.apache.org/viewvc?view=rev&rev=551172
Log:
Change the <bus> element to use a core namespace. Add nice XML support for the logging
feature in the core namespace.

Added:
    incubator/cxf/trunk/rt/core/src/main/resources/schemas/core.xsd
      - copied, changed from r550965, incubator/cxf/trunk/rt/core/src/main/resources/schemas/bus.xsd
Removed:
    incubator/cxf/trunk/rt/core/src/main/resources/schemas/bus.xsd
Modified:
    incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/NamespaceHandler.java
    incubator/cxf/trunk/rt/core/src/main/resources/META-INF/spring.handlers
    incubator/cxf/trunk/rt/core/src/main/resources/META-INF/spring.schemas
    incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/spring/bus.xml

Modified: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/NamespaceHandler.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/NamespaceHandler.java?view=diff&rev=551172&r1=551171&r2=551172
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/NamespaceHandler.java
(original)
+++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/NamespaceHandler.java
Wed Jun 27 07:21:40 2007
@@ -18,11 +18,15 @@
  */
 package org.apache.cxf.bus.spring;
 
+import org.apache.cxf.configuration.spring.SimpleBeanDefinitionParser;
+import org.apache.cxf.feature.LoggingFeature;
 import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
 
 public class NamespaceHandler extends NamespaceHandlerSupport {
     public void init() {
         registerBeanDefinitionParser("bus",
                                      new BusDefinitionParser());
+        registerBeanDefinitionParser("logging",
+                                     new SimpleBeanDefinitionParser(LoggingFeature.class));
     }
 }

Modified: incubator/cxf/trunk/rt/core/src/main/resources/META-INF/spring.handlers
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/resources/META-INF/spring.handlers?view=diff&rev=551172&r1=551171&r2=551172
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/resources/META-INF/spring.handlers (original)
+++ incubator/cxf/trunk/rt/core/src/main/resources/META-INF/spring.handlers Wed Jun 27 07:21:40
2007
@@ -19,4 +19,4 @@
 #
 #
 http\://cxf.apache.org/clustering=org.apache.cxf.clustering.spring.NamespaceHandler
-http\://cxf.apache.org/bus=org.apache.cxf.bus.spring.NamespaceHandler
+http\://cxf.apache.org/core=org.apache.cxf.bus.spring.NamespaceHandler

Modified: incubator/cxf/trunk/rt/core/src/main/resources/META-INF/spring.schemas
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/resources/META-INF/spring.schemas?view=diff&rev=551172&r1=551171&r2=551172
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/resources/META-INF/spring.schemas (original)
+++ incubator/cxf/trunk/rt/core/src/main/resources/META-INF/spring.schemas Wed Jun 27 07:21:40
2007
@@ -18,4 +18,4 @@
 #    under the License.
 #
 #
-http\://cxf.apache.org/schemas/bus.xsd=schemas/bus.xsd
\ No newline at end of file
+http\://cxf.apache.org/schemas/core.xsd=schemas/core.xsd
\ No newline at end of file

Copied: incubator/cxf/trunk/rt/core/src/main/resources/schemas/core.xsd (from r550965, incubator/cxf/trunk/rt/core/src/main/resources/schemas/bus.xsd)
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/resources/schemas/core.xsd?view=diff&rev=551172&p1=incubator/cxf/trunk/rt/core/src/main/resources/schemas/bus.xsd&r1=550965&p2=incubator/cxf/trunk/rt/core/src/main/resources/schemas/core.xsd&r2=551172
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/resources/schemas/bus.xsd (original)
+++ incubator/cxf/trunk/rt/core/src/main/resources/schemas/core.xsd Wed Jun 27 07:21:40 2007
@@ -21,13 +21,19 @@
   xmlns:beans="http://www.springframework.org/schema/beans"
   xmlns:cxf-beans="http://cxf.apache.org/configuration/beans"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  targetNamespace="http://cxf.apache.org/bus" 
+  targetNamespace="http://cxf.apache.org/core" 
   elementFormDefault="qualified"
   attributeFormDefault="unqualified"  >
 
   <xsd:import namespace="http://www.springframework.org/schema/beans" schemaLocation="http://www.springframework.org/schema/beans/spring-beans.xsd"/>
   <xsd:import namespace="http://cxf.apache.org/configuration/beans" schemaLocation="http://cxf.apache.org/schemas/configuration/cxf-beans.xsd"/>
 
+  <xsd:element name="logging">
+    <xsd:complexType>
+      <xsd:sequence />
+    </xsd:complexType>
+  </xsd:element>
+  
   <xsd:element name="bus">
     <xsd:complexType>
       <xsd:all>

Modified: incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/spring/bus.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/spring/bus.xml?view=diff&rev=551172&r1=551171&r2=551172
==============================================================================
--- incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/spring/bus.xml (original)
+++ incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/spring/bus.xml Wed Jun 27
07:21:40 2007
@@ -18,16 +18,16 @@
   under the License.
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
-  xmlns:b="http://cxf.apache.org/bus"
+  xmlns:c="http://cxf.apache.org/core"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="
 http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-http://cxf.apache.org/bus http://cxf.apache.org/schemas/bus.xsd">
+http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd">
 
-  <b:bus>
-    <b:features>
-      <bean class="org.apache.cxf.feature.LoggingFeature" />
-    </b:features>
-  </b:bus>
+  <c:bus>
+    <c:features>
+      <c:logging />
+    </c:features>
+  </c:bus>
 
 </beans>



Mime
View raw message