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 B2E9E1089B for ; Wed, 24 Jul 2013 08:03:16 +0000 (UTC) Received: (qmail 3530 invoked by uid 500); 24 Jul 2013 08:03:16 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 3408 invoked by uid 500); 24 Jul 2013 08:03:16 -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 3401 invoked by uid 99); 24 Jul 2013 08:03:15 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 24 Jul 2013 08:03:15 +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; Wed, 24 Jul 2013 08:03:14 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 3F8BB2388993; Wed, 24 Jul 2013 08:02:54 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1506431 - in /cxf/trunk/rt: core/src/main/java/org/apache/cxf/configuration/blueprint/ transports/http/src/main/java/org/apache/cxf/transport/http/blueprint/ Date: Wed, 24 Jul 2013 08:02:54 -0000 To: commits@cxf.apache.org From: ffang@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20130724080254.3F8BB2388993@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ffang Date: Wed Jul 24 08:02:53 2013 New Revision: 1506431 URL: http://svn.apache.org/r1506431 Log: [CXF-5148]extract mapElementToHolder method to parent class Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/configuration/blueprint/AbstractBPBeanDefinitionParser.java cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/blueprint/HttpConduitBPBeanDefinitionParser.java cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/blueprint/HttpDestinationBPBeanDefinitionParser.java Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/configuration/blueprint/AbstractBPBeanDefinitionParser.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/configuration/blueprint/AbstractBPBeanDefinitionParser.java?rev=1506431&r1=1506430&r2=1506431&view=diff ============================================================================== --- cxf/trunk/rt/core/src/main/java/org/apache/cxf/configuration/blueprint/AbstractBPBeanDefinitionParser.java (original) +++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/configuration/blueprint/AbstractBPBeanDefinitionParser.java Wed Jul 24 08:02:53 2013 @@ -46,6 +46,7 @@ import org.apache.cxf.common.logging.Log import org.apache.cxf.common.util.PackageUtils; import org.apache.cxf.common.util.StringUtils; import org.apache.cxf.helpers.DOMUtils; +import org.apache.cxf.staxutils.StaxUtils; import org.osgi.framework.Bundle; import org.osgi.service.blueprint.reflect.BeanMetadata; import org.osgi.service.blueprint.reflect.CollectionMetadata; @@ -334,6 +335,32 @@ public abstract class AbstractBPBeanDefi LOG.warning("Unable to parse property " + propertyName + " due to " + e); } } + + protected void mapElementToHolder(ParserContext ctx, MutableBeanMetadata bean, Element parent, QName name, + String propertyName, Class cls) { + Element data = DOMUtils.getFirstChildWithName(parent, name); + if (data == null) { + return; + } + MutableBeanMetadata ef = ctx.createMetadata(MutableBeanMetadata.class); + + ef.setRuntimeClass(cls); + + try { + // Print the DOM node + + String xmlString = StaxUtils.toString(data); + ef.addProperty("parsedElement", createValue(ctx, xmlString)); + ef.setInitMethod("init"); + + ef.setActivation(ComponentMetadata.ACTIVATION_EAGER); + bean.addProperty(propertyName, ef); + + } catch (Exception e) { + throw new RuntimeException("Could not process configuration.", e); + } + + } protected synchronized JAXBContext getContext(Class cls) { if (jaxbContext == null || jaxbClasses == null || !jaxbClasses.contains(cls)) { Modified: cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/blueprint/HttpConduitBPBeanDefinitionParser.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/blueprint/HttpConduitBPBeanDefinitionParser.java?rev=1506431&r1=1506430&r2=1506431&view=diff ============================================================================== --- cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/blueprint/HttpConduitBPBeanDefinitionParser.java (original) +++ cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/blueprint/HttpConduitBPBeanDefinitionParser.java Wed Jul 24 08:02:53 2013 @@ -37,12 +37,9 @@ import org.apache.cxf.configuration.secu import org.apache.cxf.configuration.security.SecureRandomParameters; import org.apache.cxf.configuration.security.TLSClientParametersType; import org.apache.cxf.configuration.security.TrustManagersType; -import org.apache.cxf.helpers.DOMUtils; -import org.apache.cxf.staxutils.StaxUtils; import org.apache.cxf.transport.http.HTTPConduit; import org.apache.cxf.transport.http.MessageTrustDecider; import org.apache.cxf.transport.http.auth.HttpAuthSupplier; -import org.osgi.service.blueprint.reflect.ComponentMetadata; import org.osgi.service.blueprint.reflect.Metadata; public class HttpConduitBPBeanDefinitionParser extends AbstractBPBeanDefinitionParser { @@ -174,29 +171,5 @@ public class HttpConduitBPBeanDefinition } } - private void mapElementToHolder(ParserContext ctx, MutableBeanMetadata bean, Element parent, - QName name, String propertyName, Class cls) { - Element data = DOMUtils.getFirstChildWithName(parent, name); - if (data == null) { - return; - } - MutableBeanMetadata ef = ctx.createMetadata(MutableBeanMetadata.class); - - ef.setRuntimeClass(cls); - - try { - // Print the DOM node - - String xmlString = StaxUtils.toString(data); - ef.addProperty("parsedElement", createValue(ctx, xmlString)); - ef.setInitMethod("init"); - - ef.setActivation(ComponentMetadata.ACTIVATION_EAGER); - bean.addProperty(propertyName, ef); - - } catch (Exception e) { - throw new RuntimeException("Could not process configuration.", e); - } - - } + } Modified: cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/blueprint/HttpDestinationBPBeanDefinitionParser.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/blueprint/HttpDestinationBPBeanDefinitionParser.java?rev=1506431&r1=1506430&r2=1506431&view=diff ============================================================================== --- cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/blueprint/HttpDestinationBPBeanDefinitionParser.java (original) +++ cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/blueprint/HttpDestinationBPBeanDefinitionParser.java Wed Jul 24 08:02:53 2013 @@ -32,10 +32,7 @@ import org.apache.aries.blueprint.mutabl import org.apache.aries.blueprint.mutable.MutableValueMetadata; import org.apache.cxf.common.logging.LogUtils; import org.apache.cxf.configuration.blueprint.AbstractBPBeanDefinitionParser; -import org.apache.cxf.helpers.DOMUtils; -import org.apache.cxf.staxutils.StaxUtils; import org.apache.cxf.transport.http.AbstractHTTPDestination; -import org.osgi.service.blueprint.reflect.ComponentMetadata; import org.osgi.service.blueprint.reflect.Metadata; public class HttpDestinationBPBeanDefinitionParser extends AbstractBPBeanDefinitionParser { @@ -85,32 +82,5 @@ public class HttpDestinationBPBeanDefini } } - private void mapElementToHolder(ParserContext ctx, - MutableBeanMetadata bean, Element parent, - QName name, - String propertyName, - Class cls) { - Element data = DOMUtils.getFirstChildWithName(parent, name); - if (data == null) { - return; - } - MutableBeanMetadata ef = ctx.createMetadata(MutableBeanMetadata.class); - - ef.setRuntimeClass(cls); - - try { - // Print the DOM node - - String xmlString = StaxUtils.toString(data); - ef.addProperty("parsedElement", createValue(ctx, xmlString)); - ef.setInitMethod("init"); - - ef.setActivation(ComponentMetadata.ACTIVATION_EAGER); - bean.addProperty(propertyName, ef); - - } catch (Exception e) { - throw new RuntimeException("Could not process configuration.", e); - } - - } + }