You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by gn...@apache.org on 2006/06/22 03:01:58 UTC
svn commit: r416190 - in
/incubator/servicemix/trunk/tooling/jbi-maven-plugin/src/main/java/org/apache/servicemix/maven/plugin/jbi:
GenerateServiceAssemblyMojo.java GenerateSharedLibraryDescriptorMojo.java
Author: gnodet
Date: Wed Jun 21 18:01:57 2006
New Revision: 416190
URL: http://svn.apache.org/viewvc?rev=416190&view=rev
Log:
Fix directories in SL and SA
Modified:
incubator/servicemix/trunk/tooling/jbi-maven-plugin/src/main/java/org/apache/servicemix/maven/plugin/jbi/GenerateServiceAssemblyMojo.java
incubator/servicemix/trunk/tooling/jbi-maven-plugin/src/main/java/org/apache/servicemix/maven/plugin/jbi/GenerateSharedLibraryDescriptorMojo.java
Modified: incubator/servicemix/trunk/tooling/jbi-maven-plugin/src/main/java/org/apache/servicemix/maven/plugin/jbi/GenerateServiceAssemblyMojo.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/tooling/jbi-maven-plugin/src/main/java/org/apache/servicemix/maven/plugin/jbi/GenerateServiceAssemblyMojo.java?rev=416190&r1=416189&r2=416190&view=diff
==============================================================================
--- incubator/servicemix/trunk/tooling/jbi-maven-plugin/src/main/java/org/apache/servicemix/maven/plugin/jbi/GenerateServiceAssemblyMojo.java (original)
+++ incubator/servicemix/trunk/tooling/jbi-maven-plugin/src/main/java/org/apache/servicemix/maven/plugin/jbi/GenerateServiceAssemblyMojo.java Wed Jun 21 18:01:57 2006
@@ -74,7 +74,7 @@
.getAbsolutePath()
+ " into working directory for packaging");
FileUtils.copyFileToDirectory(artifact.getFile(),
- new File(workDirectory, LIB_DIRECTORY));
+ workDirectory);
} catch (IOException e) {
throw new JbiPluginException(
"Unable to find service unit "
Modified: incubator/servicemix/trunk/tooling/jbi-maven-plugin/src/main/java/org/apache/servicemix/maven/plugin/jbi/GenerateSharedLibraryDescriptorMojo.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/tooling/jbi-maven-plugin/src/main/java/org/apache/servicemix/maven/plugin/jbi/GenerateSharedLibraryDescriptorMojo.java?rev=416190&r1=416189&r2=416190&view=diff
==============================================================================
--- incubator/servicemix/trunk/tooling/jbi-maven-plugin/src/main/java/org/apache/servicemix/maven/plugin/jbi/GenerateSharedLibraryDescriptorMojo.java (original)
+++ incubator/servicemix/trunk/tooling/jbi-maven-plugin/src/main/java/org/apache/servicemix/maven/plugin/jbi/GenerateSharedLibraryDescriptorMojo.java Wed Jun 21 18:01:57 2006
@@ -177,7 +177,7 @@
String type = artifact.getType();
if ("jar".equals(type)) {
info = new DependencyInformation();
- info.setFilename(artifact.getFile().getName());
+ info.setFilename(LIB_DIRECTORY + "/" + artifact.getFile().getName());
embeddedLibraries.add(info);
}
}