commit a7a022051d5158bc428c2411924e19932743f540
author Thomas Vachuska <tom@onlab.us> Tue Apr 14 23:13:02 2015 -0700
committer Brian O'Connor <bocon@onlab.us> Wed Apr 15 14:01:50 2015 -0700
tree b4a7d1118f74641ba207d5173e7dc9d16fb2cdf5
parent abf66d9e1abc8c64362f778610b2545469b4b918

Fixed a defect on OnosAppMojo to allow apps to properly stage their own artifacts.

Change-Id: Iea33baec27820663524ba84524ff9acb40d7a9b3

tools/package/maven-plugin/src/main/java/org/onosproject/maven/OnosAppMojo.java

diff --git a/tools/package/maven-plugin/src/main/java/org/onosproject/maven/OnosAppMojo.java b/tools/package/maven-plugin/src/main/java/org/onosproject/maven/OnosAppMojo.java
index 9ba2514..9e26266 100644
--- a/tools/package/maven-plugin/src/main/java/org/onosproject/maven/OnosAppMojo.java
+++ b/tools/package/maven-plugin/src/main/java/org/onosproject/maven/OnosAppMojo.java
@@ -225,21 +225,21 @@
     }
 
     // Stages all artifacts.
-    private void processArtifacts() {
-        artifacts.forEach(this::processArtifact);
+    private void processArtifacts() throws MojoExecutionException {
+        for (String artifact : artifacts) {
+            processArtifact(artifact);
+        }
     }
 
     // Stages the specified artifact.
-    private void processArtifact(String artifact) {
+    private void processArtifact(String artifact) throws MojoExecutionException {
         if (!artifact.startsWith(MVN_URL)) {
-            getLog().error("Unsupported artifact URL:" + artifact);
-            return;
+            throw new MojoExecutionException("Unsupported artifact URL:" + artifact);
         }
 
         String[] fields = artifact.substring(4).split("/");
         if (fields.length < 3) {
-            getLog().error("Illegal artifact URL:" + artifact);
-            return;
+            throw new MojoExecutionException("Illegal artifact URL:" + artifact);
         }
 
         try {
@@ -254,12 +254,12 @@
                 // Other artifacts are packaged from ~/.m2/repository directory.
                 String m2Path = artifactDir(fields);
                 File srcDir = new File(m2Directory, m2Path);
-                File dstDir = new File(stageDirectory, m2Path);
+                File dstDir = new File(stageDirectory, M2_PREFIX + "/" + m2Path);
                 forceMkdir(dstDir);
                 copyFile(new File(srcDir, file), new File(dstDir, file));
             }
         } catch (IOException e) {
-            getLog().error("Unable to stage artifact " + artifact + " due to ", e);
+            throw new MojoExecutionException("Unable to stage artifact " + artifact, e);
         }
     }