Repository: cxf Updated Branches: refs/heads/master d2fc5e244 -> f823ad0f8
[CXF-6411] Adding namespace handler info to all of CXF Blueprint-aware modules Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/f823ad0f Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/f823ad0f Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/f823ad0f Branch: refs/heads/master Commit: f823ad0f878ebca2e35e52240851246302dbab26 Parents: d2fc5e2 Author: Sergey Beryozkin <[email protected]> Authored: Wed May 20 11:07:29 2015 +0100 Committer: Sergey Beryozkin <[email protected]> Committed: Wed May 20 11:07:29 2015 +0100 ---------------------------------------------------------------------- rt/features/clustering/pom.xml | 6 ++++++ .../blueprint/ClusteringBPNamespaceHandler.java | 2 ++ .../main/resources/META-INF/blueprint.handlers | 22 ++++++++++++++++++++ rt/frontend/simple/pom.xml | 6 ++++++ .../blueprint/SimpleBPNamespaceHandler.java | 5 ++--- .../main/resources/META-INF/blueprint.handlers | 22 ++++++++++++++++++++ rt/rs/client/pom.xml | 6 ++++++ .../blueprint/JAXRSBPNamespaceHandler.java | 5 ++--- .../main/resources/META-INF/blueprint.handlers | 22 ++++++++++++++++++++ rt/transports/http-jetty/pom.xml | 6 ++++++ .../HTTPJettyTransportNamespaceHandler.java | 2 ++ .../main/resources/META-INF/blueprint.handlers | 22 ++++++++++++++++++++ rt/transports/http-netty/netty-server/pom.xml | 6 ++++++ .../HttpNettyTransportNamespaceHandler.java | 2 ++ .../main/resources/META-INF/blueprint.handlers | 22 ++++++++++++++++++++ rt/transports/http/pom.xml | 6 ++++++ .../transport/http/blueprint/HttpBPHandler.java | 9 ++------ .../main/resources/META-INF/blueprint.handlers | 22 ++++++++++++++++++++ 18 files changed, 180 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/f823ad0f/rt/features/clustering/pom.xml ---------------------------------------------------------------------- diff --git a/rt/features/clustering/pom.xml b/rt/features/clustering/pom.xml index 8dfa8ab..cc45ccb 100644 --- a/rt/features/clustering/pom.xml +++ b/rt/features/clustering/pom.xml @@ -68,6 +68,12 @@ <optional>true</optional> </dependency> <dependency> + <groupId>org.apache.aries.blueprint</groupId> + <artifactId>blueprint-parser</artifactId> + <scope>provided</scope> + <optional>true</optional> + </dependency> + <dependency> <groupId>org.springframework</groupId> <artifactId>spring-core</artifactId> <scope>provided</scope> http://git-wip-us.apache.org/repos/asf/cxf/blob/f823ad0f/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 a98aa9e..336d0ff 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 @@ -25,6 +25,7 @@ import org.w3c.dom.Element; import org.w3c.dom.Node; import org.apache.aries.blueprint.NamespaceHandler; +import org.apache.aries.blueprint.Namespaces; import org.apache.aries.blueprint.ParserContext; import org.apache.cxf.clustering.FailoverFeature; import org.apache.cxf.clustering.LoadDistributorFeature; @@ -32,6 +33,7 @@ import org.apache.cxf.configuration.blueprint.SimpleBPBeanDefinitionParser; import org.osgi.service.blueprint.reflect.ComponentMetadata; import org.osgi.service.blueprint.reflect.Metadata; +@Namespaces("http://cxf.apache.org/clustering";) public class ClusteringBPNamespaceHandler implements NamespaceHandler { public ComponentMetadata decorate(Node node, ComponentMetadata component, ParserContext context) { return null; http://git-wip-us.apache.org/repos/asf/cxf/blob/f823ad0f/rt/features/clustering/src/main/resources/META-INF/blueprint.handlers ---------------------------------------------------------------------- diff --git a/rt/features/clustering/src/main/resources/META-INF/blueprint.handlers b/rt/features/clustering/src/main/resources/META-INF/blueprint.handlers new file mode 100644 index 0000000..e591689 --- /dev/null +++ b/rt/features/clustering/src/main/resources/META-INF/blueprint.handlers @@ -0,0 +1,22 @@ +# +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# +org.apache.cxf.clustering.blueprint.ClusteringBPNamespaceHandler + http://git-wip-us.apache.org/repos/asf/cxf/blob/f823ad0f/rt/frontend/simple/pom.xml ---------------------------------------------------------------------- diff --git a/rt/frontend/simple/pom.xml b/rt/frontend/simple/pom.xml index 53663e3..7c26dfd 100644 --- a/rt/frontend/simple/pom.xml +++ b/rt/frontend/simple/pom.xml @@ -64,6 +64,12 @@ <optional>true</optional> </dependency> <dependency> + <groupId>org.apache.aries.blueprint</groupId> + <artifactId>blueprint-parser</artifactId> + <scope>provided</scope> + <optional>true</optional> + </dependency> + <dependency> <groupId>org.osgi</groupId> <artifactId>org.osgi.core</artifactId> </dependency> http://git-wip-us.apache.org/repos/asf/cxf/blob/f823ad0f/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/blueprint/SimpleBPNamespaceHandler.java ---------------------------------------------------------------------- diff --git a/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/blueprint/SimpleBPNamespaceHandler.java b/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/blueprint/SimpleBPNamespaceHandler.java index 356f596..0986896 100644 --- a/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/blueprint/SimpleBPNamespaceHandler.java +++ b/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/blueprint/SimpleBPNamespaceHandler.java @@ -26,14 +26,13 @@ import org.w3c.dom.Element; import org.w3c.dom.Node; import org.apache.aries.blueprint.NamespaceHandler; +import org.apache.aries.blueprint.Namespaces; import org.apache.aries.blueprint.ParserContext; import org.osgi.service.blueprint.container.BlueprintContainer; import org.osgi.service.blueprint.reflect.ComponentMetadata; import org.osgi.service.blueprint.reflect.Metadata; -/** - * - */ +@Namespaces("http://cxf.apache.org/blueprint/simple";) public class SimpleBPNamespaceHandler implements NamespaceHandler { private BlueprintContainer blueprintContainer; http://git-wip-us.apache.org/repos/asf/cxf/blob/f823ad0f/rt/frontend/simple/src/main/resources/META-INF/blueprint.handlers ---------------------------------------------------------------------- diff --git a/rt/frontend/simple/src/main/resources/META-INF/blueprint.handlers b/rt/frontend/simple/src/main/resources/META-INF/blueprint.handlers new file mode 100644 index 0000000..83728cb --- /dev/null +++ b/rt/frontend/simple/src/main/resources/META-INF/blueprint.handlers @@ -0,0 +1,22 @@ +# +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# +org.apache.cxf.frontend.blueprint.SimpleBPNamespaceHandler + http://git-wip-us.apache.org/repos/asf/cxf/blob/f823ad0f/rt/rs/client/pom.xml ---------------------------------------------------------------------- diff --git a/rt/rs/client/pom.xml b/rt/rs/client/pom.xml index dff449f..9cf6487 100644 --- a/rt/rs/client/pom.xml +++ b/rt/rs/client/pom.xml @@ -48,6 +48,12 @@ <optional>true</optional> </dependency> <dependency> + <groupId>org.apache.aries.blueprint</groupId> + <artifactId>blueprint-parser</artifactId> + <scope>provided</scope> + <optional>true</optional> + </dependency> + <dependency> <groupId>org.osgi</groupId> <artifactId>org.osgi.core</artifactId> </dependency> http://git-wip-us.apache.org/repos/asf/cxf/blob/f823ad0f/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/blueprint/JAXRSBPNamespaceHandler.java ---------------------------------------------------------------------- diff --git a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/blueprint/JAXRSBPNamespaceHandler.java b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/blueprint/JAXRSBPNamespaceHandler.java index f3b670b..d32fbe1 100644 --- a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/blueprint/JAXRSBPNamespaceHandler.java +++ b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/blueprint/JAXRSBPNamespaceHandler.java @@ -26,14 +26,13 @@ import org.w3c.dom.Element; import org.w3c.dom.Node; import org.apache.aries.blueprint.NamespaceHandler; +import org.apache.aries.blueprint.Namespaces; import org.apache.aries.blueprint.ParserContext; import org.osgi.service.blueprint.container.BlueprintContainer; import org.osgi.service.blueprint.reflect.ComponentMetadata; import org.osgi.service.blueprint.reflect.Metadata; -/** - * - */ +@Namespaces("http://cxf.apache.org/blueprint/jaxrs-client";) public class JAXRSBPNamespaceHandler implements NamespaceHandler { private BlueprintContainer blueprintContainer; http://git-wip-us.apache.org/repos/asf/cxf/blob/f823ad0f/rt/rs/client/src/main/resources/META-INF/blueprint.handlers ---------------------------------------------------------------------- diff --git a/rt/rs/client/src/main/resources/META-INF/blueprint.handlers b/rt/rs/client/src/main/resources/META-INF/blueprint.handlers new file mode 100644 index 0000000..89e4c0d --- /dev/null +++ b/rt/rs/client/src/main/resources/META-INF/blueprint.handlers @@ -0,0 +1,22 @@ +# +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# +org.apache.cxf.jaxrs.client.blueprint.JAXRSBPNamespaceHandler + http://git-wip-us.apache.org/repos/asf/cxf/blob/f823ad0f/rt/transports/http-jetty/pom.xml ---------------------------------------------------------------------- diff --git a/rt/transports/http-jetty/pom.xml b/rt/transports/http-jetty/pom.xml index 96ee2ec..58d5d34 100644 --- a/rt/transports/http-jetty/pom.xml +++ b/rt/transports/http-jetty/pom.xml @@ -54,6 +54,12 @@ <optional>true</optional> </dependency> <dependency> + <groupId>org.apache.aries.blueprint</groupId> + <artifactId>blueprint-parser</artifactId> + <scope>provided</scope> + <optional>true</optional> + </dependency> + <dependency> <groupId>org.osgi</groupId> <artifactId>org.osgi.core</artifactId> <scope>provided</scope> http://git-wip-us.apache.org/repos/asf/cxf/blob/f823ad0f/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/blueprint/HTTPJettyTransportNamespaceHandler.java ---------------------------------------------------------------------- diff --git a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/blueprint/HTTPJettyTransportNamespaceHandler.java b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/blueprint/HTTPJettyTransportNamespaceHandler.java index d03d25d..98b3f1a 100644 --- a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/blueprint/HTTPJettyTransportNamespaceHandler.java +++ b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/blueprint/HTTPJettyTransportNamespaceHandler.java @@ -26,11 +26,13 @@ import org.w3c.dom.Element; import org.w3c.dom.Node; import org.apache.aries.blueprint.NamespaceHandler; +import org.apache.aries.blueprint.Namespaces; import org.apache.aries.blueprint.ParserContext; import org.apache.cxf.common.logging.LogUtils; import org.osgi.service.blueprint.reflect.ComponentMetadata; import org.osgi.service.blueprint.reflect.Metadata; +@Namespaces("http://cxf.apache.org/transports/http-jetty/configuration";) public class HTTPJettyTransportNamespaceHandler implements NamespaceHandler { public static final String JETTY_TRANSPORT = "http://cxf.apache.org/transports/http-jetty/configuration";; http://git-wip-us.apache.org/repos/asf/cxf/blob/f823ad0f/rt/transports/http-jetty/src/main/resources/META-INF/blueprint.handlers ---------------------------------------------------------------------- diff --git a/rt/transports/http-jetty/src/main/resources/META-INF/blueprint.handlers b/rt/transports/http-jetty/src/main/resources/META-INF/blueprint.handlers new file mode 100644 index 0000000..248b293 --- /dev/null +++ b/rt/transports/http-jetty/src/main/resources/META-INF/blueprint.handlers @@ -0,0 +1,22 @@ +# +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# +org.apache.cxf.transport.http_jetty.blueprint.HTTPJettyTransportNamespaceHandler + http://git-wip-us.apache.org/repos/asf/cxf/blob/f823ad0f/rt/transports/http-netty/netty-server/pom.xml ---------------------------------------------------------------------- diff --git a/rt/transports/http-netty/netty-server/pom.xml b/rt/transports/http-netty/netty-server/pom.xml index dd925cf..0b10b2b 100644 --- a/rt/transports/http-netty/netty-server/pom.xml +++ b/rt/transports/http-netty/netty-server/pom.xml @@ -69,6 +69,12 @@ <optional>true</optional> </dependency> <dependency> + <groupId>org.apache.aries.blueprint</groupId> + <artifactId>blueprint-parser</artifactId> + <scope>provided</scope> + <optional>true</optional> + </dependency> + <dependency> <groupId>org.osgi</groupId> <artifactId>org.osgi.core</artifactId> <scope>provided</scope> http://git-wip-us.apache.org/repos/asf/cxf/blob/f823ad0f/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/blueprint/HttpNettyTransportNamespaceHandler.java ---------------------------------------------------------------------- diff --git a/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/blueprint/HttpNettyTransportNamespaceHandler.java b/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/blueprint/HttpNettyTransportNamespaceHandler.java index a1be0fc..53bb0b7 100644 --- a/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/blueprint/HttpNettyTransportNamespaceHandler.java +++ b/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/blueprint/HttpNettyTransportNamespaceHandler.java @@ -26,11 +26,13 @@ import org.w3c.dom.Element; import org.w3c.dom.Node; import org.apache.aries.blueprint.NamespaceHandler; +import org.apache.aries.blueprint.Namespaces; import org.apache.aries.blueprint.ParserContext; import org.apache.cxf.common.logging.LogUtils; import org.osgi.service.blueprint.reflect.ComponentMetadata; import org.osgi.service.blueprint.reflect.Metadata; +@Namespaces("http://cxf.apache.org/transports/http-netty-server/configuration";) public class HttpNettyTransportNamespaceHandler implements NamespaceHandler { public static final String NETTY_SERVER_TRANSPORT = http://git-wip-us.apache.org/repos/asf/cxf/blob/f823ad0f/rt/transports/http-netty/netty-server/src/main/resources/META-INF/blueprint.handlers ---------------------------------------------------------------------- diff --git a/rt/transports/http-netty/netty-server/src/main/resources/META-INF/blueprint.handlers b/rt/transports/http-netty/netty-server/src/main/resources/META-INF/blueprint.handlers new file mode 100644 index 0000000..4457c37 --- /dev/null +++ b/rt/transports/http-netty/netty-server/src/main/resources/META-INF/blueprint.handlers @@ -0,0 +1,22 @@ +# +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# +org.apache.cxf.transport.http.netty.server.blueprint.HttpNettyTransportNamespaceHandler + http://git-wip-us.apache.org/repos/asf/cxf/blob/f823ad0f/rt/transports/http/pom.xml ---------------------------------------------------------------------- diff --git a/rt/transports/http/pom.xml b/rt/transports/http/pom.xml index dc03c69..f8e02a3 100644 --- a/rt/transports/http/pom.xml +++ b/rt/transports/http/pom.xml @@ -108,6 +108,12 @@ <optional>true</optional> </dependency> <dependency> + <groupId>org.apache.aries.blueprint</groupId> + <artifactId>blueprint-parser</artifactId> + <scope>provided</scope> + <optional>true</optional> + </dependency> + <dependency> <groupId>org.slf4j</groupId> <artifactId>jcl-over-slf4j</artifactId> <scope>test</scope> http://git-wip-us.apache.org/repos/asf/cxf/blob/f823ad0f/rt/transports/http/src/main/java/org/apache/cxf/transport/http/blueprint/HttpBPHandler.java ---------------------------------------------------------------------- diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/blueprint/HttpBPHandler.java b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/blueprint/HttpBPHandler.java index 61abd0f..2cfe3fd 100755 --- a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/blueprint/HttpBPHandler.java +++ b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/blueprint/HttpBPHandler.java @@ -26,17 +26,12 @@ import org.w3c.dom.Element; import org.w3c.dom.Node; import org.apache.aries.blueprint.NamespaceHandler; -//import org.apache.aries.blueprint.ParserContext; -//import org.osgi.service.blueprint.container.BlueprintContainer; -//import org.osgi.service.blueprint.reflect.ComponentMetadata; -//import org.osgi.service.blueprint.reflect.Metadata; +import org.apache.aries.blueprint.Namespaces; import org.apache.aries.blueprint.ParserContext; import org.osgi.service.blueprint.reflect.ComponentMetadata; import org.osgi.service.blueprint.reflect.Metadata; -/** - * - */ +@Namespaces("http://cxf.apache.org/transports/http/configuration";) public class HttpBPHandler implements NamespaceHandler { public HttpBPHandler() { http://git-wip-us.apache.org/repos/asf/cxf/blob/f823ad0f/rt/transports/http/src/main/resources/META-INF/blueprint.handlers ---------------------------------------------------------------------- diff --git a/rt/transports/http/src/main/resources/META-INF/blueprint.handlers b/rt/transports/http/src/main/resources/META-INF/blueprint.handlers new file mode 100644 index 0000000..c904086 --- /dev/null +++ b/rt/transports/http/src/main/resources/META-INF/blueprint.handlers @@ -0,0 +1,22 @@ +# +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# +org.apache.cxf.transport.http.blueprint.HttpBPHandler +
