You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by io...@apache.org on 2010/09/15 16:49:21 UTC
svn commit: r997356 - in /karaf/trunk/assembly: pom.xml
src/main/descriptors/unix-minimal-bin.xml
src/main/descriptors/windows-minimal-bin.xml
src/main/filtered-resources/minimal/startup.properties
Author: iocanel
Date: Wed Sep 15 14:49:20 2010
New Revision: 997356
URL: http://svn.apache.org/viewvc?rev=997356&view=rev
Log:
[KARAF-106] Excluded demos folder from minimal distro. Removed all pdf and html from minimal distro. Removed duplicate minimal occurance in the distribution artifact.
Modified:
karaf/trunk/assembly/pom.xml
karaf/trunk/assembly/src/main/descriptors/unix-minimal-bin.xml
karaf/trunk/assembly/src/main/descriptors/windows-minimal-bin.xml
karaf/trunk/assembly/src/main/filtered-resources/minimal/startup.properties
Modified: karaf/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/assembly/pom.xml?rev=997356&r1=997355&r2=997356&view=diff
==============================================================================
--- karaf/trunk/assembly/pom.xml (original)
+++ karaf/trunk/assembly/pom.xml Wed Sep 15 14:49:20 2010
@@ -435,7 +435,7 @@
<descriptors>
<descriptor>src/main/descriptors/unix-minimal-bin.xml</descriptor>
</descriptors>
- <finalName>${project.artifactId}-minimal-${project.version}</finalName>
+ <finalName>${project.artifactId}-${project.version}</finalName>
<tarLongFileMode>gnu</tarLongFileMode>
</configuration>
</execution>
@@ -463,7 +463,7 @@
<descriptors>
<descriptor>src/main/descriptors/windows-minimal-bin.xml</descriptor>
</descriptors>
- <finalName>${project.artifactId}-minimal-${project.version}</finalName>
+ <finalName>${project.artifactId}-${project.version}</finalName>
<appendAssemblyId>true</appendAssemblyId>
<assemblyId />
</configuration>
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=997356&r1=997355&r2=997356&view=diff
==============================================================================
--- karaf/trunk/assembly/src/main/descriptors/unix-minimal-bin.xml (original)
+++ karaf/trunk/assembly/src/main/descriptors/unix-minimal-bin.xml Wed Sep 15 14:49:20 2010
@@ -71,22 +71,6 @@
<lineEnding>unix</lineEnding>
</fileSet>
-
- <!-- Copy over the examples -->
- <fileSet>
- <directory>target/classes/demos</directory>
- <outputDirectory>/demos/</outputDirectory>
- <lineEnding>unix</lineEnding>
- </fileSet>
- <fileSet>
- <directory>../demos</directory>
- <outputDirectory>/demos/</outputDirectory>
- <lineEnding>unix</lineEnding>
- <excludes>
- <exclude>**/target/**</exclude>
- </excludes>
- </fileSet>
-
<!-- Copy over files that should not get the line endings converted -->
<fileSet>
<directory>src/main/distribution/binary</directory>
@@ -111,6 +95,10 @@
<!-- Copy over jar files -->
<fileSet>
<directory>target/dependencies</directory>
+ <excludes>
+ <exclude>*.html</exclude>
+ <exclude>*.pdf</exclude>
+ </excludes>
<outputDirectory>/</outputDirectory>
</fileSet>
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=997356&r1=997355&r2=997356&view=diff
==============================================================================
--- karaf/trunk/assembly/src/main/descriptors/windows-minimal-bin.xml (original)
+++ karaf/trunk/assembly/src/main/descriptors/windows-minimal-bin.xml Wed Sep 15 14:49:20 2010
@@ -68,22 +68,6 @@
<lineEnding>dos</lineEnding>
</fileSet>
- <!-- Copy over the examples -->
- <fileSet>
- <directory>target/classes/demos</directory>
- <outputDirectory>/demos/</outputDirectory>
- <lineEnding>dos</lineEnding>
- </fileSet>
-
- <fileSet>
- <directory>../demos</directory>
- <outputDirectory>/demos/</outputDirectory>
- <lineEnding>dos</lineEnding>
- <excludes>
- <exclude>**/target/**</exclude>
- </excludes>
- </fileSet>
-
<!-- Copy over files that should not get the line endings converted -->
<fileSet>
<directory>src/main/distribution/binary</directory>
@@ -99,6 +83,10 @@
<!-- Copy over jar files -->
<fileSet>
<directory>target/dependencies</directory>
+ <excludes>
+ <exclude>*.html</exclude>
+ <exclude>*.pdf</exclude>
+ </excludes>
<outputDirectory>/</outputDirectory>
</fileSet>
Modified: karaf/trunk/assembly/src/main/filtered-resources/minimal/startup.properties
URL: http://svn.apache.org/viewvc/karaf/trunk/assembly/src/main/filtered-resources/minimal/startup.properties?rev=997356&r1=997355&r2=997356&view=diff
==============================================================================
--- karaf/trunk/assembly/src/main/filtered-resources/minimal/startup.properties (original)
+++ karaf/trunk/assembly/src/main/filtered-resources/minimal/startup.properties Wed Sep 15 14:49:20 2010
@@ -38,7 +38,6 @@ org/apache/aries/blueprint/org.apache.ar
org/apache/karaf/shell/org.apache.karaf.shell.console/${project.version}/org.apache.karaf.shell.console-${project.version}.jar=30
org/apache/karaf/shell/org.apache.karaf.shell.osgi/${project.version}/org.apache.karaf.shell.osgi-${project.version}.jar=30
org/apache/karaf/shell/org.apache.karaf.shell.log/${project.version}/org.apache.karaf.shell.log-${project.version}.jar=30
-org/apache/karaf/shell/org.apache.karaf.shell.config/${project.version}/org.apache.karaf.shell.config-${project.version}.jar=30
org/apache/karaf/shell/org.apache.karaf.shell.packages/${project.version}/org.apache.karaf.shell.packages-${project.version}.jar=30
org/apache/karaf/shell/org.apache.karaf.shell.commands/${project.version}/org.apache.karaf.shell.commands-${project.version}.jar=30
org/apache/karaf/shell/org.apache.karaf.shell.dev/${project.version}/org.apache.karaf.shell.dev-${project.version}.jar=30
@@ -50,4 +49,4 @@ org/apache/karaf/features/org.apache.kar
org/apache/karaf/org.apache.karaf.management/${project.version}/org.apache.karaf.management-${project.version}.jar=30
org/apache/aries/jmx/org.apache.aries.jmx/${aries.jmx.version}/org.apache.aries.jmx-${aries.jmx.version}.jar=30
-org/apache/aries/jmx/org.apache.aries.jmx.blueprint/${aries.jmx.version}/org.apache.aries.jmx.blueprint-${aries.jmx.version}.jar=30
\ No newline at end of file
+org/apache/aries/jmx/org.apache.aries.jmx.blueprint/${aries.jmx.version}/org.apache.aries.jmx.blueprint-${aries.jmx.version}.jar=30