svn commit: r923371 - in /sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base: impl/BootstrapInstaller.java shared/SharedConstants.java

[justin]

Author: justin
Date: Mon Mar 15 18:18:43 2010
New Revision: 923371

URL: http://svn.apache.org/viewvc?rev=923371&view=rev
Log:
SLING-1443 - adding support for 
org.apache.sling.launchpad.force.package.bundle.loading

Modified:
    
sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/impl/BootstrapInstaller.java
    
sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/shared/SharedConstants.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=923371&r1=923370&r2=923371&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 Mar 15 18:18:43 2010
@@ -204,7 +204,17 @@ class BootstrapInstaller implements Bund
         BootstrapCommandFile cmd = new BootstrapCommandFile(logger, new 
File(slingHome, BOOTSTRAP_CMD_FILENAME));
         cmd.execute(context);
 
-        if (!isAlreadyInstalled(context, slingStartupDir)) {
+        boolean shouldInstall = false;
+
+        // see if the loading of bundles from the package is forced
+        String fpblString = 
context.getProperty(SharedConstants.FORCE_PACKAGE_BUNDLE_LOADING);
+        if (Boolean.valueOf(fpblString)) {
+            shouldInstall = true;
+        } else {
+            shouldInstall = !isAlreadyInstalled(context, slingStartupDir);
+        }
+
+        if (shouldInstall) {
             // only run the deployment package stuff and war/jar copies when 
this war/jar is new/changed
 
             // register deployment package support

Modified: 
sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/shared/SharedConstants.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/shared/SharedConstants.java?rev=923371&r1=923370&r2=923371&view=diff
==============================================================================
--- 
sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/shared/SharedConstants.java
 (original)
+++ 
sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/shared/SharedConstants.java
 Mon Mar 15 18:18:43 2010
@@ -76,6 +76,13 @@ public interface SharedConstants {
      */
     public static final String DISABLE_PACKAGE_BUNDLE_LOADING = 
"org.apache.sling.launchpad.disable.package.bundle.loading";
 
+    /**
+     * True or false value which controls whether sling will load bundles which
+     * are contained in the resources/# path locations in the sling jar or war 
<br/>
+     * regardless of the modification time of the Launchpad JAR.
+     */
+    public static final String FORCE_PACKAGE_BUNDLE_LOADING = 
"org.apache.sling.launchpad.force.package.bundle.loading";
+
 
     /**
      * The name of the configuration property defining the Sling properties 
file
@@ -92,4 +99,5 @@ public interface SharedConstants {
      * @since 2.2
      */
     public static final String SLING_PROPERTIES_URL = "sling.properties.url";
+
 }