From eabb2839eb0e820c09446421db6d8301a5f2a7ba Mon Sep 17 00:00:00 2001
From: Thomas Watson
Date: Thu, 5 Sep 2013 13:13:33 -0500
Subject: Move Msg messages class to org.eclipse.osgi.internal.messages
---
.../osgi/internal/resolver/StateBuilder.java | 2 +-
bundles/org.eclipse.osgi/META-INF/MANIFEST.MF | 2 +-
.../core/runtime/adaptor/EclipseStarter.java | 2 +-
.../internal/adaptor/EclipseAppLauncher.java | 2 +-
.../builders/OSGiManifestBuilderFactory.java | 2 +-
.../org/eclipse/osgi/framework/util/Headers.java | 2 +-
.../osgi/internal/framework/BundleContextImpl.java | 2 +-
.../osgi/internal/framework/EquinoxBundle.java | 2 +-
.../internal/framework/EquinoxConfiguration.java | 2 +-
.../osgi/internal/framework/EquinoxContainer.java | 2 +-
.../osgi/internal/framework/FilterImpl.java | 2 +-
.../internal/framework/OSGiFrameworkHooks.java | 2 +-
.../osgi/internal/hooks/EclipseLazyStarter.java | 2 +-
.../osgi/internal/location/BasicLocation.java | 2 +-
.../PrototypeServiceFactoryUse.java | 2 +-
.../serviceregistry/ServiceFactoryUse.java | 2 +-
.../serviceregistry/ServiceObjectsImpl.java | 2 +-
.../serviceregistry/ServiceRegistrationImpl.java | 2 +-
.../internal/serviceregistry/ServiceRegistry.java | 2 +-
.../osgi/internal/serviceregistry/ServiceUse.java | 2 +-
.../internal/url/ContentHandlerFactoryImpl.java | 2 +-
.../internal/url/URLStreamHandlerFactoryImpl.java | 2 +-
.../osgi/storage/url/BundleURLConverter.java | 2 +-
.../supplement/META-INF/MANIFEST.MF | 6 +-
bundles/org.eclipse.osgi/supplement/pom.xml | 2 +-
.../internal/core/ExternalMessages.properties | 93 --------------------
.../eclipse/osgi/framework/internal/core/Msg.java | 98 ----------------------
.../osgi/internal/location/Locker_JavaNio.java | 2 +-
.../internal/messages/ExternalMessages.properties | 93 ++++++++++++++++++++
.../org/eclipse/osgi/internal/messages/Msg.java | 98 ++++++++++++++++++++++
.../osgi/storagemanager/StorageManager.java | 2 +-
.../src/org/eclipse/osgi/util/ManifestElement.java | 2 +-
32 files changed, 220 insertions(+), 222 deletions(-)
delete mode 100644 bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/internal/core/ExternalMessages.properties
delete mode 100644 bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/internal/core/Msg.java
create mode 100644 bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/messages/ExternalMessages.properties
create mode 100644 bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/messages/Msg.java
(limited to 'bundles')
diff --git a/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/StateBuilder.java b/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/StateBuilder.java
index 1de76de6a..7689ad400 100644
--- a/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/StateBuilder.java
+++ b/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/StateBuilder.java
@@ -13,9 +13,9 @@ package org.eclipse.osgi.internal.resolver;
import java.lang.reflect.Constructor;
import java.util.*;
-import org.eclipse.osgi.framework.internal.core.Msg;
import org.eclipse.osgi.internal.framework.EquinoxContainer;
import org.eclipse.osgi.internal.framework.FilterImpl;
+import org.eclipse.osgi.internal.messages.Msg;
import org.eclipse.osgi.internal.util.Tokenizer;
import org.eclipse.osgi.service.resolver.*;
import org.eclipse.osgi.service.resolver.VersionRange;
diff --git a/bundles/org.eclipse.osgi/META-INF/MANIFEST.MF b/bundles/org.eclipse.osgi/META-INF/MANIFEST.MF
index db400838d..d09acdfbf 100644
--- a/bundles/org.eclipse.osgi/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.osgi/META-INF/MANIFEST.MF
@@ -8,7 +8,6 @@ Export-Package: org.eclipse.core.runtime.adaptor;x-friends:="org.eclipse.core.ru
org.eclipse.osgi.container.namespaces;version="1.0",
org.eclipse.osgi.framework.console;version="1.1",
org.eclipse.osgi.framework.eventmgr;version="1.2",
- org.eclipse.osgi.framework.internal.core;x-internal:=true,
org.eclipse.osgi.framework.internal.reliablefile;x-internal:=true,
org.eclipse.osgi.framework.log;version="1.1",
org.eclipse.osgi.framework.util;x-internal:=true,
@@ -20,6 +19,7 @@ Export-Package: org.eclipse.core.runtime.adaptor;x-friends:="org.eclipse.core.ru
org.eclipse.osgi.internal.loader.classpath;x-internal:=true,
org.eclipse.osgi.internal.loader.sources;x-internal:=true,
org.eclipse.osgi.internal.location;x-internal:=true,
+ org.eclipse.osgi.internal.messages;x-internal:=true,
org.eclipse.osgi.internal.provisional.service.security;version="1.0.0";x-friends:="org.eclipse.equinox.security.ui",
org.eclipse.osgi.internal.provisional.verifier;x-friends:="org.eclipse.update.core,org.eclipse.ui.workbench,org.eclipse.equinox.p2.artifact.repository",
org.eclipse.osgi.internal.service.security;x-friends:="org.eclipse.equinox.security.ui",
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/adaptor/EclipseStarter.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/adaptor/EclipseStarter.java
index 328e4b1cf..70ecc42aa 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/adaptor/EclipseStarter.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/adaptor/EclipseStarter.java
@@ -19,7 +19,6 @@ import java.security.ProtectionDomain;
import java.util.*;
import org.eclipse.core.runtime.internal.adaptor.*;
import org.eclipse.osgi.container.namespaces.EquinoxModuleDataNamespace;
-import org.eclipse.osgi.framework.internal.core.Msg;
import org.eclipse.osgi.framework.log.FrameworkLog;
import org.eclipse.osgi.framework.log.FrameworkLogEntry;
import org.eclipse.osgi.framework.util.FilePath;
@@ -27,6 +26,7 @@ import org.eclipse.osgi.internal.framework.EquinoxConfiguration;
import org.eclipse.osgi.internal.framework.EquinoxContainer;
import org.eclipse.osgi.internal.location.EquinoxLocations;
import org.eclipse.osgi.internal.location.LocationHelper;
+import org.eclipse.osgi.internal.messages.Msg;
import org.eclipse.osgi.launch.Equinox;
import org.eclipse.osgi.service.datalocation.Location;
import org.eclipse.osgi.service.environment.EnvironmentInfo;
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/internal/adaptor/EclipseAppLauncher.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/internal/adaptor/EclipseAppLauncher.java
index 7d7e1158e..bd2fe63eb 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/internal/adaptor/EclipseAppLauncher.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/internal/adaptor/EclipseAppLauncher.java
@@ -14,11 +14,11 @@ package org.eclipse.core.runtime.internal.adaptor;
import java.lang.reflect.Method;
import java.util.Map;
import org.eclipse.core.runtime.adaptor.EclipseStarter;
-import org.eclipse.osgi.framework.internal.core.Msg;
import org.eclipse.osgi.framework.log.FrameworkLog;
import org.eclipse.osgi.framework.log.FrameworkLogEntry;
import org.eclipse.osgi.internal.framework.EquinoxConfiguration;
import org.eclipse.osgi.internal.framework.EquinoxContainer;
+import org.eclipse.osgi.internal.messages.Msg;
import org.eclipse.osgi.service.runnable.*;
import org.osgi.framework.*;
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/builders/OSGiManifestBuilderFactory.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/builders/OSGiManifestBuilderFactory.java
index 9b9962d0b..741cfd156 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/builders/OSGiManifestBuilderFactory.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/builders/OSGiManifestBuilderFactory.java
@@ -16,9 +16,9 @@ import java.util.*;
import org.eclipse.osgi.container.ModuleRevisionBuilder;
import org.eclipse.osgi.container.namespaces.EclipsePlatformNamespace;
import org.eclipse.osgi.container.namespaces.EquinoxModuleDataNamespace;
-import org.eclipse.osgi.framework.internal.core.Msg;
import org.eclipse.osgi.internal.framework.EquinoxContainer;
import org.eclipse.osgi.internal.framework.FilterImpl;
+import org.eclipse.osgi.internal.messages.Msg;
import org.eclipse.osgi.internal.util.Tokenizer;
import org.eclipse.osgi.storage.NativeCodeFinder;
import org.eclipse.osgi.storage.Storage;
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/framework/util/Headers.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/framework/util/Headers.java
index c01ef6d86..755331f6e 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/framework/util/Headers.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/framework/util/Headers.java
@@ -14,7 +14,7 @@ package org.eclipse.osgi.framework.util;
import java.io.IOException;
import java.io.InputStream;
import java.util.*;
-import org.eclipse.osgi.framework.internal.core.Msg;
+import org.eclipse.osgi.internal.messages.Msg;
import org.eclipse.osgi.util.ManifestElement;
import org.eclipse.osgi.util.NLS;
import org.osgi.framework.BundleException;
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/BundleContextImpl.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/BundleContextImpl.java
index ab705af9a..23d78adb4 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/BundleContextImpl.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/BundleContextImpl.java
@@ -19,9 +19,9 @@ import org.eclipse.osgi.container.Module;
import org.eclipse.osgi.container.ModuleWiring;
import org.eclipse.osgi.container.namespaces.EquinoxModuleDataNamespace;
import org.eclipse.osgi.framework.eventmgr.EventDispatcher;
-import org.eclipse.osgi.framework.internal.core.Msg;
import org.eclipse.osgi.internal.debug.Debug;
import org.eclipse.osgi.internal.loader.BundleLoader;
+import org.eclipse.osgi.internal.messages.Msg;
import org.eclipse.osgi.internal.serviceregistry.*;
import org.eclipse.osgi.storage.BundleInfo.Generation;
import org.eclipse.osgi.util.NLS;
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxBundle.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxBundle.java
index bb25ea2d9..e9d670ae5 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxBundle.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxBundle.java
@@ -23,11 +23,11 @@ import org.eclipse.osgi.container.Module.State;
import org.eclipse.osgi.container.Module.StopOptions;
import org.eclipse.osgi.container.ModuleContainerAdaptor.ContainerEvent;
import org.eclipse.osgi.container.ModuleContainerAdaptor.ModuleEvent;
-import org.eclipse.osgi.framework.internal.core.Msg;
import org.eclipse.osgi.framework.log.FrameworkLogEntry;
import org.eclipse.osgi.internal.loader.BundleLoader;
import org.eclipse.osgi.internal.loader.ModuleClassLoader;
import org.eclipse.osgi.internal.loader.classpath.ClasspathManager;
+import org.eclipse.osgi.internal.messages.Msg;
import org.eclipse.osgi.internal.permadmin.EquinoxSecurityManager;
import org.eclipse.osgi.signedcontent.*;
import org.eclipse.osgi.storage.BundleInfo.Generation;
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxConfiguration.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxConfiguration.java
index 20929744b..1e21e24c1 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxConfiguration.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxConfiguration.java
@@ -27,11 +27,11 @@ import java.net.*;
import java.security.CodeSource;
import java.util.*;
import org.eclipse.core.runtime.internal.adaptor.ConsoleManager;
-import org.eclipse.osgi.framework.internal.core.Msg;
import org.eclipse.osgi.internal.debug.Debug;
import org.eclipse.osgi.internal.debug.FrameworkDebugOptions;
import org.eclipse.osgi.internal.hookregistry.HookRegistry;
import org.eclipse.osgi.internal.location.EquinoxLocations;
+import org.eclipse.osgi.internal.messages.Msg;
import org.eclipse.osgi.service.debug.DebugOptions;
import org.eclipse.osgi.service.environment.Constants;
import org.eclipse.osgi.service.environment.EnvironmentInfo;
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxContainer.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxContainer.java
index 07f0c449b..3abc9ff8a 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxContainer.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxContainer.java
@@ -19,7 +19,6 @@ import java.util.*;
import java.util.concurrent.*;
import org.eclipse.osgi.framework.eventmgr.EventManager;
import org.eclipse.osgi.framework.eventmgr.ListenerQueue;
-import org.eclipse.osgi.framework.internal.core.Msg;
import org.eclipse.osgi.framework.log.FrameworkLogEntry;
import org.eclipse.osgi.framework.util.SecureAction;
import org.eclipse.osgi.internal.framework.legacy.PackageAdminImpl;
@@ -27,6 +26,7 @@ import org.eclipse.osgi.internal.framework.legacy.StartLevelImpl;
import org.eclipse.osgi.internal.hookregistry.HookRegistry;
import org.eclipse.osgi.internal.location.EquinoxLocations;
import org.eclipse.osgi.internal.log.EquinoxLogServices;
+import org.eclipse.osgi.internal.messages.Msg;
import org.eclipse.osgi.internal.serviceregistry.ServiceRegistry;
import org.eclipse.osgi.service.datalocation.Location;
import org.eclipse.osgi.signedcontent.SignedContentFactory;
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/FilterImpl.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/FilterImpl.java
index 718a87fb7..1977c3426 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/FilterImpl.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/FilterImpl.java
@@ -15,9 +15,9 @@ import java.lang.reflect.*;
import java.security.AccessController;
import java.security.PrivilegedAction;
import java.util.*;
-import org.eclipse.osgi.framework.internal.core.Msg;
import org.eclipse.osgi.framework.util.Headers;
import org.eclipse.osgi.internal.debug.Debug;
+import org.eclipse.osgi.internal.messages.Msg;
import org.eclipse.osgi.internal.serviceregistry.ServiceReferenceImpl;
import org.eclipse.osgi.util.NLS;
import org.osgi.framework.*;
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/OSGiFrameworkHooks.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/OSGiFrameworkHooks.java
index 4e1f47807..0bb82c11b 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/OSGiFrameworkHooks.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/OSGiFrameworkHooks.java
@@ -14,9 +14,9 @@ import java.security.AccessController;
import java.security.PrivilegedAction;
import java.util.*;
import org.eclipse.osgi.container.*;
-import org.eclipse.osgi.framework.internal.core.Msg;
import org.eclipse.osgi.framework.util.ArrayMap;
import org.eclipse.osgi.internal.debug.Debug;
+import org.eclipse.osgi.internal.messages.Msg;
import org.eclipse.osgi.internal.serviceregistry.*;
import org.eclipse.osgi.report.resolution.ResolutionReport;
import org.eclipse.osgi.storage.Storage;
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/hooks/EclipseLazyStarter.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/hooks/EclipseLazyStarter.java
index b118179d4..a736c3f9a 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/hooks/EclipseLazyStarter.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/hooks/EclipseLazyStarter.java
@@ -17,12 +17,12 @@ import org.eclipse.osgi.container.*;
import org.eclipse.osgi.container.Module.StartOptions;
import org.eclipse.osgi.container.Module.State;
import org.eclipse.osgi.container.namespaces.EquinoxModuleDataNamespace;
-import org.eclipse.osgi.framework.internal.core.Msg;
import org.eclipse.osgi.framework.log.FrameworkLogEntry;
import org.eclipse.osgi.framework.util.SecureAction;
import org.eclipse.osgi.internal.framework.EquinoxContainer;
import org.eclipse.osgi.internal.hookregistry.ClassLoaderHook;
import org.eclipse.osgi.internal.loader.classpath.ClasspathManager;
+import org.eclipse.osgi.internal.messages.Msg;
import org.eclipse.osgi.util.NLS;
import org.osgi.framework.*;
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/location/BasicLocation.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/location/BasicLocation.java
index f106c90c6..40e79ce01 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/location/BasicLocation.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/location/BasicLocation.java
@@ -13,8 +13,8 @@ package org.eclipse.osgi.internal.location;
import java.io.File;
import java.io.IOException;
import java.net.URL;
-import org.eclipse.osgi.framework.internal.core.Msg;
import org.eclipse.osgi.internal.framework.EquinoxConfiguration;
+import org.eclipse.osgi.internal.messages.Msg;
import org.eclipse.osgi.service.datalocation.Location;
import org.eclipse.osgi.util.NLS;
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/PrototypeServiceFactoryUse.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/PrototypeServiceFactoryUse.java
index 748aeb13f..661021b5a 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/PrototypeServiceFactoryUse.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/PrototypeServiceFactoryUse.java
@@ -12,9 +12,9 @@
package org.eclipse.osgi.internal.serviceregistry;
import java.util.*;
-import org.eclipse.osgi.framework.internal.core.Msg;
import org.eclipse.osgi.internal.debug.Debug;
import org.eclipse.osgi.internal.framework.BundleContextImpl;
+import org.eclipse.osgi.internal.messages.Msg;
import org.osgi.framework.*;
/**
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/ServiceFactoryUse.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/ServiceFactoryUse.java
index 0b80552f1..e98ec6b7a 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/ServiceFactoryUse.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/ServiceFactoryUse.java
@@ -13,9 +13,9 @@ package org.eclipse.osgi.internal.serviceregistry;
import java.security.AccessController;
import java.security.PrivilegedAction;
-import org.eclipse.osgi.framework.internal.core.Msg;
import org.eclipse.osgi.internal.debug.Debug;
import org.eclipse.osgi.internal.framework.BundleContextImpl;
+import org.eclipse.osgi.internal.messages.Msg;
import org.eclipse.osgi.util.NLS;
import org.osgi.framework.*;
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/ServiceObjectsImpl.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/ServiceObjectsImpl.java
index 3fee2a0dc..60f7e9675 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/ServiceObjectsImpl.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/ServiceObjectsImpl.java
@@ -11,8 +11,8 @@
package org.eclipse.osgi.internal.serviceregistry;
-import org.eclipse.osgi.framework.internal.core.Msg;
import org.eclipse.osgi.internal.framework.BundleContextImpl;
+import org.eclipse.osgi.internal.messages.Msg;
import org.osgi.framework.*;
/**
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/ServiceRegistrationImpl.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/ServiceRegistrationImpl.java
index c13a084c3..c3ea994c0 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/ServiceRegistrationImpl.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/ServiceRegistrationImpl.java
@@ -12,10 +12,10 @@
package org.eclipse.osgi.internal.serviceregistry;
import java.util.*;
-import org.eclipse.osgi.framework.internal.core.Msg;
import org.eclipse.osgi.internal.debug.Debug;
import org.eclipse.osgi.internal.framework.BundleContextImpl;
import org.eclipse.osgi.internal.loader.sources.PackageSource;
+import org.eclipse.osgi.internal.messages.Msg;
import org.osgi.framework.*;
/**
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/ServiceRegistry.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/ServiceRegistry.java
index d7b409bfd..2b2472298 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/ServiceRegistry.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/ServiceRegistry.java
@@ -16,10 +16,10 @@ import java.util.*;
import org.eclipse.osgi.container.Module;
import org.eclipse.osgi.container.ModuleRevision;
import org.eclipse.osgi.framework.eventmgr.*;
-import org.eclipse.osgi.framework.internal.core.Msg;
import org.eclipse.osgi.internal.debug.Debug;
import org.eclipse.osgi.internal.framework.BundleContextImpl;
import org.eclipse.osgi.internal.framework.EquinoxContainer;
+import org.eclipse.osgi.internal.messages.Msg;
import org.eclipse.osgi.storage.BundleInfo.Generation;
import org.eclipse.osgi.util.NLS;
import org.osgi.framework.*;
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/ServiceUse.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/ServiceUse.java
index d4e2e9e9f..ab8e45e0b 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/ServiceUse.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/ServiceUse.java
@@ -11,8 +11,8 @@
package org.eclipse.osgi.internal.serviceregistry;
-import org.eclipse.osgi.framework.internal.core.Msg;
import org.eclipse.osgi.internal.framework.BundleContextImpl;
+import org.eclipse.osgi.internal.messages.Msg;
import org.osgi.framework.ServiceException;
/**
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/ContentHandlerFactoryImpl.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/ContentHandlerFactoryImpl.java
index e1b77d64b..ba234761d 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/ContentHandlerFactoryImpl.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/ContentHandlerFactoryImpl.java
@@ -15,9 +15,9 @@ import java.lang.reflect.Method;
import java.net.ContentHandler;
import java.net.URLConnection;
import java.util.*;
-import org.eclipse.osgi.framework.internal.core.Msg;
import org.eclipse.osgi.framework.log.FrameworkLogEntry;
import org.eclipse.osgi.internal.framework.EquinoxContainer;
+import org.eclipse.osgi.internal.messages.Msg;
import org.eclipse.osgi.util.NLS;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/URLStreamHandlerFactoryImpl.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/URLStreamHandlerFactoryImpl.java
index 6384e1064..dc82b9935 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/URLStreamHandlerFactoryImpl.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/URLStreamHandlerFactoryImpl.java
@@ -15,11 +15,11 @@ import java.lang.reflect.Method;
import java.net.*;
import java.security.AccessController;
import java.util.*;
-import org.eclipse.osgi.framework.internal.core.Msg;
import org.eclipse.osgi.framework.log.FrameworkLogEntry;
import org.eclipse.osgi.framework.util.SecureAction;
import org.eclipse.osgi.internal.framework.EquinoxContainer;
import org.eclipse.osgi.internal.location.EquinoxLocations;
+import org.eclipse.osgi.internal.messages.Msg;
import org.eclipse.osgi.storage.url.BundleResourceHandler;
import org.eclipse.osgi.util.NLS;
import org.osgi.framework.BundleContext;
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/url/BundleURLConverter.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/url/BundleURLConverter.java
index c994abdf2..7dea10baa 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/url/BundleURLConverter.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/url/BundleURLConverter.java
@@ -13,7 +13,7 @@ package org.eclipse.osgi.storage.url;
import java.io.IOException;
import java.net.URL;
import java.net.URLConnection;
-import org.eclipse.osgi.framework.internal.core.Msg;
+import org.eclipse.osgi.internal.messages.Msg;
import org.eclipse.osgi.service.urlconversion.URLConverter;
import org.eclipse.osgi.util.NLS;
diff --git a/bundles/org.eclipse.osgi/supplement/META-INF/MANIFEST.MF b/bundles/org.eclipse.osgi/supplement/META-INF/MANIFEST.MF
index 2708b31a2..f2d8dac94 100644
--- a/bundles/org.eclipse.osgi/supplement/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.osgi/supplement/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.equinox.supplement
-Bundle-Version: 1.5.0.qualifier
+Bundle-Version: 1.5.100.qualifier
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Export-Package: org.eclipse.equinox.log;version="1.0",
@@ -15,9 +15,7 @@ Export-Package: org.eclipse.equinox.log;version="1.0",
org.eclipse.osgi.service.runnable;version="1.1",
org.eclipse.osgi.service.urlconversion;version="1.0",
org.eclipse.osgi.storagemanager;version="1.0",
- org.eclipse.osgi.util;version="1.1",
- org.eclipse.osgi.framework.internal.core;x-internal:=true,
- org.eclipse.osgi.framework.internal.reliablefile;x-internal:=true
+ org.eclipse.osgi.util;version="1.1"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: org.osgi.framework,
org.osgi.service.log,
diff --git a/bundles/org.eclipse.osgi/supplement/pom.xml b/bundles/org.eclipse.osgi/supplement/pom.xml
index 7ca31fac4..41a89566e 100644
--- a/bundles/org.eclipse.osgi/supplement/pom.xml
+++ b/bundles/org.eclipse.osgi/supplement/pom.xml
@@ -21,7 +21,7 @@
org.eclipse.equinox
org.eclipse.equinox.supplement
- 1.5.0-SNAPSHOT
+ 1.5.100-SNAPSHOT
eclipse-plugin
diff --git a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/internal/core/ExternalMessages.properties b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/internal/core/ExternalMessages.properties
deleted file mode 100644
index 72a913562..000000000
--- a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/internal/core/ExternalMessages.properties
+++ /dev/null
@@ -1,93 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2013 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-
-#External Messages for EN locale
-BUNDLE_CONTEXT_INVALID_EXCEPTION=BundleContext is no longer valid
-BUNDLE_ACTIVATOR_EXCEPTION=Exception in {0}.{1}() of bundle {2}.
-BUNDLE_SYSTEMBUNDLE_UNINSTALL_EXCEPTION=The System Bundle cannot be uninstalled
-MANIFEST_INVALID_SPACE=The manifest line \"{0}\" has an invalid leading space '' '' character.
-MANIFEST_INVALID_LINE_NOCOLON=The manifest line \"{0}\" is invalid; it has no colon '':'' character after the header key.
-MANIFEST_INVALID_HEADER_EXCEPTION=Invalid manifest header {0}: \"{1}\"
-MANIFEST_IOEXCEPTION=An error occurred while reading the manifest file.
-SERVICE_FACTORY_EXCEPTION=Exception in {0}.{1}()
-SERVICE_FACTORY_RECURSION=Recursive ServiceFactory call in {0}.{1}()
-SERVICE_NOT_INSTANCEOF_CLASS_EXCEPTION=The service object is not an instance of the service class {0}
-SERVICE_FACTORY_NOT_INSTANCEOF_CLASS_EXCEPTION={0}.getService() returned a service object that is not an instance of the service class {1}
-SERVICE_OBJECT_NULL_EXCEPTION={0}.getService() returned a null service object
-SERVICE_ARGUMENT_NULL_EXCEPTION=The service parameter is null
-SERVICE_OBJECTS_UNGET_ARGUMENT_EXCEPTION=The service parameter was not provided by this object
-SERVICE_ALREADY_UNREGISTERED_EXCEPTION=The service has been unregistered
-SERVICE_EMPTY_CLASS_LIST_EXCEPTION=The array of service names is empty
-SERVICE_USE_OVERFLOW=The use count for the service overflowed.
-HEADER_DUPLICATE_KEY_EXCEPTION=The key \"{0}\" already exists in another case variation
-FILTER_MISSING_LEFTPAREN=Missing ''('' at \"{0}\"
-FILTER_MISSING_RIGHTPAREN=Missing '')'' at \"{0}\"
-FILTER_TRAILING_CHARACTERS=Extraneous trailing characters at \"{0}\"
-FILTER_TERMINATED_ABRUBTLY=Filter ended abruptly
-FILTER_INVALID_OPERATOR=Invalid operator at \"{0}\"
-FILTER_MISSING_ATTR=Missing attr at \"{0}\"
-FILTER_MISSING_VALUE=Missing value at \"{0}\"
-FILTER_INVALID_VALUE=Invalid value at \"{0}\"
-
-CANNOT_SET_CONTEXTFINDER=The context finder has not been installed.
-
-URL_HANDLER_INCORRECT_TYPE=The service property "{0}" is not the correct type for the service "{1}" registered by the bundle "{2}"
-
-HEADER_PACKAGE_DUPLICATES=Cannot import a package more than once \"{0}\"
-HEADER_PACKAGE_JAVA=Cannot specify java.* packages in Import/Export headers \"{0}\"
-HEADER_VERSION_ERROR=The attributes \"{0}\" and \"{1}\" must match
-HEADER_EXPORT_ATTR_ERROR=Specifying \"{0}\" in the \"{1}\" header is not permitted
-HEADER_DIRECTIVE_DUPLICATES=Duplicate directives are not permitted \"{0}\"
-HEADER_ATTRIBUTE_DUPLICATES=Duplicate attributes are not permitted \"{0}\"
-HEADER_EXTENSION_ERROR=Extension bundle is not a fragment to the system bundle \"{0}\"
-
-#EclipseStarter messages
-ECLIPSE_STARTUP_BUNDLE_NOT_FOUND=Bundle {0} not found.
-ECLIPSE_STARTUP_ERROR_BUNDLE_NOT_RESOLVED=Bundle {0} was not resolved.
-ECLIPSE_STARTUP_ERROR_BUNDLE_NOT_ACTIVE=Bundle {0} is not active.
-ECLIPSE_STARTUP_ERROR_NO_APPLICATION=Unable to acquire application service. Ensure that the org.eclipse.core.runtime bundle is resolved and started (see config.ini).
-#Don't use double quotes in the ECLIPSE_STARTUP_ERROR_CHECK_LOG. (See bug 86085)
-ECLIPSE_STARTUP_ERROR_CHECK_LOG=An error has occurred. See the log file\n{0}.
-ECLIPSE_STARTUP_ALREADY_RUNNING=Platform already running
-ECLIPSE_STARTUP_NOT_RUNNING=Platform not running
-ECLIPSE_STARTUP_STARTUP_ERROR=Startup error
-ECLIPSE_STARTUP_APP_ERROR=Application error
-ECLIPSE_STARTUP_SHUTDOWN_ERROR=Shutdown error
-ECLIPSE_STARTUP_FAILED_INSTALL=Error installing bundle: {0}
-ECLIPSE_STARTUP_FAILED_UNINSTALL=Error uninstalling bundle: {0}
-ECLIPSE_STARTUP_FAILED_START=Error starting bundle: {0}
-ECLIPSE_STARTUP_PROPS_NOT_SET=Cannot start without the following system properties set: {0}
-
-#Classloader messages
-ECLIPSE_CLASSLOADER_CONCURRENT_STARTUP=While loading class "{1}", thread "{0}" timed out waiting ({4}ms) for thread "{2}" to finish starting bundle "{3}". To avoid deadlock, thread "{0}" is proceeding but "{1}" may not be fully initialized.
-ECLIPSE_CLASSLOADER_ACTIVATION=An error occurred while automatically activating bundle {0} ({1}).
-
-#Location message
-ECLIPSE_CANNOT_CHANGE_LOCATION = Cannot change the location once it is set.
-
-#NL Problem
-error_badNL=Bad value: \"{0}\" for NL. Using system default.
-
-#FileMananger messages
-fileManager_cannotLock = Unable to create lock manager.
-fileManager_updateFailed = File update failed on one or more files.
-fileManager_illegalInReadOnlyMode = Cannot perform operation while in read-only mode.
-fileManager_notOpen = Manager is not opened.
-
-#Location messages
-location_cannotLockNIO = An error occurred while locking file \"{0}\": \"{1}\". A common reason is that the file system or Runtime Environment does not support file locking for that location. Please choose a different location, or disable file locking by passing {2} as a VM argument.
-location_cannotLock = An error occurred while locking file \"{0}\".
-location_folderReadOnly = The folder \"{0}\" is read-only.
-location_notSet = The location has not been set.
-location_notFileProtocol = Unable to lock the location. The set location is not a file URL: {0}
-location_noLockFile = The lock file has not been set.
-
-ECLIPSE_PLUGIN_EXTRACTION_PROBLEM = The URL \"{0}\" could not be extracted probably due to insufficient permissions or insufficient disk space.
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
deleted file mode 100644
index 8d77f6155..000000000
--- a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/internal/core/Msg.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2013 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osgi.framework.internal.core;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Msg extends NLS {
- private static final String BUNDLE_NAME = "org.eclipse.osgi.framework.internal.core.ExternalMessages"; //$NON-NLS-1$
-
- public static String MANIFEST_INVALID_HEADER_EXCEPTION;
-
- public static String SERVICE_ARGUMENT_NULL_EXCEPTION;
- public static String SERVICE_EMPTY_CLASS_LIST_EXCEPTION;
- public static String SERVICE_NOT_INSTANCEOF_CLASS_EXCEPTION;
- public static String SERVICE_FACTORY_NOT_INSTANCEOF_CLASS_EXCEPTION;
- public static String BUNDLE_ACTIVATOR_EXCEPTION;
- public static String BUNDLE_CONTEXT_INVALID_EXCEPTION;
-
- public static String FILTER_TERMINATED_ABRUBTLY;
- public static String FILTER_TRAILING_CHARACTERS;
- public static String FILTER_MISSING_LEFTPAREN;
- public static String FILTER_MISSING_RIGHTPAREN;
- public static String FILTER_INVALID_OPERATOR;
- public static String FILTER_MISSING_ATTR;
- public static String FILTER_INVALID_VALUE;
- public static String FILTER_MISSING_VALUE;
-
- public static String SERVICE_ALREADY_UNREGISTERED_EXCEPTION;
-
- public static String SERVICE_FACTORY_EXCEPTION;
- public static String SERVICE_OBJECT_NULL_EXCEPTION;
- public static String SERVICE_FACTORY_RECURSION;
- public static String SERVICE_USE_OVERFLOW;
-
- public static String SERVICE_OBJECTS_UNGET_ARGUMENT_EXCEPTION;
-
- public static String BUNDLE_SYSTEMBUNDLE_UNINSTALL_EXCEPTION;
-
- public static String HEADER_DUPLICATE_KEY_EXCEPTION;
- public static String MANIFEST_INVALID_SPACE;
- public static String MANIFEST_INVALID_LINE_NOCOLON;
- public static String MANIFEST_IOEXCEPTION;
-
- public static String CANNOT_SET_CONTEXTFINDER;
-
- public static String URL_HANDLER_INCORRECT_TYPE;
-
- public static String HEADER_PACKAGE_DUPLICATES;
- public static String HEADER_PACKAGE_JAVA;
- public static String HEADER_VERSION_ERROR;
- public static String HEADER_EXPORT_ATTR_ERROR;
- public static String HEADER_DIRECTIVE_DUPLICATES;
- public static String HEADER_ATTRIBUTE_DUPLICATES;
- public static String HEADER_EXTENSION_ERROR;
-
- static {
- // initialize resource bundles
- NLS.initializeMessages(BUNDLE_NAME, Msg.class);
- }
-
- public static String ECLIPSE_CANNOT_CHANGE_LOCATION;
- public static String fileManager_cannotLock;
- public static String fileManager_updateFailed;
- public static String fileManager_illegalInReadOnlyMode;
- public static String fileManager_notOpen;
- public static String ECLIPSE_CLASSLOADER_CONCURRENT_STARTUP;
- public static String ECLIPSE_CLASSLOADER_ACTIVATION;
- public static String ECLIPSE_STARTUP_ALREADY_RUNNING;
- public static String ECLIPSE_STARTUP_STARTUP_ERROR;
- public static String ECLIPSE_STARTUP_SHUTDOWN_ERROR;
- public static String ECLIPSE_STARTUP_ERROR_CHECK_LOG;
- public static String ECLIPSE_STARTUP_NOT_RUNNING;
- public static String ECLIPSE_STARTUP_ERROR_NO_APPLICATION;
- public static String ECLIPSE_STARTUP_ERROR_BUNDLE_NOT_ACTIVE;
- public static String ECLIPSE_STARTUP_ERROR_BUNDLE_NOT_RESOLVED;
- public static String ECLIPSE_STARTUP_BUNDLE_NOT_FOUND;
- public static String ECLIPSE_STARTUP_FAILED_UNINSTALL;
- public static String ECLIPSE_STARTUP_FAILED_INSTALL;
- public static String ECLIPSE_STARTUP_FAILED_START;
- public static String ECLIPSE_STARTUP_APP_ERROR;
- public static String ECLIPSE_STARTUP_PROPS_NOT_SET;
- public static String error_badNL;
- public static String location_cannotLock;
- public static String location_cannotLockNIO;
- public static String location_folderReadOnly;
- public static String location_notSet;
- public static String location_notFileProtocol;
- public static String location_noLockFile;
- public static String ECLIPSE_PLUGIN_EXTRACTION_PROBLEM;
-}
diff --git a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/location/Locker_JavaNio.java b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/location/Locker_JavaNio.java
index c70fbd07a..a934a0164 100644
--- a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/location/Locker_JavaNio.java
+++ b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/location/Locker_JavaNio.java
@@ -15,7 +15,7 @@ package org.eclipse.osgi.internal.location;
import java.io.*;
import java.nio.channels.FileLock;
import java.nio.channels.OverlappingFileLockException;
-import org.eclipse.osgi.framework.internal.core.Msg;
+import org.eclipse.osgi.internal.messages.Msg;
import org.eclipse.osgi.util.NLS;
/**
diff --git a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/messages/ExternalMessages.properties b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/messages/ExternalMessages.properties
new file mode 100644
index 000000000..72a913562
--- /dev/null
+++ b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/messages/ExternalMessages.properties
@@ -0,0 +1,93 @@
+###############################################################################
+# Copyright (c) 2003, 2013 IBM Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+# IBM Corporation - initial API and implementation
+###############################################################################
+
+#External Messages for EN locale
+BUNDLE_CONTEXT_INVALID_EXCEPTION=BundleContext is no longer valid
+BUNDLE_ACTIVATOR_EXCEPTION=Exception in {0}.{1}() of bundle {2}.
+BUNDLE_SYSTEMBUNDLE_UNINSTALL_EXCEPTION=The System Bundle cannot be uninstalled
+MANIFEST_INVALID_SPACE=The manifest line \"{0}\" has an invalid leading space '' '' character.
+MANIFEST_INVALID_LINE_NOCOLON=The manifest line \"{0}\" is invalid; it has no colon '':'' character after the header key.
+MANIFEST_INVALID_HEADER_EXCEPTION=Invalid manifest header {0}: \"{1}\"
+MANIFEST_IOEXCEPTION=An error occurred while reading the manifest file.
+SERVICE_FACTORY_EXCEPTION=Exception in {0}.{1}()
+SERVICE_FACTORY_RECURSION=Recursive ServiceFactory call in {0}.{1}()
+SERVICE_NOT_INSTANCEOF_CLASS_EXCEPTION=The service object is not an instance of the service class {0}
+SERVICE_FACTORY_NOT_INSTANCEOF_CLASS_EXCEPTION={0}.getService() returned a service object that is not an instance of the service class {1}
+SERVICE_OBJECT_NULL_EXCEPTION={0}.getService() returned a null service object
+SERVICE_ARGUMENT_NULL_EXCEPTION=The service parameter is null
+SERVICE_OBJECTS_UNGET_ARGUMENT_EXCEPTION=The service parameter was not provided by this object
+SERVICE_ALREADY_UNREGISTERED_EXCEPTION=The service has been unregistered
+SERVICE_EMPTY_CLASS_LIST_EXCEPTION=The array of service names is empty
+SERVICE_USE_OVERFLOW=The use count for the service overflowed.
+HEADER_DUPLICATE_KEY_EXCEPTION=The key \"{0}\" already exists in another case variation
+FILTER_MISSING_LEFTPAREN=Missing ''('' at \"{0}\"
+FILTER_MISSING_RIGHTPAREN=Missing '')'' at \"{0}\"
+FILTER_TRAILING_CHARACTERS=Extraneous trailing characters at \"{0}\"
+FILTER_TERMINATED_ABRUBTLY=Filter ended abruptly
+FILTER_INVALID_OPERATOR=Invalid operator at \"{0}\"
+FILTER_MISSING_ATTR=Missing attr at \"{0}\"
+FILTER_MISSING_VALUE=Missing value at \"{0}\"
+FILTER_INVALID_VALUE=Invalid value at \"{0}\"
+
+CANNOT_SET_CONTEXTFINDER=The context finder has not been installed.
+
+URL_HANDLER_INCORRECT_TYPE=The service property "{0}" is not the correct type for the service "{1}" registered by the bundle "{2}"
+
+HEADER_PACKAGE_DUPLICATES=Cannot import a package more than once \"{0}\"
+HEADER_PACKAGE_JAVA=Cannot specify java.* packages in Import/Export headers \"{0}\"
+HEADER_VERSION_ERROR=The attributes \"{0}\" and \"{1}\" must match
+HEADER_EXPORT_ATTR_ERROR=Specifying \"{0}\" in the \"{1}\" header is not permitted
+HEADER_DIRECTIVE_DUPLICATES=Duplicate directives are not permitted \"{0}\"
+HEADER_ATTRIBUTE_DUPLICATES=Duplicate attributes are not permitted \"{0}\"
+HEADER_EXTENSION_ERROR=Extension bundle is not a fragment to the system bundle \"{0}\"
+
+#EclipseStarter messages
+ECLIPSE_STARTUP_BUNDLE_NOT_FOUND=Bundle {0} not found.
+ECLIPSE_STARTUP_ERROR_BUNDLE_NOT_RESOLVED=Bundle {0} was not resolved.
+ECLIPSE_STARTUP_ERROR_BUNDLE_NOT_ACTIVE=Bundle {0} is not active.
+ECLIPSE_STARTUP_ERROR_NO_APPLICATION=Unable to acquire application service. Ensure that the org.eclipse.core.runtime bundle is resolved and started (see config.ini).
+#Don't use double quotes in the ECLIPSE_STARTUP_ERROR_CHECK_LOG. (See bug 86085)
+ECLIPSE_STARTUP_ERROR_CHECK_LOG=An error has occurred. See the log file\n{0}.
+ECLIPSE_STARTUP_ALREADY_RUNNING=Platform already running
+ECLIPSE_STARTUP_NOT_RUNNING=Platform not running
+ECLIPSE_STARTUP_STARTUP_ERROR=Startup error
+ECLIPSE_STARTUP_APP_ERROR=Application error
+ECLIPSE_STARTUP_SHUTDOWN_ERROR=Shutdown error
+ECLIPSE_STARTUP_FAILED_INSTALL=Error installing bundle: {0}
+ECLIPSE_STARTUP_FAILED_UNINSTALL=Error uninstalling bundle: {0}
+ECLIPSE_STARTUP_FAILED_START=Error starting bundle: {0}
+ECLIPSE_STARTUP_PROPS_NOT_SET=Cannot start without the following system properties set: {0}
+
+#Classloader messages
+ECLIPSE_CLASSLOADER_CONCURRENT_STARTUP=While loading class "{1}", thread "{0}" timed out waiting ({4}ms) for thread "{2}" to finish starting bundle "{3}". To avoid deadlock, thread "{0}" is proceeding but "{1}" may not be fully initialized.
+ECLIPSE_CLASSLOADER_ACTIVATION=An error occurred while automatically activating bundle {0} ({1}).
+
+#Location message
+ECLIPSE_CANNOT_CHANGE_LOCATION = Cannot change the location once it is set.
+
+#NL Problem
+error_badNL=Bad value: \"{0}\" for NL. Using system default.
+
+#FileMananger messages
+fileManager_cannotLock = Unable to create lock manager.
+fileManager_updateFailed = File update failed on one or more files.
+fileManager_illegalInReadOnlyMode = Cannot perform operation while in read-only mode.
+fileManager_notOpen = Manager is not opened.
+
+#Location messages
+location_cannotLockNIO = An error occurred while locking file \"{0}\": \"{1}\". A common reason is that the file system or Runtime Environment does not support file locking for that location. Please choose a different location, or disable file locking by passing {2} as a VM argument.
+location_cannotLock = An error occurred while locking file \"{0}\".
+location_folderReadOnly = The folder \"{0}\" is read-only.
+location_notSet = The location has not been set.
+location_notFileProtocol = Unable to lock the location. The set location is not a file URL: {0}
+location_noLockFile = The lock file has not been set.
+
+ECLIPSE_PLUGIN_EXTRACTION_PROBLEM = The URL \"{0}\" could not be extracted probably due to insufficient permissions or insufficient disk space.
diff --git a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/messages/Msg.java b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/messages/Msg.java
new file mode 100644
index 000000000..288efefcf
--- /dev/null
+++ b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/messages/Msg.java
@@ -0,0 +1,98 @@
+/*******************************************************************************
+ * Copyright (c) 2004, 2013 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.osgi.internal.messages;
+
+import org.eclipse.osgi.util.NLS;
+
+public class Msg extends NLS {
+ private static final String BUNDLE_NAME = "org.eclipse.osgi.internal.messages.ExternalMessages"; //$NON-NLS-1$
+
+ public static String MANIFEST_INVALID_HEADER_EXCEPTION;
+
+ public static String SERVICE_ARGUMENT_NULL_EXCEPTION;
+ public static String SERVICE_EMPTY_CLASS_LIST_EXCEPTION;
+ public static String SERVICE_NOT_INSTANCEOF_CLASS_EXCEPTION;
+ public static String SERVICE_FACTORY_NOT_INSTANCEOF_CLASS_EXCEPTION;
+ public static String BUNDLE_ACTIVATOR_EXCEPTION;
+ public static String BUNDLE_CONTEXT_INVALID_EXCEPTION;
+
+ public static String FILTER_TERMINATED_ABRUBTLY;
+ public static String FILTER_TRAILING_CHARACTERS;
+ public static String FILTER_MISSING_LEFTPAREN;
+ public static String FILTER_MISSING_RIGHTPAREN;
+ public static String FILTER_INVALID_OPERATOR;
+ public static String FILTER_MISSING_ATTR;
+ public static String FILTER_INVALID_VALUE;
+ public static String FILTER_MISSING_VALUE;
+
+ public static String SERVICE_ALREADY_UNREGISTERED_EXCEPTION;
+
+ public static String SERVICE_FACTORY_EXCEPTION;
+ public static String SERVICE_OBJECT_NULL_EXCEPTION;
+ public static String SERVICE_FACTORY_RECURSION;
+ public static String SERVICE_USE_OVERFLOW;
+
+ public static String SERVICE_OBJECTS_UNGET_ARGUMENT_EXCEPTION;
+
+ public static String BUNDLE_SYSTEMBUNDLE_UNINSTALL_EXCEPTION;
+
+ public static String HEADER_DUPLICATE_KEY_EXCEPTION;
+ public static String MANIFEST_INVALID_SPACE;
+ public static String MANIFEST_INVALID_LINE_NOCOLON;
+ public static String MANIFEST_IOEXCEPTION;
+
+ public static String CANNOT_SET_CONTEXTFINDER;
+
+ public static String URL_HANDLER_INCORRECT_TYPE;
+
+ public static String HEADER_PACKAGE_DUPLICATES;
+ public static String HEADER_PACKAGE_JAVA;
+ public static String HEADER_VERSION_ERROR;
+ public static String HEADER_EXPORT_ATTR_ERROR;
+ public static String HEADER_DIRECTIVE_DUPLICATES;
+ public static String HEADER_ATTRIBUTE_DUPLICATES;
+ public static String HEADER_EXTENSION_ERROR;
+
+ static {
+ // initialize resource bundles
+ NLS.initializeMessages(BUNDLE_NAME, Msg.class);
+ }
+
+ public static String ECLIPSE_CANNOT_CHANGE_LOCATION;
+ public static String fileManager_cannotLock;
+ public static String fileManager_updateFailed;
+ public static String fileManager_illegalInReadOnlyMode;
+ public static String fileManager_notOpen;
+ public static String ECLIPSE_CLASSLOADER_CONCURRENT_STARTUP;
+ public static String ECLIPSE_CLASSLOADER_ACTIVATION;
+ public static String ECLIPSE_STARTUP_ALREADY_RUNNING;
+ public static String ECLIPSE_STARTUP_STARTUP_ERROR;
+ public static String ECLIPSE_STARTUP_SHUTDOWN_ERROR;
+ public static String ECLIPSE_STARTUP_ERROR_CHECK_LOG;
+ public static String ECLIPSE_STARTUP_NOT_RUNNING;
+ public static String ECLIPSE_STARTUP_ERROR_NO_APPLICATION;
+ public static String ECLIPSE_STARTUP_ERROR_BUNDLE_NOT_ACTIVE;
+ public static String ECLIPSE_STARTUP_ERROR_BUNDLE_NOT_RESOLVED;
+ public static String ECLIPSE_STARTUP_BUNDLE_NOT_FOUND;
+ public static String ECLIPSE_STARTUP_FAILED_UNINSTALL;
+ public static String ECLIPSE_STARTUP_FAILED_INSTALL;
+ public static String ECLIPSE_STARTUP_FAILED_START;
+ public static String ECLIPSE_STARTUP_APP_ERROR;
+ public static String ECLIPSE_STARTUP_PROPS_NOT_SET;
+ public static String error_badNL;
+ public static String location_cannotLock;
+ public static String location_cannotLockNIO;
+ public static String location_folderReadOnly;
+ public static String location_notSet;
+ public static String location_notFileProtocol;
+ public static String location_noLockFile;
+ public static String ECLIPSE_PLUGIN_EXTRACTION_PROBLEM;
+}
diff --git a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/storagemanager/StorageManager.java b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/storagemanager/StorageManager.java
index 240a9cd38..a3a3c29a6 100644
--- a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/storagemanager/StorageManager.java
+++ b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/storagemanager/StorageManager.java
@@ -12,10 +12,10 @@ package org.eclipse.osgi.storagemanager;
import java.io.*;
import java.util.*;
-import org.eclipse.osgi.framework.internal.core.Msg;
import org.eclipse.osgi.framework.internal.reliablefile.*;
import org.eclipse.osgi.internal.location.LocationHelper;
import org.eclipse.osgi.internal.location.Locker;
+import org.eclipse.osgi.internal.messages.Msg;
/**
* Storage managers provide a facility for tracking the state of a group of files having
diff --git a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/util/ManifestElement.java b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/util/ManifestElement.java
index 1cb8b3aeb..1ef321071 100644
--- a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/util/ManifestElement.java
+++ b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/util/ManifestElement.java
@@ -13,7 +13,7 @@ package org.eclipse.osgi.util;
import java.io.*;
import java.util.*;
-import org.eclipse.osgi.framework.internal.core.Msg;
+import org.eclipse.osgi.internal.messages.Msg;
import org.eclipse.osgi.internal.util.SupplementDebug;
import org.eclipse.osgi.internal.util.Tokenizer;
import org.osgi.framework.BundleException;
--
cgit v1.2.3