Author: ningjiang
Date: Tue May 22 02:06:37 2012
New Revision: 1341289
URL: http://svn.apache.org/viewvc?rev=1341289&view=rev
Log:
CXF-4327 unify the cxf-clustering schema
Removed:
cxf/trunk/rt/features/clustering/src/main/resources/schemas/blueprint/clustering.xsd
Modified:
cxf/trunk/rt/features/clustering/src/main/java/org/apache/cxf/clustering/blueprint/ClusteringBPNamespaceHandler.java
cxf/trunk/rt/features/clustering/src/main/resources/schemas/clustering.xsd
Modified:
cxf/trunk/rt/features/clustering/src/main/java/org/apache/cxf/clustering/blueprint/ClusteringBPNamespaceHandler.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/features/clustering/src/main/java/org/apache/cxf/clustering/blueprint/ClusteringBPNamespaceHandler.java?rev=1341289&r1=1341288&r2=1341289&view=diff
==============================================================================
---
cxf/trunk/rt/features/clustering/src/main/java/org/apache/cxf/clustering/blueprint/ClusteringBPNamespaceHandler.java
(original)
+++
cxf/trunk/rt/features/clustering/src/main/java/org/apache/cxf/clustering/blueprint/ClusteringBPNamespaceHandler.java
Tue May 22 02:06:37 2012
@@ -47,13 +47,13 @@ public class ClusteringBPNamespaceHandle
return null;
}
+ @SuppressWarnings("rawtypes")
public Set<Class> getManagedClasses() {
- //probably should have the various stuff in cxf-api in here?
return null;
}
public URL getSchemaLocation(String namespace) {
- return
getClass().getClassLoader().getResource("/schemas/blueprint/clustering.xsd");
+ return
getClass().getClassLoader().getResource("/schemas/clustering.xsd");
}
}
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=1341289&r1=1341288&r2=1341289&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
Tue May 22 02:06:37 2012
@@ -25,7 +25,9 @@
elementFormDefault="qualified"
attributeFormDefault="unqualified" >
- <xsd:import namespace="http://www.springframework.org/schema/beans";
schemaLocation="http://www.springframework.org/schema/beans/spring-beans.xsd"/>
+ <xsd:complexType name="identifiedType" abstract="true">
+ <xsd:attribute name="id" type="xs:ID"/>
+ </xsd:complexType>
<xsd:element name="failover">
<xsd:annotation>
@@ -33,7 +35,7 @@
</xsd:annotation>
<xsd:complexType>
<xsd:complexContent>
- <xsd:extension base="beans:identifiedType">
+ <xsd:extension base="tns:identifiedType">
<xsd:all>
<xsd:element name="strategy" type="xsd:anyType" minOccurs="0">
<xsd:annotation>
@@ -56,7 +58,7 @@
</xsd:annotation>
<xsd:complexType>
<xsd:complexContent>
- <xsd:extension base="beans:identifiedType">
+ <xsd:extension base="tns:identifiedType">
<xsd:all>
<xsd:element name="strategy" type="xsd:anyType" minOccurs="0">
<xsd:annotation>
