You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by dj...@apache.org on 2010/02/26 09:34:53 UTC
svn commit: r916618 - in
/incubator/aries/trunk/application/eba-maven-plugin/src:
main/java/org/apache/aries/plugin/eba/ test/resources/unit/basic-eba-test/
test/resources/unit/basic-eba-with-descriptor/
test/resources/unit/basic-eba-with-manifest/
Author: djencks
Date: Fri Feb 26 08:34:53 2010
New Revision: 916618
URL: http://svn.apache.org/viewvc?rev=916618&view=rev
Log:
ARIES-120 include legal files from maven-remote-resources-plugin
Modified:
incubator/aries/trunk/application/eba-maven-plugin/src/main/java/org/apache/aries/plugin/eba/EbaMojo.java
incubator/aries/trunk/application/eba-maven-plugin/src/test/resources/unit/basic-eba-test/plugin-config.xml
incubator/aries/trunk/application/eba-maven-plugin/src/test/resources/unit/basic-eba-with-descriptor/plugin-config.xml
incubator/aries/trunk/application/eba-maven-plugin/src/test/resources/unit/basic-eba-with-manifest/plugin-config.xml
Modified: incubator/aries/trunk/application/eba-maven-plugin/src/main/java/org/apache/aries/plugin/eba/EbaMojo.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/eba-maven-plugin/src/main/java/org/apache/aries/plugin/eba/EbaMojo.java?rev=916618&r1=916617&r2=916618&view=diff
==============================================================================
--- incubator/aries/trunk/application/eba-maven-plugin/src/main/java/org/apache/aries/plugin/eba/EbaMojo.java (original)
+++ incubator/aries/trunk/application/eba-maven-plugin/src/main/java/org/apache/aries/plugin/eba/EbaMojo.java Fri Feb 26 08:34:53 2010
@@ -89,6 +89,14 @@
private String workDirectory;
/**
+ * Directory that remote-resources puts legal files.
+ *
+ * @parameter expression="${project.build.directory}/maven-shared-archive-resources"
+ * @required
+ */
+ private String sharedResources;
+
+ /**
* The directory for the generated eba.
*
* @parameter expression="${project.build.directory}"
@@ -248,7 +256,12 @@
// Include custom manifest if necessary
includeCustomManifestFile();
- archiver.getArchiver().addDirectory( getBuildDir() );
+ jarArchiver.addDirectory( getBuildDir() );
+ //include legal files if any
+ File sharedResourcesDir = new File(sharedResources);
+ if (sharedResourcesDir.isDirectory()) {
+ jarArchiver.addDirectory(sharedResourcesDir);
+ }
archiver.createArchive( project, archive );
project.getArtifact().setFile( ebaFile );
Modified: incubator/aries/trunk/application/eba-maven-plugin/src/test/resources/unit/basic-eba-test/plugin-config.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/eba-maven-plugin/src/test/resources/unit/basic-eba-test/plugin-config.xml?rev=916618&r1=916617&r2=916618&view=diff
==============================================================================
--- incubator/aries/trunk/application/eba-maven-plugin/src/test/resources/unit/basic-eba-test/plugin-config.xml (original)
+++ incubator/aries/trunk/application/eba-maven-plugin/src/test/resources/unit/basic-eba-test/plugin-config.xml Fri Feb 26 08:34:53 2010
@@ -28,6 +28,7 @@
<includeJar>true</includeJar>
<manifestFile>${basedir}/src/main/eba/META-INF/MANIFEST.MF</manifestFile>
<workDirectory>${basedir}/target/unit/basic-eba-test/target/eba-test</workDirectory>
+ <sharedResources>${basedir}/target/unit/basic-eba-test/target/maven-shared-archive-resources</sharedResources>
<outputDirectory>${basedir}/target/unit/basic-eba-test/target</outputDirectory>
<finalName>test-eba</finalName>
<project implementation="org.apache.aries.plugin.eba.stubs.EbaMavenProjectStub" />
Modified: incubator/aries/trunk/application/eba-maven-plugin/src/test/resources/unit/basic-eba-with-descriptor/plugin-config.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/eba-maven-plugin/src/test/resources/unit/basic-eba-with-descriptor/plugin-config.xml?rev=916618&r1=916617&r2=916618&view=diff
==============================================================================
--- incubator/aries/trunk/application/eba-maven-plugin/src/test/resources/unit/basic-eba-with-descriptor/plugin-config.xml (original)
+++ incubator/aries/trunk/application/eba-maven-plugin/src/test/resources/unit/basic-eba-with-descriptor/plugin-config.xml Fri Feb 26 08:34:53 2010
@@ -28,6 +28,7 @@
<includeJar>false</includeJar>
<manifestFile>${basedir}/src/test/resources/unit/basic-eba-with-descriptor/src/main/eba/META-INF/MANIFEST.MF</manifestFile>
<workDirectory>${basedir}/target/unit/basic-eba-with-descriptor/target/eba-test-with-descriptor</workDirectory>
+ <sharedResources>${basedir}/target/unit/basic-eba-with-descriptor/target/maven-shared-archive-resources</sharedResources>
<outputDirectory>${basedir}/target/unit/basic-eba-with-descriptor/target</outputDirectory>
<finalName>test-eba-with-descriptor</finalName>
<project implementation="org.apache.aries.plugin.eba.stubs.EbaMavenProjectStub2" />
Modified: incubator/aries/trunk/application/eba-maven-plugin/src/test/resources/unit/basic-eba-with-manifest/plugin-config.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/eba-maven-plugin/src/test/resources/unit/basic-eba-with-manifest/plugin-config.xml?rev=916618&r1=916617&r2=916618&view=diff
==============================================================================
--- incubator/aries/trunk/application/eba-maven-plugin/src/test/resources/unit/basic-eba-with-manifest/plugin-config.xml (original)
+++ incubator/aries/trunk/application/eba-maven-plugin/src/test/resources/unit/basic-eba-with-manifest/plugin-config.xml Fri Feb 26 08:34:53 2010
@@ -28,6 +28,7 @@
<includeJar>false</includeJar>
<manifestFile>${basedir}/src/test/resources/unit/basic-eba-with-manifest/src/main/eba/META-INF/MANIFEST.MF</manifestFile>
<workDirectory>${basedir}/target/unit/basic-eba-with-manifest/target/eba-test-with-manifest</workDirectory>
+ <sharedResources>${basedir}/target/unit/basic-eba-with-manifest/target/maven-shared-archive-resources</sharedResources>
<outputDirectory>${basedir}/target/unit/basic-eba-with-manifest/target</outputDirectory>
<finalName>test-eba-with-manifest</finalName>
<project implementation="org.apache.aries.plugin.eba.stubs.EbaMavenProjectStub3" />