Moving around some packages and renaming some bundles to match their
ultimate names and locations within Felix.
git-svn-id: https://svn.apache.org/repos/asf/incubator/felix/trunk@375971 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/org.apache.felix.framework/build.xml b/org.apache.felix.framework/build.xml
index d98b041..463fad6 100644
--- a/org.apache.felix.framework/build.xml
+++ b/org.apache.felix.framework/build.xml
@@ -79,17 +79,18 @@
<!-- Shell -->
<jar manifest="${src.dir}/org/apache/felix/shell/impl/manifest.mf"
- jarfile="${bundle.dir}/shell.jar"
+ jarfile="${bundle.dir}/org.apache.felix.shell.jar"
basedir="${output.dir}">
<include name="org/apache/felix/shell/**"/>
<include name="org/ungoverned/osgi/service/shell/**"/>
+ <exclude name="org/apache/felix/shell/tui/**"/>
</jar>
<!-- Shell TUI -->
- <jar manifest="${src.dir}/org/apache/felix/shelltui/manifest.mf"
- jarfile="${bundle.dir}/shelltui.jar"
+ <jar manifest="${src.dir}/org/apache/felix/shell/tui/manifest.mf"
+ jarfile="${bundle.dir}/org.apache.felix.shell.tui.jar"
basedir="${output.dir}">
- <include name="org/apache/felix/shelltui/**"/>
+ <include name="org/apache/felix/shell/tui/**"/>
</jar>
<!-- OBR -->
@@ -97,7 +98,7 @@
todir="${output.dir}/org/apache/felix/bundlerepository/impl/"/>
<jar manifest="${src.dir}/org/apache/felix/bundlerepository/impl/manifest.mf"
- jarfile="${bundle.dir}/bundlerepository.jar"
+ jarfile="${bundle.dir}/org.apache.felix.bundlerepository.jar"
basedir="${output.dir}">
<include name="org/apache/felix/bundlerepository/**"/>
</jar>