sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r1162660 - in /sling/trunk/maven/maven-launchpad-plugin/src/main/java/org/apache/sling/maven/projectsupport: AbstractBundleListMojo.java AttachPartialBundleListMojo.java PreparePackageMojo.java
Date Mon, 29 Aug 2011 07:09:23 GMT
Author: cziegeler
Date: Mon Aug 29 07:09:23 2011
New Revision: 1162660

URL: http://svn.apache.org/viewvc?rev=1162660&view=rev
Log:
SLING-2182 : Provide a way to specify additional bootstrap commands

Modified:
    sling/trunk/maven/maven-launchpad-plugin/src/main/java/org/apache/sling/maven/projectsupport/AbstractBundleListMojo.java
    sling/trunk/maven/maven-launchpad-plugin/src/main/java/org/apache/sling/maven/projectsupport/AttachPartialBundleListMojo.java
    sling/trunk/maven/maven-launchpad-plugin/src/main/java/org/apache/sling/maven/projectsupport/PreparePackageMojo.java

Modified: sling/trunk/maven/maven-launchpad-plugin/src/main/java/org/apache/sling/maven/projectsupport/AbstractBundleListMojo.java
URL: http://svn.apache.org/viewvc/sling/trunk/maven/maven-launchpad-plugin/src/main/java/org/apache/sling/maven/projectsupport/AbstractBundleListMojo.java?rev=1162660&r1=1162659&r2=1162660&view=diff
==============================================================================
--- sling/trunk/maven/maven-launchpad-plugin/src/main/java/org/apache/sling/maven/projectsupport/AbstractBundleListMojo.java
(original)
+++ sling/trunk/maven/maven-launchpad-plugin/src/main/java/org/apache/sling/maven/projectsupport/AbstractBundleListMojo.java
Mon Aug 29 07:09:23 2011
@@ -62,7 +62,7 @@ public abstract class AbstractBundleList
 
     /**
      * @parameter expression="${commonSlingBootstrap}"
-     *            default-value="src/main/sling/bootstrap.txt"
+     *            default-value="src/main/sling/common.bootstrap.txt"
      */
     protected File commonSlingBootstrap;
 

Modified: sling/trunk/maven/maven-launchpad-plugin/src/main/java/org/apache/sling/maven/projectsupport/AttachPartialBundleListMojo.java
URL: http://svn.apache.org/viewvc/sling/trunk/maven/maven-launchpad-plugin/src/main/java/org/apache/sling/maven/projectsupport/AttachPartialBundleListMojo.java?rev=1162660&r1=1162659&r2=1162660&view=diff
==============================================================================
--- sling/trunk/maven/maven-launchpad-plugin/src/main/java/org/apache/sling/maven/projectsupport/AttachPartialBundleListMojo.java
(original)
+++ sling/trunk/maven/maven-launchpad-plugin/src/main/java/org/apache/sling/maven/projectsupport/AttachPartialBundleListMojo.java
Mon Aug 29 07:09:23 2011
@@ -40,7 +40,7 @@ public class AttachPartialBundleListMojo
 
     public static final String SLING_COMMON_PROPS = "common.properties";
 
-    public static final String SLING_COMMON_BOOTSTRAP = "bootstrap.txt";
+    public static final String SLING_COMMON_BOOTSTRAP = "common.bootstrap.txt";
 
     /**
      * @parameter default-value="${project.build.directory}/bundleListconfig"

Modified: sling/trunk/maven/maven-launchpad-plugin/src/main/java/org/apache/sling/maven/projectsupport/PreparePackageMojo.java
URL: http://svn.apache.org/viewvc/sling/trunk/maven/maven-launchpad-plugin/src/main/java/org/apache/sling/maven/projectsupport/PreparePackageMojo.java?rev=1162660&r1=1162659&r2=1162660&view=diff
==============================================================================
--- sling/trunk/maven/maven-launchpad-plugin/src/main/java/org/apache/sling/maven/projectsupport/PreparePackageMojo.java
(original)
+++ sling/trunk/maven/maven-launchpad-plugin/src/main/java/org/apache/sling/maven/projectsupport/PreparePackageMojo.java
Mon Aug 29 07:09:23 2011
@@ -191,7 +191,7 @@ public class PreparePackageMojo extends 
      */
     private void patchSlingBootstrap(final File dest, final String additionalCmd)
     throws MojoExecutionException {
-        getLog().info("Patching sling.bootstrap.txt");
+        getLog().info("Patching sling_bootstrap.txt");
         final File origSlingCmd = new File(dest, "sling_bootstrap.txt");
         FileWriter writer = null;
 



Mime
View raw message