incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r1209114 - in /sling/trunk/maven/maven-launchpad-plugin: pom.xml src/main/java/org/apache/sling/maven/projectsupport/AbstractLaunchpadStartingMojo.java
Date Thu, 01 Dec 2011 15:11:03 GMT
Author: cziegeler
Date: Thu Dec  1 15:11:02 2011
New Revision: 1209114

URL: http://svn.apache.org/viewvc?rev=1209114&view=rev
Log:
SLING-2203 : Allow for better configuration of sling home folder

Modified:
    sling/trunk/maven/maven-launchpad-plugin/pom.xml
    sling/trunk/maven/maven-launchpad-plugin/src/main/java/org/apache/sling/maven/projectsupport/AbstractLaunchpadStartingMojo.java

Modified: sling/trunk/maven/maven-launchpad-plugin/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/maven/maven-launchpad-plugin/pom.xml?rev=1209114&r1=1209113&r2=1209114&view=diff
==============================================================================
--- sling/trunk/maven/maven-launchpad-plugin/pom.xml (original)
+++ sling/trunk/maven/maven-launchpad-plugin/pom.xml Thu Dec  1 15:11:02 2011
@@ -176,12 +176,12 @@
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.launchpad.base</artifactId>
-            <version>2.3.0</version>
+            <version>2.3.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.launchpad.base</artifactId>
-            <version>2.3.0</version>
+            <version>2.3.1-SNAPSHOT</version>
             <classifier>app</classifier>
         </dependency>
         <dependency>

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=1209114&r1=1209113&r2=1209114&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
Thu Dec  1 15:11:02 2011
@@ -267,6 +267,9 @@ public abstract class AbstractLaunchpadS
 
             props.put(SharedConstants.SLING_HOME, slingHome);
 
+            // ensure launchpad is set
+            props.put(SharedConstants.SLING_LAUNCHPAD, slingHome);
+
             if (forceBundleLoad) {
                 props.put(SharedConstants.FORCE_PACKAGE_BUNDLE_LOADING, "true");
             }



Mime
View raw message