summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMengxin Zhu2012-11-28 01:23:18 (EST)
committerMengxin Zhu2012-11-28 01:24:45 (EST)
commit12d362448a4c77a128e5ff6d9321bd75232585b9 (patch)
treed27f36dd16af02ad6dea474240fe15058f09caeb
parentccb680b7d85ddb274cd8cf719a2c8f185a624c26 (diff)
downloadrt.equinox.p2-12d362448a4c77a128e5ff6d9321bd75232585b9.zip
rt.equinox.p2-12d362448a4c77a128e5ff6d9321bd75232585b9.tar.gz
rt.equinox.p2-12d362448a4c77a128e5ff6d9321bd75232585b9.tar.bz2
Bug 395239: ecf.Messages loads properties file from bundle repository.v20121128-062445I20121204-2230I20121204-1600I20121204-1000I20121204-0915I20121204-0800
-rw-r--r--bundles/org.eclipse.equinox.p2.transport.ecf/src/org/eclipse/equinox/internal/p2/transport/ecf/Messages.java24
-rw-r--r--bundles/org.eclipse.equinox.p2.transport.ecf/src/org/eclipse/equinox/internal/p2/transport/ecf/messages.properties20
2 files changed, 3 insertions, 41 deletions
diff --git a/bundles/org.eclipse.equinox.p2.transport.ecf/src/org/eclipse/equinox/internal/p2/transport/ecf/Messages.java b/bundles/org.eclipse.equinox.p2.transport.ecf/src/org/eclipse/equinox/internal/p2/transport/ecf/Messages.java
index 8d51aaa..1a3c13a 100644
--- a/bundles/org.eclipse.equinox.p2.transport.ecf/src/org/eclipse/equinox/internal/p2/transport/ecf/Messages.java
+++ b/bundles/org.eclipse.equinox.p2.transport.ecf/src/org/eclipse/equinox/internal/p2/transport/ecf/Messages.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2010 IBM Corporation and others.
+ * Copyright (c) 2007, 2012 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,18 +15,10 @@ package org.eclipse.equinox.internal.p2.transport.ecf;
import org.eclipse.osgi.util.NLS;
public class Messages extends NLS {
- private static final String BUNDLE_NAME = "org.eclipse.equinox.internal.p2.repository.messages"; //$NON-NLS-1$
-
- public static String CacheManager_AuthenticationFaileFor_0;
- public static String CacheManager_FailedCommunicationWithRepo_0;
- public static String CacheManager_Neither_0_nor_1_found;
- public static String CacheManage_ErrorRenamingCache;
+ private static final String BUNDLE_NAME = "org.eclipse.equinox.internal.p2.transport.ecf.messages"; //$NON-NLS-1$
public static String artifact_not_found;
public static String io_failedRead;
- public static String ecf_configuration_error;
- public static String repoMan_internalError;
- public static String repo_loading;
public static String exception_malformedRepoURI;
public static String TransportErrorTranslator_400;
@@ -71,18 +63,6 @@ public class Messages extends NLS {
public static String TransportErrorTranslator_UnknownErrorCode;
public static String TransportErrorTranslator_UnknownHost;
- public static String fetching_0_from_1_2_at_3;
- public static String fetching_0_from_1_2_of_3_at_4;
- public static String connection_to_0_failed_on_1_retry_attempt_2;
-
- public static String FileTransport_reader;
- public static String FileTransport_cancelCheck;
-
- public static String UnableToRead_0_TooManyAttempts;
- public static String UnableToRead_0_UserCanceled;
-
- public static String RepositoryTransport_failedReadRepo;
-
static {
// initialize resource bundles
NLS.initializeMessages(BUNDLE_NAME, Messages.class);
diff --git a/bundles/org.eclipse.equinox.p2.transport.ecf/src/org/eclipse/equinox/internal/p2/transport/ecf/messages.properties b/bundles/org.eclipse.equinox.p2.transport.ecf/src/org/eclipse/equinox/internal/p2/transport/ecf/messages.properties
index 4e59267..90422e1 100644
--- a/bundles/org.eclipse.equinox.p2.transport.ecf/src/org/eclipse/equinox/internal/p2/transport/ecf/messages.properties
+++ b/bundles/org.eclipse.equinox.p2.transport.ecf/src/org/eclipse/equinox/internal/p2/transport/ecf/messages.properties
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2007, 2010 IBM Corporation and others.
+# Copyright (c) 2007, 2012 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
@@ -13,16 +13,6 @@
artifact_not_found=Artifact not found: {0}.
io_failedRead=Unable to read repository at {0}.
-ecf_configuration_error=Transport initialization error.
-
-
-repoMan_internalError=Internal error.
-repo_loading = Loading the repository {0}
-
-CacheManager_Neither_0_nor_1_found=Neither {0} nor {1} found.
-CacheManager_AuthenticationFaileFor_0=Authentication failed for {0}.
-CacheManager_FailedCommunicationWithRepo_0=Communication with repository at {0} failed.
-CacheManage_ErrorRenamingCache=An error occurred while downloading {0}. The cache file {1} could not be renamed to {1}.
exception_malformedRepoURI = The repository location ({0}) must be a URI.
@@ -66,11 +56,3 @@ TransportErrorTranslator_MalformedRemoteFileReference=Malformed reference to rem
TransportErrorTranslator_UnableToConnectToRepository_0=Unable to connect to repository {0}
TransportErrorTranslator_UnknownErrorCode=HTTP Server Unknown HTTP Response Code ({0}):{1}
TransportErrorTranslator_UnknownHost=Unknown Host: {0}
-fetching_0_from_1_2_at_3=Fetching {0} ({2} at {3}/s) from {1}
-fetching_0_from_1_2_of_3_at_4=Fetching {0} ({2} of {3} at {4}/s) from {1}
-FileTransport_reader=File Transport Reader
-FileTransport_cancelCheck=File Transport Cancel Handler
-connection_to_0_failed_on_1_retry_attempt_2=Connection to {0} failed on {1}. Retry attempt {2} started
-UnableToRead_0_TooManyAttempts=Unable to read repository at: {0}. Too many failed login attempts.
-UnableToRead_0_UserCanceled=Unable to read repository at: {0}. Login canceled by user.
-RepositoryTransport_failedReadRepo=Error while reading from repository: {0}.