incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fmesc...@apache.org
Subject svn commit: r887175 - /sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/app/MainDelegate.java
Date Fri, 04 Dec 2009 12:43:41 GMT
Author: fmeschbe
Date: Fri Dec  4 12:43:40 2009
New Revision: 887175

URL: http://svn.apache.org/viewvc?rev=887175&view=rev
Log:
SLING-1179 Servlet API is not available in the launcher any more, thus we
have to remove the system package declaration in the standalone application

Modified:
    sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/app/MainDelegate.java

Modified: sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/app/MainDelegate.java
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/app/MainDelegate.java?rev=887175&r1=887174&r2=887175&view=diff
==============================================================================
--- sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/app/MainDelegate.java
(original)
+++ sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/app/MainDelegate.java
Fri Dec  4 12:43:40 2009
@@ -34,7 +34,6 @@
 import org.apache.sling.launchpad.base.shared.Notifiable;
 import org.apache.sling.launchpad.base.shared.SharedConstants;
 import org.osgi.framework.BundleException;
-import org.osgi.framework.Constants;
 
 /**
  * The <code>Main</code> class is a simple Java Application which interprests
@@ -94,11 +93,6 @@
     /** The default port on which the HTTP service listens. */
     private static final String DEFAULT_PORT = "8080";
 
-    /**
-     * The property value to export the Servlet API 2.5 from the system bundle.
-     */
-    private static final String SERVLET_API_EXPORT = "javax.servlet;javax.servlet.http;javax.servlet.resources;
version=2.5";
-
     private Notifiable notifiable;
 
     /** The parsed command line mapping (Sling) option name to option value */
@@ -174,16 +168,6 @@
                     if (commandLine != null) {
                         properties.putAll(commandLine);
                     }
-
-                    // add Servlet API to the system bundle exports
-                    String sysExport = properties.get(Constants.FRAMEWORK_SYSTEMPACKAGES);
-                    if (sysExport == null) {
-                        sysExport = SERVLET_API_EXPORT;
-                    } else {
-                        sysExport += "," + SERVLET_API_EXPORT;
-                    }
-                    properties.put(Constants.FRAMEWORK_SYSTEMPACKAGES,
-                        sysExport);
                 }
             };
 



Mime
View raw message