svn commit: r1074056 - in /servicemix/maven-plugins/jbi-maven-plugin/trunk/src/main: java/org/apache/servicemix/maven/plugin/jbi/GenerateServiceAssemblyMojo.java resources/META-INF/plexus/components.xml

[lh...@apache.org]

Author: lhein
Date: Thu Feb 24 07:08:20 2011
New Revision: 1074056

URL: http://svn.apache.org/viewvc?rev=1074056&view=rev
Log:
plugin creates only a zip file for service assemblies (see SM-2008, ESB-1396)

Modified:
    servicemix/maven-plugins/jbi-maven-plugin/trunk/src/main/java/org/apache/servicemix/maven/plugin/jbi/GenerateServiceAssemblyMojo.java
    servicemix/maven-plugins/jbi-maven-plugin/trunk/src/main/resources/META-INF/plexus/components.xml

Modified: servicemix/maven-plugins/jbi-maven-plugin/trunk/src/main/java/org/apache/servicemix/maven/plugin/jbi/GenerateServiceAssemblyMojo.java
URL: http://svn.apache.org/viewvc/servicemix/maven-plugins/jbi-maven-plugin/trunk/src/main/java/org/apache/servicemix/maven/plugin/jbi/GenerateServiceAssemblyMojo.java?rev=1074056&r1=1074055&r2=1074056&view=diff
==============================================================================
--- servicemix/maven-plugins/jbi-maven-plugin/trunk/src/main/java/org/apache/servicemix/maven/plugin/jbi/GenerateServiceAssemblyMojo.java (original)
+++ servicemix/maven-plugins/jbi-maven-plugin/trunk/src/main/java/org/apache/servicemix/maven/plugin/jbi/GenerateServiceAssemblyMojo.java Thu Feb 24 07:08:20 2011
@@ -16,11 +16,6 @@
  */
 package org.apache.servicemix.maven.plugin.jbi;
 
-import java.io.File;
-import java.io.IOException;
-import java.util.Iterator;
-import java.util.Set;
-
 import org.apache.maven.archiver.MavenArchiveConfiguration;
 import org.apache.maven.archiver.MavenArchiver;
 import org.apache.maven.artifact.Artifact;
@@ -35,6 +30,11 @@ import org.codehaus.plexus.archiver.jar.
 import org.codehaus.plexus.util.DirectoryScanner;
 import org.codehaus.plexus.util.FileUtils;
 
+import java.io.File;
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.Set;
+
 /**
  * A Mojo used to build the jbi service assembly zip file
  *
@@ -68,7 +68,7 @@ public class GenerateServiceAssemblyMojo
     /**
      * The name of the generated war.
      *
-     * @parameter expression="${project.build.finalName}.jar"
+     * @parameter expression="${project.build.finalName}.zip"
      * @required
      */
     private String finalName;
@@ -84,11 +84,8 @@ public class GenerateServiceAssemblyMojo
         try {
             injectDependentServiceUnits();
             File sa = new File(outputDirectory, finalName);
-            File zipFile = new File(outputDirectory, FileUtils.removeExtension(finalName) + ".zip");
             createArchive(sa);
-            // now copy it to zip
-            FileUtils.copyFile(sa, zipFile);
-            projectHelper.attachArtifact(project, "zip", null, zipFile);
+            project.getArtifact().setFile(sa);
         } catch (Exception e) {
             throw new MojoExecutionException("Failed to inject dependencies", e);
         }

Modified: servicemix/maven-plugins/jbi-maven-plugin/trunk/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/servicemix/maven-plugins/jbi-maven-plugin/trunk/src/main/resources/META-INF/plexus/components.xml?rev=1074056&r1=1074055&r2=1074056&view=diff
==============================================================================
--- servicemix/maven-plugins/jbi-maven-plugin/trunk/src/main/resources/META-INF/plexus/components.xml (original)
+++ servicemix/maven-plugins/jbi-maven-plugin/trunk/src/main/resources/META-INF/plexus/components.xml Thu Feb 24 07:08:20 2011
@@ -90,7 +90,7 @@
       <implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
       <configuration>
         <type>jbi-service-assembly</type>
-        <extension>jar</extension>
+        <extension>zip</extension>
         <language>java</language>
       </configuration>
     </component>
@@ -106,8 +106,7 @@
           <process-test-resources>org.apache.maven.plugins:maven-resources-plugin:testResources</process-test-resources>
           <test-compile>org.apache.maven.plugins:maven-compiler-plugin:testCompile</test-compile>
           <test>org.apache.maven.plugins:maven-surefire-plugin:test</test>
-          <package>org.apache.servicemix.tooling:jbi-maven-plugin:jbi-service-assembly,
-                   org.apache.maven.plugins:maven-jar-plugin:jar</package>
+          <package>org.apache.servicemix.tooling:jbi-maven-plugin:jbi-service-assembly</package>
           <install>org.apache.maven.plugins:maven-install-plugin:install</install>
           <deploy>org.apache.maven.plugins:maven-deploy-plugin:deploy</deploy>
         </phases>