Change the name of the SystemBundle interface to be Framework as a result
of the latest discussions. (FELIX-753)
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@707407 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/framework/src/main/java/org/apache/felix/framework/Felix.java b/framework/src/main/java/org/apache/felix/framework/Felix.java
index 528bc9e..09372c4 100644
--- a/framework/src/main/java/org/apache/felix/framework/Felix.java
+++ b/framework/src/main/java/org/apache/felix/framework/Felix.java
@@ -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();
diff --git a/framework/src/main/java/org/osgi/framework/launch/SystemBundle.java b/framework/src/main/java/org/osgi/framework/launch/Framework.java
similarity index 99%
rename from framework/src/main/java/org/osgi/framework/launch/SystemBundle.java
rename to framework/src/main/java/org/osgi/framework/launch/Framework.java
index cebb21c..a8d542c 100644
--- a/framework/src/main/java/org/osgi/framework/launch/SystemBundle.java
+++ b/framework/src/main/java/org/osgi/framework/launch/Framework.java
@@ -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
diff --git a/main/src/main/java/org/apache/felix/main/Main.java b/main/src/main/java/org/apache/felix/main/Main.java
index fd2ba88..59368d9 100644
--- a/main/src/main/java/org/apache/felix/main/Main.java
+++ b/main/src/main/java/org/apache/felix/main/Main.java
@@ -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
+}