Return-Path: Delivered-To: apmail-sling-commits-archive@www.apache.org Received: (qmail 71334 invoked from network); 13 Sep 2009 12:47:09 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 13 Sep 2009 12:47:09 -0000 Received: (qmail 10896 invoked by uid 500); 13 Sep 2009 12:47:08 -0000 Delivered-To: apmail-sling-commits-archive@sling.apache.org Received: (qmail 10836 invoked by uid 500); 13 Sep 2009 12:47:08 -0000 Mailing-List: contact commits-help@sling.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@sling.apache.org Delivered-To: mailing list commits@sling.apache.org Received: (qmail 10827 invoked by uid 99); 13 Sep 2009 12:47:08 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 13 Sep 2009 12:47:08 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 13 Sep 2009 12:47:06 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id F0B7F23888E4; Sun, 13 Sep 2009 12:46:45 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r814308 - in /sling/trunk/launchpad/base: pom.xml src/main/resources/sling.properties Date: Sun, 13 Sep 2009 12:46:45 -0000 To: commits@sling.apache.org From: fmeschbe@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090913124645.F0B7F23888E4@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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 @@ * 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/** 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