Author: cziegeler
Date: Fri Nov 16 07:28:24 2012
New Revision: 1410218
URL: http://svn.apache.org/viewvc?rev=1410218&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=1410218&r1=1410217&r2=1410218&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
Fri Nov 16 07:28:24 2012
@@ -72,7 +72,7 @@ public class LaunchpadConfigInstaller {
*/
private boolean checkPath(final String rootPath,
final String resourceType,
- final Integer prio) {
+ Integer prio) {
int count = 0;
final Iterator<String> configPaths =
resourceProvider.getChildren(rootPath);
@@ -100,9 +100,13 @@ public class LaunchpadConfigInstaller {
} catch (final URISyntaxException e) {
// we just ignore this
}
- } else if ( !hint.equals(CONFIG_NAME) && isActive(hint) ==
0 ) {
- logger.debug("Launchpad ignoring {} : {} due to
unactivated run mode: {}", new Object[] {resourceType, path, hint});
- continue;
+ } else if ( !hint.equals(CONFIG_NAME) ) {
+ final int activeModes = isActive(hint);
+ if ( activeModes == 0 ) {
+ logger.debug("Launchpad ignoring {} : {} due to
unactivated run mode: {}", new Object[] {resourceType, path, hint});
+ continue;
+ }
+ prio = PRIORITY + PRIORITY_BOOST * activeModes;
}
long lastModified = -1;
try {
