You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by lh...@apache.org on 2010/11/10 13:55:23 UTC
svn commit: r1033444 - in
/servicemix/maven-plugins/jbi-maven-plugin/trunk/src/main:
java/org/apache/servicemix/maven/plugin/jbi/ resources/META-INF/plexus/
Author: lhein
Date: Wed Nov 10 12:55:23 2010
New Revision: 1033444
URL: http://svn.apache.org/viewvc?rev=1033444&view=rev
Log:
- fixed wrong installing of artifacts 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
servicemix/maven-plugins/jbi-maven-plugin/trunk/src/main/java/org/apache/servicemix/maven/plugin/jbi/GenerateServiceUnitMojo.java
servicemix/maven-plugins/jbi-maven-plugin/trunk/src/main/java/org/apache/servicemix/maven/plugin/jbi/GenerateSharedLibraryMojo.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=1033444&r1=1033443&r2=1033444&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 Wed Nov 10 12:55:23 2010
@@ -51,6 +51,7 @@ public class GenerateServiceAssemblyMojo
/**
* The Zip archiver.
*
+ * @parameter expression="${component.org.codehaus.plexus.archiver.Archiver#jar}"
* @component role="org.codehaus.plexus.archiver.Archiver" roleHint="jar"
* @required
*/
@@ -67,7 +68,7 @@ public class GenerateServiceAssemblyMojo
/**
* The name of the generated war.
*
- * @parameter expression="${project.build.finalName}.zip"
+ * @parameter expression="${project.build.finalName}.jar"
* @required
*/
private String finalName;
@@ -105,7 +106,6 @@ public class GenerateServiceAssemblyMojo
jarArchiver.addDirectory(workDirectory, null, DirectoryScanner.DEFAULTEXCLUDES);
archiver.createArchive(getProject(), archive);
-
} catch (Exception e) {
throw new JbiPluginException("Error creating shared library: "
+ e.getMessage(), e);
Modified: servicemix/maven-plugins/jbi-maven-plugin/trunk/src/main/java/org/apache/servicemix/maven/plugin/jbi/GenerateServiceUnitMojo.java
URL: http://svn.apache.org/viewvc/servicemix/maven-plugins/jbi-maven-plugin/trunk/src/main/java/org/apache/servicemix/maven/plugin/jbi/GenerateServiceUnitMojo.java?rev=1033444&r1=1033443&r2=1033444&view=diff
==============================================================================
--- servicemix/maven-plugins/jbi-maven-plugin/trunk/src/main/java/org/apache/servicemix/maven/plugin/jbi/GenerateServiceUnitMojo.java (original)
+++ servicemix/maven-plugins/jbi-maven-plugin/trunk/src/main/java/org/apache/servicemix/maven/plugin/jbi/GenerateServiceUnitMojo.java Wed Nov 10 12:55:23 2010
@@ -53,7 +53,7 @@ public class GenerateServiceUnitMojo ext
/**
* The name of the generated war.
*
- * @parameter expression="${project.artifactId}-${project.version}.zip"
+ * @parameter expression="${project.build.finalName}.zip"
* @required
*/
private String serviceUnitName;
Modified: servicemix/maven-plugins/jbi-maven-plugin/trunk/src/main/java/org/apache/servicemix/maven/plugin/jbi/GenerateSharedLibraryMojo.java
URL: http://svn.apache.org/viewvc/servicemix/maven-plugins/jbi-maven-plugin/trunk/src/main/java/org/apache/servicemix/maven/plugin/jbi/GenerateSharedLibraryMojo.java?rev=1033444&r1=1033443&r2=1033444&view=diff
==============================================================================
--- servicemix/maven-plugins/jbi-maven-plugin/trunk/src/main/java/org/apache/servicemix/maven/plugin/jbi/GenerateSharedLibraryMojo.java (original)
+++ servicemix/maven-plugins/jbi-maven-plugin/trunk/src/main/java/org/apache/servicemix/maven/plugin/jbi/GenerateSharedLibraryMojo.java Wed Nov 10 12:55:23 2010
@@ -55,7 +55,7 @@ public class GenerateSharedLibraryMojo e
/**
* The name of the generated war.
*
- * @parameter expression="${project.artifactId}-${project.version}.zip"
+ * @parameter expression="${project.build.finalName}.zip"
* @required
*/
private String sharedLibraryName;
@@ -63,7 +63,7 @@ public class GenerateSharedLibraryMojo e
/**
* The name of the generated war.
*
- * @parameter expression="${project.artifactId}-${project.version}.jar"
+ * @parameter expression="${project.build.finalName}.jar"
* @required
*/
private String jarName;
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=1033444&r1=1033443&r2=1033444&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 Wed Nov 10 12:55:23 2010
@@ -90,7 +90,7 @@
<implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
<configuration>
<type>jbi-service-assembly</type>
- <extension>zip</extension>
+ <extension>jar</extension>
<language>java</language>
</configuration>
</component>