incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fmesc...@apache.org
Subject svn commit: r814308 - in /sling/trunk/launchpad/base: pom.xml src/main/resources/sling.properties
Date Sun, 13 Sep 2009 12:46:45 GMT
Author: fmeschbe
Date: Sun Sep 13 12:46:45 2009
New Revision: 814308

URL: http://svn.apache.org/viewvc?rev=814308&view=rev
Log:
SLING-1094 Reduce contents of the launchpad/base launcher jar file to the absolute
minimum, namely framework core and HttpService. The main parts of the Compendium API
packages should be provided from within the framework - either by a compendium
API bundle or by the compendium service implementation bundles.

Modified:
    sling/trunk/launchpad/base/pom.xml
    sling/trunk/launchpad/base/src/main/resources/sling.properties

Modified: sling/trunk/launchpad/base/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/base/pom.xml?rev=814308&r1=814307&r2=814308&view=diff
==============================================================================
--- sling/trunk/launchpad/base/pom.xml (original)
+++ sling/trunk/launchpad/base/pom.xml Sun Sep 13 12:46:45 2009
@@ -72,33 +72,7 @@
                         <DynamicImport-Package>*</DynamicImport-Package>
                         <Embed-Dependency>
                             org.apache.felix.framework;inline=org/**,
-                            org.osgi.core;inline=org/osgi/service/condpermadmin/**|
-                                org/osgi/service/permissionadmin/**,
-                            org.osgi.compendium;inline=org/osgi/service/log/**|
-                                org/osgi/service/http/**|
-                                org/osgi/service/device/**|
-                                org/osgi/service/cm/**|
-                                org/osgi/service/metatype/**|
-                                org/osgi/service/prefs/**|
-                                org/osgi/service/useradmin/**|
-                                org/osgi/service/wireadmin/**|
-                                org/osgi/service/io/**|
-                                org/osgi/service/provisioning/**|
-                                org/osgi/service/upnp/**|
-                                org/osgi/service/component/**|
-                                org/osgi/service/event/**|
-                                org/osgi/service/deploymentadmin/**|
-                                org/osgi/service/deploymentadmin/spi/**|
-                                org/osgi/service/application/**|
-                                info/dmtree/**| info/dmtree/notification/**|
-                                info/dmtree/notification/spi/**|
-                                info/dmtree/registry/**|
-                                info/dmtree/security/**| info/dmtree/spi/**|
-                                org/osgi/service/monitor/**|
-                                org/osgi/application/**|
-                                org/osgi/util/xml/**|
-                                org/osgi/util/position/**|
-                                org/osgi/util/measurement/**,
+                            org.osgi.compendium;inline=org/osgi/service/http/**,
                             servlet-api;inline=javax/servlet/**,
                             servlet;inline=org/eclipse/**
                         </Embed-Dependency>

Modified: sling/trunk/launchpad/base/src/main/resources/sling.properties
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/base/src/main/resources/sling.properties?rev=814308&r1=814307&r2=814308&view=diff
==============================================================================
--- sling/trunk/launchpad/base/src/main/resources/sling.properties (original)
+++ sling/trunk/launchpad/base/src/main/resources/sling.properties Sun Sep 13 12:46:45 2009
@@ -185,42 +185,17 @@
 #       overwrite the values from the sling.properties file in case of an
 #       OSGi API update.
 
+# Only provide the OSGi packages contained in the Felix framework itself
 sling.osgi-core-packages= \
  org.osgi.framework; version=1.4.0, \
  org.osgi.framework.hooks.service, \
  org.osgi.framework.launch, \
- org.osgi.service.condpermadmin; version=1.0.0, \
  org.osgi.service.packageadmin; version=1.2.0, \
- org.osgi.service.permissionadmin; version=1.2.0, \
  org.osgi.service.startlevel; version=1.1.0, \
  org.osgi.service.url; version=1.0.0
 
+# Only provide the HTTP Service (embedded for the webapp) and the tracker
+# (from the felix framework)
 sling.osgi-compendium-services= \
- org.osgi.service.application;version="1.0", \
- org.osgi.service.cm;version="1.2", \
- org.osgi.service.component;version="1.0", \
- org.osgi.service.deploymentadmin;version="1.0", \
- org.osgi.service.deploymentadmin.spi;uses:="org.osgi.service.deploymentadmin";version="1.0",
\
- org.osgi.service.device;version="1.1", \
- org.osgi.service.event;version="1.1", \
  org.osgi.service.http;version="1.2", \
- org.osgi.service.io;version="1.0", \
- org.osgi.service.log;version="1.3", \
- org.osgi.service.metatype;version="1.1", \
- org.osgi.service.monitor;version="1.0", \
- org.osgi.service.prefs;version="1.1", \
- org.osgi.service.provisioning;version="1.1", \
- org.osgi.service.upnp;version="1.1", \
- org.osgi.service.useradmin;version="1.1", \
- org.osgi.service.wireadmin;version="1.0", \
- info.dmtree.notification;version="1.0", \
- info.dmtree.notification.spi;uses:="info.dmtree.notification";version="1.0", \
- info.dmtree.registry;uses:="info.dmtree.notification";version="1.0", \
- info.dmtree.security;version="1.0", \
- info.dmtree.spi;version="1.0", \
- org.osgi.util.gsm;version="1.0", \
- org.osgi.util.measurement;version="1.0", \
- org.osgi.util.mobile;version="1.0", \
- org.osgi.util.position;uses:="org.osgi.util.measurement";version="1.0", \
- org.osgi.util.tracker;version="1.3.3", \
- org.osgi.util.xml;version="1.0"
\ No newline at end of file
+ org.osgi.util.tracker;version="1.3.3"
\ No newline at end of file



Mime
View raw message