svn commit: r1556168 - in /cxf/trunk/rt/frontend: jaxws/ jaxws/src/main/java/org/apache/cxf/jaxws/blueprint/ jaxws/src/main/java/org/apache/cxf/jaxws/osgi/ simple/src/main/java/org/apache/cxf/frontend/blueprint/ simple/src/main/resources/OSGI-INF/

[cs...@apache.org]

Author: cschneider
Date: Tue Jan  7 10:14:04 2014
New Revision: 1556168

URL: http://svn.apache.org/r1556168
Log:
[CXF-4736] Switch simple frontend to Activator for BP namespace

Added:
    cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/blueprint/Activator.java
      - copied, changed from r1552707, cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/osgi/Activator.java
    cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/blueprint/Activator.java
Removed:
    cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/osgi/Activator.java
    cxf/trunk/rt/frontend/simple/src/main/resources/OSGI-INF/
Modified:
    cxf/trunk/rt/frontend/jaxws/pom.xml

Modified: cxf/trunk/rt/frontend/jaxws/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/pom.xml?rev=1556168&r1=1556167&r2=1556168&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/pom.xml (original)
+++ cxf/trunk/rt/frontend/jaxws/pom.xml Tue Jan  7 10:14:04 2014
@@ -39,7 +39,7 @@
             javax.xml.ws*;version="${cxf.osgi.javax.xml.ws.version}",
             org.springframework*;resolution:="optional";version="${cxf.osgi.spring.version}"
         </cxf.osgi.import>
-        <cxf.bundle.activator>org.apache.cxf.jaxws.osgi.Activator</cxf.bundle.activator>
+        <cxf.bundle.activator>org.apache.cxf.jaxws.blueprint.Activator</cxf.bundle.activator>
     </properties>
     <dependencies>
         <dependency>

Copied: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/blueprint/Activator.java (from r1552707, cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/osgi/Activator.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/blueprint/Activator.java?p2=cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/blueprint/Activator.java&p1=cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/osgi/Activator.java&r1=1552707&r2=1556168&rev=1556168&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/osgi/Activator.java (original)
+++ cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/blueprint/Activator.java Tue Jan  7 10:14:04 2014
@@ -16,11 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.cxf.jaxws.osgi;
+package org.apache.cxf.jaxws.blueprint;
 
 import org.apache.cxf.bus.blueprint.BlueprintNameSpaceHandlerFactory;
 import org.apache.cxf.bus.blueprint.NamespaceHandlerRegisterer;
-import org.apache.cxf.jaxws.blueprint.JAXWSBPNamespaceHandler;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
 

Added: cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/blueprint/Activator.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/blueprint/Activator.java?rev=1556168&view=auto
==============================================================================
--- cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/blueprint/Activator.java (added)
+++ cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/blueprint/Activator.java Tue Jan  7 10:14:04 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.frontend.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 SimpleBPNamespaceHandler();
+            }
+        };
+        NamespaceHandlerRegisterer.register(context, factory , "http://cxf.apache.org/blueprint/simple");
+        
+    }
+
+    @Override
+    public void stop(BundleContext context) throws Exception {
+    }
+
+}