You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by pi...@apache.org on 2011/01/15 14:58:07 UTC
svn commit: r1059336 - in /karaf/trunk/assembly: pom.xml
src/main/descriptors/unix-bin.xml src/main/descriptors/unix-minimal-bin.xml
src/main/descriptors/windows-bin.xml
src/main/descriptors/windows-minimal-bin.xml
Author: pieber
Date: Sat Jan 15 13:58:06 2011
New Revision: 1059336
URL: http://svn.apache.org/viewvc?rev=1059336&view=rev
Log:
[KARAF-373] use new feature of KARAF-373 on assembly plugin
Signed-off-by: Andreas Pieber <an...@gmail.com>
Modified:
karaf/trunk/assembly/pom.xml
karaf/trunk/assembly/src/main/descriptors/unix-bin.xml
karaf/trunk/assembly/src/main/descriptors/unix-minimal-bin.xml
karaf/trunk/assembly/src/main/descriptors/windows-bin.xml
karaf/trunk/assembly/src/main/descriptors/windows-minimal-bin.xml
Modified: karaf/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/assembly/pom.xml?rev=1059336&r1=1059335&r2=1059336&view=diff
==============================================================================
--- karaf/trunk/assembly/pom.xml (original)
+++ karaf/trunk/assembly/pom.xml Sat Jan 15 13:58:06 2011
@@ -612,6 +612,13 @@
<feature>ssh</feature>
<feature>management</feature>
</features>
+ <copyFileBasedDescriptors>
+ <copyFileBasedDescriptor>
+ <sourceFile>${basedir}/target/classes/features.xml</sourceFile>
+ <targetDirectory>org/apache/karaf/apache-karaf/${project.version}</targetDirectory>
+ <targetFileName>${project.artifactId}-${project.version}-features.xml</targetFileName>
+ </copyFileBasedDescriptor>
+ </copyFileBasedDescriptors>
<repository>target/features-repo</repository>
</configuration>
</execution>
Modified: karaf/trunk/assembly/src/main/descriptors/unix-bin.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/assembly/src/main/descriptors/unix-bin.xml?rev=1059336&r1=1059335&r2=1059336&view=diff
==============================================================================
--- karaf/trunk/assembly/src/main/descriptors/unix-bin.xml (original)
+++ karaf/trunk/assembly/src/main/descriptors/unix-bin.xml Sat Jan 15 13:58:06 2011
@@ -123,13 +123,6 @@
<fileMode>0644</fileMode>
<lineEnding>unix</lineEnding>
</file>
- <file>
- <source>${basedir}/target/classes/features.xml</source>
- <outputDirectory>/system/org/apache/karaf/apache-karaf/${project.version}</outputDirectory>
- <destName>apache-karaf-${project.version}-features.xml</destName>
- <fileMode>0644</fileMode>
- <lineEnding>unix</lineEnding>
- </file>
</files>
<dependencySets>
Modified: karaf/trunk/assembly/src/main/descriptors/unix-minimal-bin.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/assembly/src/main/descriptors/unix-minimal-bin.xml?rev=1059336&r1=1059335&r2=1059336&view=diff
==============================================================================
--- karaf/trunk/assembly/src/main/descriptors/unix-minimal-bin.xml (original)
+++ karaf/trunk/assembly/src/main/descriptors/unix-minimal-bin.xml Sat Jan 15 13:58:06 2011
@@ -120,13 +120,6 @@
<fileMode>0644</fileMode>
<lineEnding>unix</lineEnding>
</file>
- <file>
- <source>${basedir}/target/classes/features.xml</source>
- <outputDirectory>/system/org/apache/karaf/apache-karaf/${project.version}</outputDirectory>
- <destName>apache-karaf-${project.version}-features.xml</destName>
- <fileMode>0644</fileMode>
- <lineEnding>unix</lineEnding>
- </file>
</files>
<dependencySets>
Modified: karaf/trunk/assembly/src/main/descriptors/windows-bin.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/assembly/src/main/descriptors/windows-bin.xml?rev=1059336&r1=1059335&r2=1059336&view=diff
==============================================================================
--- karaf/trunk/assembly/src/main/descriptors/windows-bin.xml (original)
+++ karaf/trunk/assembly/src/main/descriptors/windows-bin.xml Sat Jan 15 13:58:06 2011
@@ -110,13 +110,6 @@
<fileMode>0644</fileMode>
<lineEnding>dos</lineEnding>
</file>
- <file>
- <source>${basedir}/target/classes/features.xml</source>
- <outputDirectory>/system/org/apache/karaf/apache-karaf/${project.version}</outputDirectory>
- <destName>apache-karaf-${project.version}-features.xml</destName>
- <fileMode>0644</fileMode>
- <lineEnding>dos</lineEnding>
- </file>
</files>
<dependencySets>
Modified: karaf/trunk/assembly/src/main/descriptors/windows-minimal-bin.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/assembly/src/main/descriptors/windows-minimal-bin.xml?rev=1059336&r1=1059335&r2=1059336&view=diff
==============================================================================
--- karaf/trunk/assembly/src/main/descriptors/windows-minimal-bin.xml (original)
+++ karaf/trunk/assembly/src/main/descriptors/windows-minimal-bin.xml Sat Jan 15 13:58:06 2011
@@ -108,13 +108,6 @@
<fileMode>0644</fileMode>
<lineEnding>dos</lineEnding>
</file>
- <file>
- <source>${basedir}/target/classes/features.xml</source>
- <outputDirectory>/system/org/apache/karaf/apache-karaf/${project.version}</outputDirectory>
- <destName>apache-karaf-${project.version}-features.xml</destName>
- <fileMode>0644</fileMode>
- <lineEnding>dos</lineEnding>
- </file>
</files>
<dependencySets>