Fixed TCF package names in import statements.

10 files changed, 30 insertions, 30 deletions

diff --git a/examples/org.eclipse.tcf.examples.daytime.agent/Makefile b/examples/org.eclipse.tcf.examples.daytime.agent/Makefile
index 76b098864..d9a121eb2 100644
--- a/examples/org.eclipse.tcf.examples.daytime.agent/Makefile
+++ b/examples/org.eclipse.tcf.examples.daytime.agent/Makefile
@@ -1,4 +1,4 @@
-TCF_AGENT_DIR=../../../org.eclipse.tcf.agent
+TCF_AGENT_DIR=../../../org.eclipse.tcf.agent/agent
 
 include $(TCF_AGENT_DIR)/Makefile.inc
 
@@ -15,8 +15,8 @@ $(BINDIR)/libtcf$(EXTLIB) : $(OFILES)
 	$(AR) -rc $@ $^
 	$(RANLIB)
 
-$(BINDIR)/agent$(EXTEXE): $(BINDIR)/main/main$(EXTOBJ) $(BINDIR)/libtcf$(EXTLIB)
-	$(CC) $(CFLAGS) -o $@ $(BINDIR)/main/main$(EXTOBJ) $(BINDIR)/libtcf$(EXTLIB) $(LIBS)
+$(BINDIR)/agent$(EXTEXE): $(BINDIR)/tcf/main/main$(EXTOBJ) $(BINDIR)/libtcf$(EXTLIB)
+	$(CC) $(CFLAGS) -o $@ $(BINDIR)/tcf/main/main$(EXTOBJ) $(BINDIR)/libtcf$(EXTLIB) $(LIBS)
 
 $(BINDIR)/%$(EXTOBJ): %.c $(HFILES) Makefile
 	@$(call MKDIR,$(dir $@))
diff --git a/examples/org.eclipse.tcf.examples.daytime.agent/tcf/config.h b/examples/org.eclipse.tcf.examples.daytime.agent/tcf/config.h
index d2bb543a3..b4ba0cb72 100644
--- a/examples/org.eclipse.tcf.examples.daytime.agent/tcf/config.h
+++ b/examples/org.eclipse.tcf.examples.daytime.agent/tcf/config.h
@@ -24,7 +24,7 @@
 #ifndef D_config
 #define D_config
 
-#include <framework/mdep.h>
+#include <tcf/framework/mdep.h>
 
 #if defined(WIN32) || defined(__CYGWIN__)
 #  define TARGET_UNIX       0
diff --git a/examples/org.eclipse.tcf.examples.daytime.agent/tcf/main/services-ext.h b/examples/org.eclipse.tcf.examples.daytime.agent/tcf/main/services-ext.h
index 35d154256..00083d39a 100644
--- a/examples/org.eclipse.tcf.examples.daytime.agent/tcf/main/services-ext.h
+++ b/examples/org.eclipse.tcf.examples.daytime.agent/tcf/main/services-ext.h
@@ -19,7 +19,7 @@
  * a customized version of services-ext.h file can be added to compiler headers search paths.
  */
 
