From commits-return-17166-apmail-cxf-commits-archive=cxf.apache.org@cxf.apache.org Mon Dec 12 09:44:10 2011 Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 4167F9E24 for ; Mon, 12 Dec 2011 09:44:10 +0000 (UTC) Received: (qmail 62599 invoked by uid 500); 12 Dec 2011 09:44:10 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 62537 invoked by uid 500); 12 Dec 2011 09:44:10 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 62530 invoked by uid 99); 12 Dec 2011 09:44:09 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 12 Dec 2011 09:44:09 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 12 Dec 2011 09:43:59 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 0DE1D2388B71 for ; Mon, 12 Dec 2011 09:43:38 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1213179 - in /cxf/trunk/rt/ws/rm/src/main: java/org/apache/cxf/ws/rm/blueprint/ resources/schemas/configuration/ resources/schemas/configuration/blueprint/ Date: Mon, 12 Dec 2011 09:43:37 -0000 To: commits@cxf.apache.org From: ay@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111212094338.0DE1D2388B71@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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 @@ + @@ -58,9 +60,10 @@ - + + @@ -119,7 +122,7 @@ - + Deprecated. @@ -132,8 +135,9 @@ - + +