Fixed TCF package names in import statements.

11 files changed, 45 insertions, 45 deletions

diff --git a/plugins/org.eclipse.tcf/META-INF/MANIFEST.MF b/plugins/org.eclipse.tcf/META-INF/MANIFEST.MF
index 2d91d5c0e..802c2e13e 100644
--- a/plugins/org.eclipse.tcf/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.tcf/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
-Bundle-SymbolicName: org.eclipse.tm.tcf;singleton:=true
+Bundle-SymbolicName: org.eclipse.tcf;singleton:=true
 Bundle-Version: 0.5.0.qualifier
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ActivationPolicy: lazy
 Eclipse-LazyStart: true
 Require-Bundle: org.eclipse.core.runtime
-Bundle-Activator: org.eclipse.tm.tcf.Activator
-Import-Package: org.eclipse.tm.tcf.core;version="0.4.0",
- org.eclipse.tm.tcf.protocol;version="0.5.0"
-Export-Package: org.eclipse.tm.tcf.extensions;version="0.4.0",
- org.eclipse.tm.tcf.ssl;version="0.4.0"
+Bundle-Activator: org.eclipse.tcf.Activator
+Import-Package: org.eclipse.tcf.core;version="0.4.0",
+ org.eclipse.tcf.protocol;version="0.5.0"
+Export-Package: org.eclipse.tcf.extensions;version="0.4.0",
+ org.eclipse.tcf.ssl;version="0.4.0"
diff --git a/plugins/org.eclipse.tcf/pom.xml b/plugins/org.eclipse.tcf/pom.xml
index dd8e983e3..ad54cef16 100644
--- a/plugins/org.eclipse.tcf/pom.xml
+++ b/plugins/org.eclipse.tcf/pom.xml
@@ -12,6 +12,6 @@
   </parent>
 
   <version>0.5.0-SNAPSHOT</version>
-  <artifactId>org.eclipse.tm.tcf</artifactId>
+  <artifactId>org.eclipse.tcf</artifactId>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/plugins/org.eclipse.tcf/src/org/eclipse/tcf/Activator.java b/plugins/org.eclipse.tcf/src/org/eclipse/tcf/Activator.java
index a106d9c42..1d5d69891 100644
--- a/plugins/org.eclipse.tcf/src/org/eclipse/tcf/Activator.java
+++ b/plugins/org.eclipse.tcf/src/org/eclipse/tcf/Activator.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Wind River Systems - initial API and implementation
  *******************************************************************************/
-package org.eclipse.tm.tcf;
+package org.eclipse.tcf;
 
 import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.core.runtime.IExtension;
@@ -17,11 +17,11 @@ import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.Plugin;
 import org.eclipse.core.runtime.Status;
