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 10:27:35 UTC
[sling-slingstart-maven-plugin] 04/08: SLING-5476 : target/classes
should not be used by the plugin
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag slingstart-maven-plugin-1.4.2
in repository https://gitbox.apache.org/repos/asf/sling-slingstart-maven-plugin.git
commit 854f27971a3ff956255193f052e157212496e84a
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Tue Feb 2 13:31:46 2016 +0000
SLING-5476 : target/classes should not be used by the plugin
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/tooling/maven/slingstart-maven-plugin@1728116 13f79535-47bb-0310-9956-ffa450edef68
---
.../org/apache/sling/maven/slingstart/AbstractSlingStartMojo.java | 4 ++++
src/main/java/org/apache/sling/maven/slingstart/PackageMojo.java | 2 +-
.../org/apache/sling/maven/slingstart/PreparePackageMojo.java | 8 ++------
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/main/java/org/apache/sling/maven/slingstart/AbstractSlingStartMojo.java b/src/main/java/org/apache/sling/maven/slingstart/AbstractSlingStartMojo.java
index 04af510..0e84976 100644
--- a/src/main/java/org/apache/sling/maven/slingstart/AbstractSlingStartMojo.java
+++ b/src/main/java/org/apache/sling/maven/slingstart/AbstractSlingStartMojo.java
@@ -96,4 +96,8 @@ public abstract class AbstractSlingStartMojo extends AbstractMojo {
}
return options;
}
+
+ protected File getStandaloneOutputDirectory() {
+ return new File(this.getTmpDir(), "standalone");
+ }
}
diff --git a/src/main/java/org/apache/sling/maven/slingstart/PackageMojo.java b/src/main/java/org/apache/sling/maven/slingstart/PackageMojo.java
index 0699561..8e19ecd 100644
--- a/src/main/java/org/apache/sling/maven/slingstart/PackageMojo.java
+++ b/src/main/java/org/apache/sling/maven/slingstart/PackageMojo.java
@@ -68,7 +68,7 @@ public class PackageMojo extends AbstractSlingStartMojo {
@SuppressWarnings("unchecked")
final Map<String, File> contentsMap = (Map<String, File>) this.project.getContextValue(BuildConstants.CONTEXT_STANDALONE);
- final File buildOutputDirectory = new File(this.project.getBuild().getOutputDirectory());
+ final File buildOutputDirectory = this.getStandaloneOutputDirectory();
final File manifestFile = new File(buildOutputDirectory, "META-INF/MANIFEST.MF");
FileInputStream fis = null;
try {
diff --git a/src/main/java/org/apache/sling/maven/slingstart/PreparePackageMojo.java b/src/main/java/org/apache/sling/maven/slingstart/PreparePackageMojo.java
index fb4ad2f..d9197d1 100644
--- a/src/main/java/org/apache/sling/maven/slingstart/PreparePackageMojo.java
+++ b/src/main/java/org/apache/sling/maven/slingstart/PreparePackageMojo.java
@@ -85,7 +85,7 @@ public class PreparePackageMojo extends AbstractSlingStartMojo {
private static final String CONFIG_DIRECTORY = "config";
private static final String PROVISIONING_DIRECTORY = "provisioning";
-
+
private static final String EMBEDDED_MODEL_FILENAME = "model.txt";
private static final String BOOTSTRAP_FILE = "sling_bootstrap.txt";
@@ -121,10 +121,6 @@ public class PreparePackageMojo extends AbstractSlingStartMojo {
this.prepareWebapp(model);
}
- protected File getStandaloneOutputDirectory() {
- return new File(this.project.getBuild().getOutputDirectory());
- }
-
/**
* Prepare the global map for the artifacts.
*/
@@ -151,7 +147,7 @@ public class PreparePackageMojo extends AbstractSlingStartMojo {
this.buildContentsMap(model, ModelConstants.RUN_MODE_STANDALONE, contentsMap);
}
-
+
/** Embed our model in the created jar file */
private void embedModel(Model model, File outputDir) throws MojoExecutionException {
final File modelDir = new File(new File(outputDir, BASE_DESTINATION), PROVISIONING_DIRECTORY);
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.