Author: cschneider
Date: Fri Jan 10 14:00:52 2014
New Revision: 1557123
URL: http://svn.apache.org/r1557123
Log:
CXF-4736 Switching the rest of the bundles to use activator for blueprint
namespaces
Added:
cxf/trunk/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/blueprint/Activator.java
cxf/trunk/rt/bindings/object/src/main/java/org/apache/cxf/binding/object/blueprint/Activator.java
cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/blueprint/Activator.java
cxf/trunk/rt/features/clustering/src/main/java/org/apache/cxf/clustering/blueprint/Activator.java
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/blueprint/Activator.java
cxf/trunk/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/blueprint/Activator.java
cxf/trunk/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/blueprint/Activator.java
cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/blueprint/Activator.java
cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/blueprint/Activator.java
cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/blueprint/Activator.java
Removed:
cxf/trunk/rt/bindings/coloc/src/main/resources/OSGI-INF/
cxf/trunk/rt/bindings/object/src/main/resources/OSGI-INF/
cxf/trunk/rt/bindings/soap/src/main/resources/OSGI-INF/
cxf/trunk/rt/frontend/jaxrs/src/main/resources/OSGI-INF/
cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/osgi/
cxf/trunk/rt/rs/client/src/main/resources/OSGI-INF/
cxf/trunk/rt/transports/http-jetty/src/main/resources/OSGI-INF/
cxf/trunk/rt/transports/http-netty/netty-server/src/main/resources/OSGI-INF/
cxf/trunk/rt/transports/http/src/main/resources/OSGI-INF/blueprint/cxf-http.xml
cxf/trunk/rt/ws/addr/src/main/resources/OSGI-INF/
cxf/trunk/rt/ws/policy/src/main/resources/OSGI-INF/
cxf/trunk/rt/ws/rm/src/main/resources/OSGI-INF/
Modified:
cxf/trunk/core/pom.xml
cxf/trunk/osgi/itests-felix/src/test/java/org/apache/cxf/osgi/itests/NoAriesBlueprintTest.java
cxf/trunk/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/BundlesAndNamespacesTest.java
cxf/trunk/parent/pom.xml
cxf/trunk/rt/bindings/coloc/pom.xml
cxf/trunk/rt/bindings/object/pom.xml
cxf/trunk/rt/bindings/soap/pom.xml
cxf/trunk/rt/features/clustering/pom.xml
cxf/trunk/rt/frontend/jaxrs/pom.xml
cxf/trunk/rt/frontend/jaxws/pom.xml
cxf/trunk/rt/frontend/simple/pom.xml
cxf/trunk/rt/rs/client/pom.xml
cxf/trunk/rt/transports/http-jetty/pom.xml
cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/osgi/HTTPJettyTransportActivator.java
cxf/trunk/rt/transports/http-netty/netty-server/pom.xml
cxf/trunk/rt/transports/http/pom.xml
cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/osgi/HTTPTransportActivator.java
cxf/trunk/rt/ws/addr/pom.xml
cxf/trunk/rt/ws/policy/pom.xml
cxf/trunk/rt/ws/rm/pom.xml
Modified: cxf/trunk/core/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/core/pom.xml?rev=1557123&r1=1557122&r2=1557123&view=diff
==============================================================================
--- cxf/trunk/core/pom.xml (original)
+++ cxf/trunk/core/pom.xml Fri Jan 10 14:00:52 2014
@@ -61,6 +61,14 @@
<cxf.osgi.dynamic.import>
org.apache.cxf.bus,org.apache.cxf.*,com.ctc.wstx.*
</cxf.osgi.dynamic.import>
+ <!-- keep in sync with services exported in activator -->
+ <cxf.export.service>
+
org.apache.aries.blueprint.NamespaceHandler;osgi.service.blueprint.namespace="http://cxf.apache.org/blueprint/core";,
+
org.apache.aries.blueprint.NamespaceHandler;osgi.service.blueprint.namespace="http://cxf.apache.org/configuration/beans";,
+
org.apache.aries.blueprint.NamespaceHandler;osgi.service.blueprint.namespace="http://cxf.apache.org/configuration/parameterized-types";,
+
org.apache.aries.blueprint.NamespaceHandler;osgi.service.blueprint.namespace="http://cxf.apache.org/configuration/security";
+
org.apache.aries.blueprint.NamespaceHandler;osgi.service.blueprint.namespace="http://schemas.xmlsoap.org/wsdl/";,
+ </cxf.export.service>
</properties>
<dependencies>
<dependency>
@@ -338,6 +346,9 @@
<DynamicImport-Package>
${cxf.osgi.dynamic.import}
</DynamicImport-Package>
+ <Export-Service>
+ ${cxf.export.service}
+ </Export-Service>
<Bundle-Activator>${cxf.bundle.activator}</Bundle-Activator>
</instructions>
</configuration>
Modified:
cxf/trunk/osgi/itests-felix/src/test/java/org/apache/cxf/osgi/itests/NoAriesBlueprintTest.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/osgi/itests-felix/src/test/java/org/apache/cxf/osgi/itests/NoAriesBlueprintTest.java?rev=1557123&r1=1557122&r2=1557123&view=diff
==============================================================================
---
cxf/trunk/osgi/itests-felix/src/test/java/org/apache/cxf/osgi/itests/NoAriesBlueprintTest.java
(original)
+++
cxf/trunk/osgi/itests-felix/src/test/java/org/apache/cxf/osgi/itests/NoAriesBlueprintTest.java
Fri Jan 10 14:00:52 2014
@@ -40,6 +40,7 @@ public class NoAriesBlueprintTest extend
@Test
public void testCXFBundles() throws Exception {
assertBundleStarted("org.apache.cxf.cxf-core");
+ assertBundleStarted("org.apache.cxf.cxf-rt-frontend-simple");
assertBundleStarted("org.apache.cxf.cxf-rt-frontend-jaxws");
}
Modified:
cxf/trunk/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/BundlesAndNamespacesTest.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/BundlesAndNamespacesTest.java?rev=1557123&r1=1557122&r2=1557123&view=diff
==============================================================================
---
cxf/trunk/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/BundlesAndNamespacesTest.java
(original)
+++
cxf/trunk/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/BundlesAndNamespacesTest.java
Fri Jan 10 14:00:52 2014
@@ -45,6 +45,7 @@ public class BundlesAndNamespacesTest ex
assertBundleStarted("org.apache.cxf.cxf-rt-frontend-jaxws");
assertBlueprintNamespacePublished("http://cxf.apache.org/blueprint/jaxws";,
1000);
+
assertBlueprintNamespacePublished("http://cxf.apache.org/blueprint/simple";,
1000);
}
@Configuration
Modified: cxf/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/parent/pom.xml?rev=1557123&r1=1557122&r2=1557123&view=diff
==============================================================================
--- cxf/trunk/parent/pom.xml (original)
+++ cxf/trunk/parent/pom.xml Fri Jan 10 14:00:52 2014
@@ -497,6 +497,9 @@
<DynamicImport-Package>
${cxf.osgi.dynamic.import}
</DynamicImport-Package>
+ <Export-Service>
+ ${cxf.export.service}
+ </Export-Service>
<Bundle-Activator>${cxf.bundle.activator}</Bundle-Activator>
</instructions>
</configuration>
Modified: cxf/trunk/rt/bindings/coloc/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/coloc/pom.xml?rev=1557123&r1=1557122&r2=1557123&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/coloc/pom.xml (original)
+++ cxf/trunk/rt/bindings/coloc/pom.xml Fri Jan 10 14:00:52 2014
@@ -34,8 +34,13 @@
<properties>
<cxf.osgi.import>
org.springframework*;resolution:=optional;version="${cxf.osgi.spring.version}",
- org.apache.aries*;version="${cxf.aries.version.range}"
+
org.apache.aries*;version="${cxf.aries.version.range}";resolution:=optional
</cxf.osgi.import>
+
<cxf.bundle.activator>org.apache.cxf.binding.coloc.blueprint.Activator</cxf.bundle.activator>
+ <!-- keep in sync with services exported in activator -->
+ <cxf.export.service>
+
org.apache.aries.blueprint.NamespaceHandler;osgi.service.blueprint.namespace="http://cxf.apache.org/binding/coloc";
+ </cxf.export.service>
</properties>
<dependencies>
<dependency>
Added:
cxf/trunk/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/blueprint/Activator.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/blueprint/Activator.java?rev=1557123&view=auto
==============================================================================
---
cxf/trunk/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/blueprint/Activator.java
(added)
+++
cxf/trunk/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/blueprint/Activator.java
Fri Jan 10 14:00:52 2014
@@ -0,0 +1,46 @@
+/**
+ * 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.
+ */
+
+package org.apache.cxf.binding.coloc.blueprint;
+
+import org.apache.cxf.bus.blueprint.BlueprintNameSpaceHandlerFactory;
+import org.apache.cxf.bus.blueprint.NamespaceHandlerRegisterer;
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+
+public class Activator implements BundleActivator {
+
+ @Override
+ public void start(BundleContext context) throws Exception {
+ BlueprintNameSpaceHandlerFactory factory = new
BlueprintNameSpaceHandlerFactory() {
+
+ @Override
+ public Object createNamespaceHandler() {
+ return new ColocBPNamespaceHandler();
+ }
+ };
+ NamespaceHandlerRegisterer.register(context, factory,
+
"http://cxf.apache.org/binding/coloc";);
+ }
+
+ @Override
+ public void stop(BundleContext context) throws Exception {
+ }
+
+}
Modified: cxf/trunk/rt/bindings/object/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/object/pom.xml?rev=1557123&r1=1557122&r2=1557123&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/object/pom.xml (original)
+++ cxf/trunk/rt/bindings/object/pom.xml Fri Jan 10 14:00:52 2014
@@ -33,8 +33,13 @@
<properties>
<cxf.osgi.import>
org.springframework*;resolution:=optional;version="${cxf.osgi.spring.version}",
- org.apache.aries*;version="${cxf.aries.version.range}"
+
org.apache.aries*;version="${cxf.aries.version.range}";resolution:=optional
</cxf.osgi.import>
+
<cxf.bundle.activator>org.apache.cxf.binding.object.blueprint.Activator</cxf.bundle.activator>
+ <!-- keep in sync with services exported in activator -->
+ <cxf.export.service>
+
org.apache.aries.blueprint.NamespaceHandler;osgi.service.blueprint.namespace="http://cxf.apache.org/blueprint/binding/object";
+ </cxf.export.service>
</properties>
<dependencies>
<dependency>
Added:
cxf/trunk/rt/bindings/object/src/main/java/org/apache/cxf/binding/object/blueprint/Activator.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/object/src/main/java/org/apache/cxf/binding/object/blueprint/Activator.java?rev=1557123&view=auto
==============================================================================
---
cxf/trunk/rt/bindings/object/src/main/java/org/apache/cxf/binding/object/blueprint/Activator.java
(added)
+++
cxf/trunk/rt/bindings/object/src/main/java/org/apache/cxf/binding/object/blueprint/Activator.java
Fri Jan 10 14:00:52 2014
@@ -0,0 +1,46 @@
+/**
+ * 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.
+ */
+
+package org.apache.cxf.binding.object.blueprint;
+
+import org.apache.cxf.bus.blueprint.BlueprintNameSpaceHandlerFactory;
+import org.apache.cxf.bus.blueprint.NamespaceHandlerRegisterer;
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+
+public class Activator implements BundleActivator {
+
+ @Override
+ public void start(BundleContext context) throws Exception {
+ BlueprintNameSpaceHandlerFactory factory = new
BlueprintNameSpaceHandlerFactory() {
+
+ @Override
+ public Object createNamespaceHandler() {
+ return new ObjectBindingBPHandler();
+ }
+ };
+ NamespaceHandlerRegisterer.register(context, factory,
+
"http://cxf.apache.org/blueprint/binding/object";);
+ }
+
+ @Override
+ public void stop(BundleContext context) throws Exception {
+ }
+
+}
Modified: cxf/trunk/rt/bindings/soap/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/soap/pom.xml?rev=1557123&r1=1557122&r2=1557123&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/soap/pom.xml (original)
+++ cxf/trunk/rt/bindings/soap/pom.xml Fri Jan 10 14:00:52 2014
@@ -32,9 +32,14 @@
</parent>
<properties>
<cxf.osgi.import>
- org.apache.aries*;version="${cxf.aries.version.range}",
+
org.apache.aries*;version="${cxf.aries.version.range}";resolution:=optional,
org.springframework*;resolution:="optional";version="${cxf.osgi.spring.version}"
</cxf.osgi.import>
+
<cxf.bundle.activator>org.apache.cxf.binding.soap.blueprint.Activator</cxf.bundle.activator>
+ <!-- keep in sync with services exported in activator -->
+ <cxf.export.service>
+
org.apache.aries.blueprint.NamespaceHandler;osgi.service.blueprint.namespace="http://cxf.apache.org/blueprint/bindings/soap";
+ </cxf.export.service>
</properties>
<dependencies>
<dependency>
Added:
cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/blueprint/Activator.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/blueprint/Activator.java?rev=1557123&view=auto
==============================================================================
---
cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/blueprint/Activator.java
(added)
+++
cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/blueprint/Activator.java
Fri Jan 10 14:00:52 2014
@@ -0,0 +1,45 @@
+/**
+ * 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.
+ */
+
+package org.apache.cxf.binding.soap.blueprint;
+
+import org.apache.cxf.bus.blueprint.BlueprintNameSpaceHandlerFactory;
+import org.apache.cxf.bus.blueprint.NamespaceHandlerRegisterer;
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+
+public class Activator implements BundleActivator {
+
+ @Override
+ public void start(BundleContext context) throws Exception {
+ BlueprintNameSpaceHandlerFactory factory = new
BlueprintNameSpaceHandlerFactory() {
+ @Override
+ public Object createNamespaceHandler() {
+ return new SoapBindingBPHandler();
+ }
+ };
+ NamespaceHandlerRegisterer.register(context, factory ,
+
"http://cxf.apache.org/blueprint/bindings/soap";);
+ }
+
+ @Override
+ public void stop(BundleContext context) throws Exception {
+ }
+
+}
Modified: cxf/trunk/rt/features/clustering/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/features/clustering/pom.xml?rev=1557123&r1=1557122&r2=1557123&view=diff
==============================================================================
--- cxf/trunk/rt/features/clustering/pom.xml (original)
+++ cxf/trunk/rt/features/clustering/pom.xml Fri Jan 10 14:00:52 2014
@@ -31,10 +31,15 @@
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
<properties>
+
<cxf.bundle.activator>org.apache.cxf.clustering.blueprint.Activator</cxf.bundle.activator>
<cxf.osgi.import>
- org.apache.aries*;version="${cxf.aries.version.range}",
+
org.apache.aries*;version="${cxf.aries.version.range}";resolution:=optional,
org.springframework*;resolution:="optional";version="${cxf.osgi.spring.version}"
</cxf.osgi.import>
+ <!-- keep in sync with services exported in activator -->
+ <cxf.export.service>
+
org.apache.aries.blueprint.NamespaceHandler;osgi.service.blueprint.namespace="http://cxf.apache.org/clustering";
+ </cxf.export.service>
</properties>
<dependencies>
<dependency>
@@ -53,6 +58,10 @@
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.core</artifactId>
<scope>provided</scope>
Added:
cxf/trunk/rt/features/clustering/src/main/java/org/apache/cxf/clustering/blueprint/Activator.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/features/clustering/src/main/java/org/apache/cxf/clustering/blueprint/Activator.java?rev=1557123&view=auto
==============================================================================
---
cxf/trunk/rt/features/clustering/src/main/java/org/apache/cxf/clustering/blueprint/Activator.java
(added)
+++
cxf/trunk/rt/features/clustering/src/main/java/org/apache/cxf/clustering/blueprint/Activator.java
Fri Jan 10 14:00:52 2014
@@ -0,0 +1,46 @@
+/**
+ * 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.
+ */
+package org.apache.cxf.clustering.blueprint;
+
+import org.apache.cxf.bus.blueprint.BlueprintNameSpaceHandlerFactory;
+import org.apache.cxf.bus.blueprint.NamespaceHandlerRegisterer;
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+
+public class Activator implements BundleActivator {
+
+ @Override
+ public void start(BundleContext context) throws Exception {
+ BlueprintNameSpaceHandlerFactory factory = new
BlueprintNameSpaceHandlerFactory() {
+ @Override
+ public Object createNamespaceHandler() {
+ return new ClusteringBPNamespaceHandler();
+ }
+ };
+ NamespaceHandlerRegisterer.register(context, factory ,
+
"http://cxf.apache.org/clustering";);
+
+ }
+
+ @Override
+ public void stop(BundleContext context) throws Exception {
+
+ }
+
+}
Modified: cxf/trunk/rt/frontend/jaxrs/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/pom.xml?rev=1557123&r1=1557122&r2=1557123&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/pom.xml (original)
+++ cxf/trunk/rt/frontend/jaxrs/pom.xml Fri Jan 10 14:00:52 2014
@@ -33,7 +33,7 @@
<properties>
<cxf.osgi.import>
javax.servlet*;version="${cxf.osgi.javax.servlet.version}",
- org.apache.aries*;version="${cxf.aries.version.range}",
+
org.apache.aries*;version="${cxf.aries.version.range}";resolution:=optional,
org.springframework*;resolution:="optional";version="${cxf.osgi.spring.version}",
javax.validation*;resolution:=optional;version="${cxf.validation.api.version}",
javax.ws.rs.client;version="[2.0,3)",
@@ -42,6 +42,11 @@
<cxf.osgi.export>
org.apache.cxf.jaxrs*
</cxf.osgi.export>
+
<cxf.bundle.activator>org.apache.cxf.jaxrs.blueprint.Activator</cxf.bundle.activator>
+ <!-- keep in sync with services exported in activator -->
+ <cxf.export.service>
+
org.apache.aries.blueprint.NamespaceHandler;osgi.service.blueprint.namespace="http://cxf.apache.org/blueprint/jaxrs";
+ </cxf.export.service>
</properties>
<dependencies>
<dependency>
Added:
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/blueprint/Activator.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/blueprint/Activator.java?rev=1557123&view=auto
==============================================================================
---
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/blueprint/Activator.java
(added)
+++
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/blueprint/Activator.java
Fri Jan 10 14:00:52 2014
@@ -0,0 +1,46 @@
+/**
+ * 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.
+ */
+package org.apache.cxf.jaxrs.blueprint;
+
+import org.apache.cxf.bus.blueprint.BlueprintNameSpaceHandlerFactory;
+import org.apache.cxf.bus.blueprint.NamespaceHandlerRegisterer;
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+
+public class Activator implements BundleActivator {
+
+ @Override
+ public void start(BundleContext context) throws Exception {
+ BlueprintNameSpaceHandlerFactory factory = new
BlueprintNameSpaceHandlerFactory() {
+ @Override
+ public Object createNamespaceHandler() {
+ return new JAXRSBPNamespaceHandler();
+ }
+ };
+ NamespaceHandlerRegisterer.register(context, factory ,
+
"http://cxf.apache.org/blueprint/jaxrs";);
+
+ }
+
+ @Override
+ public void stop(BundleContext context) throws Exception {
+
+ }
+
+}
Modified: cxf/trunk/rt/frontend/jaxws/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/pom.xml?rev=1557123&r1=1557122&r2=1557123&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/pom.xml (original)
+++ cxf/trunk/rt/frontend/jaxws/pom.xml Fri Jan 10 14:00:52 2014
@@ -34,11 +34,15 @@
<cxf.spi-dir>spi-2.1</cxf.spi-dir>
<cxf.osgi.import>
javax.servlet*;version="${cxf.osgi.javax.servlet.version}",
- org.apache.aries*;version="${cxf.aries.version.range}",
+
org.apache.aries*;version="${cxf.aries.version.range}";resolution:=optional,
javax.xml.ws.spi.http;version="${cxf.osgi.javax.xml.ws.version}";resolution:="optional",
javax.xml.ws*;version="${cxf.osgi.javax.xml.ws.version}",
org.springframework*;resolution:="optional";version="${cxf.osgi.spring.version}"
</cxf.osgi.import>
+ <!-- keep in sync with services exported in activator -->
+ <cxf.export.service>
+
org.apache.aries.blueprint.NamespaceHandler;osgi.service.blueprint.namespace="http://cxf.apache.org/blueprint/jaxws";
+ </cxf.export.service>
<cxf.bundle.activator>org.apache.cxf.jaxws.blueprint.Activator</cxf.bundle.activator>
</properties>
<dependencies>
Modified: cxf/trunk/rt/frontend/simple/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/simple/pom.xml?rev=1557123&r1=1557122&r2=1557123&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/simple/pom.xml (original)
+++ cxf/trunk/rt/frontend/simple/pom.xml Fri Jan 10 14:00:52 2014
@@ -32,10 +32,15 @@
</parent>
<properties>
<cxf.osgi.import>
- org.apache.aries*;version="${cxf.aries.version.range}",
+
org.apache.aries*;version="${cxf.aries.version.range}";resolution:=optional,
com.sun.tools*;resolution:=optional,
org.springframework*;resolution:="optional";version="${cxf.osgi.spring.version}"
</cxf.osgi.import>
+ <!-- keep in sync with services exported in activator -->
+ <cxf.export.service>
+
org.apache.aries.blueprint.NamespaceHandler;osgi.service.blueprint.namespace="http://cxf.apache.org/blueprint/simple";
+ </cxf.export.service>
+
<cxf.bundle.activator>org.apache.cxf.frontend.blueprint.Activator</cxf.bundle.activator>
</properties>
<dependencies>
<dependency>
Modified: cxf/trunk/rt/rs/client/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/rs/client/pom.xml?rev=1557123&r1=1557122&r2=1557123&view=diff
==============================================================================
--- cxf/trunk/rt/rs/client/pom.xml (original)
+++ cxf/trunk/rt/rs/client/pom.xml Fri Jan 10 14:00:52 2014
@@ -32,9 +32,14 @@
</parent>
<properties>
<cxf.osgi.import>
- org.apache.aries*;version="${cxf.aries.version.range}",
+
org.apache.aries*;version="${cxf.aries.version.range}";resolution:=optional,
org.springframework*;resolution:="optional";version="${cxf.osgi.spring.version}"
</cxf.osgi.import>
+ <!-- keep in sync with services exported in activator -->
+ <cxf.export.service>
+
org.apache.aries.blueprint.NamespaceHandler;osgi.service.blueprint.namespace="http://cxf.apache.org/blueprint/jaxrs-client";
+ </cxf.export.service>
+
<cxf.bundle.activator>org.apache.cxf.jaxrs.client.blueprint.Activator</cxf.bundle.activator>
</properties>
<dependencies>
<dependency>
Added:
cxf/trunk/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/blueprint/Activator.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/blueprint/Activator.java?rev=1557123&view=auto
==============================================================================
---
cxf/trunk/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/blueprint/Activator.java
(added)
+++
cxf/trunk/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/blueprint/Activator.java
Fri Jan 10 14:00:52 2014
@@ -0,0 +1,48 @@
+/**
+ * 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.
+ */
+
+package org.apache.cxf.jaxrs.client.blueprint;
+
+import org.apache.cxf.bus.blueprint.BlueprintNameSpaceHandlerFactory;
+import org.apache.cxf.bus.blueprint.NamespaceHandlerRegisterer;
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+
+/**
+ * Registers blueprint namespace handler
+ */
+public class Activator implements BundleActivator {
+
+ @Override
+ public void start(BundleContext context) throws Exception {
+ BlueprintNameSpaceHandlerFactory factory = new
BlueprintNameSpaceHandlerFactory() {
+ @Override
+ public Object createNamespaceHandler() {
+ return new
org.apache.cxf.jaxrs.client.blueprint.JAXRSBPNamespaceHandler();
+ }
+ };
+ NamespaceHandlerRegisterer.register(context, factory ,
+
"http://cxf.apache.org/blueprint/jaxrs-client";);
+ }
+
+ @Override
+ public void stop(BundleContext context) throws Exception {
+ }
+
+}
Modified: cxf/trunk/rt/transports/http-jetty/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http-jetty/pom.xml?rev=1557123&r1=1557122&r2=1557123&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http-jetty/pom.xml (original)
+++ cxf/trunk/rt/transports/http-jetty/pom.xml Fri Jan 10 14:00:52 2014
@@ -35,12 +35,16 @@
<cxf.osgi.import>
javax.servlet*;version="${cxf.osgi.javax.servlet.version}",
org.eclipse.jetty*;version="${cxf.jetty.osgi.version}",
- org.apache.aries*;version="${cxf.aries.version.range}",
+
org.apache.aries*;version="${cxf.aries.version.range}";resolution:=optional,
org.springframework*;resolution:="optional";version="${cxf.osgi.spring.version}"
</cxf.osgi.import>
<cxf.osgi.dynamic.import>
org.eclipse.jetty.jmx
</cxf.osgi.dynamic.import>
+ <!-- keep in sync with services exported in activator -->
+ <cxf.export.service>
+
org.apache.aries.blueprint.NamespaceHandler;osgi.service.blueprint.namespace="http://cxf.apache.org/transports/http-jetty/configuration";
+ </cxf.export.service>
</properties>
<dependencies>
<dependency>
Modified:
cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/osgi/HTTPJettyTransportActivator.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/osgi/HTTPJettyTransportActivator.java?rev=1557123&r1=1557122&r2=1557123&view=diff
==============================================================================
---
cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/osgi/HTTPJettyTransportActivator.java
(original)
+++
cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/osgi/HTTPJettyTransportActivator.java
Fri Jan 10 14:00:52 2014
@@ -29,6 +29,8 @@ import java.util.StringTokenizer;
import javax.management.MBeanServer;
+import org.apache.cxf.bus.blueprint.BlueprintNameSpaceHandlerFactory;
+import org.apache.cxf.bus.blueprint.NamespaceHandlerRegisterer;
import org.apache.cxf.configuration.jsse.TLSParameterJaxBUtils;
import org.apache.cxf.configuration.jsse.TLSServerParameters;
import org.apache.cxf.configuration.security.CertStoreType;
@@ -44,29 +46,27 @@ import org.apache.cxf.configuration.secu
import org.apache.cxf.transport.http_jetty.JettyHTTPServerEngine;
import org.apache.cxf.transport.http_jetty.JettyHTTPServerEngineFactory;
import org.apache.cxf.transport.http_jetty.ThreadingParameters;
+import
org.apache.cxf.transport.http_jetty.blueprint.HTTPJettyTransportNamespaceHandler;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Constants;
-import org.osgi.framework.ServiceReference;
import org.osgi.framework.ServiceRegistration;
-import org.osgi.service.cm.ConfigurationAdmin;
import org.osgi.service.cm.ConfigurationException;
import org.osgi.service.cm.ManagedServiceFactory;
import org.osgi.util.tracker.ServiceTracker;
-
public class HTTPJettyTransportActivator
implements BundleActivator, ManagedServiceFactory {
public static final String FACTORY_PID = "org.apache.cxf.http.jetty";
BundleContext context;
MBeanServer mbeans;
- ServiceTracker configAdminTracker;
+ ServiceTracker mbeanServerTracker;
ServiceRegistration reg;
JettyHTTPServerEngineFactory factory = new JettyHTTPServerEngineFactory() {
public MBeanServer getMBeanServer() {
- return mbeans;
+ return (MBeanServer)mbeanServerTracker.getService();
}
};
@@ -77,19 +77,21 @@ public class HTTPJettyTransportActivator
reg = context.registerService(ManagedServiceFactory.class.getName(),
this, servProps);
-
- configAdminTracker = new ServiceTracker(context,
ConfigurationAdmin.class.getName(), null);
- configAdminTracker.open();
-
- ServiceReference ref =
context.getServiceReference(MBeanServer.class.getName());
- if (ref != null) {
- mbeans = (MBeanServer)context.getService(ref);
- }
+ mbeanServerTracker = new ServiceTracker(ctx,
MBeanServer.class.getName(), null);
+ BlueprintNameSpaceHandlerFactory nsHandlerFactory = new
BlueprintNameSpaceHandlerFactory() {
+
+ @Override
+ public Object createNamespaceHandler() {
+ return new HTTPJettyTransportNamespaceHandler();
+ }
+ };
+ NamespaceHandlerRegisterer.register(context, nsHandlerFactory,
+
"http://cxf.apache.org/transports/http-jetty/configuration";);
}
public void stop(BundleContext ctx) throws Exception {
+ mbeanServerTracker.close();
reg.unregister();
- configAdminTracker.close();
}
public String getName() {
Modified: cxf/trunk/rt/transports/http-netty/netty-server/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http-netty/netty-server/pom.xml?rev=1557123&r1=1557122&r2=1557123&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http-netty/netty-server/pom.xml (original)
+++ cxf/trunk/rt/transports/http-netty/netty-server/pom.xml Fri Jan 10 14:00:52
2014
@@ -31,15 +31,20 @@
<relativePath>../../../../parent/pom.xml</relativePath>
</parent>
<properties>
+
<cxf.bundle.activator>org.apache.cxf.transport.http.netty.server.blueprint.Activator</cxf.bundle.activator>
<cxf.osgi.import>
io.netty.*;version="${cxf.netty.version.range}",
javax.annotation;version="${cxf.osgi.javax.annotation.version}",
- org.apache.aries*;version="${cxf.aries.version.range}",
-
org.springframework*;resolution:="optional";version="${cxf.osgi.spring.version}"
+
org.apache.aries*;version="${cxf.aries.version.range}";resolution:=optional,
+
org.springframework*;resolution:="optional";version="${cxf.osgi.spring.version}"
</cxf.osgi.import>
<cxf.osgi.export>
org.apache.cxf.*,
</cxf.osgi.export>
+ <!-- keep in sync with services exported in activator -->
+ <cxf.export.service>
+
org.apache.aries.blueprint.NamespaceHandler;osgi.service.blueprint.namespace="http://cxf.apache.org/transports/http-netty-server/configuration";
+ </cxf.export.service>
</properties>
<dependencies>
<dependency>
Added:
cxf/trunk/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/blueprint/Activator.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/blueprint/Activator.java?rev=1557123&view=auto
==============================================================================
---
cxf/trunk/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/blueprint/Activator.java
(added)
+++
cxf/trunk/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/blueprint/Activator.java
Fri Jan 10 14:00:52 2014
@@ -0,0 +1,45 @@
+/**
+ * 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.
+ */
+package org.apache.cxf.transport.http.netty.server.blueprint;
+
+import org.apache.cxf.bus.blueprint.BlueprintNameSpaceHandlerFactory;
+import org.apache.cxf.bus.blueprint.NamespaceHandlerRegisterer;
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+
+public class Activator implements BundleActivator {
+
+ @Override
+ public void start(BundleContext context) throws Exception {
+ BlueprintNameSpaceHandlerFactory factory = new
BlueprintNameSpaceHandlerFactory() {
+
+ @Override
+ public Object createNamespaceHandler() {
+ return new HttpNettyTransportNamespaceHandler();
+ }
+ };
+ NamespaceHandlerRegisterer.register(context, factory,
+
"http://cxf.apache.org/transports/http-netty-server/configuration";);
+ }
+
+ @Override
+ public void stop(BundleContext context) throws Exception {
+ }
+
+}
Modified: cxf/trunk/rt/transports/http/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http/pom.xml?rev=1557123&r1=1557122&r2=1557123&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http/pom.xml (original)
+++ cxf/trunk/rt/transports/http/pom.xml Fri Jan 10 14:00:52 2014
@@ -34,9 +34,13 @@
<cxf.bundle.activator>org.apache.cxf.transport.http.osgi.HTTPTransportActivator</cxf.bundle.activator>
<cxf.osgi.import>
javax.servlet*;version="${cxf.osgi.javax.servlet.version}",
- org.apache.aries*;version="${cxf.aries.version.range}",
+
org.apache.aries*;version="${cxf.aries.version.range}";resolution:=optional,
org.springframework*;resolution:="optional";version="${cxf.osgi.spring.version}"
</cxf.osgi.import>
+ <!-- keep in sync with services exported in activator -->
+ <cxf.export.service>
+
org.apache.aries.blueprint.NamespaceHandler;osgi.service.blueprint.namespace="http://cxf.apache.org/transports/http/configuration";
+ </cxf.export.service>
</properties>
<dependencies>
<dependency>
Modified:
cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/osgi/HTTPTransportActivator.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/osgi/HTTPTransportActivator.java?rev=1557123&r1=1557122&r2=1557123&view=diff
==============================================================================
---
cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/osgi/HTTPTransportActivator.java
(original)
+++
cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/osgi/HTTPTransportActivator.java
Fri Jan 10 14:00:52 2014
@@ -21,7 +21,10 @@ package org.apache.cxf.transport.http.os
import java.util.Properties;
+import org.apache.cxf.bus.blueprint.BlueprintNameSpaceHandlerFactory;
+import org.apache.cxf.bus.blueprint.NamespaceHandlerRegisterer;
import org.apache.cxf.transport.http.HTTPConduitConfigurer;
+import org.apache.cxf.transport.http.blueprint.HttpBPHandler;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Constants;
@@ -46,6 +49,15 @@ public class HTTPTransportActivator
servProps.put(Constants.SERVICE_PID,
"org.apache.cxf.http.conduit-configurer");
reg = context.registerService(HTTPConduitConfigurer.class.getName(),
conduitConfigurer, servProps);
+ BlueprintNameSpaceHandlerFactory factory = new
BlueprintNameSpaceHandlerFactory() {
+
+ @Override
+ public Object createNamespaceHandler() {
+ return new HttpBPHandler();
+ }
+ };
+ NamespaceHandlerRegisterer.register(context, factory,
+
"http://cxf.apache.org/transports/http/configuration";);
}
public void stop(BundleContext context) throws Exception {
Modified: cxf/trunk/rt/ws/addr/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/ws/addr/pom.xml?rev=1557123&r1=1557122&r2=1557123&view=diff
==============================================================================
--- cxf/trunk/rt/ws/addr/pom.xml (original)
+++ cxf/trunk/rt/ws/addr/pom.xml Fri Jan 10 14:00:52 2014
@@ -31,10 +31,15 @@
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
<properties>
+
<cxf.bundle.activator>org.apache.cxf.ws.addressing.blueprint.Activator</cxf.bundle.activator>
<cxf.osgi.import>
org.springframework*;resolution:="optional";version="${cxf.osgi.spring.version}",
- org.apache.aries*;version="${cxf.aries.version.range}"
+
org.apache.aries*;version="${cxf.aries.version.range}";resolution:=optional
</cxf.osgi.import>
+ <!-- keep in sync with services exported in activator -->
+ <cxf.export.service>
+
org.apache.aries.blueprint.NamespaceHandler;osgi.service.blueprint.namespace="http://cxf.apache.org/ws/addressing";
+ </cxf.export.service>
</properties>
<dependencies>
<dependency>
Added:
cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/blueprint/Activator.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/blueprint/Activator.java?rev=1557123&view=auto
==============================================================================
---
cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/blueprint/Activator.java
(added)
+++
cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/blueprint/Activator.java
Fri Jan 10 14:00:52 2014
@@ -0,0 +1,45 @@
+/**
+ * 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.
+ */
+package org.apache.cxf.ws.addressing.blueprint;
+
+import org.apache.cxf.bus.blueprint.BlueprintNameSpaceHandlerFactory;
+import org.apache.cxf.bus.blueprint.NamespaceHandlerRegisterer;
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+
+public class Activator implements BundleActivator {
+
+ @Override
+ public void start(BundleContext context) throws Exception {
+ BlueprintNameSpaceHandlerFactory factory = new
BlueprintNameSpaceHandlerFactory() {
+
+ @Override
+ public Object createNamespaceHandler() {
+ return new WsBPHandler();
+ }
+ };
+ NamespaceHandlerRegisterer.register(context, factory,
+
"http://cxf.apache.org/ws/addressing";);
+ }
+
+ @Override
+ public void stop(BundleContext context) throws Exception {
+ }
+
+}
Modified: cxf/trunk/rt/ws/policy/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/ws/policy/pom.xml?rev=1557123&r1=1557122&r2=1557123&view=diff
==============================================================================
--- cxf/trunk/rt/ws/policy/pom.xml (original)
+++ cxf/trunk/rt/ws/policy/pom.xml Fri Jan 10 14:00:52 2014
@@ -31,10 +31,22 @@
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
<properties>
+
<cxf.bundle.activator>org.apache.cxf.ws.policy.blueprint.Activator</cxf.bundle.activator>
<cxf.osgi.import>
org.springframework*;resolution:="optional";version="${cxf.osgi.spring.version}",
- org.apache.aries*;version="${cxf.aries.version.range}"
+
org.apache.aries*;version="${cxf.aries.version.range}";resolution:=optional
</cxf.osgi.import>
+ <!-- keep in sync with services exported in activator -->
+ <cxf.export.service>
+
org.apache.aries.blueprint.NamespaceHandler;osgi.service.blueprint.namespace="http://cxf.apache.org/policy";,
+
org.apache.aries.blueprint.NamespaceHandler;osgi.service.blueprint.namespace="http://www.w3.org/ns/ws-policy";,
+
org.apache.aries.blueprint.NamespaceHandler;osgi.service.blueprint.namespace="http://www.w3.org/2006/07/ws-policy";,
+
org.apache.aries.blueprint.NamespaceHandler;osgi.service.blueprint.namespace="http://schemas.xmlsoap.org/ws/2004/09/policy";,
+
org.apache.aries.blueprint.NamespaceHandler;osgi.service.blueprint.namespace="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd";,
+
org.apache.aries.blueprint.NamespaceHandler;osgi.service.blueprint.namespace="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd";,
+
org.apache.aries.blueprint.NamespaceHandler;osgi.service.blueprint.namespace="http://www.w3.org/2000/09/xmldsig#";,
+
org.apache.aries.blueprint.NamespaceHandler;osgi.service.blueprint.namespace="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702";
+ </cxf.export.service>
</properties>
<dependencies>
<dependency>
Added:
cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/blueprint/Activator.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/blueprint/Activator.java?rev=1557123&view=auto
==============================================================================
---
cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/blueprint/Activator.java
(added)
+++
cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/blueprint/Activator.java
Fri Jan 10 14:00:52 2014
@@ -0,0 +1,50 @@
+/**
+ * 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.
+ */
+package org.apache.cxf.ws.policy.blueprint;
+
+import org.apache.cxf.bus.blueprint.BlueprintNameSpaceHandlerFactory;
+import org.apache.cxf.bus.blueprint.NamespaceHandlerRegisterer;
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+
+public class Activator implements BundleActivator {
+
+ @Override
+ public void start(BundleContext context) throws Exception {
+ BlueprintNameSpaceHandlerFactory factory = new
BlueprintNameSpaceHandlerFactory() {
+
+ @Override
+ public Object createNamespaceHandler() {
+ return new PolicyBPHandler();
+ }
+ };
+ NamespaceHandlerRegisterer
+ .register(context, factory, "http://cxf.apache.org/policy";,
"http://www.w3.org/ns/ws-policy";,
+ "http://www.w3.org/2006/07/ws-policy";,
"http://schemas.xmlsoap.org/ws/2004/09/policy";,
+
"http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd";,
+
"http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd";,
+ "http://www.w3.org/2000/09/xmldsig#";,
+
"http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702";);
+ }
+
+ @Override
+ public void stop(BundleContext context) throws Exception {
+ }
+
+}
Modified: cxf/trunk/rt/ws/rm/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/pom.xml?rev=1557123&r1=1557122&r2=1557123&view=diff
==============================================================================
--- cxf/trunk/rt/ws/rm/pom.xml (original)
+++ cxf/trunk/rt/ws/rm/pom.xml Fri Jan 10 14:00:52 2014
@@ -31,10 +31,16 @@
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
<properties>
+
<cxf.bundle.activator>org.apache.cxf.ws.rm.blueprint.Activator</cxf.bundle.activator>
<cxf.osgi.import>
- org.apache.aries*;version="${cxf.aries.version.range}",
+
org.apache.aries*;version="${cxf.aries.version.range}";resolution:=optional,
org.springframework*;resolution:="optional";version="${cxf.osgi.spring.version}"
</cxf.osgi.import>
+ <!-- keep in sync with services exported in activator -->
+ <cxf.export.service>
+
org.apache.aries.blueprint.NamespaceHandler;osgi.service.blueprint.namespace="http://cxf.apache.org/ws/rm/manager";,
+
org.apache.aries.blueprint.NamespaceHandler;osgi.service.blueprint.namespace="http://schemas.xmlsoap.org/ws/2005/02/rm/policy";
+ </cxf.export.service>
</properties>
<dependencies>
<dependency>
Added:
cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/blueprint/Activator.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/blueprint/Activator.java?rev=1557123&view=auto
==============================================================================
---
cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/blueprint/Activator.java
(added)
+++
cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/blueprint/Activator.java
Fri Jan 10 14:00:52 2014
@@ -0,0 +1,46 @@
+/**
+ * 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.
+ */
+package org.apache.cxf.ws.rm.blueprint;
+
+import org.apache.cxf.bus.blueprint.BlueprintNameSpaceHandlerFactory;
+import org.apache.cxf.bus.blueprint.NamespaceHandlerRegisterer;
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+
+public class Activator implements BundleActivator {
+
+ @Override
+ public void start(BundleContext context) throws Exception {
+ BlueprintNameSpaceHandlerFactory factory = new
BlueprintNameSpaceHandlerFactory() {
+
+ @Override
+ public Object createNamespaceHandler() {
+ return new RMBPHandler();
+ }
+ };
+ NamespaceHandlerRegisterer.register(context, factory,
+
"http://cxf.apache.org/ws/rm/manager";,
+
"http://schemas.xmlsoap.org/ws/2005/02/rm/policy";);
+ }
+
+ @Override
+ public void stop(BundleContext context) throws Exception {
+ }
+
+}
