You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2017/11/07 09:53:32 UTC
[sling-org-apache-sling-launchpad-installer] 07/11: SLING-2649 :
Add support for run modes
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.launchpad.installer-1.2.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-launchpad-installer.git
commit ba280e20db87d62caf333d394061c98bb9f8b12f
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Wed Nov 14 17:10:38 2012 +0000
SLING-2649 : Add support for run modes
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/launchpad/installer@1409258 13f79535-47bb-0310-9956-ffa450edef68
---
.../sling/launchpad/installer/impl/LaunchpadConfigInstaller.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/apache/sling/launchpad/installer/impl/LaunchpadConfigInstaller.java b/src/main/java/org/apache/sling/launchpad/installer/impl/LaunchpadConfigInstaller.java
index 1f9dd99..11760ef 100644
--- a/src/main/java/org/apache/sling/launchpad/installer/impl/LaunchpadConfigInstaller.java
+++ b/src/main/java/org/apache/sling/launchpad/installer/impl/LaunchpadConfigInstaller.java
@@ -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);
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.