svn commit: r1536893 - in /cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/blueprint: ./ CXFBlueprintServlet.java

[se...@apache.org]

Author: sergeyb
Date: Tue Oct 29 21:08:54 2013
New Revision: 1536893

URL: http://svn.apache.org/r1536893
Log:
[CXF-5080] Initial support for CXFBlueprintServlet, it has no Aries code deps

Added:
    cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/blueprint/
    cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/blueprint/CXFBlueprintServlet.java   (with props)

Added: cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/blueprint/CXFBlueprintServlet.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/blueprint/CXFBlueprintServlet.java?rev=1536893&view=auto
==============================================================================
--- cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/blueprint/CXFBlueprintServlet.java (added)
+++ cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/blueprint/CXFBlueprintServlet.java Tue Oct 29 21:08:54 2013
@@ -0,0 +1,58 @@
+/**
+ * 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.servlet.blueprint;
+
+import javax.servlet.ServletConfig;
+
+import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
+import org.apache.cxf.transport.servlet.CXFNonSpringServlet;
+import org.osgi.service.blueprint.container.BlueprintContainer;
+
+public class CXFBlueprintServlet extends CXFNonSpringServlet {
+    private static final String CONTAINER_ATTRIBUTE = "org.apache.aries.blueprint.container";
+    
+    private static final long serialVersionUID = -5922443981969455305L;
+    private boolean busCreated;
+    public CXFBlueprintServlet() {
+    }
+
+    @Override
+    protected void loadBus(ServletConfig servletConfig) {
+        BlueprintContainer container = 
+            (BlueprintContainer)servletConfig.getServletContext().getAttribute(CONTAINER_ATTRIBUTE);
+        
+        if (container != null) {
+            Object busComponent = container.getComponentInstance("cxf");
+            setBus((Bus)busComponent);
+        } else {
+            busCreated = true;
+            setBus(BusFactory.newInstance().createBus());
+        }
+    }
+
+    public void destroyBus() {
+        if (busCreated) {
+            //if we created the Bus, we need to destroy it.  Otherwise, spring will handle it.
+            getBus().shutdown(true);
+            setBus(null);
+        }
+    }
+
+}

Propchange: cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/blueprint/CXFBlueprintServlet.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/blueprint/CXFBlueprintServlet.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date