svn commit: r707407 - in /felix/trunk: framework/src/main/java/org/apache/felix/framework/ framework/src/main/java/org/osgi/framework/launch/ main/src/main/java/org/apache/felix/main/

[ri...@apache.org]

Author: rickhall
Date: Thu Oct 23 09:24:48 2008
New Revision: 707407

URL: http://svn.apache.org/viewvc?rev=707407&view=rev
Log:
Change the name of the SystemBundle interface to be Framework as a result
of the latest discussions. (FELIX-753)

Added:
    felix/trunk/framework/src/main/java/org/osgi/framework/launch/Framework.java
      - copied, changed from r706399, felix/trunk/framework/src/main/java/org/osgi/framework/launch/SystemBundle.java
Removed:
    felix/trunk/framework/src/main/java/org/osgi/framework/launch/SystemBundle.java
Modified:
    felix/trunk/framework/src/main/java/org/apache/felix/framework/Felix.java
    felix/trunk/main/src/main/java/org/apache/felix/main/Main.java

Modified: felix/trunk/framework/src/main/java/org/apache/felix/framework/Felix.java
URL: http://svn.apache.org/viewvc/felix/trunk/framework/src/main/java/org/apache/felix/framework/Felix.java?rev=707407&r1=707406&r2=707407&view=diff
==============================================================================
--- felix/trunk/framework/src/main/java/org/apache/felix/framework/Felix.java (original)
+++ felix/trunk/framework/src/main/java/org/apache/felix/framework/Felix.java Thu Oct 23 09:24:48 2008
@@ -18,7 +18,7 @@
  */
 package org.apache.felix.framework;
 
-import org.osgi.framework.launch.SystemBundle;
+import org.osgi.framework.launch.Framework;
 import java.io.*;
 import java.net.*;
 import java.security.*;
@@ -34,7 +34,7 @@
 import org.osgi.service.packageadmin.ExportedPackage;
 import org.osgi.service.startlevel.StartLevel;
 
-public class Felix extends FelixBundle implements SystemBundle
+public class Felix extends FelixBundle implements Framework
 {
     // The secure action used to do privileged calls
     static SecureAction m_secureAction = new SecureAction();

Copied: felix/trunk/framework/src/main/java/org/osgi/framework/launch/Framework.java (from r706399, felix/trunk/framework/src/main/java/org/osgi/framework/launch/SystemBundle.java)
URL: http://svn.apache.org/viewvc/felix/trunk/framework/src/main/java/org/osgi/framework/launch/Framework.java?p2=felix/trunk/framework/src/main/java/org/osgi/framework/launch/Framework.java&p1=felix/trunk/framework/src/main/java/org/osgi/framework/launch/SystemBundle.java&r1=706399&r2=707407&rev=707407&view=diff
==============================================================================
--- felix/trunk/framework/src/main/java/org/osgi/framework/launch/SystemBundle.java (original)
+++ felix/trunk/framework/src/main/java/org/osgi/framework/launch/Framework.java Thu Oct 23 09:24:48 2008
@@ -58,7 +58,7 @@
  * @ThreadSafe
  * @version $Revision: 5686 $
  */
-public interface SystemBundle extends Bundle {
+public interface Framework extends Bundle {
 
 	/**
 	 * Initialize this System Bundle. After calling this method, this System

Modified: felix/trunk/main/src/main/java/org/apache/felix/main/Main.java
URL: http://svn.apache.org/viewvc/felix/trunk/main/src/main/java/org/apache/felix/main/Main.java?rev=707407&r1=707406&r2=707407&view=diff
==============================================================================
--- felix/trunk/main/src/main/java/org/apache/felix/main/Main.java (original)
+++ felix/trunk/main/src/main/java/org/apache/felix/main/Main.java Thu Oct 23 09:24:48 2008
@@ -26,6 +26,7 @@
 import org.apache.felix.framework.util.FelixConstants;
 import org.apache.felix.framework.util.Util;
 import org.osgi.framework.Constants;
+import org.osgi.framework.launch.Framework;
 
 /**
  * <p>
@@ -57,7 +58,7 @@
     **/
     public static final String CONFIG_PROPERTIES_FILE_VALUE = "config.properties";
 
-    private static Felix m_felix = null;
+    private static Framework m_felix = null;
 
     /**
      * <p>
@@ -444,4 +445,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}