cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a.@apache.org
Subject svn commit: r1342726 - in /cxf/branches/2.5.x-fixes: ./ api/ api/src/main/java/org/apache/cxf/security/blueprint/ api/src/main/resources/OSGI-INF/ common/common/src/main/resources/schemas/configuration/ rt/core/src/main/java/org/apache/cxf/bus/blueprin...
Date Fri, 25 May 2012 16:58:15 GMT
Author: ay
Date: Fri May 25 16:58:14 2012
New Revision: 1342726

URL: http://svn.apache.org/viewvc?rev=1342726&view=rev
Log:
Merged revisions 1342232 via  svn merge from
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1342232 | ay | 2012-05-24 14:40:59 +0200 (Thu, 24 May 2012) | 1 line
  
  consolidate some BP schemas
........

Removed:
    cxf/branches/2.5.x-fixes/api/src/main/java/org/apache/cxf/security/blueprint/
    cxf/branches/2.5.x-fixes/api/src/main/resources/OSGI-INF/
Modified:
    cxf/branches/2.5.x-fixes/   (props changed)
    cxf/branches/2.5.x-fixes/api/pom.xml
    cxf/branches/2.5.x-fixes/common/common/src/main/resources/schemas/configuration/cxf-beans.xsd
    cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/blueprint/CXFCoreNamespaceHandler.java
    cxf/branches/2.5.x-fixes/rt/core/src/main/resources/OSGI-INF/blueprint/cxf-core.xml
    cxf/branches/2.5.x-fixes/rt/transports/http/src/main/resources/schemas/configuration/http-conf.xsd
    cxf/branches/2.5.x-fixes/rt/ws/rm/src/main/resources/schemas/configuration/wsrm-manager.xsd

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

Modified: cxf/branches/2.5.x-fixes/api/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/api/pom.xml?rev=1342726&r1=1342725&r2=1342726&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/api/pom.xml (original)
+++ cxf/branches/2.5.x-fixes/api/pom.xml Fri May 25 16:58:14 2012
@@ -85,10 +85,6 @@
             <artifactId>wsdl4j</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.aries.blueprint</groupId>
-            <artifactId>org.apache.aries.blueprint.core</artifactId>
-        </dependency>
-        <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
         </dependency>

Modified: cxf/branches/2.5.x-fixes/common/common/src/main/resources/schemas/configuration/cxf-beans.xsd
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/common/common/src/main/resources/schemas/configuration/cxf-beans.xsd?rev=1342726&r1=1342725&r2=1342726&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/common/common/src/main/resources/schemas/configuration/cxf-beans.xsd
(original)
+++ cxf/branches/2.5.x-fixes/common/common/src/main/resources/schemas/configuration/cxf-beans.xsd
Fri May 25 16:58:14 2012
@@ -78,4 +78,8 @@
        <xsd:attribute name="bean"  type="xsd:string"/>
     </xsd:complexType>
 
+    <xsd:complexType name="identifiedType" abstract="true">
+      <xsd:attribute name="id" type="xsd:ID"/>
+    </xsd:complexType>
+
 </xsd:schema>
\ No newline at end of file

Modified: cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/blueprint/CXFCoreNamespaceHandler.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/blueprint/CXFCoreNamespaceHandler.java?rev=1342726&r1=1342725&r2=1342726&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/blueprint/CXFCoreNamespaceHandler.java
(original)
+++ cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/blueprint/CXFCoreNamespaceHandler.java
Fri May 25 16:58:14 2012
@@ -47,6 +47,8 @@ public class CXFCoreNamespaceHandler imp
             return getClass().getClassLoader().getResource("/schemas/configuration/cxf-beans.xsd");
          
         } else if ("http://cxf.apache.org/configuration/parameterized-types".equals(namespace))
{
             return getClass().getClassLoader().getResource("/schemas/configuration/parameterized-types.xsd");
+        } else if ("http://cxf.apache.org/configuration/security".equals(namespace)) {
+            return getClass().getClassLoader().getResource("/schemas/configuration/security.xsd");
         }
         return null;
     }

Modified: cxf/branches/2.5.x-fixes/rt/core/src/main/resources/OSGI-INF/blueprint/cxf-core.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/core/src/main/resources/OSGI-INF/blueprint/cxf-core.xml?rev=1342726&r1=1342725&r2=1342726&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/core/src/main/resources/OSGI-INF/blueprint/cxf-core.xml (original)
+++ cxf/branches/2.5.x-fixes/rt/core/src/main/resources/OSGI-INF/blueprint/cxf-core.xml Fri
May 25 16:58:14 2012
@@ -39,4 +39,9 @@
       <entry key="osgi.service.blueprint.namespace" value="http://cxf.apache.org/configuration/parameterized-types"/>
     </service-properties>
   </service>
