Author: ay
Date: Mon Dec 12 09:43:37 2011
New Revision: 1213179
URL: http://svn.apache.org/viewvc?rev=1213179&view=rev
Log:
[CXF-3975] consolidate ws-rm configuration schema for spring and blueprint
Removed:
cxf/trunk/rt/ws/rm/src/main/resources/schemas/configuration/blueprint/
Modified:
cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/blueprint/RMBPBeanDefinitionParser.java
cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/blueprint/RMBPHandler.java
cxf/trunk/rt/ws/rm/src/main/resources/schemas/configuration/wsrm-manager.xsd
Modified:
cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/blueprint/RMBPBeanDefinitionParser.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/blueprint/RMBPBeanDefinitionParser.java?rev=1213179&r1=1213178&r2=1213179&view=diff
==============================================================================
---
cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/blueprint/RMBPBeanDefinitionParser.java
(original)
+++
cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/blueprint/RMBPBeanDefinitionParser.java
Mon Dec 12 09:43:37 2011
@@ -36,6 +36,7 @@ import org.apache.cxf.common.util.Packag
import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.configuration.blueprint.AbstractBPBeanDefinitionParser;
import org.apache.cxf.helpers.DOMUtils;
+import org.apache.cxf.ws.rm.RMManager;
import org.apache.cxf.ws.rm.manager.DeliveryAssuranceType;
import org.apache.cxf.ws.rm.manager.DestinationPolicyType;
import org.apache.cxf.ws.rm.manager.ObjectFactory;
@@ -89,6 +90,11 @@ public class RMBPBeanDefinitionParser ex
parseChildElements(element, context, bean);
bean.setId(beanClass.getName() + context.generateId());
+
+ if (beanClass.equals(RMManager.class)) {
+ bean.addProperty("bus", getBusRef(context, bus));
+ bean.setDestroyMethod("shutdown");
+ }
return bean;
}
Modified:
cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/blueprint/RMBPHandler.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/blueprint/RMBPHandler.java?rev=1213179&r1=1213178&r2=1213179&view=diff
==============================================================================
---
cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/blueprint/RMBPHandler.java
(original)
+++
cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/blueprint/RMBPHandler.java
Mon Dec 12 09:43:37 2011
@@ -37,7 +37,7 @@ public class RMBPHandler implements Name
public URL getSchemaLocation(String s) {
if ("http://cxf.apache.org/ws/rm/manager".equals(s)) {
return getClass().getClassLoader().
-
getResource("/schemas/configuration/blueprint/wsrm-manager.xsd");
+ getResource("/schemas/configuration/wsrm-manager.xsd");
} else if
("http://schemas.xmlsoap.org/ws/2005/02/rm/policy".equals(s)) {
return getClass().getClassLoader().
getResource("/schemas/configuration/wsrm-policy.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=1213179&r1=1213178&r2=1213179&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 09:43:37 2011
@@ -22,7 +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: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">
@@ -35,6 +36,7 @@
<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"/>
+ <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"/>
@@ -58,9 +60,10 @@
<xs:element name="rmManager">
<xs:complexType>
<xs:complexContent>
- <xs:extension base="beans:identifiedType">
+ <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:extension>
</xs:complexContent>
</xs:complexType>
@@ -119,7 +122,7 @@
</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element ref="beans:property" minOccurs="0" maxOccurs="unbounded">
+ <xs:element ref="s-beans:property" minOccurs="0" maxOccurs="unbounded">
<xs:annotation>
<xs:documentation>
Deprecated.
@@ -132,8 +135,9 @@
<xs:element name="jdbcStore">
<xs:complexType>
<xs:complexContent>
- <xs:extension base="beans:identifiedType">
+ <xs:extension base="s-beans:identifiedType">
<xs:attributeGroup ref="cxf-beans:beanAttributes"/>
+ <xs:attribute name="activation" type="bp-beans:Tactivation"/>
<xs:attribute name="driverClassName" type="xs:string"
default="org.apache.derby.jdbc.EmbeddedDriver">
<xs:annotation>
<xs:documentation>
