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>
diff --git a/org.apache.felix.framework/lib/config.properties b/org.apache.felix.framework/lib/config.properties
index 463fab4..9be1a57 100644
--- a/org.apache.felix.framework/lib/config.properties
+++ b/org.apache.felix.framework/lib/config.properties
@@ -11,9 +11,9 @@
version=1.4
#felix.cache.profile=foo
felix.auto.start.1= \
- file:bundle/shell.jar \
- file:bundle/shelltui.jar \
- file:bundle/bundlerepository.jar
+ file:bundle/org.apache.felix.shell.jar \
+ file:bundle/org.apache.felix.shell.tui.jar \
+ file:bundle/org.apache.felix.bundlerepository.jar
felix.startlevel.framework=1
felix.startlevel.bundle=1
#framework.service.urlhandlers=false
diff --git a/org.apache.felix.framework/src/main/java/org/apache/felix/bundlerepository/impl/manifest.mf b/org.apache.felix.framework/src/main/java/org/apache/felix/bundlerepository/impl/manifest.mf
index 304938c..1d82b41 100644
--- a/org.apache.felix.framework/src/main/java/org/apache/felix/bundlerepository/impl/manifest.mf
+++ b/org.apache.felix.framework/src/main/java/org/apache/felix/bundlerepository/impl/manifest.mf
@@ -1,6 +1,6 @@
-Bundle-Name: Bundle Repository
+Bundle-Name: BundleRepository
Bundle-SymbolicName: org.apache.felix.bundlerepository.impl
-Bundle-Description: A simple bundle repository for Felix.
+Bundle-Description: A bundle repository for Felix.
Bundle-Activator: org.apache.felix.bundlerepository.impl.Activator
Bundle-ClassPath: .,org/apache/felix/bundlerepository/impl/kxml.jar
Bundle-Version: 2.0.0.alpha2
@@ -8,3 +8,4 @@
DynamicImport-Package: org.apache.felix.shell
Export-Package:
org.apache.felix.bundlerepository; specification-version="1.1.0"
+Export-Service: org.apache.felix.bundlerepository.BundleRepository
diff --git a/org.apache.felix.framework/src/main/java/org/apache/felix/shell/impl/manifest.mf b/org.apache.felix.framework/src/main/java/org/apache/felix/shell/impl/manifest.mf
index e5f3559..6e0c47b 100644
--- a/org.apache.felix.framework/src/main/java/org/apache/felix/shell/impl/manifest.mf
+++ b/org.apache.felix.framework/src/main/java/org/apache/felix/shell/impl/manifest.mf
@@ -1,6 +1,7 @@
-Bundle-Name: Shell Service
+Bundle-Name: ShellService
Bundle-SymbolicName: org.apache.felix.shell.impl
-Bundle-Description: A simple command shell service for Felix.
+Bundle-Description: A simple command shell service for Felix (or any other OSGi framework).
+Bundle-DocURL: http://oscar-osgi.sf.net/repo/shell/
Bundle-Version: 1.0.2
Bundle-Activator: org.apache.felix.shell.impl.Activator
Bundle-ClassPath: .
@@ -11,3 +12,5 @@
Export-Package:
org.apache.felix.shell; specification-version="1.0.0",
org.ungoverned.osgi.service.shell; specification-version="1.0.0"
+Export-Service: org.apache.felix.shell,
+ org.ungoverned.osgi.service.shell
diff --git a/org.apache.felix.framework/src/main/java/org/apache/felix/shelltui/Activator.java b/org.apache.felix.framework/src/main/java/org/apache/felix/shell/tui/Activator.java
similarity index 99%
rename from org.apache.felix.framework/src/main/java/org/apache/felix/shelltui/Activator.java
rename to org.apache.felix.framework/src/main/java/org/apache/felix/shell/tui/Activator.java
index be713f0..3bfafd6 100644
--- a/org.apache.felix.framework/src/main/java/org/apache/felix/shelltui/Activator.java
+++ b/org.apache.felix.framework/src/main/java/org/apache/felix/shell/tui/Activator.java
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.felix.shelltui;
+package org.apache.felix.shell.tui;
import java.io.*;
diff --git a/org.apache.felix.framework/src/main/java/org/apache/felix/shell/tui/manifest.mf b/org.apache.felix.framework/src/main/java/org/apache/felix/shell/tui/manifest.mf
new file mode 100644
index 0000000..c66b813
--- /dev/null
+++ b/org.apache.felix.framework/src/main/java/org/apache/felix/shell/tui/manifest.mf
@@ -0,0 +1,9 @@
+Bundle-Name: ShellTUI
+Bundle-SymbolicName: org.apache.felix.shell.tui
+Bundle-Description: A simple textual user interface for Felix' shell service.
+Bundle-DocURL: http://oscar-osgi.sf.net/repo/shelltui/
+Bundle-Version: 1.0.0
+Bundle-Activator: org.apache.felix.shell.tui.Activator
+Bundle-ClassPath: .
+Import-Package: org.osgi.framework, org.apache.felix.shell
+Import-Service: org.apache.felix.shell
diff --git a/org.apache.felix.framework/src/main/java/org/apache/felix/shelltui/manifest.mf b/org.apache.felix.framework/src/main/java/org/apache/felix/shelltui/manifest.mf
deleted file mode 100644
index 9c75221..0000000
--- a/org.apache.felix.framework/src/main/java/org/apache/felix/shelltui/manifest.mf
+++ /dev/null
@@ -1,7 +0,0 @@
-Bundle-Name: Shell TUI
-Bundle-SymbolicName: org.apache.felix.shelltui
-Bundle-Description: A simple textual user interface for Felix's the shell service.
-Bundle-Version: 1.0.0
-Bundle-Activator: org.apache.felix.shelltui.Activator
-Bundle-ClassPath: .
-Import-Package: org.osgi.framework, org.apache.felix.shell