You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by ri...@apache.org on 2006/02/08 15:29:13 UTC
svn commit: r375971 - in /incubator/felix/trunk/org.apache.felix.framework:
./ lib/ src/main/java/org/apache/felix/bundlerepository/impl/
src/main/java/org/apache/felix/shell/impl/
src/main/java/org/apache/felix/shell/tui/ src/main/java/org/apache/feli...
Author: rickhall
Date: Wed Feb 8 06:29:10 2006
New Revision: 375971
URL: http://svn.apache.org/viewcvs?rev=375971&view=rev
Log:
Moving around some packages and renaming some bundles to match their
ultimate names and locations within Felix.
Added:
incubator/felix/trunk/org.apache.felix.framework/src/main/java/org/apache/felix/shell/tui/
incubator/felix/trunk/org.apache.felix.framework/src/main/java/org/apache/felix/shell/tui/Activator.java (contents, props changed)
- copied, changed from r374634, incubator/felix/trunk/org.apache.felix.framework/src/main/java/org/apache/felix/shelltui/Activator.java
incubator/felix/trunk/org.apache.felix.framework/src/main/java/org/apache/felix/shell/tui/manifest.mf
- copied, changed from r374634, incubator/felix/trunk/org.apache.felix.framework/src/main/java/org/apache/felix/shelltui/manifest.mf
Removed:
incubator/felix/trunk/org.apache.felix.framework/src/main/java/org/apache/felix/shelltui/
Modified:
incubator/felix/trunk/org.apache.felix.framework/build.xml
incubator/felix/trunk/org.apache.felix.framework/lib/config.properties
incubator/felix/trunk/org.apache.felix.framework/src/main/java/org/apache/felix/bundlerepository/impl/manifest.mf
incubator/felix/trunk/org.apache.felix.framework/src/main/java/org/apache/felix/shell/impl/manifest.mf
Modified: incubator/felix/trunk/org.apache.felix.framework/build.xml
URL: http://svn.apache.org/viewcvs/incubator/felix/trunk/org.apache.felix.framework/build.xml?rev=375971&r1=375970&r2=375971&view=diff
==============================================================================
--- incubator/felix/trunk/org.apache.felix.framework/build.xml (original)
+++ incubator/felix/trunk/org.apache.felix.framework/build.xml Wed Feb 8 06:29:10 2006
@@ -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>
Modified: incubator/felix/trunk/org.apache.felix.framework/lib/config.properties
URL: http://svn.apache.org/viewcvs/incubator/felix/trunk/org.apache.felix.framework/lib/config.properties?rev=375971&r1=375970&r2=375971&view=diff
==============================================================================
--- incubator/felix/trunk/org.apache.felix.framework/lib/config.properties (original)
+++ incubator/felix/trunk/org.apache.felix.framework/lib/config.properties Wed Feb 8 06:29:10 2006
@@ -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
Modified: incubator/felix/trunk/org.apache.felix.framework/src/main/java/org/apache/felix/bundlerepository/impl/manifest.mf
URL: http://svn.apache.org/viewcvs/incubator/felix/trunk/org.apache.felix.framework/src/main/java/org/apache/felix/bundlerepository/impl/manifest.mf?rev=375971&r1=375970&r2=375971&view=diff
==============================================================================
--- incubator/felix/trunk/org.apache.felix.framework/src/main/java/org/apache/felix/bundlerepository/impl/manifest.mf (original)
+++ incubator/felix/trunk/org.apache.felix.framework/src/main/java/org/apache/felix/bundlerepository/impl/manifest.mf Wed Feb 8 06:29:10 2006
@@ -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
Modified: incubator/felix/trunk/org.apache.felix.framework/src/main/java/org/apache/felix/shell/impl/manifest.mf
URL: http://svn.apache.org/viewcvs/incubator/felix/trunk/org.apache.felix.framework/src/main/java/org/apache/felix/shell/impl/manifest.mf?rev=375971&r1=375970&r2=375971&view=diff
==============================================================================
--- incubator/felix/trunk/org.apache.felix.framework/src/main/java/org/apache/felix/shell/impl/manifest.mf (original)
+++ incubator/felix/trunk/org.apache.felix.framework/src/main/java/org/apache/felix/shell/impl/manifest.mf Wed Feb 8 06:29:10 2006
@@ -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
Copied: incubator/felix/trunk/org.apache.felix.framework/src/main/java/org/apache/felix/shell/tui/Activator.java (from r374634, incubator/felix/trunk/org.apache.felix.framework/src/main/java/org/apache/felix/shelltui/Activator.java)
URL: http://svn.apache.org/viewcvs/incubator/felix/trunk/org.apache.felix.framework/src/main/java/org/apache/felix/shell/tui/Activator.java?p2=incubator/felix/trunk/org.apache.felix.framework/src/main/java/org/apache/felix/shell/tui/Activator.java&p1=incubator/felix/trunk/org.apache.felix.framework/src/main/java/org/apache/felix/shelltui/Activator.java&r1=374634&r2=375971&rev=375971&view=diff
==============================================================================
--- incubator/felix/trunk/org.apache.felix.framework/src/main/java/org/apache/felix/shelltui/Activator.java (original)
+++ incubator/felix/trunk/org.apache.felix.framework/src/main/java/org/apache/felix/shell/tui/Activator.java Wed Feb 8 06:29:10 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.felix.shelltui;
+package org.apache.felix.shell.tui;
import java.io.*;
Propchange: incubator/felix/trunk/org.apache.felix.framework/src/main/java/org/apache/felix/shell/tui/Activator.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/felix/trunk/org.apache.felix.framework/src/main/java/org/apache/felix/shell/tui/Activator.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Copied: incubator/felix/trunk/org.apache.felix.framework/src/main/java/org/apache/felix/shell/tui/manifest.mf (from r374634, incubator/felix/trunk/org.apache.felix.framework/src/main/java/org/apache/felix/shelltui/manifest.mf)
URL: http://svn.apache.org/viewcvs/incubator/felix/trunk/org.apache.felix.framework/src/main/java/org/apache/felix/shell/tui/manifest.mf?p2=incubator/felix/trunk/org.apache.felix.framework/src/main/java/org/apache/felix/shell/tui/manifest.mf&p1=incubator/felix/trunk/org.apache.felix.framework/src/main/java/org/apache/felix/shelltui/manifest.mf&r1=374634&r2=375971&rev=375971&view=diff
==============================================================================
--- incubator/felix/trunk/org.apache.felix.framework/src/main/java/org/apache/felix/shelltui/manifest.mf (original)
+++ incubator/felix/trunk/org.apache.felix.framework/src/main/java/org/apache/felix/shell/tui/manifest.mf Wed Feb 8 06:29:10 2006
@@ -1,7 +1,9 @@
-Bundle-Name: Shell TUI
-Bundle-SymbolicName: org.apache.felix.shelltui
-Bundle-Description: A simple textual user interface for Felix's the shell service.
+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.shelltui.Activator
+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