Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Watson2012-07-17 16:13:26 +0000
committerThomas Watson2012-07-17 16:13:26 +0000
commit4465965036f196893db8f4abd3a4fdc6e67aeeb1 (patch)
treede08e20dcbc90d3e686e93f1b44b59d178b651bb
parent91ed5edc70bba096f9133ce1abb48161f9d6a278 (diff)
downloadrt.equinox.framework-4465965036f196893db8f4abd3a4fdc6e67aeeb1.tar.gz
rt.equinox.framework-4465965036f196893db8f4abd3a4fdc6e67aeeb1.tar.xz
rt.equinox.framework-4465965036f196893db8f4abd3a4fdc6e67aeeb1.zip
Move SystemBundleActivator to org.eclipse.osgi.internal.framework
-rw-r--r--bundles/org.eclipse.osgi/META-INF/MANIFEST.MF2
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/framework/internal/core/AbstractBundle.java4
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/framework/internal/core/Framework.java29
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/framework/internal/core/PackageAdminImpl.java5
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/SystemBundleActivator.java (renamed from bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/framework/internal/core/SystemBundleActivator.java)5
5 files changed, 22 insertions, 23 deletions
diff --git a/bundles/org.eclipse.osgi/META-INF/MANIFEST.MF b/bundles/org.eclipse.osgi/META-INF/MANIFEST.MF
index 3a70ff231..82bccff93 100644
--- a/bundles/org.eclipse.osgi/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.osgi/META-INF/MANIFEST.MF
@@ -77,7 +77,7 @@ Export-Service: org.osgi.service.packageadmin.PackageAdmin,
org.eclipse.osgi.service.debug.DebugOptions
Bundle-Name: %systemBundle
Bundle-SymbolicName: org.eclipse.osgi; singleton:=true
-Bundle-Activator: org.eclipse.osgi.framework.internal.core.SystemBundleActivator
+Bundle-Activator: org.eclipse.osgi.internal.framework.SystemBundleActivator
Bundle-Description: %systemBundle
Bundle-Copyright: %copyright
Bundle-Vendor: %eclipse.org
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/framework/internal/core/AbstractBundle.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/framework/internal/core/AbstractBundle.java
index a494a68fd..f944b462d 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/framework/internal/core/AbstractBundle.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/framework/internal/core/AbstractBundle.java
@@ -52,7 +52,7 @@ public abstract class AbstractBundle implements Bundle, Comparable<Bundle>, Keye
STATE_CHANGE_TIMEOUT = stateChangeWait;
}
/** The Framework this bundle is part of */
- protected final Framework framework;
+ public final Framework framework;
/** The state of the bundle. */
protected volatile int state;
/** A flag to denote whether a bundle state change is in progress */
@@ -64,7 +64,7 @@ public abstract class AbstractBundle implements Bundle, Comparable<Bundle>, Keye
/** ProtectionDomain for the bundle */
protected BundleProtectionDomain domain;
- volatile protected ManifestLocalization manifestLocalization = null;
+ public volatile ManifestLocalization manifestLocalization = null;
/**
* Bundle object constructor. This constructor should not perform any real
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/framework/internal/core/Framework.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/framework/internal/core/Framework.java
index 3a8da4c32..4a36643eb 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/framework/internal/core/Framework.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/framework/internal/core/Framework.java
@@ -10,15 +10,6 @@
*******************************************************************************/
package org.eclipse.osgi.framework.internal.core;
-import org.eclipse.osgi.internal.url.ContentHandlerFactory;
-import org.eclipse.osgi.internal.url.StreamHandlerFactory;
-
-import org.eclipse.osgi.internal.loader.sources.PackageSource;
-
-import org.eclipse.osgi.internal.framework.ContextFinder;
-
-import org.eclipse.osgi.internal.debug.Debug;
-
import java.io.*;
import java.lang.reflect.*;
import java.net.*;
@@ -29,11 +20,17 @@ import org.eclipse.osgi.framework.adaptor.*;
import org.eclipse.osgi.framework.eventmgr.*;
import org.eclipse.osgi.framework.log.FrameworkLogEntry;
import org.eclipse.osgi.framework.util.SecureAction;
-import org.eclipse.osgi.internal.loader.*;
+import org.eclipse.osgi.internal.debug.Debug;
+import org.eclipse.osgi.internal.framework.ContextFinder;
+import org.eclipse.osgi.internal.loader.BundleLoader;
+import org.eclipse.osgi.internal.loader.SystemBundleLoader;
+import org.eclipse.osgi.internal.loader.sources.PackageSource;
import org.eclipse.osgi.internal.permadmin.EquinoxSecurityManager;
import org.eclipse.osgi.internal.permadmin.SecurityAdmin;
import org.eclipse.osgi.internal.profile.Profile;
import org.eclipse.osgi.internal.serviceregistry.*;
+import org.eclipse.osgi.internal.url.ContentHandlerFactory;
+import org.eclipse.osgi.internal.url.StreamHandlerFactory;
import org.eclipse.osgi.signedcontent.SignedContentFactory;
import org.eclipse.osgi.util.ManifestElement;
import org.eclipse.osgi.util.NLS;
@@ -61,7 +58,7 @@ public class Framework implements EventPublisher, Runnable {
private static String JAVASE = "JavaSE-"; //$NON-NLS-1$
private static String PROFILE_EXT = ".profile"; //$NON-NLS-1$
/** FrameworkAdaptor specific functions. */
- protected FrameworkAdaptor adaptor;
+ public FrameworkAdaptor adaptor;
/** Framework properties object. A reference to the
* System.getProperies() object. The properties from
* the adaptor will be merged into these properties.
@@ -74,11 +71,11 @@ public class Framework implements EventPublisher, Runnable {
/** The bundles installed in the framework */
protected BundleRepository bundles;
/** Package Admin object. This object manages the exported packages. */
- protected PackageAdminImpl packageAdmin;
+ public PackageAdminImpl packageAdmin;
/** PermissionAdmin and ConditionalPermissionAdmin impl. This object manages the bundle permissions. */
- protected SecurityAdmin securityAdmin;
+ public SecurityAdmin securityAdmin;
/** Startlevel object. This object manages the framework and bundle startlevels */
- protected StartLevelManager startLevelManager;
+ public StartLevelManager startLevelManager;
/** The ServiceRegistry */
private ServiceRegistry serviceRegistry;
private final int BSN_VERSION;
@@ -113,7 +110,7 @@ public class Framework implements EventPublisher, Runnable {
/* Reservation object for install synchronization */
private Map<String, Thread> installLock;
/** System Bundle object */
- protected InternalSystemBundle systemBundle;
+ public InternalSystemBundle systemBundle;
private String[] bootDelegation;
private String[] bootDelegationStems;
private boolean bootDelegateAll = false;
@@ -2001,7 +1998,7 @@ public class Framework implements EventPublisher, Runnable {
return (currentTracker == null ? null : currentTracker.getService());
}
- ContextFinder getContextFinder() {
+ public ContextFinder getContextFinder() {
return contextFinder;
}
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/framework/internal/core/PackageAdminImpl.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/framework/internal/core/PackageAdminImpl.java
index a73bc4bc2..d57868d63 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/framework/internal/core/PackageAdminImpl.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/framework/internal/core/PackageAdminImpl.java
@@ -11,13 +11,12 @@
package org.eclipse.osgi.framework.internal.core;
-import org.eclipse.osgi.internal.debug.Debug;
-
import java.io.IOException;
import java.security.AccessController;
import java.security.PrivilegedAction;
import java.util.*;
import org.eclipse.osgi.framework.adaptor.*;
+import org.eclipse.osgi.internal.debug.Debug;
import org.eclipse.osgi.internal.loader.BundleLoader;
import org.eclipse.osgi.internal.loader.BundleLoaderProxy;
import org.eclipse.osgi.internal.profile.Profile;
@@ -647,7 +646,7 @@ public class PackageAdminImpl implements PackageAdmin, FrameworkWiring {
//This is only called when the framework is shutting down
}
- protected void setResolvedBundles(InternalSystemBundle systemBundle) {
+ public void setResolvedBundles(InternalSystemBundle systemBundle) {
checkSystemBundle(systemBundle);
// Now set the actual state of the bundles from the persisted state.
State state = framework.adaptor.getState();
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/framework/internal/core/SystemBundleActivator.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/SystemBundleActivator.java
index 05587afc6..1109d0f0f 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/framework/internal/core/SystemBundleActivator.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/SystemBundleActivator.java
@@ -9,7 +9,10 @@
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.osgi.framework.internal.core;
+package org.eclipse.osgi.internal.framework;
+
+import org.eclipse.osgi.framework.internal.core.*;
+import org.eclipse.osgi.framework.internal.core.Constants;
import org.eclipse.osgi.internal.debug.FrameworkDebugOptions;

Back to the top