Author: ay
Date: Wed Nov 16 16:54:45 2011
New Revision: 1202775
URL: http://svn.apache.org/viewvc?rev=1202775&view=rev
Log:
Merged revisions 1202267 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1202267 | ay | 2011-11-15 17:04:04 +0100 (Tue, 15 Nov 2011) | 1 line
[CXF-3913] blueprint for ws-rm
........
Added:
cxf/branches/2.4.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/blueprint/
- copied from r1202267,
cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/blueprint/
cxf/branches/2.4.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/blueprint/RMBPBeanDefinitionParser.java
- copied, changed from r1202267,
cxf/trunk/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
- copied unchanged from r1202267,
cxf/trunk/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/OSGI-INF/
- copied from r1202267, cxf/trunk/rt/ws/rm/src/main/resources/OSGI-INF/
cxf/branches/2.4.x-fixes/rt/ws/rm/src/main/resources/OSGI-INF/blueprint/
- copied from r1202267,
cxf/trunk/rt/ws/rm/src/main/resources/OSGI-INF/blueprint/
cxf/branches/2.4.x-fixes/rt/ws/rm/src/main/resources/OSGI-INF/blueprint/ws-rm.xml
- copied unchanged from r1202267,
cxf/trunk/rt/ws/rm/src/main/resources/OSGI-INF/blueprint/ws-rm.xml
cxf/branches/2.4.x-fixes/rt/ws/rm/src/main/resources/schemas/configuration/blueprint/
- copied from r1202267,
cxf/trunk/rt/ws/rm/src/main/resources/schemas/configuration/blueprint/
cxf/branches/2.4.x-fixes/rt/ws/rm/src/main/resources/schemas/configuration/blueprint/wsrm-manager.xsd
- copied unchanged from r1202267,
cxf/trunk/rt/ws/rm/src/main/resources/schemas/configuration/blueprint/wsrm-manager.xsd
Modified:
cxf/branches/2.4.x-fixes/ (props changed)
cxf/branches/2.4.x-fixes/rt/ws/rm/pom.xml
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
svn:mergeinfo = /cxf/trunk:1202267
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.4.x-fixes/rt/ws/rm/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/ws/rm/pom.xml?rev=1202775&r1=1202774&r2=1202775&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/ws/rm/pom.xml (original)
+++ cxf/branches/2.4.x-fixes/rt/ws/rm/pom.xml Wed Nov 16 16:54:45 2011
@@ -34,6 +34,14 @@
<dependencies>
<dependency>
+ <groupId>org.apache.aries.blueprint</groupId>
+ <artifactId>org.apache.aries.blueprint.core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<scope>provided</scope>
Copied:
cxf/branches/2.4.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/blueprint/RMBPBeanDefinitionParser.java
(from r1202267,
cxf/trunk/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?p2=cxf/branches/2.4.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/blueprint/RMBPBeanDefinitionParser.java&p1=cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/blueprint/RMBPBeanDefinitionParser.java&r1=1202267&r2=1202775&rev=1202775&view=diff
==============================================================================
---
cxf/trunk/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
Wed Nov 16 16:54:45 2011
@@ -79,11 +79,11 @@ public class RMBPBeanDefinitionParser ex
mapElementToJaxbProperty(context, bean, element,
new QName("http://schemas.xmlsoap.org/ws/2005/02/rm/policy";,
"RMAssertion"),
"RMAssertion",
- org.apache.cxf.ws.rmp.v200502.RMAssertion.class);
+ org.apache.cxf.ws.rm.policy.RMAssertion.class);
mapElementToJaxbProperty(context, bean, element,
new QName("http://docs.oasis-open.org/ws-rx/wsrmp/200702";,
"RMAssertion"),
"RMAssertion",
- org.apache.cxf.ws.rmp.v200702.RMAssertion.class);
+ org.apache.cxf.ws.rm.policy.RMAssertion.class);
parseAttributes(element, context, bean);
parseChildElements(element, context, bean);
