[karaf] rename gshell to shell and rename submodules to avoid having the parent module name in their names
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@816769 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/karaf/assembly/src/main/descriptors/unix-bin.xml b/karaf/assembly/src/main/descriptors/unix-bin.xml
index 479524a..a9d0fe9 100644
--- a/karaf/assembly/src/main/descriptors/unix-bin.xml
+++ b/karaf/assembly/src/main/descriptors/unix-bin.xml
@@ -27,8 +27,8 @@
<directory>..</directory>
<outputDirectory>/</outputDirectory>
<includes>
- <include>README.txt</include>
- <include>RELEASE*.txt</include>
+ <include>README</include>
+ <include>RELEASE*</include>
</includes>
<lineEnding>unix</lineEnding>
</fileSet>
@@ -100,16 +100,16 @@
<files>
<file>
- <source>${basedir}/target/maven-shared-archive-resources/META-INF/LICENSE</source>
+ <source>${basedir}/../LICENSE</source>
<outputDirectory>/</outputDirectory>
- <destName>LICENSE.txt</destName>
+ <destName>LICENSE</destName>
<fileMode>0644</fileMode>
<lineEnding>unix</lineEnding>
</file>
<file>
- <source>${basedir}/target/maven-shared-archive-resources/META-INF/NOTICE</source>
+ <source>${basedir}/NOTICE</source>
<outputDirectory>/</outputDirectory>
- <destName>NOTICE.txt</destName>
+ <destName>NOTICE</destName>
<fileMode>0644</fileMode>
<lineEnding>unix</lineEnding>
</file>
@@ -200,16 +200,16 @@
<outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
<useProjectArtifact>false</useProjectArtifact>
- <outputFileNameMapping>org/apache/felix/karaf/gshell/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+ <outputFileNameMapping>org/apache/felix/karaf/shell/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
<includes>
- <include>org.apache.felix.karaf.gshell:org.apache.felix.karaf.gshell.console</include>
- <include>org.apache.felix.karaf.gshell:org.apache.felix.karaf.gshell.admin</include>
- <include>org.apache.felix.karaf.gshell:org.apache.felix.karaf.gshell.osgi</include>
- <include>org.apache.felix.karaf.gshell:org.apache.felix.karaf.gshell.log</include>
- <include>org.apache.felix.karaf.gshell:org.apache.felix.karaf.gshell.config</include>
- <include>org.apache.felix.karaf.gshell:org.apache.felix.karaf.gshell.packages</include>
- <include>org.apache.felix.karaf.gshell:org.apache.felix.karaf.gshell.ssh</include>
- <include>org.apache.felix.karaf.gshell:org.apache.felix.karaf.gshell.commands</include>
+ <include>org.apache.felix.karaf.shell:org.apache.felix.karaf.shell.console</include>
+ <include>org.apache.felix.karaf.shell:org.apache.felix.karaf.shell.admin</include>
+ <include>org.apache.felix.karaf.shell:org.apache.felix.karaf.shell.osgi</include>
+ <include>org.apache.felix.karaf.shell:org.apache.felix.karaf.shell.log</include>
+ <include>org.apache.felix.karaf.shell:org.apache.felix.karaf.shell.config</include>
+ <include>org.apache.felix.karaf.shell:org.apache.felix.karaf.shell.packages</include>
+ <include>org.apache.felix.karaf.shell:org.apache.felix.karaf.shell.ssh</include>
+ <include>org.apache.felix.karaf.shell:org.apache.felix.karaf.shell.commands</include>
</includes>
</dependencySet>
<dependencySet>
diff --git a/karaf/assembly/src/main/descriptors/unix-src.xml b/karaf/assembly/src/main/descriptors/unix-src.xml
index 4385030..121e36a 100644
--- a/karaf/assembly/src/main/descriptors/unix-src.xml
+++ b/karaf/assembly/src/main/descriptors/unix-src.xml
@@ -26,9 +26,11 @@
<directory>${basedir}/..</directory>
<outputDirectory>/</outputDirectory>
<includes>
- <include>BUILDING.txt</include>
- <include>README.txt</include>
- <include>RELEASE*.txt</include>
+ <include>BUILDING</include>
+ <include>README</include>
+ <include>NOTICE</include>
+ <include>LICENSE</include>
+ <include>RELEASE*</include>
</includes>
<lineEnding>unix</lineEnding>
</fileSet>
@@ -104,20 +106,4 @@
<lineEnding>unix</lineEnding>
</fileSet>
</fileSets>
- <files>
- <file>
- <source>${basedir}/target/maven-shared-archive-resources/META-INF/LICENSE</source>
- <outputDirectory>/</outputDirectory>
- <destName>LICENSE.txt</destName>
- <fileMode>0644</fileMode>
- <lineEnding>unix</lineEnding>
- </file>
- <file>
- <source>${basedir}/target/maven-shared-archive-resources/META-INF/NOTICE</source>
- <outputDirectory>/</outputDirectory>
- <destName>NOTICE.txt</destName>
- <fileMode>0644</fileMode>
- <lineEnding>unix</lineEnding>
- </file>
- </files>
</assembly>
diff --git a/karaf/assembly/src/main/descriptors/windows-bin.xml b/karaf/assembly/src/main/descriptors/windows-bin.xml
index df43754..40d09d1 100644
--- a/karaf/assembly/src/main/descriptors/windows-bin.xml
+++ b/karaf/assembly/src/main/descriptors/windows-bin.xml
@@ -28,8 +28,8 @@
<directory>..</directory>
<outputDirectory>/</outputDirectory>
<includes>
- <include>README.txt</include>
- <include>RELEASE*.txt</include>
+ <include>README</include>
+ <include>RELEASE*</include>
</includes>
<lineEnding>dos</lineEnding>
</fileSet>
@@ -91,16 +91,16 @@
<files>
<file>
- <source>${basedir}/target/maven-shared-archive-resources/META-INF/LICENSE</source>
+ <source>${basedir}/../LICENSE</source>
<outputDirectory>/</outputDirectory>
- <destName>LICENSE.txt</destName>
+ <destName>LICENSE</destName>
<fileMode>0644</fileMode>
<lineEnding>dos</lineEnding>
</file>
<file>
- <source>${basedir}/target/maven-shared-archive-resources/META-INF/NOTICE</source>
+ <source>${basedir}/NOTICE</source>
<outputDirectory>/</outputDirectory>
- <destName>NOTICE.txt</destName>
+ <destName>NOTICE</destName>
<fileMode>0644</fileMode>
<lineEnding>dos</lineEnding>
</file>
@@ -191,16 +191,16 @@
<outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
<useProjectArtifact>false</useProjectArtifact>
- <outputFileNameMapping>org/apache/felix/karaf/gshell/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+ <outputFileNameMapping>org/apache/felix/karaf/shell/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
<includes>
- <include>org.apache.felix.karaf.gshell:org.apache.felix.karaf.gshell.console</include>
- <include>org.apache.felix.karaf.gshell:org.apache.felix.karaf.gshell.admin</include>
- <include>org.apache.felix.karaf.gshell:org.apache.felix.karaf.gshell.osgi</include>
- <include>org.apache.felix.karaf.gshell:org.apache.felix.karaf.gshell.log</include>
- <include>org.apache.felix.karaf.gshell:org.apache.felix.karaf.gshell.config</include>
- <include>org.apache.felix.karaf.gshell:org.apache.felix.karaf.gshell.packages</include>
- <include>org.apache.felix.karaf.gshell:org.apache.felix.karaf.gshell.ssh</include>
- <include>org.apache.felix.karaf.gshell:org.apache.felix.karaf.gshell.commands</include>
+ <include>org.apache.felix.karaf.shell:org.apache.felix.karaf.shell.console</include>
+ <include>org.apache.felix.karaf.shell:org.apache.felix.karaf.shell.admin</include>
+ <include>org.apache.felix.karaf.shell:org.apache.felix.karaf.shell.osgi</include>
+ <include>org.apache.felix.karaf.shell:org.apache.felix.karaf.shell.log</include>
+ <include>org.apache.felix.karaf.shell:org.apache.felix.karaf.shell.config</include>
+ <include>org.apache.felix.karaf.shell:org.apache.felix.karaf.shell.packages</include>
+ <include>org.apache.felix.karaf.shell:org.apache.felix.karaf.shell.ssh</include>
+ <include>org.apache.felix.karaf.shell:org.apache.felix.karaf.shell.commands</include>
</includes>
</dependencySet>
<dependencySet>
diff --git a/karaf/assembly/src/main/descriptors/windows-src.xml b/karaf/assembly/src/main/descriptors/windows-src.xml
index 15b969f..d038b9b 100644
--- a/karaf/assembly/src/main/descriptors/windows-src.xml
+++ b/karaf/assembly/src/main/descriptors/windows-src.xml
@@ -26,9 +26,11 @@
<directory>${basedir}/..</directory>
<outputDirectory>/</outputDirectory>
<includes>
- <include>BUILDING.txt</include>
- <include>README.txt</include>
- <include>RELEASE*.txt</include>
+ <include>BUILDING</include>
+ <include>README</include>
+ <include>NOTICE</include>
+ <include>LICENSE</include>
+ <include>RELEASE*</include>
</includes>
<lineEnding>dos</lineEnding>
</fileSet>
@@ -105,20 +107,4 @@
<lineEnding>dos</lineEnding>
</fileSet>
</fileSets>
- <files>
- <file>
- <source>${basedir}/target/maven-shared-archive-resources/META-INF/LICENSE</source>
- <outputDirectory>/</outputDirectory>
- <destName>LICENSE.txt</destName>
- <fileMode>0644</fileMode>
- <lineEnding>unix</lineEnding>
- </file>
- <file>
- <source>${basedir}/target/maven-shared-archive-resources/META-INF/NOTICE</source>
- <outputDirectory>/</outputDirectory>
- <destName>NOTICE.txt</destName>
- <fileMode>0644</fileMode>
- <lineEnding>unix</lineEnding>
- </file>
- </files>
</assembly>