You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2011/08/29 09:03:46 UTC
svn commit: r1162656 - in
/sling/trunk/maven/maven-launchpad-plugin/src/main/java/org/apache/sling/maven/projectsupport:
AbstractBundleListMojo.java AbstractUsingBundleListMojo.java
AttachPartialBundleListMojo.java
Author: cziegeler
Date: Mon Aug 29 07:03:45 2011
New Revision: 1162656
URL: http://svn.apache.org/viewvc?rev=1162656&view=rev
Log:
SLING-2134 : Provide a way to add additional properties to sling.properties
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/AbstractUsingBundleListMojo.java
sling/trunk/maven/maven-launchpad-plugin/src/main/java/org/apache/sling/maven/projectsupport/AttachPartialBundleListMojo.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=1162656&r1=1162655&r2=1162656&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:03:45 2011
@@ -55,16 +55,16 @@ public abstract class AbstractBundleList
private File configDirectory;
/**
- * @parameter expression="${additionalSlingProps}"
- * default-value="src/main/sling/additional.properties"
+ * @parameter expression="${commonSlingProps}"
+ * default-value="src/main/sling/common.properties"
*/
- protected File additionalSlingProps;
+ protected File commonSlingProps;
/**
- * @parameter expression="${additionalSlingBootstrap}"
+ * @parameter expression="${commonSlingBootstrap}"
* default-value="src/main/sling/bootstrap.txt"
*/
- protected File additionalSlingBootstrap;
+ protected File commonSlingBootstrap;
protected File getConfigDirectory() {
return this.configDirectory;
Modified: sling/trunk/maven/maven-launchpad-plugin/src/main/java/org/apache/sling/maven/projectsupport/AbstractUsingBundleListMojo.java
URL: http://svn.apache.org/viewvc/sling/trunk/maven/maven-launchpad-plugin/src/main/java/org/apache/sling/maven/projectsupport/AbstractUsingBundleListMojo.java?rev=1162656&r1=1162655&r2=1162656&view=diff
==============================================================================
--- sling/trunk/maven/maven-launchpad-plugin/src/main/java/org/apache/sling/maven/projectsupport/AbstractUsingBundleListMojo.java (original)
+++ sling/trunk/maven/maven-launchpad-plugin/src/main/java/org/apache/sling/maven/projectsupport/AbstractUsingBundleListMojo.java Mon Aug 29 07:03:45 2011
@@ -380,8 +380,8 @@ public abstract class AbstractUsingBundl
zipUnarchiver.extract();
final File slingDir = new File(this.tmpOutputDir, "sling");
- this.readSlingProperties(new File(slingDir, AttachPartialBundleListMojo.SLING_ADDITIONAL_PROPS));
- this.readSlingBootstrap(new File(slingDir, AttachPartialBundleListMojo.SLING_BOOTSTRAP));
+ this.readSlingProperties(new File(slingDir, AttachPartialBundleListMojo.SLING_COMMON_PROPS));
+ this.readSlingBootstrap(new File(slingDir, AttachPartialBundleListMojo.SLING_COMMON_BOOTSTRAP));
// and now configurations
if ( this.overlayConfigDir == null ) {
@@ -488,7 +488,7 @@ public abstract class AbstractUsingBundl
}
protected Properties getSlingProperties() throws MojoExecutionException {
- readSlingProperties(this.additionalSlingProps);
+ readSlingProperties(this.commonSlingProps);
return this.slingProperties;
}
@@ -541,7 +541,7 @@ public abstract class AbstractUsingBundl
* @throws MojoExecutionException
*/
protected String getSlingBootstrap() throws MojoExecutionException {
- this.readSlingBootstrap(this.additionalSlingBootstrap);
+ this.readSlingBootstrap(this.commonSlingBootstrap);
return this.slingBootstrapCommand;
}
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=1162656&r1=1162655&r2=1162656&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:03:45 2011
@@ -38,9 +38,9 @@ public class AttachPartialBundleListMojo
public static final String CONFIG_TYPE = "zip";
- public static final String SLING_ADDITIONAL_PROPS = "additional.properties";
+ public static final String SLING_COMMON_PROPS = "common.properties";
- public static final String SLING_BOOTSTRAP = "bootstrap.txt";
+ public static final String SLING_COMMON_BOOTSTRAP = "bootstrap.txt";
/**
* @parameter default-value="${project.build.directory}/bundleListconfig"
@@ -82,8 +82,8 @@ public class AttachPartialBundleListMojo
}
// check if we have configurations
boolean hasConfigs = this.checkFile(this.getConfigDirectory());
- hasConfigs |= this.checkFile(this.additionalSlingBootstrap);
- hasConfigs |= this.checkFile(this.additionalSlingProps);
+ hasConfigs |= this.checkFile(this.commonSlingBootstrap);
+ hasConfigs |= this.checkFile(this.commonSlingProps);
if ( !hasConfigs ) {
this.getLog().debug("No configurations to attach.");
@@ -91,15 +91,15 @@ public class AttachPartialBundleListMojo
}
// copy configuration, as this project might use different names we have to copy everything!
this.configOutputDir.mkdirs();
- if ( this.checkFile(this.additionalSlingBootstrap) ) {
+ if ( this.checkFile(this.commonSlingBootstrap) ) {
final File slingDir = new File(this.configOutputDir, "sling");
slingDir.mkdirs();
- FileUtils.copyFile(this.additionalSlingBootstrap, new File(slingDir, SLING_BOOTSTRAP));
+ FileUtils.copyFile(this.commonSlingBootstrap, new File(slingDir, SLING_COMMON_BOOTSTRAP));
}
- if ( this.checkFile(this.additionalSlingProps) ) {
+ if ( this.checkFile(this.commonSlingProps) ) {
final File slingDir = new File(this.configOutputDir, "sling");
slingDir.mkdirs();
- FileUtils.copyFile(this.additionalSlingProps, new File(slingDir, SLING_ADDITIONAL_PROPS));
+ FileUtils.copyFile(this.commonSlingProps, new File(slingDir, SLING_COMMON_PROPS));
}
if ( this.checkFile(this.getConfigDirectory()) ) {
final File configDir = new File(this.configOutputDir, "config");