svn commit: r1035756 - /servicemix/maven-plugins/jbi-maven-plugin/trunk/src/main/java/org/apache/servicemix/maven/plugin/jbi/GenerateServiceAssemblyMojo.java

[lhein]

Author: lhein
Date: Tue Nov 16 19:33:26 2010
New Revision: 1035756

URL: http://svn.apache.org/viewvc?rev=1035756&view=rev
Log:
- now always a jar and a zip is created in target for service assemblies (see 
SM-2008)

Modified:
    
servicemix/maven-plugins/jbi-maven-plugin/trunk/src/main/java/org/apache/servicemix/maven/plugin/jbi/GenerateServiceAssemblyMojo.java

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=1035756&r1=1035755&r2=1035756&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
 Tue Nov 16 19:33:26 2010
@@ -83,10 +83,12 @@ public class GenerateServiceAssemblyMojo
     public void execute() throws MojoExecutionException, MojoFailureException {
         try {
             injectDependentServiceUnits();
-
-            createArchive(new File(outputDirectory, finalName));
-
-            projectHelper.attachArtifact(project, "zip", null, new 
File(outputDirectory, finalName));
+            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);
         } catch (Exception e) {
             throw new MojoExecutionException("Failed to inject dependencies", 
e);
         }