felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fmesc...@apache.org
Subject svn commit: r728651 - in /felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal: deppack/DepPackServlet.java servlet/OsgiManager.java
Date Mon, 22 Dec 2008 11:36:59 GMT
Author: fmeschbe
Date: Mon Dec 22 03:36:59 2008
New Revision: 728651

URL: http://svn.apache.org/viewvc?rev=728651&view=rev
Log:
FELIX-857 Statically register DepPackServlet in the OSGi Manager
without the need for Declarative Services

Modified:
    felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/deppack/DepPackServlet.java
    felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/OsgiManager.java

Modified: felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/deppack/DepPackServlet.java
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/deppack/DepPackServlet.java?rev=728651&r1=728650&r2=728651&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/deppack/DepPackServlet.java
(original)
+++ felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/deppack/DepPackServlet.java
Mon Dec 22 03:36:59 2008
@@ -33,14 +33,11 @@
 import org.json.JSONException;
 import org.json.JSONWriter;
 import org.osgi.service.component.ComponentContext;
-import org.osgi.service.deploymentadmin.*;
+import org.osgi.service.deploymentadmin.DeploymentAdmin;
+import org.osgi.service.deploymentadmin.DeploymentException;
+import org.osgi.service.deploymentadmin.DeploymentPackage;
 
 
-/**
- * @scr.component metatype="false"
- * @scr.service interface="javax.servlet.Servlet"
- * @scr.property name="felix.webconsole.label" valueRef="LABEL"
- */
 public class DepPackServlet extends BaseWebConsolePlugin
 {
 
@@ -54,6 +51,7 @@
 
     private static final String PARAMETER_PCK_FILE = "pckfile";
 
+
     public String getLabel()
     {
         return LABEL;
@@ -66,75 +64,79 @@
     }
 
 
-    protected void activate(ComponentContext context) {
-        this.activate(context.getBundleContext());
+    protected void activate( ComponentContext context )
+    {
+        this.activate( context.getBundleContext() );
     }
 
-    protected void deactivate(ComponentContext context) {
+
+    protected void deactivate( ComponentContext context )
+    {
         this.deactivate();
     }
 
-    protected void doPost(HttpServletRequest req, HttpServletResponse resp)
-            throws ServletException, IOException
+
+    protected void doPost( HttpServletRequest req, HttpServletResponse resp ) throws ServletException,
IOException
     {
         // get the uploaded data
-        final String action = getParameter(req, Util.PARAM_ACTION);
-        if ( ACTION_DEPLOY.equals(action))
+        final String action = getParameter( req, Util.PARAM_ACTION );
+        if ( ACTION_DEPLOY.equals( action ) )
         {
             Map params = ( Map ) req.getAttribute( AbstractWebConsolePlugin.ATTR_FILEUPLOAD
);
             if ( params != null )
             {
                 final FileItem pck = getFileItem( params, PARAMETER_PCK_FILE, false );
-                final DeploymentAdmin admin = (DeploymentAdmin) this.getService(DeploymentAdmin.class.getName());
+                final DeploymentAdmin admin = ( DeploymentAdmin ) this.getService( DeploymentAdmin.class.getName()
);
                 if ( admin != null )
                 {
                     try
                     {
-                        admin.installDeploymentPackage(pck.getInputStream());
+                        admin.installDeploymentPackage( pck.getInputStream() );
 
                         final String uri = req.getRequestURI();
                         resp.sendRedirect( uri );
                         return;
                     }
-                    catch (DeploymentException e)
+                    catch ( DeploymentException e )
                     {
-                        throw new ServletException("Unable to deploy package.", e);
+                        throw new ServletException( "Unable to deploy package.", e );
                     }
                 }
             }
-            throw new ServletException("Upload file or deployment admin missing.");
+            throw new ServletException( "Upload file or deployment admin missing." );
         }
-        else if (ACTION_UNINSTALL.equals(action))
+        else if ( ACTION_UNINSTALL.equals( action ) )
         {
             final String pckId = req.getPathInfo().substring( req.getPathInfo().lastIndexOf(
'/' ) + 1 );
             if ( pckId != null && pckId.length() > 0 )
             {
-                final DeploymentAdmin admin = (DeploymentAdmin) this.getService(DeploymentAdmin.class.getName());
+                final DeploymentAdmin admin = ( DeploymentAdmin ) this.getService( DeploymentAdmin.class.getName()
);
                 if ( admin != null )
                 {
                     try
                     {
-                        final DeploymentPackage pck = admin.getDeploymentPackage(pckId);
+                        final DeploymentPackage pck = admin.getDeploymentPackage( pckId );
                         if ( pck != null )
                         {
                             pck.uninstall();
                         }
                     }
-                    catch (DeploymentException e)
+                    catch ( DeploymentException e )
                     {
-                        throw new ServletException("Unable to undeploy package.", e);
+                        throw new ServletException( "Unable to undeploy package.", e );
                     }
                 }
 
             }
 
             final PrintWriter pw = resp.getWriter();
-            pw.println("{ \"reload\":true }");
+            pw.println( "{ \"reload\":true }" );
             return;
         }
-        throw new ServletException("Unknown action: " + action);
+        throw new ServletException( "Unknown action: " + action );
     }
 
+
     private FileItem getFileItem( Map params, String name, boolean isFormField )
     {
         FileItem[] items = ( FileItem[] ) params.get( name );
@@ -153,6 +155,7 @@
         return null;
     }
 
+
     protected void renderContent( HttpServletRequest request, HttpServletResponse response
) throws ServletException,
         IOException
     {
@@ -162,10 +165,11 @@
         String appRoot = ( String ) request.getAttribute( OsgiManager.ATTR_APP_ROOT );
         pw.println( "<script src='" + appRoot + "/res/ui/packages.js' language='JavaScript'></script>"
);
 
-        pw.println("<h1>Deployment Admin</h1>");
-        final DeploymentAdmin admin = (DeploymentAdmin) this.getService(DeploymentAdmin.class.getName());
-        if ( admin == null ) {
-            pw.println("<p><em>Deployment Admin is not installed.</em></p>");
+        pw.println( "<h1>Deployment Admin</h1>" );
+        final DeploymentAdmin admin = ( DeploymentAdmin ) this.getService( DeploymentAdmin.class.getName()
);
+        if ( admin == null )
+        {
+            pw.println( "<p><em>Deployment Admin is not installed.</em></p>"
);
             return;
         }
         final DeploymentPackage[] packages = admin.listDeploymentPackages();
@@ -181,7 +185,7 @@
 
             jw.array();
 
-            for(int i=0; i<packages.length; i++)
+            for ( int i = 0; i < packages.length; i++ )
             {
                 packageInfoJson( jw, packages[i] );
             }
@@ -201,14 +205,14 @@
         Util.endScript( pw );
     }
 
-    private void packageInfoJson( JSONWriter jw, DeploymentPackage pack)
-    throws JSONException
+
+    private void packageInfoJson( JSONWriter jw, DeploymentPackage pack ) throws JSONException
     {
         jw.object();
         jw.key( "id" );
         jw.value( pack.getName() );
         jw.key( "name" );
-        jw.value( pack.getName());
+        jw.value( pack.getName() );
         jw.key( "state" );
         jw.value( pack.getVersion() );
 
@@ -232,19 +236,21 @@
         keyVal( jw, "Version", pack.getVersion() );
 
         final StringBuffer buffer = new StringBuffer();
-        for(int i=0; i<pack.getBundleInfos().length; i++) {
-            buffer.append(pack.getBundleInfos()[i].getSymbolicName() );
-            buffer.append(" - " );
-            buffer.append(pack.getBundleInfos()[i].getVersion() );
-            buffer.append("<br/>");
+        for ( int i = 0; i < pack.getBundleInfos().length; i++ )
+        {
+            buffer.append( pack.getBundleInfos()[i].getSymbolicName() );
+            buffer.append( " - " );
+            buffer.append( pack.getBundleInfos()[i].getVersion() );
+            buffer.append( "<br/>" );
         }
-        keyVal(jw, "Bundles", buffer.toString());
+        keyVal( jw, "Bundles", buffer.toString() );
 
         jw.endArray();
 
         jw.endObject();
     }
 
+
     private void keyVal( JSONWriter jw, String key, Object value ) throws JSONException
     {
         if ( key != null && value != null )

Modified: felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/OsgiManager.java
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/OsgiManager.java?rev=728651&r1=728650&r2=728651&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/OsgiManager.java
(original)
+++ felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/OsgiManager.java
Mon Dec 22 03:36:59 2008
@@ -119,6 +119,7 @@
             "org.apache.felix.webconsole.internal.core.BundlesServlet",
             "org.apache.felix.webconsole.internal.core.InstallAction",
             "org.apache.felix.webconsole.internal.core.SetStartLevelAction",
+            "org.apache.felix.webconsole.internal.deppack.DepPackServlet",
             "org.apache.felix.webconsole.internal.misc.EventAdminServlet",
             "org.apache.felix.webconsole.internal.misc.LicenseServlet",
             "org.apache.felix.webconsole.internal.misc.ConfigurationRender",



Mime
View raw message