Author: ay
Date: Thu May 24 12:40:59 2012
New Revision: 1342232
URL: http://svn.apache.org/viewvc?rev=1342232&view=rev
Log:
consolidate some BP schemas
Removed:
cxf/trunk/api/src/main/java/org/apache/cxf/security/blueprint/
cxf/trunk/api/src/main/resources/OSGI-INF/
Modified:
cxf/trunk/api/pom.xml
cxf/trunk/api/src/main/resources/schemas/configuration/cxf-beans.xsd
cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/blueprint/CXFCoreNamespaceHandler.java
cxf/trunk/rt/core/src/main/resources/OSGI-INF/blueprint/cxf-core.xml
cxf/trunk/rt/features/clustering/src/main/resources/schemas/clustering.xsd
cxf/trunk/rt/transports/http/src/main/resources/schemas/configuration/http-conf.xsd
cxf/trunk/rt/ws/rm/src/main/resources/schemas/configuration/wsrm-manager.xsd
Modified: cxf/trunk/api/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/api/pom.xml?rev=1342232&r1=1342231&r2=1342232&view=diff
==============================================================================
--- cxf/trunk/api/pom.xml (original)
+++ cxf/trunk/api/pom.xml Thu May 24 12:40:59 2012
@@ -150,10 +150,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/trunk/api/src/main/resources/schemas/configuration/cxf-beans.xsd
URL:
http://svn.apache.org/viewvc/cxf/trunk/api/src/main/resources/schemas/configuration/cxf-beans.xsd?rev=1342232&r1=1342231&r2=1342232&view=diff
==============================================================================
--- cxf/trunk/api/src/main/resources/schemas/configuration/cxf-beans.xsd
(original)
+++ cxf/trunk/api/src/main/resources/schemas/configuration/cxf-beans.xsd Thu
May 24 12:40:59 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/trunk/rt/core/src/main/java/org/apache/cxf/bus/blueprint/CXFCoreNamespaceHandler.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/blueprint/CXFCoreNamespaceHandler.java?rev=1342232&r1=1342231&r2=1342232&view=diff
==============================================================================
---
cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/blueprint/CXFCoreNamespaceHandler.java
(original)
+++
cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/blueprint/CXFCoreNamespaceHandler.java
Thu May 24 12:40:59 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/trunk/rt/core/src/main/resources/OSGI-INF/blueprint/cxf-core.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/resources/OSGI-INF/blueprint/cxf-core.xml?rev=1342232&r1=1342231&r2=1342232&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/resources/OSGI-INF/blueprint/cxf-core.xml
(original)
+++ cxf/trunk/rt/core/src/main/resources/OSGI-INF/blueprint/cxf-core.xml Thu
May 24 12:40:59 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/trunk/rt/features/clustering/src/main/resources/schemas/clustering.xsd
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/features/clustering/src/main/resources/schemas/clustering.xsd?rev=1342232&r1=1342231&r2=1342232&view=diff
==============================================================================
--- cxf/trunk/rt/features/clustering/src/main/resources/schemas/clustering.xsd
(original)
+++ cxf/trunk/rt/features/clustering/src/main/resources/schemas/clustering.xsd
Thu May 24 12:40:59 2012
@@ -21,21 +21,21 @@
xmlns:xsd="http://www.w3.org/2001/XMLSchema";
xmlns:tns="http://cxf.apache.org/clustering";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xmlns:cxf-beans="http://cxf.apache.org/configuration/beans";
targetNamespace="http://cxf.apache.org/clustering";
elementFormDefault="qualified"
attributeFormDefault="unqualified" >
- <xsd:complexType name="identifiedType" abstract="true">
- <xsd:attribute name="id" type="xsd:ID"/>
- </xsd:complexType>
-
+ <xsd:import namespace="http://cxf.apache.org/configuration/beans";
+
schemaLocation="http://cxf.apache.org/schemas/configuration/cxf-beans.xsd"/>
+
<xsd:element name="failover">
<xsd:annotation>
<xsd:documentation>Configures the failover feature. This element is
associated with the org.apache.cxf.clustering.FailoverFeature
object.</xsd:documentation>
</xsd:annotation>
<xsd:complexType>
<xsd:complexContent>
- <xsd:extension base="tns:identifiedType">
+ <xsd:extension base="cxf-beans:identifiedType">
<xsd:all>
<xsd:element name="strategy" type="xsd:anyType" minOccurs="0">
<xsd:annotation>
@@ -59,7 +59,7 @@
</xsd:annotation>
<xsd:complexType>
<xsd:complexContent>
- <xsd:extension base="tns:identifiedType">
+ <xsd:extension base="cxf-beans:identifiedType">
<xsd:all>
<xsd:element name="strategy" type="xsd:anyType" minOccurs="0">
<xsd:annotation>
Modified:
cxf/trunk/rt/transports/http/src/main/resources/schemas/configuration/http-conf.xsd
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http/src/main/resources/schemas/configuration/http-conf.xsd?rev=1342232&r1=1342231&r2=1342232&view=diff
==============================================================================
---
cxf/trunk/rt/transports/http/src/main/resources/schemas/configuration/http-conf.xsd
(original)
+++
cxf/trunk/rt/transports/http/src/main/resources/schemas/configuration/http-conf.xsd
Thu May 24 12:40:59 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/trunk/rt/ws/rm/src/main/resources/schemas/configuration/wsrm-manager.xsd
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/src/main/resources/schemas/configuration/wsrm-manager.xsd?rev=1342232&r1=1342231&r2=1342232&view=diff
==============================================================================
---
cxf/trunk/rt/ws/rm/src/main/resources/schemas/configuration/wsrm-manager.xsd
(original)
+++
cxf/trunk/rt/ws/rm/src/main/resources/schemas/configuration/wsrm-manager.xsd
Thu May 24 12:40:59 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">
