diff options
Diffstat (limited to 'bundles/org.eclipse.osgi/container/src/org/eclipse/osgi')
9 files changed, 25 insertions, 100 deletions
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/classpath/ClasspathManager.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/classpath/ClasspathManager.java index f847bfc05..bb4ea8093 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/classpath/ClasspathManager.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/classpath/ClasspathManager.java @@ -25,6 +25,7 @@ import org.eclipse.osgi.internal.framework.EquinoxConfiguration; import org.eclipse.osgi.internal.hookregistry.ClassLoaderHook; import org.eclipse.osgi.internal.hookregistry.HookRegistry; import org.eclipse.osgi.internal.loader.ModuleClassLoader; +import org.eclipse.osgi.internal.messages.Msg; import org.eclipse.osgi.storage.BundleInfo.Generation; import org.eclipse.osgi.storage.*; import org.eclipse.osgi.storage.bundlefile.BundleEntry; @@ -169,7 +170,7 @@ public class ClasspathManager { hookAdded |= hook.addClassPathEntry(result, cp, hostloader, sourceGeneration); } if (!addClassPathEntry(result, cp, hostloader, sourceGeneration) && !hookAdded) { - BundleException be = new BundleException(NLS.bind(StorageMsg.BUNDLE_CLASSPATH_ENTRY_NOT_FOUND_EXCEPTION, cp, sourceGeneration.getRevision().toString()), BundleException.MANIFEST_ERROR); + BundleException be = new BundleException(NLS.bind(Msg.BUNDLE_CLASSPATH_ENTRY_NOT_FOUND_EXCEPTION, cp, sourceGeneration.getRevision().toString()), BundleException.MANIFEST_ERROR); sourceGeneration.getBundleInfo().getStorage().getAdaptor().publishContainerEvent(ContainerEvent.INFO, sourceGeneration.getRevision().getRevisions().getModule(), be); } } diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/signedcontent/SignedContentMessages.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/signedcontent/SignedContentMessages.java index f09412c55..bfff159d3 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/signedcontent/SignedContentMessages.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/signedcontent/SignedContentMessages.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2012 IBM Corporation and others. + * Copyright (c) 2006, 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 @@ -40,10 +40,7 @@ public class SignedContentMessages extends NLS { public static String Default_Trust_Existing_Cert; public static String Default_Trust_Existing_Alias; - // private static final String BUNDLE_PACKAGE = SignedContentMessages.class.getPackage().getName() + "."; - private static final String BUNDLE_PACKAGE = "org.eclipse.osgi.internal.signedcontent."; //$NON-NLS-1$ - private static final String BUNDLE_FILENAME = "SignedContentMessages"; //$NON-NLS-1$ - private static final String BUNDLE_NAME = BUNDLE_PACKAGE + BUNDLE_FILENAME; + private static final String BUNDLE_NAME = "org.eclipse.osgi.internal.signedcontent.SignedContentMessages"; //$NON-NLS-1$ static { NLS.initializeMessages(BUNDLE_NAME, SignedContentMessages.class); diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/ExternalMessages.properties b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/ExternalMessages.properties deleted file mode 100644 index 82a05227e..000000000 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/ExternalMessages.properties +++ /dev/null @@ -1,28 +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 - -ADAPTOR_URL_CREATE_EXCEPTION=\"{0}\" is an invalid URL -ADAPTOR_DIRECTORY_CREATE_EXCEPTION=The directory \"{0}\" could not be created -ADAPTOR_DIRECTORY_EXCEPTION=The file \"{0}\" is not a directory -ADAPTER_FILEEXIST_EXCEPTION=The file \"{0}\" does not exist -ADAPTOR_STORAGE_INIT_FAILED_MSG=Locking is not possible in the directory \"{0}\". 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 passing \"-Dosgi.locking=none\" as a VM argument. -ADAPTOR_STORAGE_INIT_FAILED_TITLE =Invalid Configuration Location -ECLIPSE_STARTUP_FILEMANAGER_OPEN_ERROR=Error reading configuration: {0} - -BUNDLE_READ_EXCEPTION=An error occurred trying to read the bundle -BUNDLE_CLASSPATH_ENTRY_NOT_FOUND_EXCEPTION=The bundle class path entry \"{0}\" could not be found for the bundle \"{1}\" - -RESOURCE_NOT_FOUND_EXCEPTION=The resource {0} could not be found -URL_NO_BUNDLE_ID=No bundle ID specified: {0} -URL_INVALID_BUNDLE_ID=Invalid Bundle ID specified: {0} -URL_NO_BUNDLE_FOUND=No bundle found for URL: {0} diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/Storage.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/Storage.java index 3e1f27c22..06a4ea399 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/Storage.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/Storage.java @@ -30,6 +30,7 @@ import org.eclipse.osgi.internal.hookregistry.StorageHookFactory.StorageHook; import org.eclipse.osgi.internal.location.EquinoxLocations; import org.eclipse.osgi.internal.location.LocationHelper; import org.eclipse.osgi.internal.log.EquinoxLogServices; +import org.eclipse.osgi.internal.messages.Msg; import org.eclipse.osgi.internal.permadmin.SecurityAdmin; import org.eclipse.osgi.internal.url.URLStreamHandlerFactoryImpl; import org.eclipse.osgi.service.datalocation.Location; @@ -763,7 +764,7 @@ public class Storage { if (in instanceof ReferenceInputStream) { URL reference = ((ReferenceInputStream) in).getReference(); if (!"file".equals(reference.getProtocol())) //$NON-NLS-1$ - throw new BundleException(NLS.bind(StorageMsg.ADAPTOR_URL_CREATE_EXCEPTION, reference)); + throw new BundleException(NLS.bind(Msg.ADAPTOR_URL_CREATE_EXCEPTION, reference)); return new File(reference.getPath()); } @@ -787,7 +788,7 @@ public class Storage { if (outFile != null) { outFile.delete(); } - throw new BundleException(StorageMsg.BUNDLE_READ_EXCEPTION, BundleException.READ_ERROR, e); + throw new BundleException(Msg.BUNDLE_READ_EXCEPTION, BundleException.READ_ERROR, e); } } @@ -1675,10 +1676,10 @@ public class Storage { Debug.println("Error reading framework.info: " + ex.getMessage()); //$NON-NLS-1$ Debug.printStackTrace(ex); } - String message = NLS.bind(StorageMsg.ECLIPSE_STARTUP_FILEMANAGER_OPEN_ERROR, ex.getMessage()); + String message = NLS.bind(Msg.ECLIPSE_STARTUP_FILEMANAGER_OPEN_ERROR, ex.getMessage()); equinoxContainer.getLogServices().log(EquinoxContainer.NAME, FrameworkLogEntry.ERROR, message, ex); getConfiguration().setProperty(EclipseStarter.PROP_EXITCODE, "15"); //$NON-NLS-1$ - String errorDialog = "<title>" + StorageMsg.ADAPTOR_STORAGE_INIT_FAILED_TITLE + "</title>" + NLS.bind(StorageMsg.ADAPTOR_STORAGE_INIT_FAILED_MSG, childRoot) + "\n" + ex.getMessage(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + String errorDialog = "<title>" + Msg.ADAPTOR_STORAGE_INIT_FAILED_TITLE + "</title>" + NLS.bind(Msg.ADAPTOR_STORAGE_INIT_FAILED_MSG, childRoot) + "\n" + ex.getMessage(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ getConfiguration().setProperty(EclipseStarter.PROP_EXITDATA, errorDialog); throw ex; } diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/StorageMsg.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/StorageMsg.java deleted file mode 100644 index f176a6214..000000000 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/StorageMsg.java +++ /dev/null @@ -1,48 +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.storage; - -import org.eclipse.osgi.util.NLS; - -/** - * Commom framework adaptor messages. - * <p> - * Clients may not extend this class - * </p> - * @since 3.1 - */ -public class StorageMsg extends NLS { - - public static String ADAPTER_FILEEXIST_EXCEPTION; - public static String ADAPTOR_DIRECTORY_CREATE_EXCEPTION; - public static String ADAPTOR_DIRECTORY_EXCEPTION; - public static String ADAPTOR_URL_CREATE_EXCEPTION; - public static String ADAPTOR_STORAGE_INIT_FAILED_MSG; - public static String ADAPTOR_STORAGE_INIT_FAILED_TITLE; - public static String ECLIPSE_STARTUP_FILEMANAGER_OPEN_ERROR; - - public static String BUNDLE_CLASSPATH_ENTRY_NOT_FOUND_EXCEPTION; - public static String BUNDLE_READ_EXCEPTION; - - public static String RESOURCE_NOT_FOUND_EXCEPTION; - - public static String URL_INVALID_BUNDLE_ID; - public static String URL_NO_BUNDLE_FOUND; - public static String URL_NO_BUNDLE_ID; - - private static final String BUNDLE_NAME = "org.eclipse.osgi.storage.ExternalMessages"; //$NON-NLS-1$ - - static { - // initialize resource bundles - NLS.initializeMessages(BUNDLE_NAME, StorageMsg.class); - } - -} diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/bundlefile/DirBundleFile.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/bundlefile/DirBundleFile.java index 462892cd7..5807fb505 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/bundlefile/DirBundleFile.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/bundlefile/DirBundleFile.java @@ -14,7 +14,7 @@ package org.eclipse.osgi.storage.bundlefile; import java.io.File; import java.io.IOException; import java.util.*; -import org.eclipse.osgi.storage.StorageMsg; +import org.eclipse.osgi.internal.messages.Msg; import org.eclipse.osgi.util.NLS; /** @@ -36,7 +36,7 @@ public class DirBundleFile extends BundleFile { public DirBundleFile(File basefile, boolean enableStrictBundleEntryPath) throws IOException { super(getBaseFile(basefile, enableStrictBundleEntryPath)); if (!BundleFile.secureAction.exists(basefile) || !BundleFile.secureAction.isDirectory(basefile)) { - throw new IOException(NLS.bind(StorageMsg.ADAPTOR_DIRECTORY_EXCEPTION, basefile)); + throw new IOException(NLS.bind(Msg.ADAPTOR_DIRECTORY_EXCEPTION, basefile)); } this.enableStrictBundleEntryPath = enableStrictBundleEntryPath; } diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/bundlefile/ZipBundleFile.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/bundlefile/ZipBundleFile.java index b810d96bd..5c4640258 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/bundlefile/ZipBundleFile.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/bundlefile/ZipBundleFile.java @@ -19,7 +19,9 @@ import java.util.zip.ZipFile; import org.eclipse.osgi.container.ModuleContainerAdaptor.ContainerEvent; import org.eclipse.osgi.container.ModuleRevision; import org.eclipse.osgi.internal.debug.Debug; -import org.eclipse.osgi.storage.*; +import org.eclipse.osgi.internal.messages.Msg; +import org.eclipse.osgi.storage.BundleInfo; +import org.eclipse.osgi.storage.StorageUtil; import org.eclipse.osgi.util.NLS; /** @@ -46,7 +48,7 @@ public class ZipBundleFile extends BundleFile { public ZipBundleFile(File basefile, BundleInfo.Generation generation, MRUBundleFileList mruList, Debug debug) throws IOException { super(basefile); if (!BundleFile.secureAction.exists(basefile)) - throw new IOException(NLS.bind(StorageMsg.ADAPTER_FILEEXIST_EXCEPTION, basefile)); + throw new IOException(NLS.bind(Msg.ADAPTER_FILEEXIST_EXCEPTION, basefile)); this.debug = debug; this.generation = generation; this.closed = true; @@ -172,7 +174,7 @@ public class ZipBundleFile extends BundleFile { if (!nested.mkdirs()) { if (debug.DEBUG_GENERAL) Debug.println("Unable to create directory: " + nested.getPath()); //$NON-NLS-1$ - throw new IOException(NLS.bind(StorageMsg.ADAPTOR_DIRECTORY_CREATE_EXCEPTION, nested.getAbsolutePath())); + throw new IOException(NLS.bind(Msg.ADAPTOR_DIRECTORY_CREATE_EXCEPTION, nested.getAbsolutePath())); } extractDirectory(zipEntry.getName()); } else { @@ -187,7 +189,7 @@ public class ZipBundleFile extends BundleFile { if (!dir.exists() && !dir.mkdirs()) { if (debug.DEBUG_GENERAL) Debug.println("Unable to create directory: " + dir.getPath()); //$NON-NLS-1$ - throw new IOException(NLS.bind(StorageMsg.ADAPTOR_DIRECTORY_CREATE_EXCEPTION, dir.getAbsolutePath())); + throw new IOException(NLS.bind(Msg.ADAPTOR_DIRECTORY_CREATE_EXCEPTION, dir.getAbsolutePath())); } /* copy the entry to the cache */ StorageUtil.readFile(in, nested); diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/url/BundleResourceHandler.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/url/BundleResourceHandler.java index a4f6db3eb..5ca972bcb 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/url/BundleResourceHandler.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/url/BundleResourceHandler.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2004, 2012 IBM Corporation and others. + * 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 @@ -15,7 +15,7 @@ import java.io.IOException; import java.net.*; import org.eclipse.osgi.container.Module; import org.eclipse.osgi.container.ModuleContainer; -import org.eclipse.osgi.storage.StorageMsg; +import org.eclipse.osgi.internal.messages.Msg; import org.eclipse.osgi.storage.bundlefile.BundleEntry; import org.eclipse.osgi.util.NLS; import org.osgi.framework.AdminPermission; @@ -148,17 +148,17 @@ public abstract class BundleResourceHandler extends URLStreamHandler { String host = url.getHost(); if (host == null) { - throw new IOException(NLS.bind(StorageMsg.URL_NO_BUNDLE_ID, url.toExternalForm())); + throw new IOException(NLS.bind(Msg.URL_NO_BUNDLE_ID, url.toExternalForm())); } long bundleID; try { bundleID = getBundleID(host); } catch (NumberFormatException nfe) { - throw (MalformedURLException) new MalformedURLException(NLS.bind(StorageMsg.URL_INVALID_BUNDLE_ID, host)).initCause(nfe); + throw (MalformedURLException) new MalformedURLException(NLS.bind(Msg.URL_INVALID_BUNDLE_ID, host)).initCause(nfe); } Module module = getModule(bundleID); if (module == null) - throw new IOException(NLS.bind(StorageMsg.URL_NO_BUNDLE_FOUND, url.toExternalForm())); + throw new IOException(NLS.bind(Msg.URL_NO_BUNDLE_FOUND, url.toExternalForm())); // check to make sure that this URL was created using the // parseURL method. This ensures the security check was done // at URL construction. diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/url/BundleURLConnection.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/url/BundleURLConnection.java index 5ce310206..75fd96734 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/url/BundleURLConnection.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/url/BundleURLConnection.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2004, 2012 IBM Corporation and others. + * 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 @@ -15,7 +15,7 @@ import java.io.IOException; import java.io.InputStream; import java.net.URL; import java.net.URLConnection; -import org.eclipse.osgi.storage.StorageMsg; +import org.eclipse.osgi.internal.messages.Msg; import org.eclipse.osgi.storage.bundlefile.BundleEntry; import org.eclipse.osgi.util.NLS; @@ -53,7 +53,7 @@ public class BundleURLConnection extends URLConnection { in = bundleEntry.getInputStream(); connected = true; } else { - throw new IOException(NLS.bind(StorageMsg.RESOURCE_NOT_FOUND_EXCEPTION, url)); + throw new IOException(NLS.bind(Msg.RESOURCE_NOT_FOUND_EXCEPTION, url)); } } } |