Author: dkulp
Date: Mon Dec 12 22:52:55 2011
New Revision: 1213483
URL: http://svn.apache.org/viewvc?rev=1213483&view=rev
Log:
Merged revisions 1213179,1213211,1213262,1213313 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1213179 | ay | 2011-12-12 04:43:37 -0500 (Mon, 12 Dec 2011) | 1 line
[CXF-3975] consolidate ws-rm configuration schema for spring and blueprint
........
r1213211 | ay | 2011-12-12 07:30:11 -0500 (Mon, 12 Dec 2011) | 1 line
fix to make cxf-3975 work for spring with no internet connection
........
r1213262 | ay | 2011-12-12 09:59:10 -0500 (Mon, 12 Dec 2011) | 1 line
removing spring schema reference in CXF-3975
........
r1213313 | ay | 2011-12-12 12:07:04 -0500 (Mon, 12 Dec 2011) | 1 line
unique particle attribution error in wsrm-manager.xsd from CXF-3975
........
Removed:
cxf/branches/2.4.x-fixes/rt/ws/rm/src/main/resources/schemas/configuration/blueprint/
Modified:
cxf/branches/2.4.x-fixes/ (props changed)
cxf/branches/2.4.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/blueprint/RMBPBeanDefinitionParser.java
cxf/branches/2.4.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/blueprint/RMBPHandler.java
cxf/branches/2.4.x-fixes/rt/ws/rm/src/main/resources/schemas/configuration/wsrm-manager-types.xsd
cxf/branches/2.4.x-fixes/rt/ws/rm/src/main/resources/schemas/configuration/wsrm-manager.xsd
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
svn:mergeinfo = /cxf/trunk:1213179,1213211,1213262,1213313
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-blocked' - no diff available.
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.4.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/blueprint/RMBPBeanDefinitionParser.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/blueprint/RMBPBeanDefinitionParser.java?rev=1213483&r1=1213482&r2=1213483&view=diff
==============================================================================
---
cxf/branches/2.4.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/blueprint/RMBPBeanDefinitionParser.java
(original)
+++
cxf/branches/2.4.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/blueprint/RMBPBeanDefinitionParser.java
Mon Dec 12 22:52:55 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/branches/2.4.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/blueprint/RMBPHandler.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/blueprint/RMBPHandler.java?rev=1213483&r1=1213482&r2=1213483&view=diff
==============================================================================
---
cxf/branches/2.4.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/blueprint/RMBPHandler.java
(original)
+++
cxf/branches/2.4.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/blueprint/RMBPHandler.java
Mon Dec 12 22:52:55 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/branches/2.4.x-fixes/rt/ws/rm/src/main/resources/schemas/configuration/wsrm-manager-types.xsd
URL:
http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/ws/rm/src/main/resources/schemas/configuration/wsrm-manager-types.xsd?rev=1213483&r1=1213482&r2=1213483&view=diff
==============================================================================
---
cxf/branches/2.4.x-fixes/rt/ws/rm/src/main/resources/schemas/configuration/wsrm-manager-types.xsd
(original)
+++
cxf/branches/2.4.x-fixes/rt/ws/rm/src/main/resources/schemas/configuration/wsrm-manager-types.xsd
Mon Dec 12 22:52:55 2011
@@ -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>
Modified:
cxf/branches/2.4.x-fixes/rt/ws/rm/src/main/resources/schemas/configuration/wsrm-manager.xsd
URL:
http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/ws/rm/src/main/resources/schemas/configuration/wsrm-manager.xsd?rev=1213483&r1=1213482&r2=1213483&view=diff
==============================================================================
---
cxf/branches/2.4.x-fixes/rt/ws/rm/src/main/resources/schemas/configuration/wsrm-manager.xsd
(original)
+++
cxf/branches/2.4.x-fixes/rt/ws/rm/src/main/resources/schemas/configuration/wsrm-manager.xsd
Mon Dec 12 22:52:55 2011
@@ -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:beans="http://www.springframework.org/schema/beans";
xmlns:cxf-beans="http://cxf.apache.org/configuration/beans";
elementFormDefault="qualified"
attributeFormDefault="unqualified">
@@ -34,10 +33,14 @@
</xs:annotation>
<xs:include
schemaLocation="http://cxf.apache.org/schemas/configuration/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://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="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>
@@ -58,9 +61,10 @@
<xs:element name="rmManager">
<xs:complexType>
<xs:complexContent>
- <xs:extension base="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>
@@ -109,21 +113,23 @@
</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element ref="beans:property" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
+ <xs:any namespace="http://www.springframework.org/schema/beans";
processContents="lax" 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="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">
<xs:annotation>
<xs:documentation>
@@ -157,4 +163,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>
