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 5C6A017578 for ; Tue, 13 Jan 2015 05:52:54 +0000 (UTC) Received: (qmail 35867 invoked by uid 500); 13 Jan 2015 05:52:56 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 35692 invoked by uid 500); 13 Jan 2015 05:52:55 -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 35349 invoked by uid 99); 13 Jan 2015 05:52:55 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 13 Jan 2015 05:52:55 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 40E56A05BDC; Tue, 13 Jan 2015 05:52:55 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ningjiang@apache.org To: commits@cxf.apache.org Date: Tue, 13 Jan 2015 05:52:56 -0000 Message-Id: <23dd8b2b41814bf3a9ecdb84bcde175c@git.apache.org> In-Reply-To: <1f0e45c860104f2eb3ff8d59401b6cf2@git.apache.org> References: <1f0e45c860104f2eb3ff8d59401b6cf2@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/3] cxf git commit: CXF-6192 Fixed the issue of CXF blueprint clustering CXF-6192 Fixed the issue of CXF blueprint clustering Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/67ec8299 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/67ec8299 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/67ec8299 Branch: refs/heads/3.0.x-fixes Commit: 67ec8299eea8956a6b2cf09ef64b6810a7af83b0 Parents: 088c68f Author: Willem Jiang Authored: Tue Jan 13 13:50:20 2015 +0800 Committer: Willem Jiang Committed: Tue Jan 13 13:51:19 2015 +0800 ---------------------------------------------------------------------- .../blueprint/ClusteringBPNamespaceHandler.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/67ec8299/rt/features/clustering/src/main/java/org/apache/cxf/clustering/blueprint/ClusteringBPNamespaceHandler.java ---------------------------------------------------------------------- diff --git a/rt/features/clustering/src/main/java/org/apache/cxf/clustering/blueprint/ClusteringBPNamespaceHandler.java b/rt/features/clustering/src/main/java/org/apache/cxf/clustering/blueprint/ClusteringBPNamespaceHandler.java index 8e67e51..a98aa9e 100644 --- a/rt/features/clustering/src/main/java/org/apache/cxf/clustering/blueprint/ClusteringBPNamespaceHandler.java +++ b/rt/features/clustering/src/main/java/org/apache/cxf/clustering/blueprint/ClusteringBPNamespaceHandler.java @@ -27,7 +27,7 @@ import org.w3c.dom.Node; import org.apache.aries.blueprint.NamespaceHandler; import org.apache.aries.blueprint.ParserContext; import org.apache.cxf.clustering.FailoverFeature; -import org.apache.cxf.clustering.LoadDistributorTargetSelector; +import org.apache.cxf.clustering.LoadDistributorFeature; import org.apache.cxf.configuration.blueprint.SimpleBPBeanDefinitionParser; import org.osgi.service.blueprint.reflect.ComponentMetadata; import org.osgi.service.blueprint.reflect.Metadata; @@ -36,22 +36,22 @@ public class ClusteringBPNamespaceHandler implements NamespaceHandler { public ComponentMetadata decorate(Node node, ComponentMetadata component, ParserContext context) { return null; } - + public Metadata parse(Element element, ParserContext context) { String s = element.getLocalName(); if ("failover".equals(s)) { return new SimpleBPBeanDefinitionParser(FailoverFeature.class).parse(element, context); } else if ("loadDistributor".equals(s)) { - return new SimpleBPBeanDefinitionParser(LoadDistributorTargetSelector.class).parse(element, context); + return new SimpleBPBeanDefinitionParser(LoadDistributorFeature.class).parse(element, context); } return null; } - + @SuppressWarnings("rawtypes") public Set getManagedClasses() { return null; } - + public URL getSchemaLocation(String namespace) { return getClass().getClassLoader().getResource("schemas/clustering.xsd"); }