Aki,
I've attached a diff that might be usable. Can you give it a try?
Dan
On Monday, December 12, 2011 2:49:51 PM Aki Yoshida wrote:
> Hi Dan,
> okay. you are right. I just removed the bp reference but forgot the
> same problem can happen in the other end as well. i will remove the
> spring schema reference too.
> thanks.
> regards, aki
>
> 2011/12/12 Daniel Kulp <[email protected]>:
> > On Monday, December 12, 2011 9:43:37 AM [email protected] wrote:
> >> xmlns:xs="http://www.w3.org/2001/XMLSchema";
> >>
> >> xmlns:wsrmp="http://schemas.xmlsoap.org/ws/2005/02/rm/policy"; -
> >> xmlns:beans="http://www.springframework.org/schema/beans"; +
> >> xmlns:s-beans="http://www.springframework.org/schema/beans"; +
> >> xmlns:bp-beans="http://www.osgi.org/xmlns/blueprint/v1.0.0";
> >> xmlns:cxf-beans="http://cxf.apache.org/configuration/beans";
> >> elementFormDefault="qualified"
> >> attributeFormDefault="unqualified">
> >
> > As you already discovered, this is not where we need to go with this.
> > The schemas need to NOT import blueprint or spring schemas in order to
> > be usable by both.
> >
> > Ideally, the blueprint stuff is usable without Spring installed and
> > Spring stuff is usable without blueprint. Thus, the schemas, if they
> > are shared, really need to not import either. :-(
> >
> > --
> > Daniel Kulp
> > [email protected] - http://dankulp.com/blog
> > Talend Community Coder - http://coders.talend.com
--
Daniel Kulp
[email protected] - http://dankulp.com/blog
Talend Community Coder - http://coders.talend.com
diff --git a/rt/ws/rm/src/main/resources/schemas/configuration/wsrm-manager-types.xsd b/rt/ws/rm/src/main/resources/schemas/configuration/wsrm-manager-types.xsd
index 217aa73..e158eb3 100644
--- a/rt/ws/rm/src/main/resources/schemas/configuration/wsrm-manager-types.xsd
+++ b/rt/ws/rm/src/main/resources/schemas/configuration/wsrm-manager-types.xsd
@@ -22,10 +22,8 @@
xmlns:tns="http://cxf.apache.org/ws/rm/manager";
xmlns:xs="http://www.w3.org/2001/XMLSchema";
xmlns:wsrmp="http://schemas.xmlsoap.org/ws/2005/02/rm/policy";
- xmlns:jaxb="http://java.sun.com/xml/ns/jaxb";
elementFormDefault="qualified"
- attributeFormDefault="unqualified"
- jaxb:version="2.0">
+ attributeFormDefault="unqualified">
<xs:annotation>
<xs:documentation>
diff --git a/rt/ws/rm/src/main/resources/schemas/configuration/wsrm-manager.xsd b/rt/ws/rm/src/main/resources/schemas/configuration/wsrm-manager.xsd
index 4f7a373..0aee1bd 100644
--- a/rt/ws/rm/src/main/resources/schemas/configuration/wsrm-manager.xsd
+++ b/rt/ws/rm/src/main/resources/schemas/configuration/wsrm-manager.xsd
@@ -22,7 +22,6 @@
xmlns:tns="http://cxf.apache.org/ws/rm/manager";
xmlns:xs="http://www.w3.org/2001/XMLSchema";
xmlns:wsrmp="http://schemas.xmlsoap.org/ws/2005/02/rm/policy";
- xmlns:s-beans="http://www.springframework.org/schema/beans";
xmlns:cxf-beans="http://cxf.apache.org/configuration/beans";
elementFormDefault="qualified"
attributeFormDefault="unqualified">
@@ -34,13 +33,14 @@
</xs:annotation>
<xs:include schemaLocation="wsrm-manager-types.xsd"/>
- <xs:import namespace="http://www.springframework.org/schema/beans"; schemaLocation="http://www.springframework.org/schema/beans/spring-beans.xsd"/>
- <!-- problem in refering to this schema when parsed by spring; this needs to be placed in the spring.handlers
- <xs:import namespace="http://www.osgi.org/xmlns/blueprint/v1.0.0"; schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd"/>
- -->
<xs:import namespace="http://cxf.apache.org/configuration/beans"; schemaLocation="http://cxf.apache.org/schemas/configuration/cxf-beans.xsd"/>
<xs:import namespace="http://schemas.xmlsoap.org/ws/2005/02/rm/policy"; schemaLocation="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,10 +61,10 @@
<xs:element name="rmManager">
<xs:complexType>
<xs:complexContent>
- <xs:extension base="s-beans:identifiedType">
+ <xs:extension base="tns:identifiedType">
<xs:group ref="tns:rmElements"/>
- <xs:attributeGroup ref="cxf-beans:beanAttributes"/>
<xs:attribute name="activation" type="tns:activationType"/>
+ <xs:attributeGroup ref="cxf-beans:beanAttributes"></xs:attributeGroup>
</xs:extension>
</xs:complexContent>
</xs:complexType>
@@ -123,20 +123,21 @@
</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element ref="s-beans:property" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
+ <xs:any minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
<xs:documentation>
- Deprecated.
- </xs:documentation>
+ Deprecated. To support the older spring:property element that is no longer used
+ </xs:documentation>
</xs:annotation>
- </xs:element>
+ </xs:any>
+
</xs:sequence>
</xs:group>
<xs:element name="jdbcStore">
<xs:complexType>
<xs:complexContent>
- <xs:extension base="s-beans:identifiedType">
+ <xs:extension base="tns: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">