-#include "daytime.h"
+#include <tcf/services/daytime.h>
 
 static void ini_ext_services(Protocol * proto, TCFBroadcastGroup * bcg) {
     ini_daytime_service(proto);
diff --git a/examples/org.eclipse.tcf.examples.daytime.agent/tcf/daytime.c b/examples/org.eclipse.tcf.examples.daytime.agent/tcf/services/daytime.c
index 745d081c2..c4108038e 100644
--- a/examples/org.eclipse.tcf.examples.daytime.agent/tcf/daytime.c
+++ b/examples/org.eclipse.tcf.examples.daytime.agent/tcf/services/daytime.c
@@ -17,12 +17,12 @@
  * Sample TCF service implementation.
  */
 
-#include <config.h>
+#include <tcf/config.h>
 #include <time.h>
-#include <framework/json.h>
-#include <framework/errors.h>
-#include <framework/exceptions.h>
-#include <daytime.h>
+#include <tcf/framework/json.h>
+#include <tcf/framework/errors.h>
+#include <tcf/framework/exceptions.h>
+#include <tcf/services/daytime.h>
 
 static const char * DAYTIME = "Daytime";
 
diff --git a/examples/org.eclipse.tcf.examples.daytime.agent/tcf/daytime.h b/examples/org.eclipse.tcf.examples.daytime.agent/tcf/services/daytime.h
index 99e11cb2e..492544d76 100644
--- a/examples/org.eclipse.tcf.examples.daytime.agent/tcf/daytime.h
+++ b/examples/org.eclipse.tcf.examples.daytime.agent/tcf/services/daytime.h
@@ -20,8 +20,8 @@
 #ifndef DAYTIME_H_
 #define DAYTIME_H_
 
-#include <config.h>
-#include <framework/protocol.h>
+#include <tcf/config.h>
+#include <tcf/framework/protocol.h>
 
 extern void ini_daytime_service(Protocol * proto);
 
diff --git a/examples/org.eclipse.tcf.examples.daytime/META-INF/MANIFEST.MF b/examples/org.eclipse.tcf.examples.daytime/META-INF/MANIFEST.MF
index 34e3ea31e..dd7f69912 100644
--- a/examples/org.eclipse.tcf.examples.daytime/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.tcf.examples.daytime/META-INF/MANIFEST.MF
@@ -1,14 +1,14 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.tm.tcf.examples.daytime;singleton:=true
+Bundle-SymbolicName: org.eclipse.tcf.examples.daytime;singleton:=true
 Bundle-Version: 0.5.0.qualifier
-Bundle-Activator: org.eclipse.tm.internal.tcf.examples.daytime.Activator
+Bundle-Activator: org.eclipse.tcf.internal.examples.daytime.Activator
 Bundle-Vendor: %providerName
 Require-Bundle: org.eclipse.core.runtime
 Bundle-ActivationPolicy: lazy
 Eclipse-LazyStart: true
-Import-Package: org.eclipse.tm.tcf.core;version="0.5.0",
- org.eclipse.tm.tcf.protocol;version="0.5.0"
-Export-Package: org.eclipse.tm.internal.tcf.examples.daytime
+Import-Package: org.eclipse.tcf.core;version="0.4.0",
+ org.eclipse.tcf.protocol;version="0.5.0"
+Export-Package: org.eclipse.tcf.internal.examples.daytime
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/examples/org.eclipse.tcf.examples.daytime/plugin.xml b/examples/org.eclipse.tcf.examples.daytime/plugin.xml
index bc6b5dc36..aa8e245fb 100644
--- a/examples/org.eclipse.tcf.examples.daytime/plugin.xml
+++ b/examples/org.eclipse.tcf.examples.daytime/plugin.xml
@@ -2,8 +2,8 @@
 <?eclipse version="3.2"?>
 <plugin>
 
-   <extension point="org.eclipse.tm.tcf.startup">
-      <class name="org.eclipse.tm.internal.tcf.examples.daytime.DaytimeServiceProxy"/>
+   <extension point="org.eclipse.tcf.startup">
+      <class name="org.eclipse.tcf.internal.examples.daytime.DaytimeServiceProxy"/>
    </extension>
 
 </plugin>
diff --git a/examples/org.eclipse.tcf.examples.daytime/src/org/eclipse/tcf/internal/examples/daytime/Activator.java b/examples/org.eclipse.tcf.examples.daytime/src/org/eclipse/tcf/internal/examples/daytime/Activator.java
index e8e753675..9db588004 100644
--- a/examples/org.eclipse.tcf.examples.daytime/src/org/eclipse/tcf/internal/examples/daytime/Activator.java
+++ b/examples/org.eclipse.tcf.examples.daytime/src/org/eclipse/tcf/internal/examples/daytime/Activator.java
@@ -9,7 +9,7 @@
  *     Wind River Systems - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.tm.internal.tcf.examples.daytime;
+package org.eclipse.tcf.internal.examples.daytime;
 
 import org.eclipse.core.runtime.Plugin;
 import org.osgi.framework.BundleContext;
@@ -20,7 +20,7 @@ import org.osgi.framework.BundleContext;
 public class Activator extends Plugin {
 
     // The plug-in ID
-    public static final String PLUGIN_ID = "org.eclipse.tm.tcf.examples.daytime";
+    public static final String PLUGIN_ID = "org.eclipse.tcf.examples.daytime";
 
     // The shared instance
     private static Activator plugin;
diff --git a/examples/org.eclipse.tcf.examples.daytime/src/org/eclipse/tcf/internal/examples/daytime/DaytimeServiceProxy.java b/examples/org.eclipse.tcf.examples.daytime/src/org/eclipse/tcf/internal/examples/daytime/DaytimeServiceProxy.java
index 37e37d6d1..72dd6ddd9 100644
--- a/examples/org.eclipse.tcf.examples.daytime/src/org/eclipse/tcf/internal/examples/daytime/DaytimeServiceProxy.java
+++ b/examples/org.eclipse.tcf.examples.daytime/src/org/eclipse/tcf/internal/examples/daytime/DaytimeServiceProxy.java
@@ -9,12 +9,12 @@
  *     Wind River Systems - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.tm.internal.tcf.examples.daytime;
+package org.eclipse.tcf.internal.examples.daytime;
 
-import org.eclipse.tm.tcf.core.Command;
-import org.eclipse.tm.tcf.protocol.IChannel;
-import org.eclipse.tm.tcf.protocol.IToken;
-import org.eclipse.tm.tcf.protocol.Protocol;
+import org.eclipse.tcf.core.Command;
+import org.eclipse.tcf.protocol.IChannel;
+import org.eclipse.tcf.protocol.IToken;
+import org.eclipse.tcf.protocol.Protocol;
 
 
 public class DaytimeServiceProxy implements IDaytimeService {
@@ -58,7 +58,7 @@ public class DaytimeServiceProxy implements IDaytimeService {
         /*
          * Make Daytime Service proxy available to all potential clients by creating
          * the proxy object every time a TCF communication channel is opened.
-         * Note: extension point "org.eclipse.tm.tcf.startup" is used to load this class
+         * Note: extension point "org.eclipse.tcf.startup" is used to load this class
          * at TCF startup time, so proxy factory is properly activated even if nobody
          * import directly from this plugin.
          */
diff --git a/examples/org.eclipse.tcf.examples.daytime/src/org/eclipse/tcf/internal/examples/daytime/IDaytimeService.java b/examples/org.eclipse.tcf.examples.daytime/src/org/eclipse/tcf/internal/examples/daytime/IDaytimeService.java
index ef08ff838..58414df5c 100644
--- a/examples/org.eclipse.tcf.examples.daytime/src/org/eclipse/tcf/internal/examples/daytime/IDaytimeService.java
+++ b/examples/org.eclipse.tcf.examples.daytime/src/org/eclipse/tcf/internal/examples/daytime/IDaytimeService.java
@@ -9,10 +9,10 @@
  *     Wind River Systems - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.tm.internal.tcf.examples.daytime;
+package org.eclipse.tcf.internal.examples.daytime;
 
-import org.eclipse.tm.tcf.protocol.IService;
-import org.eclipse.tm.tcf.protocol.IToken;
+import org.eclipse.tcf.protocol.IService;
+import org.eclipse.tcf.protocol.IToken;
 
 /**
  * IDaytimeService allows retrieving the time of day from a remote system.