You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2017/11/07 09:16:44 UTC
[sling-maven-launchpad-plugin] 02/10: SLING-2589 : Project
Configurations are overwritten by inherited
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag maven-launchpad-plugin-2.2.0
in repository https://gitbox.apache.org/repos/asf/sling-maven-launchpad-plugin.git
commit bf9822b977288b71eb1743d7d45e5204fbd2b054
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Thu Aug 30 14:31:43 2012 +0000
SLING-2589 : Project Configurations are overwritten by inherited
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/maven/maven-launchpad-plugin@1378957 13f79535-47bb-0310-9956-ffa450edef68
---
.../AbstractUsingBundleListMojo.java | 28 ++++++++++------------
1 file changed, 13 insertions(+), 15 deletions(-)
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 991f2be..34a8b02 100644
--- a/src/main/java/org/apache/sling/maven/projectsupport/AbstractUsingBundleListMojo.java
+++ b/src/main/java/org/apache/sling/maven/projectsupport/AbstractUsingBundleListMojo.java
@@ -239,7 +239,7 @@ public abstract class AbstractUsingBundleListMojo extends AbstractBundleListMojo
for (Artifact artifact : dependencies) {
if (PARTIAL.equals(artifact.getType())) {
getLog().info(
- String.format("merging partial bundle list for %s:%s:%s", artifact.getGroupId(),
+ String.format("Merging partial bundle list %s:%s:%s", artifact.getGroupId(),
artifact.getArtifactId(), artifact.getVersion()));
initializedBundleList.merge(readBundleList(artifact.getFile()));
}
@@ -263,15 +263,17 @@ public abstract class AbstractUsingBundleListMojo extends AbstractBundleListMojo
final Set<Artifact> dependencies = project.getDependencyArtifacts();
for (Artifact artifact : dependencies) {
if (PARTIAL.equals(artifact.getType())) {
- getLog().info(
- String.format("merging configuration from partial bundle list for %s:%s:%s", artifact.getGroupId(),
- artifact.getArtifactId(), artifact.getVersion()));
extractConfiguration(artifact);
}
}
+ // copy own config files
+ if ( this.overlayConfigDir != null && super.getConfigDirectory().exists() ) {
+ FileUtils.copyDirectory(super.getConfigDirectory(), this.overlayConfigDir,
+ null, FileUtils.getDefaultExcludesAsString());
+ }
}
- private void extractConfiguration(Artifact artifact) throws MojoExecutionException, IOException {
+ private void extractConfiguration(final Artifact artifact) throws MojoExecutionException, IOException {
// check for configuration artifact
Artifact cfgArtifact = null;
try {
@@ -285,7 +287,7 @@ public abstract class AbstractUsingBundleListMojo extends AbstractBundleListMojo
}
if ( cfgArtifact != null ) {
getLog().info(
- String.format("merging partial bundle list configuration for %s:%s:%s", cfgArtifact.getGroupId(),
+ String.format("Merging settings from partial bundle list %s:%s:%s", cfgArtifact.getGroupId(),
cfgArtifact.getArtifactId(), cfgArtifact.getVersion()));
// extract
@@ -304,17 +306,13 @@ public abstract class AbstractUsingBundleListMojo extends AbstractBundleListMojo
this.readSlingBootstrap(new File(slingDir, AttachPartialBundleListMojo.SLING_STANDALONE_BOOTSTRAP), 2);
// and now configurations
- if ( this.overlayConfigDir == null ) {
- this.tempConfigDir.mkdirs();
- if ( this.getConfigDirectory().exists() ) {
- FileUtils.copyDirectory(this.getConfigDirectory(), this.tempConfigDir,
- null, FileUtils.getDefaultExcludesAsString());
- }
- this.overlayConfigDir = this.tempConfigDir;
- }
final File configDir = new File(this.tmpOutputDir, "config");
if ( configDir.exists() ) {
- FileUtils.copyDirectory(configDir, this.tempConfigDir,
+ if ( this.overlayConfigDir == null ) {
+ this.tempConfigDir.mkdirs();
+ this.overlayConfigDir = this.tempConfigDir;
+ }
+ FileUtils.copyDirectory(configDir, this.overlayConfigDir,
null, FileUtils.getDefaultExcludesAsString());
}
} catch (final ArchiverException ae) {
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.