Author: iocanel
Date: Fri Oct 29 14:05:28 2010
New Revision: 1028756
URL: http://svn.apache.org/viewvc?rev=1028756&view=rev
Log:
[KARAF-188] Updated assembly to include the new Jaas Command bundle.
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
karaf/trunk/assembly/src/main/filtered-resources/etc/startup.properties
karaf/trunk/assembly/src/main/filtered-resources/minimal/startup.properties
karaf/trunk/pom.xml
Modified: karaf/trunk/assembly/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/assembly/pom.xml?rev=1028756&r1=1028755&r2=1028756&view=diff
==============================================================================
--- karaf/trunk/assembly/pom.xml (original)
+++ karaf/trunk/assembly/pom.xml Fri Oct 29 14:05:28 2010
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<!--
@@ -155,6 +156,10 @@
<artifactId>org.apache.karaf.jaas.modules</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.karaf.jaas</groupId>
+ <artifactId>org.apache.karaf.jaas.command</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.karaf</groupId>
<artifactId>org.apache.karaf.management</artifactId>
</dependency>
@@ -463,7 +468,7 @@
</descriptors>
<finalName>${project.artifactId}-${project.version}</finalName>
<appendAssemblyId>true</appendAssemblyId>
- <assemblyId />
+ <assemblyId/>
</configuration>
</execution>
<execution>
@@ -478,7 +483,7 @@
</descriptors>
<finalName>${project.artifactId}-${project.version}</finalName>
<appendAssemblyId>true</appendAssemblyId>
- <assemblyId />
+ <assemblyId/>
</configuration>
</execution>
<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=1028756&r1=1028755&r2=1028756&view=diff
==============================================================================
--- karaf/trunk/assembly/src/main/descriptors/unix-bin.xml (original)
+++ karaf/trunk/assembly/src/main/descriptors/unix-bin.xml Fri Oct 29 14:05:28
2010
@@ -16,7 +16,8 @@
limitations under the License.
-->
<assembly>
- <id></id> <!-- intentionally left blank ->
http://jira.codehaus.org/browse/MASSEMBLY-301 -->
+ <id></id>
+ <!-- intentionally left blank ->
http://jira.codehaus.org/browse/MASSEMBLY-301 -->
<formats>
<format>tar.gz</format>
</formats>
@@ -87,7 +88,7 @@
<outputDirectory>/</outputDirectory>
<fileMode>0755</fileMode>
</fileSet>
-
+
<!-- Copy over the files that need unix line endings and also chmod to
755 -->
<fileSet>
<directory>src/main/distribution/unix-shell</directory>
@@ -102,8 +103,8 @@
<outputDirectory>/</outputDirectory>
</fileSet>
<fileSet>
- <directory>target/features-repo</directory>
- <outputDirectory>system</outputDirectory>
+ <directory>target/features-repo</directory>
+ <outputDirectory>system</outputDirectory>
</fileSet>
</fileSets>
@@ -145,7 +146,9 @@
<outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
<useProjectArtifact>false</useProjectArtifact>
-
<outputFileNameMapping>org/apache/felix/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+ <outputFileNameMapping>
+
org/apache/felix/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
+ </outputFileNameMapping>
<includes>
<include>org.apache.felix:org.apache.felix.configadmin</include>
<include>org.apache.felix:org.apache.felix.framework</include>
@@ -156,7 +159,9 @@
<outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
<useProjectArtifact>false</useProjectArtifact>
-
<outputFileNameMapping>org/ops4j/pax/logging/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+ <outputFileNameMapping>
+
org/ops4j/pax/logging/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
+ </outputFileNameMapping>
<includes>
<include>org.ops4j.pax.logging:pax-logging-api</include>
<include>org.ops4j.pax.logging:pax-logging-service</include>
@@ -166,7 +171,9 @@
<outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
<useProjectArtifact>false</useProjectArtifact>
-
<outputFileNameMapping>org/ops4j/pax/url/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+ <outputFileNameMapping>
+
org/ops4j/pax/url/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
+ </outputFileNameMapping>
<includes>
<include>org.ops4j.pax.url:pax-url-mvn</include>
<include>org.ops4j.pax.url:pax-url-wrap</include>
@@ -176,7 +183,9 @@
<outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
<useProjectArtifact>false</useProjectArtifact>
-
<outputFileNameMapping>org/apache/karaf/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+ <outputFileNameMapping>
+
org/apache/karaf/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
+ </outputFileNameMapping>
<includes>
<include>org.apache.karaf:org.apache.karaf.management</include>
</includes>
@@ -185,7 +194,9 @@
<outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
<useProjectArtifact>false</useProjectArtifact>
-
<outputFileNameMapping>org/apache/karaf/features/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+ <outputFileNameMapping>
+
org/apache/karaf/features/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
+ </outputFileNameMapping>
<includes>
<include>org.apache.karaf.features:org.apache.karaf.features.core</include>
<include>org.apache.karaf.features:org.apache.karaf.features.command</include>
@@ -196,7 +207,9 @@
<outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
<useProjectArtifact>false</useProjectArtifact>
-
<outputFileNameMapping>org/apache/karaf/admin/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+ <outputFileNameMapping>
+
org/apache/karaf/admin/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
+ </outputFileNameMapping>
<includes>
<include>org.apache.karaf.admin:org.apache.karaf.admin.core</include>
<include>org.apache.karaf.admin:org.apache.karaf.admin.command</include>
@@ -207,7 +220,9 @@
<outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
<useProjectArtifact>false</useProjectArtifact>
-
<outputFileNameMapping>org/apache/karaf/deployer/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+ <outputFileNameMapping>
+
org/apache/karaf/deployer/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
+ </outputFileNameMapping>
<includes>
<include>org.apache.karaf.deployer:org.apache.karaf.deployer.spring</include>
<include>org.apache.karaf.deployer:org.apache.karaf.deployer.blueprint</include>
@@ -219,7 +234,9 @@
<outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
<useProjectArtifact>false</useProjectArtifact>
-
<outputFileNameMapping>org/apache/karaf/shell/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+ <outputFileNameMapping>
+
org/apache/karaf/shell/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
+ </outputFileNameMapping>
<includes>
<include>org.apache.karaf.shell:org.apache.karaf.shell.console</include>
<include>org.apache.karaf.shell:org.apache.karaf.shell.dev</include>
@@ -235,17 +252,22 @@
<outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
<useProjectArtifact>false</useProjectArtifact>
-
<outputFileNameMapping>org/apache/karaf/jaas/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+ <outputFileNameMapping>
+
org/apache/karaf/jaas/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
+ </outputFileNameMapping>
<includes>
<include>org.apache.karaf.jaas:org.apache.karaf.jaas.config</include>
<include>org.apache.karaf.jaas:org.apache.karaf.jaas.modules</include>
+
<include>org.apache.karaf.jaas:org.apache.karaf.jaas.command</include>
</includes>
</dependencySet>
<dependencySet>
<outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
<useProjectArtifact>false</useProjectArtifact>
-
<outputFileNameMapping>org/apache/sshd/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+ <outputFileNameMapping>
+
org/apache/sshd/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
+ </outputFileNameMapping>
<includes>
<include>org.apache.sshd:sshd-core</include>
</includes>
@@ -254,7 +276,9 @@
<outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
<useProjectArtifact>false</useProjectArtifact>
-
<outputFileNameMapping>org/apache/mina/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+ <outputFileNameMapping>
+
org/apache/mina/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
+ </outputFileNameMapping>
<includes>
<include>org.apache.mina:mina-core</include>
</includes>
@@ -263,7 +287,9 @@
<outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
<useProjectArtifact>false</useProjectArtifact>
-
<outputFileNameMapping>org/eclipse/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+ <outputFileNameMapping>
+
org/eclipse/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
+ </outputFileNameMapping>
<includes>
<include>org.eclipse:osgi</include>
</includes>
@@ -272,7 +298,9 @@
<outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
<useProjectArtifact>false</useProjectArtifact>
-
<outputFileNameMapping>org/apache/aries/blueprint/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+ <outputFileNameMapping>
+
org/apache/aries/blueprint/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
+ </outputFileNameMapping>
<includes>
<include>org.apache.aries.blueprint:org.apache.aries.blueprint</include>
</includes>
@@ -281,7 +309,9 @@
<outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
<useProjectArtifact>false</useProjectArtifact>
-
<outputFileNameMapping>org/apache/aries/jmx/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+ <outputFileNameMapping>
+
org/apache/aries/jmx/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
+ </outputFileNameMapping>
<includes>
<include>org.apache.aries.jmx:org.apache.aries.jmx</include>
<include>org.apache.aries.jmx:org.apache.aries.jmx.blueprint</include>
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=1028756&r1=1028755&r2=1028756&view=diff
==============================================================================
--- karaf/trunk/assembly/src/main/descriptors/unix-minimal-bin.xml (original)
+++ karaf/trunk/assembly/src/main/descriptors/unix-minimal-bin.xml Fri Oct 29
14:05:28 2010
@@ -18,7 +18,8 @@
<assembly
xmlns='http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1'
xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
xsi:schemaLocation='http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1
http://maven.apache.org/xsd/assembly-1.1.1.xsd'>
- <id>minimal</id> <!-- Used as artifact discriminator -->
+ <id>minimal</id>
+ <!-- Used as artifact discriminator -->
<formats>
<format>tar.gz</format>
</formats>
@@ -64,7 +65,7 @@
<outputDirectory>/etc/</outputDirectory>
<lineEnding>unix</lineEnding>
</fileSet>
-
+
<fileSet>
<directory>target/classes/minimal</directory>
<outputDirectory>/etc/</outputDirectory>
@@ -142,7 +143,9 @@
<outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
<useProjectArtifact>false</useProjectArtifact>
-
<outputFileNameMapping>org/apache/felix/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+ <outputFileNameMapping>
+
org/apache/felix/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
+ </outputFileNameMapping>
<includes>
<include>org.apache.felix:org.apache.felix.configadmin</include>
<include>org.apache.felix:org.apache.felix.framework</include>
@@ -153,7 +156,9 @@
<outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
<useProjectArtifact>false</useProjectArtifact>
-
<outputFileNameMapping>org/ops4j/pax/logging/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+ <outputFileNameMapping>
+
org/ops4j/pax/logging/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
+ </outputFileNameMapping>
<includes>
<include>org.ops4j.pax.logging:pax-logging-api</include>
<include>org.ops4j.pax.logging:pax-logging-service</include>
@@ -163,7 +168,9 @@
<outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
<useProjectArtifact>false</useProjectArtifact>
-
<outputFileNameMapping>org/ops4j/pax/url/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+ <outputFileNameMapping>
+
org/ops4j/pax/url/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
+ </outputFileNameMapping>
<includes>
<include>org.ops4j.pax.url:pax-url-mvn</include>
<include>org.ops4j.pax.url:pax-url-wrap</include>
@@ -173,7 +180,9 @@
<outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
<useProjectArtifact>false</useProjectArtifact>
-
<outputFileNameMapping>org/apache/karaf/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+ <outputFileNameMapping>
+
org/apache/karaf/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
+ </outputFileNameMapping>
<includes>
<include>org.apache.karaf:org.apache.karaf.management</include>
</includes>
@@ -182,7 +191,9 @@
<outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
<useProjectArtifact>false</useProjectArtifact>
-
<outputFileNameMapping>org/apache/karaf/features/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+ <outputFileNameMapping>
+
org/apache/karaf/features/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
+ </outputFileNameMapping>
<includes>
<include>org.apache.karaf.features:org.apache.karaf.features.core</include>
<include>org.apache.karaf.features:org.apache.karaf.features.command</include>
@@ -193,7 +204,9 @@
<outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
<useProjectArtifact>false</useProjectArtifact>
-
<outputFileNameMapping>org/apache/karaf/shell/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+ <outputFileNameMapping>
+
org/apache/karaf/shell/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
+ </outputFileNameMapping>
<includes>
<include>org.apache.karaf.shell:org.apache.karaf.shell.console</include>
<include>org.apache.karaf.shell:org.apache.karaf.shell.dev</include>
@@ -208,17 +221,22 @@
<outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
<useProjectArtifact>false</useProjectArtifact>
-
<outputFileNameMapping>org/apache/karaf/jaas/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+ <outputFileNameMapping>
+
org/apache/karaf/jaas/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
+ </outputFileNameMapping>
<includes>
<include>org.apache.karaf.jaas:org.apache.karaf.jaas.config</include>
<include>org.apache.karaf.jaas:org.apache.karaf.jaas.modules</include>
+
<include>org.apache.karaf.jaas:org.apache.karaf.jaas.command</include>
</includes>
</dependencySet>
<dependencySet>
<outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
<useProjectArtifact>false</useProjectArtifact>
-
<outputFileNameMapping>org/eclipse/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+ <outputFileNameMapping>
+
org/eclipse/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
+ </outputFileNameMapping>
<includes>
<include>org.eclipse:osgi</include>
</includes>
@@ -227,7 +245,9 @@
<outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
<useProjectArtifact>false</useProjectArtifact>
-
<outputFileNameMapping>org/apache/aries/blueprint/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+ <outputFileNameMapping>
+
org/apache/aries/blueprint/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
+ </outputFileNameMapping>
<includes>
<include>org.apache.aries.blueprint:org.apache.aries.blueprint</include>
</includes>
@@ -236,7 +256,9 @@
<outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
<useProjectArtifact>false</useProjectArtifact>
-
<outputFileNameMapping>org/apache/aries/jmx/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+ <outputFileNameMapping>
+
org/apache/aries/jmx/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
+ </outputFileNameMapping>
<includes>
<include>org.apache.aries.jmx:org.apache.aries.jmx</include>
<include>org.apache.aries.jmx:org.apache.aries.jmx.blueprint</include>
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=1028756&r1=1028755&r2=1028756&view=diff
==============================================================================
--- karaf/trunk/assembly/src/main/descriptors/windows-bin.xml (original)
+++ karaf/trunk/assembly/src/main/descriptors/windows-bin.xml Fri Oct 29
14:05:28 2010
@@ -16,12 +16,13 @@
limitations under the License.
-->
<assembly>
- <id></id> <!-- intentionally left blank ->
http://jira.codehaus.org/browse/MASSEMBLY-301 -->
+ <id></id>
+ <!-- intentionally left blank ->
http://jira.codehaus.org/browse/MASSEMBLY-301 -->
<formats>
<format>zip</format>
</formats>
<fileSets>
- <!-- Copy license and other files from root -->
+ <!-- Copy license and other files from root -->
<fileSet>
<directory>..</directory>
<outputDirectory>/</outputDirectory>
@@ -32,7 +33,7 @@
<lineEnding>dos</lineEnding>
</fileSet>
- <!-- Copy over everything that needs to get dos line endings -->
+ <!-- Copy over everything that needs to get dos line endings -->
<fileSet>
<directory>src/main/distribution/text</directory>
<outputDirectory>/</outputDirectory>
@@ -57,7 +58,7 @@
<directory>target/classes/etc</directory>
<outputDirectory>/etc/</outputDirectory>
<lineEnding>dos</lineEnding>
- </fileSet>
+ </fileSet>
<!-- Copy over the examples -->
<fileSet>
<directory>target/classes/demos</directory>
@@ -74,19 +75,19 @@
</excludes>
</fileSet>
- <!-- Copy over files that should not get the line endings converted -->
+ <!-- Copy over files that should not get the line endings converted -->
<fileSet>
<directory>src/main/distribution/binary</directory>
<outputDirectory>/</outputDirectory>
</fileSet>
- <!-- Copy over the files that should not get the line endings converted
but need to be chmod to 755 -->
+ <!-- Copy over the files that should not get the line endings
converted but need to be chmod to 755 -->
<fileSet>
<directory>src/main/distribution/windows-binary</directory>
<outputDirectory>/</outputDirectory>
</fileSet>
-
- <!-- Copy over jar files -->
+
+ <!-- Copy over jar files -->
<fileSet>
<directory>target/dependencies</directory>
<outputDirectory>/</outputDirectory>
@@ -132,7 +133,9 @@
<outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
<useProjectArtifact>false</useProjectArtifact>
-
<outputFileNameMapping>org/apache/felix/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+ <outputFileNameMapping>
+
org/apache/felix/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
+ </outputFileNameMapping>
<includes>
<include>org.apache.felix:org.apache.felix.configadmin</include>
<include>org.apache.felix:org.apache.felix.framework</include>
@@ -143,7 +146,9 @@
<outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
<useProjectArtifact>false</useProjectArtifact>
-
<outputFileNameMapping>org/ops4j/pax/logging/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+ <outputFileNameMapping>
+
org/ops4j/pax/logging/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
+ </outputFileNameMapping>
<includes>
<include>org.ops4j.pax.logging:pax-logging-api</include>
<include>org.ops4j.pax.logging:pax-logging-service</include>
@@ -153,7 +158,9 @@
<outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
<useProjectArtifact>false</useProjectArtifact>
-
<outputFileNameMapping>org/ops4j/pax/url/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+ <outputFileNameMapping>
+
org/ops4j/pax/url/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
+ </outputFileNameMapping>
<includes>
<include>org.ops4j.pax.url:pax-url-mvn</include>
<include>org.ops4j.pax.url:pax-url-wrap</include>
@@ -163,7 +170,9 @@
<outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
<useProjectArtifact>false</useProjectArtifact>
-
<outputFileNameMapping>org/apache/karaf/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+ <outputFileNameMapping>
+
org/apache/karaf/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
+ </outputFileNameMapping>
<includes>
<include>org.apache.karaf:org.apache.karaf.management</include>
</includes>
@@ -172,7 +181,9 @@
<outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
<useProjectArtifact>false</useProjectArtifact>
-
<outputFileNameMapping>org/apache/karaf/features/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+ <outputFileNameMapping>
+
org/apache/karaf/features/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
+ </outputFileNameMapping>
<includes>
<include>org.apache.karaf.features:org.apache.karaf.features.core</include>
<include>org.apache.karaf.features:org.apache.karaf.features.command</include>
@@ -183,7 +194,9 @@
<outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
<useProjectArtifact>false</useProjectArtifact>
-
<outputFileNameMapping>org/apache/karaf/admin/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+ <outputFileNameMapping>
+
org/apache/karaf/admin/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
+ </outputFileNameMapping>
<includes>
<include>org.apache.karaf.admin:org.apache.karaf.admin.core</include>
<include>org.apache.karaf.admin:org.apache.karaf.admin.command</include>
@@ -194,19 +207,23 @@
<outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
<useProjectArtifact>false</useProjectArtifact>
-
<outputFileNameMapping>org/apache/karaf/deployer/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+ <outputFileNameMapping>
+
org/apache/karaf/deployer/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
+ </outputFileNameMapping>
<includes>
<include>org.apache.karaf.deployer:org.apache.karaf.deployer.spring</include>
<include>org.apache.karaf.deployer:org.apache.karaf.deployer.blueprint</include>
<include>org.apache.karaf.deployer:org.apache.karaf.deployer.features</include>
-
<include>org.apache.karaf.deployer:org.apache.karaf.deployer.kar</include>
+
<include>org.apache.karaf.deployer:org.apache.karaf.deployer.kar</include>
</includes>
</dependencySet>
<dependencySet>
<outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
<useProjectArtifact>false</useProjectArtifact>
-
<outputFileNameMapping>org/apache/karaf/shell/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+ <outputFileNameMapping>
+
org/apache/karaf/shell/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
+ </outputFileNameMapping>
<includes>
<include>org.apache.karaf.shell:org.apache.karaf.shell.console</include>
<include>org.apache.karaf.shell:org.apache.karaf.shell.dev</include>
@@ -222,17 +239,22 @@
<outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
<useProjectArtifact>false</useProjectArtifact>
-
<outputFileNameMapping>org/apache/karaf/jaas/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+ <outputFileNameMapping>
+
org/apache/karaf/jaas/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
+ </outputFileNameMapping>
<includes>
<include>org.apache.karaf.jaas:org.apache.karaf.jaas.config</include>
<include>org.apache.karaf.jaas:org.apache.karaf.jaas.modules</include>
+
<include>org.apache.karaf.jaas:org.apache.karaf.jaas.command</include>
</includes>
</dependencySet>
<dependencySet>
<outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
<useProjectArtifact>false</useProjectArtifact>
-
<outputFileNameMapping>org/apache/sshd/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+ <outputFileNameMapping>
+
org/apache/sshd/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
+ </outputFileNameMapping>
<includes>
<include>org.apache.sshd:sshd-core</include>
</includes>
@@ -241,7 +263,9 @@
<outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
<useProjectArtifact>false</useProjectArtifact>
-
<outputFileNameMapping>org/apache/mina/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+ <outputFileNameMapping>
+
org/apache/mina/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
+ </outputFileNameMapping>
<includes>
<include>org.apache.mina:mina-core</include>
</includes>
@@ -250,7 +274,9 @@
<outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
<useProjectArtifact>false</useProjectArtifact>
-
<outputFileNameMapping>org/eclipse/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+ <outputFileNameMapping>
+
org/eclipse/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
+ </outputFileNameMapping>
<includes>
<include>org.eclipse:osgi</include>
</includes>
@@ -259,7 +285,9 @@
<outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
<useProjectArtifact>false</useProjectArtifact>
-
<outputFileNameMapping>org/apache/aries/blueprint/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+ <outputFileNameMapping>
+
org/apache/aries/blueprint/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
+ </outputFileNameMapping>
<includes>
<include>org.apache.aries.blueprint:org.apache.aries.blueprint</include>
</includes>
@@ -268,7 +296,9 @@
<outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
<useProjectArtifact>false</useProjectArtifact>
-
<outputFileNameMapping>org/apache/aries/jmx/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+ <outputFileNameMapping>
+
org/apache/aries/jmx/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
+ </outputFileNameMapping>
<includes>
<include>org.apache.aries.jmx:org.apache.aries.jmx</include>
<include>org.apache.aries.jmx:org.apache.aries.jmx.blueprint</include>
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=1028756&r1=1028755&r2=1028756&view=diff
==============================================================================
--- karaf/trunk/assembly/src/main/descriptors/windows-minimal-bin.xml (original)
+++ karaf/trunk/assembly/src/main/descriptors/windows-minimal-bin.xml Fri Oct
29 14:05:28 2010
@@ -16,14 +16,15 @@
limitations under the License.
-->
<assembly>
- <id>minimal</id> <!-- Used as artifact discriminator -->
+ <id>minimal</id>
+ <!-- Used as artifact discriminator -->
<formats>
<format>zip</format>
</formats>
<fileSets>
- <!-- Copy license and other files from root -->
+ <!-- Copy license and other files from root -->
<fileSet>
<directory>..</directory>
<outputDirectory>/</outputDirectory>
@@ -34,7 +35,7 @@
<lineEnding>dos</lineEnding>
</fileSet>
- <!-- Copy over everything that needs to get dos line endings -->
+ <!-- Copy over everything that needs to get dos line endings -->
<fileSet>
<directory>target/classes/text</directory>
<outputDirectory>/</outputDirectory>
@@ -55,10 +56,10 @@
</fileSet>
<fileSet>
<directory>target/classes/etc</directory>
- <excludes>
- <exclude>org.apache.karaf.features.cfg</exclude>
- <exclude>startup.properties</exclude>
- </excludes>
+ <excludes>
+ <exclude>org.apache.karaf.features.cfg</exclude>
+ <exclude>startup.properties</exclude>
+ </excludes>
<outputDirectory>/etc/</outputDirectory>
<lineEnding>dos</lineEnding>
</fileSet>
@@ -68,19 +69,19 @@
<lineEnding>dos</lineEnding>
</fileSet>
- <!-- Copy over files that should not get the line endings converted -->
+ <!-- Copy over files that should not get the line endings converted -->
<fileSet>
<directory>src/main/distribution/binary</directory>
<outputDirectory>/</outputDirectory>
</fileSet>
- <!-- Copy over the files that should not get the line endings converted
but need to be chmod to 755 -->
+ <!-- Copy over the files that should not get the line endings
converted but need to be chmod to 755 -->
<fileSet>
<directory>src/main/distribution/windows-binary</directory>
<outputDirectory>/</outputDirectory>
</fileSet>
-
- <!-- Copy over jar files -->
+
+ <!-- Copy over jar files -->
<fileSet>
<directory>target/dependencies</directory>
<excludes>
@@ -130,7 +131,9 @@
<outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
<useProjectArtifact>false</useProjectArtifact>
-
<outputFileNameMapping>org/apache/felix/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+ <outputFileNameMapping>
+
org/apache/felix/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
+ </outputFileNameMapping>
<includes>
<include>org.apache.felix:org.apache.felix.configadmin</include>
<include>org.apache.felix:org.apache.felix.framework</include>
@@ -141,7 +144,9 @@
<outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
<useProjectArtifact>false</useProjectArtifact>
-
<outputFileNameMapping>org/ops4j/pax/logging/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+ <outputFileNameMapping>
+
org/ops4j/pax/logging/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
+ </outputFileNameMapping>
<includes>
<include>org.ops4j.pax.logging:pax-logging-api</include>
<include>org.ops4j.pax.logging:pax-logging-service</include>
@@ -151,7 +156,9 @@
<outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
<useProjectArtifact>false</useProjectArtifact>
-
<outputFileNameMapping>org/ops4j/pax/url/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+ <outputFileNameMapping>
+
org/ops4j/pax/url/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
+ </outputFileNameMapping>
<includes>
<include>org.ops4j.pax.url:pax-url-mvn</include>
<include>org.ops4j.pax.url:pax-url-wrap</include>
@@ -161,7 +168,9 @@
<outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
<useProjectArtifact>false</useProjectArtifact>
-
<outputFileNameMapping>org/apache/karaf/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+ <outputFileNameMapping>
+
org/apache/karaf/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
+ </outputFileNameMapping>
<includes>
<include>org.apache.karaf:org.apache.karaf.management</include>
</includes>
@@ -170,7 +179,9 @@
<outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
<useProjectArtifact>false</useProjectArtifact>
-
<outputFileNameMapping>org/apache/karaf/features/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+ <outputFileNameMapping>
+
org/apache/karaf/features/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
+ </outputFileNameMapping>
<includes>
<include>org.apache.karaf.features:org.apache.karaf.features.core</include>
<include>org.apache.karaf.features:org.apache.karaf.features.command</include>
@@ -181,7 +192,9 @@
<outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
<useProjectArtifact>false</useProjectArtifact>
-
<outputFileNameMapping>org/apache/karaf/shell/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+ <outputFileNameMapping>
+
org/apache/karaf/shell/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
+ </outputFileNameMapping>
<includes>
<include>org.apache.karaf.shell:org.apache.karaf.shell.console</include>
<include>org.apache.karaf.shell:org.apache.karaf.shell.dev</include>
@@ -197,17 +210,22 @@
<outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
<useProjectArtifact>false</useProjectArtifact>
-
<outputFileNameMapping>org/apache/karaf/jaas/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+ <outputFileNameMapping>
+
org/apache/karaf/jaas/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
+ </outputFileNameMapping>
<includes>
<include>org.apache.karaf.jaas:org.apache.karaf.jaas.config</include>
<include>org.apache.karaf.jaas:org.apache.karaf.jaas.modules</include>
+
<include>org.apache.karaf.jaas:org.apache.karaf.jaas.command</include>
</includes>
</dependencySet>
<dependencySet>
<outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
<useProjectArtifact>false</useProjectArtifact>
-
<outputFileNameMapping>org/eclipse/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+ <outputFileNameMapping>
+
org/eclipse/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
+ </outputFileNameMapping>
<includes>
<include>org.eclipse:osgi</include>
</includes>
@@ -216,7 +234,9 @@
<outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
<useProjectArtifact>false</useProjectArtifact>
-
<outputFileNameMapping>org/apache/aries/blueprint/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+ <outputFileNameMapping>
+
org/apache/aries/blueprint/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
+ </outputFileNameMapping>
<includes>
<include>org.apache.aries.blueprint:org.apache.aries.blueprint</include>
</includes>
@@ -225,7 +245,9 @@
<outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
<useProjectArtifact>false</useProjectArtifact>
-
<outputFileNameMapping>org/apache/aries/jmx/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+ <outputFileNameMapping>
+
org/apache/aries/jmx/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
+ </outputFileNameMapping>
<includes>
<include>org.apache.aries.jmx:org.apache.aries.jmx</include>
<include>org.apache.aries.jmx:org.apache.aries.jmx.blueprint</include>
Modified:
karaf/trunk/assembly/src/main/filtered-resources/etc/startup.properties
URL:
http://svn.apache.org/viewvc/karaf/trunk/assembly/src/main/filtered-resources/etc/startup.properties?rev=1028756&r1=1028755&r2=1028756&view=diff
==============================================================================
--- karaf/trunk/assembly/src/main/filtered-resources/etc/startup.properties
(original)
+++ karaf/trunk/assembly/src/main/filtered-resources/etc/startup.properties Fri
Oct 29 14:05:28 2010
@@ -43,6 +43,7 @@ org/apache/karaf/shell/org.apache.karaf.
org/apache/karaf/shell/org.apache.karaf.shell.dev/${project.version}/org.apache.karaf.shell.dev-${project.version}.jar=30
org/apache/karaf/jaas/org.apache.karaf.jaas.config/${project.version}/org.apache.karaf.jaas.config-${project.version}.jar=30
org/apache/karaf/jaas/org.apache.karaf.jaas.modules/${project.version}/org.apache.karaf.jaas.modules-${project.version}.jar=30
+org/apache/karaf/jaas/org.apache.karaf.jaas.command/${project.version}/org.apache.karaf.jaas.command-${project.version}.jar=30
org/apache/karaf/features/org.apache.karaf.features.core/${project.version}/org.apache.karaf.features.core-${project.version}.jar=30
org/apache/karaf/features/org.apache.karaf.features.command/${project.version}/org.apache.karaf.features.command-${project.version}.jar=30
org/apache/karaf/features/org.apache.karaf.features.management/${project.version}/org.apache.karaf.features.management-${project.version}.jar=30
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=1028756&r1=1028755&r2=1028756&view=diff
==============================================================================
--- karaf/trunk/assembly/src/main/filtered-resources/minimal/startup.properties
(original)
+++ karaf/trunk/assembly/src/main/filtered-resources/minimal/startup.properties
Fri Oct 29 14:05:28 2010
@@ -43,6 +43,7 @@ org/apache/karaf/shell/org.apache.karaf.
org/apache/karaf/shell/org.apache.karaf.shell.dev/${project.version}/org.apache.karaf.shell.dev-${project.version}.jar=30
org/apache/karaf/jaas/org.apache.karaf.jaas.config/${project.version}/org.apache.karaf.jaas.config-${project.version}.jar=30
org/apache/karaf/jaas/org.apache.karaf.jaas.modules/${project.version}/org.apache.karaf.jaas.modules-${project.version}.jar=30
+org/apache/karaf/jaas/org.apache.karaf.jaas.command/${project.version}/org.apache.karaf.jaas.command-${project.version}.jar=30
org/apache/karaf/features/org.apache.karaf.features.core/${project.version}/org.apache.karaf.features.core-${project.version}.jar=30
org/apache/karaf/features/org.apache.karaf.features.command/${project.version}/org.apache.karaf.features.command-${project.version}.jar=30
org/apache/karaf/features/org.apache.karaf.features.management/${project.version}/org.apache.karaf.features.management-${project.version}.jar=30
Modified: karaf/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/pom.xml?rev=1028756&r1=1028755&r2=1028756&view=diff
==============================================================================
--- karaf/trunk/pom.xml (original)
+++ karaf/trunk/pom.xml Fri Oct 29 14:05:28 2010
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<!--
@@ -371,6 +372,11 @@
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.karaf.jaas</groupId>
+ <artifactId>org.apache.karaf.jaas.command</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.karaf.webconsole</groupId>
<artifactId>org.apache.karaf.webconsole.admin</artifactId>
<version>${project.version}</version>
@@ -647,12 +653,12 @@
<version>${mina.version}</version>
<exclusions>
<exclusion>
- <groupId>org.easymock</groupId>
- <artifactId>easymock</artifactId>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
</exclusion>
<exclusion>
- <groupId>org.easymock</groupId>
- <artifactId>easymockclassextension</artifactId>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymockclassextension</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -1014,7 +1020,8 @@
<phase>generate-resources</phase>
<configuration>
<tasks>
- <copy file="NOTICE"
todir="target/maven-shared-archive-resources/META-INF" failonerror="false"
overwrite="true" />
+ <copy file="NOTICE"
todir="target/maven-shared-archive-resources/META-INF"
+ failonerror="false" overwrite="true"/>
</tasks>
</configuration>
<goals>
@@ -1030,22 +1037,22 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <inherited>true</inherited>
- <executions>
- <execution>
- <id>cleanVersions</id>
- <phase>generate-sources</phase>
- <goals>
-
<goal>cleanVersions</goal>
- </goals>
- <configuration>
- <versions>
-
<karaf.osgi.version>${project.version}</karaf.osgi.version>
- </versions>
- </configuration>
- </execution>
- </executions>
- </plugin>
+ <inherited>true</inherited>
+ <executions>
+ <execution>
+ <id>cleanVersions</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>cleanVersions</goal>
+ </goals>
+ <configuration>
+ <versions>
+
<karaf.osgi.version>${project.version}</karaf.osgi.version>
+ </versions>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
@@ -1089,7 +1096,7 @@
<profile>
<id>manual</id>
<modules>
- <module>manual</module>
+ <module>manual</module>
</modules>
</profile>
<profile>
@@ -1132,7 +1139,7 @@
<profile>
<id>release</id>
<modules>
- <module>manual</module>
+ <module>manual</module>
</modules>
<build>
<plugins>