+  <service ref="CXFCoreNamespaceHandler" interface="org.apache.aries.blueprint.NamespaceHandler">
+    <service-properties>
+      <entry key="osgi.service.blueprint.namespace" value="http://cxf.apache.org/configuration/security"/>
+    </service-properties>
+  </service>
 </blueprint>
\ No newline at end of file

Modified: cxf/branches/2.5.x-fixes/rt/transports/http/src/main/resources/schemas/configuration/http-conf.xsd
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/transports/http/src/main/resources/schemas/configuration/http-conf.xsd?rev=1342726&r1=1342725&r2=1342726&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/transports/http/src/main/resources/schemas/configuration/http-conf.xsd
(original)
+++ cxf/branches/2.5.x-fixes/rt/transports/http/src/main/resources/schemas/configuration/http-conf.xsd
Fri May 25 16:58:14 2012
@@ -39,10 +39,6 @@
     <xs:import namespace="http://cxf.apache.org/configuration/beans" 
                schemaLocation="http://cxf.apache.org/schemas/configuration/cxf-beans.xsd"/>
 
-    <xs:complexType name="identifiedType" abstract="true">
-      <xs:attribute name="id" type="xs:ID"/>
-    </xs:complexType>
-
     <!-- Conduit Specific Items -->
 
     <xs:element name="authorization"       type="sec:AuthorizationPolicy"/>
@@ -54,7 +50,7 @@
     <xs:element name="conduit">
       <xs:complexType>
         <xs:complexContent>
-          <xs:extension base="http-conf:identifiedType">
+          <xs:extension base="cxf-beans:identifiedType">
             <xs:all>
                 <xs:element ref="http-conf:client" minOccurs="0">
                    <xs:annotation>
@@ -128,7 +124,7 @@
     <xs:element name="destination">
       <xs:complexType>
         <xs:complexContent>
-          <xs:extension base="http-conf:identifiedType">
+          <xs:extension base="cxf-beans:identifiedType">
             <xs:all>
 	            <xs:element ref="http-conf:server" minOccurs="0">
 	               <xs:annotation>

Modified: cxf/branches/2.5.x-fixes/rt/ws/rm/src/main/resources/schemas/configuration/wsrm-manager.xsd
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/ws/rm/src/main/resources/schemas/configuration/wsrm-manager.xsd?rev=1342726&r1=1342725&r2=1342726&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/ws/rm/src/main/resources/schemas/configuration/wsrm-manager.xsd
(original)
+++ cxf/branches/2.5.x-fixes/rt/ws/rm/src/main/resources/schemas/configuration/wsrm-manager.xsd
Fri May 25 16:58:14 2012
@@ -37,10 +37,6 @@
   <xs:import namespace="http://schemas.xmlsoap.org/ws/2005/02/rm/policy" schemaLocation="http://schemas.xmlsoap.org/ws/2005/02/rm/wsrm-policy.xsd"/>
 
 
-  <xs:complexType name="identifiedType" abstract="true">
-    <xs:attribute name="id" type="xs:ID"/>
-  </xs:complexType>
-
   <xs:element name="reliableMessaging">
     <xs:annotation>
       <xs:documentation>
@@ -61,7 +57,7 @@
   <xs:element name="rmManager">   
     <xs:complexType>
       <xs:complexContent>
-        <xs:extension base="tns:identifiedType">
+        <xs:extension base="cxf-beans:identifiedType">
           <xs:group ref="tns:rmElements"/>
           <xs:attribute name="activation" type="tns:activationType"/>
           <xs:attributeGroup ref="cxf-beans:beanAttributes"></xs:attributeGroup>
@@ -137,7 +133,7 @@
   <xs:element name="jdbcStore">
     <xs:complexType>
       <xs:complexContent>
-        <xs:extension base="tns:identifiedType">
+        <xs:extension base="cxf-beans:identifiedType">
           <xs:attributeGroup ref="cxf-beans:beanAttributes"/>        
           <xs:attribute name="activation" type="tns:activationType"/>
           <xs:attribute name="driverClassName" type="xs:string" default="org.apache.derby.jdbc.EmbeddedDriver">



Mime
View raw message