svn commit: r1728116 - in /sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart: AbstractSlingStartMojo.java PackageMojo.java PreparePackageMojo.java

[cziegeler]

Author: cziegeler
Date: Tue Feb  2 13:31:46 2016
New Revision: 1728116

URL: http://svn.apache.org/viewvc?rev=1728116&view=rev
Log:
SLING-5476 : target/classes should not be used by the plugin

Modified:
    
sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/AbstractSlingStartMojo.java
    
sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/PackageMojo.java
    
sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/PreparePackageMojo.java

Modified: 
sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/AbstractSlingStartMojo.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/AbstractSlingStartMojo.java?rev=1728116&r1=1728115&r2=1728116&view=diff
==============================================================================
--- 
sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/AbstractSlingStartMojo.java
 (original)
+++ 
sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/AbstractSlingStartMojo.java
 Tue Feb  2 13:31:46 2016
@@ -96,4 +96,8 @@ public abstract class AbstractSlingStart
         }
         return options;
     }
+
+    protected File getStandaloneOutputDirectory() {
+        return new File(this.getTmpDir(), "standalone");
+    }
 }

Modified: 
sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/PackageMojo.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/PackageMojo.java?rev=1728116&r1=1728115&r2=1728116&view=diff
==============================================================================
--- 
sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/PackageMojo.java
 (original)
+++ 
sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/PackageMojo.java
 Tue Feb  2 13:31:46 2016
@@ -68,7 +68,7 @@ public class PackageMojo extends Abstrac
         @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 {

Modified: 
sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/PreparePackageMojo.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/PreparePackageMojo.java?rev=1728116&r1=1728115&r2=1728116&view=diff
==============================================================================
--- 
sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/PreparePackageMojo.java
 (original)
+++ 
sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/PreparePackageMojo.java
 Tue Feb  2 13:31:46 2016
@@ -85,7 +85,7 @@ public class PreparePackageMojo extends
     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
         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
 
         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);