This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag maven-launchpad-plugin-2.1.0 in repository https://gitbox.apache.org/repos/asf/sling-maven-launchpad-plugin.git
commit dff04388d48ca80ecfe502549f7d229bcfcd4fb6 Author: Carsten Ziegeler <[email protected]> AuthorDate: Mon Aug 29 07:03:45 2011 +0000 SLING-2134 : Provide a way to add additional properties to sling.properties SLING-2182 : Provide a way to specify additional bootstrap commands git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/maven/maven-launchpad-plugin@1162656 13f79535-47bb-0310-9956-ffa450edef68 --- .../maven/projectsupport/AbstractBundleListMojo.java | 10 +++++----- .../projectsupport/AbstractUsingBundleListMojo.java | 8 ++++---- .../projectsupport/AttachPartialBundleListMojo.java | 16 ++++++++-------- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/main/java/org/apache/sling/maven/projectsupport/AbstractBundleListMojo.java b/src/main/java/org/apache/sling/maven/projectsupport/AbstractBundleListMojo.java index 050c653..28d75cd 100644 --- a/src/main/java/org/apache/sling/maven/projectsupport/AbstractBundleListMojo.java +++ b/src/main/java/org/apache/sling/maven/projectsupport/AbstractBundleListMojo.java @@ -55,16 +55,16 @@ public abstract class AbstractBundleListMojo extends AbstractMojo { 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; diff --git a/src/main/java/org/apache/sling/maven/projectsupport/AbstractUsingBundleListMojo.java b/src/main/java/org/apache/sling/maven/projectsupport/AbstractUsingBundleListMojo.java index 7eac40f..f058a34 100644 --- a/src/main/java/org/apache/sling/maven/projectsupport/AbstractUsingBundleListMojo.java +++ b/src/main/java/org/apache/sling/maven/projectsupport/AbstractUsingBundleListMojo.java @@ -380,8 +380,8 @@ public abstract class AbstractUsingBundleListMojo extends AbstractBundleListMojo 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 AbstractUsingBundleListMojo extends AbstractBundleListMojo } protected Properties getSlingProperties() throws MojoExecutionException { - readSlingProperties(this.additionalSlingProps); + readSlingProperties(this.commonSlingProps); return this.slingProperties; } @@ -541,7 +541,7 @@ public abstract class AbstractUsingBundleListMojo extends AbstractBundleListMojo * @throws MojoExecutionException */ protected String getSlingBootstrap() throws MojoExecutionException { - this.readSlingBootstrap(this.additionalSlingBootstrap); + this.readSlingBootstrap(this.commonSlingBootstrap); return this.slingBootstrapCommand; } diff --git a/src/main/java/org/apache/sling/maven/projectsupport/AttachPartialBundleListMojo.java b/src/main/java/org/apache/sling/maven/projectsupport/AttachPartialBundleListMojo.java index a890ec1..9934ae2 100644 --- a/src/main/java/org/apache/sling/maven/projectsupport/AttachPartialBundleListMojo.java +++ b/src/main/java/org/apache/sling/maven/projectsupport/AttachPartialBundleListMojo.java @@ -38,9 +38,9 @@ public class AttachPartialBundleListMojo extends AbstractBundleListMojo { 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 extends AbstractBundleListMojo { } // 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 extends AbstractBundleListMojo { } // 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"); -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
