You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ay...@apache.org on 2011/12/12 13:30:12 UTC
svn commit: r1213211 -
/cxf/trunk/rt/ws/rm/src/main/resources/schemas/configuration/wsrm-manager.xsd
Author: ay
Date: Mon Dec 12 12:30:11 2011
New Revision: 1213211
URL: http://svn.apache.org/viewvc?rev=1213211&view=rev
Log:
fix to make cxf-3975 work for spring with no internet connection
Modified:
cxf/trunk/rt/ws/rm/src/main/resources/schemas/configuration/wsrm-manager.xsd
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=1213211&r1=1213210&r2=1213211&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 Mon Dec 12 12:30:11 2011
@@ -23,7 +23,6 @@
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:bp-beans="http://www.osgi.org/xmlns/blueprint/v1.0.0"
xmlns:cxf-beans="http://cxf.apache.org/configuration/beans"
elementFormDefault="qualified"
attributeFormDefault="unqualified">
@@ -36,7 +35,9 @@
<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"/>
@@ -63,7 +64,7 @@
<xs:extension base="s-beans:identifiedType">
<xs:group ref="tns:rmElements"/>
<xs:attributeGroup ref="cxf-beans:beanAttributes"/>
- <xs:attribute name="activation" type="bp-beans:Tactivation"/>
+ <xs:attribute name="activation" type="tns:activationType"/>
</xs:extension>
</xs:complexContent>
</xs:complexType>
@@ -137,7 +138,7 @@
<xs:complexContent>
<xs:extension base="s-beans:identifiedType">
<xs:attributeGroup ref="cxf-beans:beanAttributes"/>
- <xs:attribute name="activation" type="bp-beans:Tactivation"/>
+ <xs:attribute name="activation" type="tns:activationType"/>
<xs:attribute name="driverClassName" type="xs:string" default="org.apache.derby.jdbc.EmbeddedDriver">
<xs:annotation>
<xs:documentation>
@@ -171,4 +172,17 @@
</xs:complexType>
</xs:element>
+ <!-- this can be removed when blueprint Tactivation type is directly referenced (see the import above) -->
+ <xs:simpleType name="activationType">
+ <xs:annotation>
+ <xs:documentation>
+ activationType is a workaround to reuse the Tactivation type from blueprint schema.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:restriction base="xs:NMTOKEN">
+ <xs:enumeration value="eager" />
+ <xs:enumeration value="lazy" />
+ </xs:restriction>
+ </xs:simpleType>
+
</xs:schema>