-import org.eclipse.tm.tcf.internal.extensions.TcfServiceProvidersExtensionPointManager;
-import org.eclipse.tm.tcf.core.ChannelTCP;
-import org.eclipse.tm.tcf.protocol.ILogger;
-import org.eclipse.tm.tcf.protocol.Protocol;
-import org.eclipse.tm.tcf.ssl.TCFSecurityManager;
+import org.eclipse.tcf.internal.extensions.TcfServiceProvidersExtensionPointManager;
+import org.eclipse.tcf.core.ChannelTCP;
+import org.eclipse.tcf.protocol.ILogger;
+import org.eclipse.tcf.protocol.Protocol;
+import org.eclipse.tcf.ssl.TCFSecurityManager;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.BundleEvent;
@@ -33,7 +33,7 @@ import org.osgi.framework.BundleListener;
  */
 public class Activator extends Plugin {
 
-    public static final String PLUGIN_ID = "org.eclipse.tm.tcf"; //$NON-NLS-1$
+    public static final String PLUGIN_ID = "org.eclipse.tcf"; //$NON-NLS-1$
 
     private static Activator plugin;
     private static boolean debug;
@@ -77,9 +77,9 @@ public class Activator extends Plugin {
         super.start(context);
         debug = Platform.inDebugMode();
 
-        TRACE = "true".equals(Platform.getDebugOption("org.eclipse.tm.tcf/debug")); //$NON-NLS-1$
-        if (TRACE && "true".equals(Platform.getDebugOption("org.eclipse.tm.tcf/debug/discovery"))) {
-            System.setProperty("org.eclipse.tm.tcf.core.tracing.discovery", "true");
+        TRACE = "true".equals(Platform.getDebugOption("org.eclipse.tcf/debug")); //$NON-NLS-1$
+        if (TRACE && "true".equals(Platform.getDebugOption("org.eclipse.tcf/debug/discovery"))) {
+            System.setProperty("org.eclipse.tcf.core.tracing.discovery", "true");
         }
 
         ChannelTCP.setSSLContext(TCFSecurityManager.createSSLContext());
diff --git a/plugins/org.eclipse.tcf/src/org/eclipse/tcf/EventQueue.java b/plugins/org.eclipse.tcf/src/org/eclipse/tcf/EventQueue.java
index e24f7a73d..2bffc1e55 100644
--- a/plugins/org.eclipse.tcf/src/org/eclipse/tcf/EventQueue.java
+++ b/plugins/org.eclipse.tcf/src/org/eclipse/tcf/EventQueue.java
@@ -8,15 +8,15 @@
  * Contributors:
  *     Wind River Systems - initial API and implementation
  *******************************************************************************/
-package org.eclipse.tm.tcf;
+package org.eclipse.tcf;
 
 import java.util.LinkedList;
 
 import org.eclipse.core.runtime.jobs.IJobChangeEvent;
 import org.eclipse.core.runtime.jobs.IJobChangeListener;
 import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.tm.tcf.protocol.IEventQueue;
-import org.eclipse.tm.tcf.protocol.Protocol;
+import org.eclipse.tcf.protocol.IEventQueue;
+import org.eclipse.tcf.protocol.Protocol;
 
 
 /**
diff --git a/plugins/org.eclipse.tcf/src/org/eclipse/tcf/extensions/TcfAbstractExtensionPointManager.java b/plugins/org.eclipse.tcf/src/org/eclipse/tcf/extensions/TcfAbstractExtensionPointManager.java
index 75cf854d4..3bf010fdd 100644
--- a/plugins/org.eclipse.tcf/src/org/eclipse/tcf/extensions/TcfAbstractExtensionPointManager.java
+++ b/plugins/org.eclipse.tcf/src/org/eclipse/tcf/extensions/TcfAbstractExtensionPointManager.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Wind River Systems - initial API and implementation
  *******************************************************************************/
-package org.eclipse.tm.tcf.extensions;
+package org.eclipse.tcf.extensions;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -26,8 +26,8 @@ import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.osgi.util.NLS;
-import org.eclipse.tm.tcf.Activator;
-import org.eclipse.tm.tcf.internal.nls.TcfPluginMessages;
+import org.eclipse.tcf.Activator;
+import org.eclipse.tcf.internal.nls.TcfPluginMessages;
 
 
 /**
diff --git a/plugins/org.eclipse.tcf/src/org/eclipse/tcf/extensions/TcfExtensionPointComparator.java b/plugins/org.eclipse.tcf/src/org/eclipse/tcf/extensions/TcfExtensionPointComparator.java
index a6b71ecd0..ab988562f 100644
--- a/plugins/org.eclipse.tcf/src/org/eclipse/tcf/extensions/TcfExtensionPointComparator.java
+++ b/plugins/org.eclipse.tcf/src/org/eclipse/tcf/extensions/TcfExtensionPointComparator.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Wind River Systems - initial API and implementation
  *******************************************************************************/
-package org.eclipse.tm.tcf.extensions;
+package org.eclipse.tcf.extensions;
 
 import java.util.Comparator;
 
@@ -19,7 +19,7 @@ import org.eclipse.core.runtime.IExtension;
  * always read in the same order.
  * <p>
  * The order of the extensions is defined as following:<br>
- * <ul><li>Extensions contributed by the TCF core plug-ins (<code>org.eclipse.tm.tcf.*</code>)
+ * <ul><li>Extensions contributed by the TCF core plug-ins (<code>org.eclipse.tcf.*</code>)
  *         in ascending alphabetic order and</li>
  *     <li>Extensions contributed by any other plug-in in ascending alphabetic order.</li>
  *     <li>Extensions contributed by the same plug-in in ascending alphabetic order by the
@@ -27,7 +27,7 @@ import org.eclipse.core.runtime.IExtension;
  * </ul>
  */
 public class TcfExtensionPointComparator implements Comparator<IExtension> {
-    private final static String TCF_PLUGIN_PATTERN = "org.eclipse.tm.tcf.*"; //$NON-NLS-1$
+    private final static String TCF_PLUGIN_PATTERN = "org.eclipse.tcf.*"; //$NON-NLS-1$
 
     /* (non-Javadoc)
      * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
diff --git a/plugins/org.eclipse.tcf/src/org/eclipse/tcf/extensions/TcfExtensionProxy.java b/plugins/org.eclipse.tcf/src/org/eclipse/tcf/extensions/TcfExtensionProxy.java
index ebf20726b..3a42c01a8 100644
--- a/plugins/org.eclipse.tcf/src/org/eclipse/tcf/extensions/TcfExtensionProxy.java
+++ b/plugins/org.eclipse.tcf/src/org/eclipse/tcf/extensions/TcfExtensionProxy.java
@@ -8,15 +8,15 @@
  * Contributors:
  *     Wind River Systems - initial API and implementation
  *******************************************************************************/
-package org.eclipse.tm.tcf.extensions;
+package org.eclipse.tcf.extensions;
 
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.osgi.util.NLS;
-import org.eclipse.tm.tcf.Activator;
-import org.eclipse.tm.tcf.internal.nls.TcfPluginMessages;
+import org.eclipse.tcf.Activator;
+import org.eclipse.tcf.internal.nls.TcfPluginMessages;
 
 /**
  * TCF extension proxy implementation. The use of the proxy asures the
diff --git a/plugins/org.eclipse.tcf/src/org/eclipse/tcf/internal/extensions/TcfServiceProvidersExtensionPointManager.java b/plugins/org.eclipse.tcf/src/org/eclipse/tcf/internal/extensions/TcfServiceProvidersExtensionPointManager.java
index 39d0ce0b9..c84950c55 100644
--- a/plugins/org.eclipse.tcf/src/org/eclipse/tcf/internal/extensions/TcfServiceProvidersExtensionPointManager.java
+++ b/plugins/org.eclipse.tcf/src/org/eclipse/tcf/internal/extensions/TcfServiceProvidersExtensionPointManager.java
@@ -8,17 +8,17 @@
  * Contributors:
  *     Wind River Systems - initial API and implementation
  *******************************************************************************/
-package org.eclipse.tm.tcf.internal.extensions;
+package org.eclipse.tcf.internal.extensions;
 
 import java.util.Map;
 
-import org.eclipse.tm.tcf.extensions.TcfAbstractExtensionPointManager;
-import org.eclipse.tm.tcf.extensions.TcfExtensionProxy;
-import org.eclipse.tm.tcf.protocol.IServiceProvider;
-import org.eclipse.tm.tcf.protocol.Protocol;
+import org.eclipse.tcf.extensions.TcfAbstractExtensionPointManager;
+import org.eclipse.tcf.extensions.TcfExtensionProxy;
+import org.eclipse.tcf.protocol.IServiceProvider;
+import org.eclipse.tcf.protocol.Protocol;
 
 /**
- * Extension point manager implementation for "org.eclipse.tm.tcf.serviceProviders".
+ * Extension point manager implementation for "org.eclipse.tcf.serviceProviders".
  */
 public class TcfServiceProvidersExtensionPointManager extends TcfAbstractExtensionPointManager<IServiceProvider> {
     /*
@@ -36,15 +36,15 @@ public class TcfServiceProvidersExtensionPointManager extends TcfAbstractExtensi
     }
 
     /* (non-Javadoc)
-     * @see org.eclipse.tm.tcf.extensions.TcfAbstractExtensionPointManager#getExtensionPointId()
+     * @see org.eclipse.tcf.extensions.TcfAbstractExtensionPointManager#getExtensionPointId()
      */
     @Override
     protected String getExtensionPointId() {
-        return "org.eclipse.tm.tcf.serviceProviders"; //$NON-NLS-1$
+        return "org.eclipse.tcf.serviceProviders"; //$NON-NLS-1$
     }
 
     /* (non-Javadoc)
-     * @see org.eclipse.tm.tcf.extensions.TcfAbstractExtensionPointManager#getConfigurationElementName()
+     * @see org.eclipse.tcf.extensions.TcfAbstractExtensionPointManager#getConfigurationElementName()
      */
     @Override
     protected String getConfigurationElementName() {
diff --git a/plugins/org.eclipse.tcf/src/org/eclipse/tcf/internal/nls/TcfPluginMessages.java b/plugins/org.eclipse.tcf/src/org/eclipse/tcf/internal/nls/TcfPluginMessages.java
index ddd68a1f8..d4de3cce0 100644
--- a/plugins/org.eclipse.tcf/src/org/eclipse/tcf/internal/nls/TcfPluginMessages.java
+++ b/plugins/org.eclipse.tcf/src/org/eclipse/tcf/internal/nls/TcfPluginMessages.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Wind River Systems - initial API and implementation
  *******************************************************************************/
-package org.eclipse.tm.tcf.internal.nls;
+package org.eclipse.tcf.internal.nls;
 
 import org.eclipse.osgi.util.NLS;
 
@@ -18,7 +18,7 @@ import org.eclipse.osgi.util.NLS;
 public class TcfPluginMessages extends NLS {
 
     // The plug-in resouce bundle name
-    private static final String BUNDLE_NAME = "org.eclipse.tm.tcf.internal.tcf.TcfPluginMessages"; //$NON-NLS-1$
+    private static final String BUNDLE_NAME = "org.eclipse.tcf.internal.tcf.TcfPluginMessages"; //$NON-NLS-1$
 
     /**
      * Static constructor.
diff --git a/plugins/org.eclipse.tcf/src/org/eclipse/tcf/internal/nls/TcfPluginMessages.properties b/plugins/org.eclipse.tcf/src/org/eclipse/tcf/internal/nls/TcfPluginMessages.properties
index a16b7c2bf..5c19e7349 100644
--- a/plugins/org.eclipse.tcf/src/org/eclipse/tcf/internal/nls/TcfPluginMessages.properties
+++ b/plugins/org.eclipse.tcf/src/org/eclipse/tcf/internal/nls/TcfPluginMessages.properties
@@ -9,7 +9,7 @@
 #     Wind River Systems - initial API and implementation

 ###############################################################################

 #
-# org.eclipse.tm.tcf
+# org.eclipse.tcf
 # Externalized Strings.
 #
 
diff --git a/plugins/org.eclipse.tcf/src/org/eclipse/tcf/ssl/TCFSecurityManager.java b/plugins/org.eclipse.tcf/src/org/eclipse/tcf/ssl/TCFSecurityManager.java
index 55974d7b5..4bd55cb66 100644
--- a/plugins/org.eclipse.tcf/src/org/eclipse/tcf/ssl/TCFSecurityManager.java
+++ b/plugins/org.eclipse.tcf/src/org/eclipse/tcf/ssl/TCFSecurityManager.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Wind River Systems - initial API and implementation
  *******************************************************************************/
-package org.eclipse.tm.tcf.ssl;
+package org.eclipse.tcf.ssl;
 
 import java.io.BufferedInputStream;
 import java.io.BufferedReader;
@@ -33,9 +33,9 @@ import javax.net.ssl.TrustManager;
 import javax.net.ssl.X509ExtendedKeyManager;
 import javax.net.ssl.X509TrustManager;
 
-import org.eclipse.tm.tcf.Activator;
-import org.eclipse.tm.tcf.core.Base64;
-import org.eclipse.tm.tcf.protocol.Protocol;
+import org.eclipse.tcf.Activator;
+import org.eclipse.tcf.core.Base64;
+import org.eclipse.tcf.protocol.Protocol;
 
 
 /**