Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Watson2004-04-21 22:10:44 +0000
committerThomas Watson2004-04-21 22:10:44 +0000
commitaa2283455a5eab1295bdbd6dc35ddba893921889 (patch)
treeaf61dc750e52a858d036481065cd85ae70014ac6
parent5a6306634606175e0f66cfc8422e94fa114a9355 (diff)
downloadrt.equinox.framework-aa2283455a5eab1295bdbd6dc35ddba893921889.tar.gz
rt.equinox.framework-aa2283455a5eab1295bdbd6dc35ddba893921889.tar.xz
rt.equinox.framework-aa2283455a5eab1295bdbd6dc35ddba893921889.zip
Enhancement to separate Framework NSL into the EntryLocator service.
-rw-r--r--bundles/org.eclipse.osgi/META-INF/MANIFEST.MF19
-rw-r--r--bundles/org.eclipse.osgi/console/src/org/eclipse/osgi/framework/internal/core/ConsoleMsg.java9
-rw-r--r--bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/framework/util/FrameworkMessageFormat.java129
-rw-r--r--bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/Msg.java9
-rw-r--r--bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/SystemBundleActivator.java4
-rw-r--r--bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/msg/MessageFormat.java4
-rw-r--r--bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/service/systembundle/EntryLocator.java34
-rw-r--r--bundles/org.eclipse.osgi/defaultAdaptor/src/org/eclipse/osgi/framework/adaptor/core/AdaptorMsg.java5
-rw-r--r--bundles/org.eclipse.osgi/defaultAdaptor/src/org/eclipse/osgi/framework/internal/reliablefile/ReliableMsg.java5
-rw-r--r--bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/adaptor/EclipseAdaptorMsg.java3
-rw-r--r--bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/StateMsg.java5
-rw-r--r--bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/internal/core/Msg.java9
-rw-r--r--bundles/org.eclipse.osgi/systembundle.properties (renamed from bundles/org.eclipse.osgi/plugin.properties)7
13 files changed, 213 insertions, 29 deletions
diff --git a/bundles/org.eclipse.osgi/META-INF/MANIFEST.MF b/bundles/org.eclipse.osgi/META-INF/MANIFEST.MF
index 11e97200f..7aa9637ec 100644
--- a/bundles/org.eclipse.osgi/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.osgi/META-INF/MANIFEST.MF
@@ -1,3 +1,4 @@
+Manifest-Version: 1.0
Export-Package: org.osgi.framework; specification-version=1.2,
org.osgi.service.packageadmin; specification-version=1.1,
org.osgi.service.permissionadmin; specification-version=1.1,
@@ -8,6 +9,7 @@ Export-Package: org.osgi.framework; specification-version=1.2,
org.eclipse.osgi.framework.msg; specification-version=1.0,
org.eclipse.osgi.service.debug,
org.eclipse.osgi.service.resolver,
+ org.eclipse.osgi.service.systembundle,
org.eclipse.osgi.util
Provide-Package: org.osgi.framework,
org.osgi.service.packageadmin,
@@ -19,7 +21,8 @@ Provide-Package: org.osgi.framework,
org.eclipse.osgi.framework.msg,
org.eclipse.osgi.service.debug,
org.eclipse.osgi.service.resolver,
- org.eclipse.osgi.util
+ org.eclipse.osgi.service.systembundle,
+ org.eclipse.osgi.util
Import-Package: org.osgi.framework; specification-version=1.2,
org.osgi.service.packageadmin; specification-version=1.1,
org.osgi.service.permissionadmin; specification-version=1.1,
@@ -28,19 +31,21 @@ Import-Package: org.osgi.framework; specification-version=1.2,
org.eclipse.osgi.framework.eventmgr,
org.eclipse.osgi.framework.msg; specification-version=1.0,
org.eclipse.osgi.service.debug,
- org.eclipse.osgi.service.resolver
+ org.eclipse.osgi.service.resolver,
+ org.eclipse.osgi.service.systembundle,
+ org.eclipse.osgi.util
Export-Service: org.osgi.service.packageadmin.PackageAdmin,
org.osgi.service.permissionadmin.PermissionAdmin,
org.osgi.service.startlevel.StartLevel,
org.eclipse.osgi.service.debug.DebugOptions
-Bundle-Name: OSGi System Bundle
+Bundle-Name: %systemBundle
Bundle-SymbolicName: org.eclipse.osgi; singleton=true
Bundle-Activator: org.eclipse.osgi.framework.internal.core.SystemBundleActivator
-Bundle-Description: OSGi System Bundle
-Bundle-Copyright: Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Common Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/cpl-v10.html
-Bundle-Vendor: Eclipse.org
+Bundle-Description: %systemBundle
+Bundle-Copyright: %copyright
+Bundle-Vendor: %eclipse.org
Bundle-Version: 3.0.0
-Bundle-Localization: plugin
+Bundle-Localization: systembundle
Bundle-DocUrl: http://www.eclipse.org
Bundle-ClassPath:
osgi.jar,
diff --git a/bundles/org.eclipse.osgi/console/src/org/eclipse/osgi/framework/internal/core/ConsoleMsg.java b/bundles/org.eclipse.osgi/console/src/org/eclipse/osgi/framework/internal/core/ConsoleMsg.java
index cc6bd78bd..ffd8ac0d7 100644
--- a/bundles/org.eclipse.osgi/console/src/org/eclipse/osgi/framework/internal/core/ConsoleMsg.java
+++ b/bundles/org.eclipse.osgi/console/src/org/eclipse/osgi/framework/internal/core/ConsoleMsg.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
+ * Copyright (c) 2004 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Common Public License v1.0
* which accompanies this distribution, and is available at
@@ -12,6 +12,7 @@
package org.eclipse.osgi.framework.internal.core;
import org.eclipse.osgi.framework.msg.MessageFormat;
+import org.eclipse.osgi.framework.util.FrameworkMessageFormat;
/**
* This class retrieves strings from a resource bundle
@@ -21,7 +22,7 @@ import org.eclipse.osgi.framework.msg.MessageFormat;
* It is used by the system classes to provide national
* language support, by looking up messages in the
* <code>
- * org.eclipse.osgi.framework.internal.core.ExternalMessages
+ * org.eclipse.osgi.framework.internal.core.ConsoleMessages
* </code>
* resource bundle. Note that if this file is not available,
* or an invalid key is looked up, or resource bundle support
@@ -36,6 +37,6 @@ public class ConsoleMsg {
// Attempt to load the message bundle.
static {
- formatter = new MessageFormat("org.eclipse.osgi.framework.internal.core.ConsoleMessages");
+ formatter = FrameworkMessageFormat.getMessageFormat("org.eclipse.osgi.framework.internal.core.ConsoleMessages"); //$NON-NLS-1$
}
-}
+} \ No newline at end of file
diff --git a/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/framework/util/FrameworkMessageFormat.java b/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/framework/util/FrameworkMessageFormat.java
new file mode 100644
index 000000000..1b6540997
--- /dev/null
+++ b/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/framework/util/FrameworkMessageFormat.java
@@ -0,0 +1,129 @@
+/*******************************************************************************
+ * Copyright (c) 2003, 2004 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.osgi.framework.util;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.*;
+import java.util.ArrayList;
+import java.util.Locale;
+import org.eclipse.osgi.framework.msg.MessageFormat;
+import org.eclipse.osgi.service.systembundle.EntryLocator;
+import org.osgi.framework.*;
+
+public class FrameworkMessageFormat extends MessageFormat {
+ static private BundleContext context;
+ static private ArrayList msgList = new ArrayList();
+ static private ServiceListener listener = null;
+ static private EntryLocator systemEntryLocator = null;
+
+ private Class clazz;
+ private String bundleName;
+
+ private FrameworkMessageFormat(String bundleName, Locale locale, Class clazz) {
+ super(bundleName, locale, clazz);
+ this.bundleName = bundleName;
+ this.clazz = clazz;
+ }
+
+ protected void init(final String bundleName, final Locale locale, final Class clazz) {
+ if (systemEntryLocator == null) {
+ super.init(bundleName, locale, clazz);
+ return;
+ }
+
+ URL resourceURL = systemEntryLocator.getProperties(bundleName, locale);
+ if (resourceURL != null) {
+ InputStream resourceStream = null;
+ try {
+ resourceStream = resourceURL.openStream();
+ bundle = new PropertyResourceBundle(resourceStream);
+ return;
+ } catch (IOException e) {
+ // Do nothing will just call super below
+ } finally {
+ if (resourceStream != null) {
+ try {
+ resourceStream.close();
+ } catch (IOException e) {
+ //Ignore exception
+ }
+ }
+ }
+ }
+ // if we get here just call super
+ super.init(bundleName, locale, clazz);
+ }
+
+ private void init() {
+ init(bundleName, locale, clazz);
+ }
+
+ static public synchronized void setContext(BundleContext context) {
+ if (context == null) {
+ if (FrameworkMessageFormat.context != null && listener != null)
+ FrameworkMessageFormat.context.removeServiceListener(listener);
+ FrameworkMessageFormat.context = null;
+ } else if (FrameworkMessageFormat.context == null) {
+ FrameworkMessageFormat.context = context;
+ listener = new ResourceFinderListener();
+ try {
+ FrameworkMessageFormat.context.addServiceListener(listener, "(objectclass=org.eclipse.osgi.service.systembundle.EntryLocator)"); //$NON-NLS-1$
+ } catch (InvalidSyntaxException e) {
+ // Do nothing this cannot happen.
+ }
+ }
+
+ }
+
+ static public synchronized MessageFormat getMessageFormat(String bundleName) {
+ FrameworkMessageFormat msgFormat = new FrameworkMessageFormat(bundleName, Locale.getDefault(), FrameworkMessageFormat.class);
+ msgList.add(msgFormat);
+ return msgFormat;
+ }
+
+ static private synchronized void initMessages() {
+ int size = msgList.size();
+ for (int i = 0; i < size; i++) {
+ ((FrameworkMessageFormat) msgList.get(i)).init();
+ }
+ }
+
+ static private class ResourceFinderListener implements ServiceListener {
+ private ServiceReference resourceFinderRef = null;
+
+ public void serviceChanged(ServiceEvent event) {
+ synchronized (FrameworkMessageFormat.class) {
+ int eventType = event.getType();
+ ServiceReference sr = event.getServiceReference();
+ switch (eventType) {
+ case ServiceEvent.REGISTERED :
+ if (systemEntryLocator == null) {
+ resourceFinderRef = sr;
+ systemEntryLocator = (EntryLocator) context.getService(sr);
+ initMessages();
+ }
+ break;
+ case ServiceEvent.UNREGISTERING :
+ if (sr.equals(resourceFinderRef)) {
+ systemEntryLocator = null;
+ initMessages();
+ context.ungetService(resourceFinderRef);
+ resourceFinderRef = null;
+ }
+ break;
+ }
+ }
+ }
+ }
+
+} \ No newline at end of file
diff --git a/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/Msg.java b/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/Msg.java
index 91d3c602b..23fe81c86 100644
--- a/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/Msg.java
+++ b/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/Msg.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
+ * Copyright (c) 2004 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Common Public License v1.0
* which accompanies this distribution, and is available at
@@ -11,6 +11,9 @@
package org.eclipse.osgi.framework.internal.core;
+import org.eclipse.osgi.framework.msg.MessageFormat;
+import org.eclipse.osgi.framework.util.FrameworkMessageFormat;
+
/**
* This class retrieves strings from a resource bundle
* and returns them, formatting them with MessageFormat
@@ -30,10 +33,10 @@ package org.eclipse.osgi.framework.internal.core;
public class Msg {
- static public org.eclipse.osgi.framework.msg.MessageFormat formatter;
+ static public MessageFormat formatter;
// Attempt to load the message bundle.
static {
- formatter = new org.eclipse.osgi.framework.msg.MessageFormat("org.eclipse.osgi.framework.internal.core.ExternalMessages");
+ formatter = FrameworkMessageFormat.getMessageFormat("org.eclipse.osgi.framework.internal.core.ExternalMessages"); //$NON-NLS-1$
}
} \ No newline at end of file
diff --git a/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/SystemBundleActivator.java b/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/SystemBundleActivator.java
index 72c0401f7..392a6c94b 100644
--- a/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/SystemBundleActivator.java
+++ b/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/SystemBundleActivator.java
@@ -14,6 +14,7 @@ package org.eclipse.osgi.framework.internal.core;
import java.util.Dictionary;
import java.util.Hashtable;
import org.eclipse.osgi.framework.debug.DebugOptions;
+import org.eclipse.osgi.framework.util.FrameworkMessageFormat;
import org.osgi.framework.*;
/**
@@ -37,6 +38,8 @@ public class SystemBundleActivator implements BundleActivator {
bundle = (SystemBundle) context.getBundle();
framework = bundle.framework;
+ FrameworkMessageFormat.setContext(context);
+
if (framework.packageAdmin != null) {
packageAdmin = register(Constants.OSGI_PACKAGEADMIN_NAME, framework.packageAdmin);
}
@@ -81,6 +84,7 @@ public class SystemBundleActivator implements BundleActivator {
framework = null;
bundle = null;
this.context = null;
+ FrameworkMessageFormat.setContext(null);
}
/**
diff --git a/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/msg/MessageFormat.java b/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/msg/MessageFormat.java
index e72eb0bed..10265ae01 100644
--- a/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/msg/MessageFormat.java
+++ b/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/msg/MessageFormat.java
@@ -18,8 +18,8 @@ import java.util.*;
public class MessageFormat {
// ResourceBundle holding the messages.
- private ResourceBundle bundle;
- private Locale locale;
+ protected ResourceBundle bundle;
+ protected Locale locale;
public MessageFormat(String bundleName) {
init(bundleName, Locale.getDefault(), this.getClass());
diff --git a/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/service/systembundle/EntryLocator.java b/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/service/systembundle/EntryLocator.java
new file mode 100644
index 000000000..6bc575944
--- /dev/null
+++ b/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/service/systembundle/EntryLocator.java
@@ -0,0 +1,34 @@
+/*******************************************************************************
+ * Copyright (c) 2004 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.osgi.service.systembundle;
+
+import java.net.URL;
+import java.util.Locale;
+
+/**
+ * The System Bundle uses an EntryLocator service to find resource URLs
+ * to NLS properties files. The System Bundle does not have the ablity
+ * to host fragment bundles. The EntryLocator service allows a bundle
+ * installed in the Framework to provide NLS properties files to the
+ * System Bundle.
+ */
+public interface EntryLocator {
+ /**
+ * Returns the URL for the specified properies file and locale.
+ * The value of null is returned if the properties file could not be
+ * found.
+ * @param basename the base name of the properties file to get
+ * @param locale the locale to use when searching for the properites file
+ * @return the URL for the properties file or null if one could not be
+ * found
+ */
+ public URL getProperties(String basename, Locale locale);
+}
diff --git a/bundles/org.eclipse.osgi/defaultAdaptor/src/org/eclipse/osgi/framework/adaptor/core/AdaptorMsg.java b/bundles/org.eclipse.osgi/defaultAdaptor/src/org/eclipse/osgi/framework/adaptor/core/AdaptorMsg.java
index 2164ffa47..13f823f7a 100644
--- a/bundles/org.eclipse.osgi/defaultAdaptor/src/org/eclipse/osgi/framework/adaptor/core/AdaptorMsg.java
+++ b/bundles/org.eclipse.osgi/defaultAdaptor/src/org/eclipse/osgi/framework/adaptor/core/AdaptorMsg.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
+ * Copyright (c) 2003, 2004 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Common Public License v1.0
* which accompanies this distribution, and is available at
@@ -12,6 +12,7 @@
package org.eclipse.osgi.framework.adaptor.core;
import org.eclipse.osgi.framework.msg.MessageFormat;
+import org.eclipse.osgi.framework.util.FrameworkMessageFormat;
/**
* This class retrieves strings from a resource bundle
@@ -25,6 +26,6 @@ public class AdaptorMsg {
// Attempt to load the message bundle.
static {
- formatter = new MessageFormat("org.eclipse.osgi.framework.adaptor.core.ExternalMessages");
+ formatter = FrameworkMessageFormat.getMessageFormat("org.eclipse.osgi.framework.adaptor.core.ExternalMessages"); //$NON-NLS-1$
}
} \ No newline at end of file
diff --git a/bundles/org.eclipse.osgi/defaultAdaptor/src/org/eclipse/osgi/framework/internal/reliablefile/ReliableMsg.java b/bundles/org.eclipse.osgi/defaultAdaptor/src/org/eclipse/osgi/framework/internal/reliablefile/ReliableMsg.java
index 344b80a3d..6cbafc5cc 100644
--- a/bundles/org.eclipse.osgi/defaultAdaptor/src/org/eclipse/osgi/framework/internal/reliablefile/ReliableMsg.java
+++ b/bundles/org.eclipse.osgi/defaultAdaptor/src/org/eclipse/osgi/framework/internal/reliablefile/ReliableMsg.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
+ * Copyright (c) 2003, 2004 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Common Public License v1.0
* which accompanies this distribution, and is available at
@@ -12,6 +12,7 @@
package org.eclipse.osgi.framework.internal.reliablefile;
import org.eclipse.osgi.framework.msg.MessageFormat;
+import org.eclipse.osgi.framework.util.FrameworkMessageFormat;
/**
* This class retrieves strings from a resource bundle
@@ -25,6 +26,6 @@ public class ReliableMsg {
// Attempt to load the message bundle.
static {
- formatter = new MessageFormat("org.eclipse.osgi.framework.internal.reliablefile.ExternalMessages");
+ formatter = FrameworkMessageFormat.getMessageFormat("org.eclipse.osgi.framework.internal.reliablefile.ExternalMessages"); //$NON-NLS-1$
}
} \ No newline at end of file
diff --git a/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/adaptor/EclipseAdaptorMsg.java b/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/adaptor/EclipseAdaptorMsg.java
index 57ddc5b40..fa9deb0cc 100644
--- a/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/adaptor/EclipseAdaptorMsg.java
+++ b/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/adaptor/EclipseAdaptorMsg.java
@@ -11,6 +11,7 @@
package org.eclipse.core.runtime.adaptor;
import org.eclipse.osgi.framework.msg.MessageFormat;
+import org.eclipse.osgi.framework.util.FrameworkMessageFormat;
import org.eclipse.osgi.service.resolver.*;
/**
@@ -31,7 +32,7 @@ public class EclipseAdaptorMsg {
public static MessageFormat formatter;
// Attempt to load the message bundle.
static {
- formatter = new MessageFormat("org.eclipse.core.runtime.adaptor.EclipseAdaptorMessages"); //TODO This could be an adaptor constant.
+ formatter = FrameworkMessageFormat.getMessageFormat("org.eclipse.core.runtime.adaptor.EclipseAdaptorMessages"); //TODO This could be an adaptor constant.
}
public static String getResolutionFailureMessage(VersionConstraint unsatisfied) {
diff --git a/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/StateMsg.java b/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/StateMsg.java
index 66e6f621c..152cd5cca 100644
--- a/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/StateMsg.java
+++ b/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/StateMsg.java
@@ -12,6 +12,7 @@
package org.eclipse.osgi.internal.resolver;
import org.eclipse.osgi.framework.msg.MessageFormat;
+import org.eclipse.osgi.framework.util.FrameworkMessageFormat;
/**
* This class retrieves strings from a resource bundle
@@ -21,7 +22,7 @@ import org.eclipse.osgi.framework.msg.MessageFormat;
* It is used by the system classes to provide national
* language support, by looking up messages in the
* <code>
- * org.eclipse.osgi.framework.internal.core.ExternalMessages
+ * org.eclipse.osgi.internal.resolver.StateMessages
* </code>
* resource bundle. Note that if this file is not available,
* or an invalid key is looked up, or resource bundle support
@@ -36,6 +37,6 @@ public class StateMsg {
// Attempt to load the message bundle.
static {
- formatter = new MessageFormat("org.eclipse.osgi.internal.resolver.StateMessages");
+ formatter = FrameworkMessageFormat.getMessageFormat("org.eclipse.osgi.internal.resolver.StateMessages"); //$NON-NLS-1$
}
} \ No newline at end of file
diff --git a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/internal/core/Msg.java b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/internal/core/Msg.java
index 91d3c602b..23fe81c86 100644
--- a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/internal/core/Msg.java
+++ b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/internal/core/Msg.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
+ * Copyright (c) 2004 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Common Public License v1.0
* which accompanies this distribution, and is available at
@@ -11,6 +11,9 @@
package org.eclipse.osgi.framework.internal.core;
+import org.eclipse.osgi.framework.msg.MessageFormat;
+import org.eclipse.osgi.framework.util.FrameworkMessageFormat;
+
/**
* This class retrieves strings from a resource bundle
* and returns them, formatting them with MessageFormat
@@ -30,10 +33,10 @@ package org.eclipse.osgi.framework.internal.core;
public class Msg {
- static public org.eclipse.osgi.framework.msg.MessageFormat formatter;
+ static public MessageFormat formatter;
// Attempt to load the message bundle.
static {
- formatter = new org.eclipse.osgi.framework.msg.MessageFormat("org.eclipse.osgi.framework.internal.core.ExternalMessages");
+ formatter = FrameworkMessageFormat.getMessageFormat("org.eclipse.osgi.framework.internal.core.ExternalMessages"); //$NON-NLS-1$
}
} \ No newline at end of file
diff --git a/bundles/org.eclipse.osgi/plugin.properties b/bundles/org.eclipse.osgi/systembundle.properties
index ca2b8e513..166e5c925 100644
--- a/bundles/org.eclipse.osgi/plugin.properties
+++ b/bundles/org.eclipse.osgi/systembundle.properties
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2003 IBM Corporation and others.
+# Copyright (c) 2003, 2004 IBM Corporation and others.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Common Public License v1.0
# which accompanies this distribution, and is available at
@@ -8,5 +8,6 @@
# Contributors:
# IBM Corporation - initial API and implementation
###############################################################################
-pluginName = Eclipse OSGi
-providerName = Eclipse.org
+systemBundle = OSGi System Bundle
+eclipse.org = Eclipse.org
+copyright = Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Common Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/cpl-v10.html

Back to the top