svn commit: r1409168 - in /sling/trunk: launchpad/builder/src/main/bundles/ launchpad/installer/src/main/java/org/apache/sling/launchpad/installer/impl/ maven/maven-launchpad-plugin/src/main/java/org/apache/sling/maven/projectsupport/

[cziegeler]

Author: cziegeler
Date: Wed Nov 14 11:35:29 2012
New Revision: 1409168

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

Modified:
    sling/trunk/launchpad/builder/src/main/bundles/list.xml
    
sling/trunk/launchpad/installer/src/main/java/org/apache/sling/launchpad/installer/impl/LaunchpadConfigInstaller.java
    
sling/trunk/maven/maven-launchpad-plugin/src/main/java/org/apache/sling/maven/projectsupport/AbstractLaunchpadStartingMojo.java

Modified: sling/trunk/launchpad/builder/src/main/bundles/list.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/src/main/bundles/list.xml?rev=1409168&r1=1409167&r2=1409168&view=diff
==============================================================================
--- sling/trunk/launchpad/builder/src/main/bundles/list.xml (original)
+++ sling/trunk/launchpad/builder/src/main/bundles/list.xml Wed Nov 14 11:35:29 
2012
@@ -208,7 +208,7 @@
         <bundle>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.launchpad.installer</artifactId>
-            <version>1.1.4</version>
+            <version>1.1.5-SNAPSHOT</version>
         </bundle>
         <bundle>
             <groupId>org.apache.sling</groupId>

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=1409168&r1=1409167&r2=1409168&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 11:35:29 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", resourceType, path);
+                                logger.debug("Launchpad ignoring {} : {} due 
to unactivated run mode: ", new Object[] {resourceType, path, hint});
                                 continue;
                             }
                         }
@@ -169,12 +169,18 @@ 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);
+                        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);
                 }
             }
+        } else {
+            logger.warn("Run mode dependent installation not supported by 
launchpad content provider {}", resourceProvider);
+            // revert to old behaviour
+            checkPath(resourceProvider, activeRunModes, installables, 
ROOT_PATH + '/' + CONFIG_NAME, InstallableResource.TYPE_PROPERTIES, PRIORITY);
+            checkPath(resourceProvider, activeRunModes, installables, 
ROOT_PATH + '/' + INSTALL_NAME, InstallableResource.TYPE_FILE, PRIORITY);
+
         }
 
         final InstallableResource [] toInstall = installables.toArray(new 
InstallableResource []{});

Modified: 
sling/trunk/maven/maven-launchpad-plugin/src/main/java/org/apache/sling/maven/projectsupport/AbstractLaunchpadStartingMojo.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/maven/maven-launchpad-plugin/src/main/java/org/apache/sling/maven/projectsupport/AbstractLaunchpadStartingMojo.java?rev=1409168&r1=1409167&r2=1409168&view=diff
==============================================================================
--- 
sling/trunk/maven/maven-launchpad-plugin/src/main/java/org/apache/sling/maven/projectsupport/AbstractLaunchpadStartingMojo.java
 (original)
+++ 
sling/trunk/maven/maven-launchpad-plugin/src/main/java/org/apache/sling/maven/projectsupport/AbstractLaunchpadStartingMojo.java
 Wed Nov 14 11:35:29 2012
@@ -166,6 +166,12 @@ public abstract class AbstractLaunchpadS
                 } catch (NumberFormatException e) {
                     // we ignore this
                 }
+            } else if (path.equals("resources") ) {
+                final Set<String> subDirs = new HashSet<String>();
+                subDirs.add(BUNDLE_PATH_PREFIX);
+                subDirs.add(CONFIG_PATH_PREFIX);
+                subDirs.add("resources/corebundles");
+                return subDirs.iterator();
             }
 
             getLog().warn("un-handlable path " + path);
@@ -328,6 +334,7 @@ public abstract class AbstractLaunchpadS
         }
     }
 
+    @Override
     protected void initArtifactDefinitions(Properties dependencies) {
         if (jarWebSupport == null) {
             jarWebSupport = new ArtifactDefinition();