svn commit: r1409258 - /sling/trunk/launchpad/installer/src/main/java/org/apache/sling/launchpad/installer/impl/LaunchpadConfigInstaller.java

[cziegeler]

Author: cziegeler
Date: Wed Nov 14 17:10:38 2012
New Revision: 1409258

URL: http://svn.apache.org/viewvc?rev=1409258&view=rev
Log:
SLING-2649 : Add support for run modes

Modified:
    
sling/trunk/launchpad/installer/src/main/java/org/apache/sling/launchpad/installer/impl/LaunchpadConfigInstaller.java

Modified: 
sling/trunk/launchpad/installer/src/main/java/org/apache/sling/launchpad/installer/impl/LaunchpadConfigInstaller.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/launchpad/installer/src/main/java/org/apache/sling/launchpad/installer/impl/LaunchpadConfigInstaller.java?rev=1409258&r1=1409257&r2=1409258&view=diff
==============================================================================
--- 
sling/trunk/launchpad/installer/src/main/java/org/apache/sling/launchpad/installer/impl/LaunchpadConfigInstaller.java
 (original)
+++ 
sling/trunk/launchpad/installer/src/main/java/org/apache/sling/launchpad/installer/impl/LaunchpadConfigInstaller.java
 Wed Nov 14 17:10:38 2012
@@ -101,7 +101,7 @@ public class LaunchpadConfigInstaller {
                         // if this is a configuration, hint could be run Modes
                         if ( !hint.equals(CONFIG_NAME) ) {
                             if ( isActive(hint, activeRunModes) == 0 ) {
-                                logger.debug("Launchpad ignoring {} : {} due 
to unactivated run mode: ", new Object[] {resourceType, path, hint});
+                                logger.debug("Launchpad ignoring {} : {} due 
to unactivated run mode: {}", new Object[] {resourceType, path, hint});
                                 continue;
                             }
                         }
@@ -124,13 +124,14 @@ public class LaunchpadConfigInstaller {
     }
 
     private static int isActive(final String runModesString, final Set<String> 
activeRunModes) {
-        final String[] runModes = runModesString.split(".");
+        final String[] runModes = runModesString.split("\\.");
         boolean active = true;
         for(final String mode : runModes) {
             if ( !activeRunModes.contains(mode) ) {
                 active = false;
             }
         }
+
         return active ? runModes.length : 0;
     }
 
@@ -169,7 +170,7 @@ public class LaunchpadConfigInstaller {
                         final int prio = PRIORITY + PRIORITY_BOOST * 
activeModes;
                         checkPath(resourceProvider, activeRunModes, 
installables, path, InstallableResource.TYPE_FILE, prio);
                     } else {
-                        logger.debug("Ignoring path {} due to unactivated run 
mode: ", path, name.substring(INSTALL_PREFIX.length()));
+                        logger.debug("Ignoring path {} due to unactivated run 
mode: {}", path, name.substring(INSTALL_PREFIX.length()));
                     }
                 } else {
                     logger.debug("Ignoring path {} - not an installation 
path", path);