svn commit: r1768644 - /sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/PackageMojo.java

[cz...@apache.org]

Author: cziegeler
Date: Tue Nov  8 08:51:14 2016
New Revision: 1768644

URL: http://svn.apache.org/viewvc?rev=1768644&view=rev
Log:
SLING-6068 : slingstart-maven-plugin: Allow to start a quickstart JAR based on a provisioning model even for non slingstart packagings

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

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=1768644&r1=1768643&r2=1768644&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 Nov  8 08:51:14 2016
@@ -64,7 +64,6 @@ public class PackageMojo extends Abstrac
     private void packageStandaloneApp(final Map<String, File> globalContentsMap) throws MojoExecutionException {
         this.getLog().info("Packaging standalone jar...");
 
-        final File buildDirectory = new File(this.project.getBuild().getDirectory());
         @SuppressWarnings("unchecked")
         final Map<String, File> contentsMap = (Map<String, File>) this.project.getContextValue(BuildConstants.CONTEXT_STANDALONE);
 
@@ -75,14 +74,7 @@ public class PackageMojo extends Abstrac
             fis = new FileInputStream(manifestFile);
             final Manifest mf = new Manifest(fis);
 
-            // make sure this filename does not conflict with any other project artifacts (primary or secondary)
-            final File outputFile;
-            if ( BuildConstants.PACKAGING_SLINGSTART.equals(project.getPackaging()) ) {
-                outputFile = new File(buildDirectory, this.project.getArtifactId() + "-" + this.project.getVersion() + ".jar");
-            } else {
-                outputFile = new File(buildDirectory, this.project.getArtifactId() + "-" + this.project.getVersion() + ".standalonelaunchpad.jar");
-            }
-
+            final File outputFile = getBuildFile(".jar");
             final JarArchiverHelper helper = new JarArchiverHelper(jarArchiver, this.project, outputFile, mf);
             helper.addDirectory(buildOutputDirectory, null, EXCLUDES_MANIFEST);
 
@@ -110,16 +102,10 @@ public class PackageMojo extends Abstrac
             @SuppressWarnings("unchecked")
             final Map<String, File> contentsMap = (Map<String, File>) this.project.getContextValue(BuildConstants.CONTEXT_WEBAPP);
 
-            final File buildOutputDirectory = new File(buildDirectory, BuildConstants.WEBAPP_OUTDIR);
-            // make sure this filename does not conflict with any other project artifacts (primary or secondary)
-            final File outputFile;
-            if ( BuildConstants.PACKAGING_SLINGSTART.equals(project.getPackaging()) ) {
-                outputFile = new File(buildDirectory, this.project.getArtifactId() + "-" + this.project.getVersion() + ".war");
-            } else {
-                outputFile = new File(buildDirectory, this.project.getArtifactId() + "-" + this.project.getVersion() + ".webapplaunchpad.war");
-            }
+            final File outputFile = getBuildFile(".war");
 
             final JarArchiverHelper helper = new JarArchiverHelper(this.jarArchiver, this.project, outputFile);
+            final File buildOutputDirectory = new File(buildDirectory, BuildConstants.WEBAPP_OUTDIR);
             helper.addDirectory(buildOutputDirectory, null, EXCLUDES_MANIFEST);
 
             helper.addArtifacts(globalContentsMap, "WEB-INF/");
@@ -130,4 +116,21 @@ public class PackageMojo extends Abstrac
             projectHelper.attachArtifact(project, BuildConstants.TYPE_WAR, BuildConstants.CLASSIFIER_WEBAPP, outputFile);
         }
     }
+
+    /**
+     *
+     * @param isStandalone {@code true} if the standalone launchpad should be built, {@code false} if the webapp should be built.
+     * @return the absolute file name of the to be created artifact
+     */
+    private File getBuildFile(final String extension) {
+        final File buildDirectory = new File(this.project.getBuild().getDirectory());
+        final File buildFile;
+        if ( BuildConstants.PACKAGING_SLINGSTART.equals(project.getPackaging()) ) {
+            buildFile = new File(buildDirectory, this.project.getBuild().getFinalName() + extension);
+        } else {
+            // make sure this filename does not conflict with any other project artifacts (primary or secondary)
+            buildFile = new File(buildDirectory, this.project.getBuild().getFinalName() + ".launchpad" + extension);
+        }
+        return buildFile;
+    }
 }