svn commit: r1062752 - in /sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/impl: BootstrapInstaller.java DeploymentPackageInstaller.java

[cziegeler]

Author: cziegeler
Date: Mon Jan 24 12:31:49 2011
New Revision: 1062752

URL: http://svn.apache.org/viewvc?rev=1062752&view=rev
Log:
SLING-1952 : Remove support for deployment packages

Removed:
    
sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/impl/DeploymentPackageInstaller.java
Modified:
    
sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/impl/BootstrapInstaller.java

Modified: 
sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/impl/BootstrapInstaller.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/impl/BootstrapInstaller.java?rev=1062752&r1=1062751&r2=1062752&view=diff
==============================================================================
--- 
sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/impl/BootstrapInstaller.java
 (original)
+++ 
sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/impl/BootstrapInstaller.java
 Mon Jan 24 12:31:49 2011
@@ -216,21 +216,7 @@ class BootstrapInstaller implements Bund
         }
 
         if (shouldInstall) {
-            // only run the deployment package stuff and war/jar copies when 
this war/jar is new/changed
-
-            // register deployment package support
-            try {
-                final DeploymentPackageInstaller dpi = new 
DeploymentPackageInstaller(
-                    context, logger, resourceProvider);
-                context.addFrameworkListener(dpi);
-                context.addServiceListener(dpi, "(" + Constants.OBJECTCLASS
-                    + "=" + DeploymentPackageInstaller.DEPLOYMENT_ADMIN + ")");
-            } catch (Throwable t) {
-                logger.log(
-                    Logger.LOG_WARNING,
-                    "Cannot register Deployment Admin support, continuing 
without",
-                    t);
-            }
+            // only run the war/jar copies when this war/jar is new/changed
 
             // see if the loading of bundles from the package is disabled
             String dpblString = 
context.getProperty(SharedConstants.DISABLE_PACKAGE_BUNDLE_LOADING);