# HG changeset patch
# User Chad Peckham <chad.peckham@nokia.com>
# Date 1251754273 18000
# Node ID eb76ac5926e9e3d2c1ad28c653c6a837ed666992
# Parent  ad78fc66e5f60a943827f0181c18c94911d9d02f
merge from SVN

diff -r ad78fc66e5f6 -r eb76ac5926e9 dsdp/tm/tcf_0_3_x/org.eclipse.tm.tcf.core/.classpath
--- a/dsdp/tm/tcf_0_3_x/org.eclipse.tm.tcf.core/.classpath	Fri Aug 28 13:17:24 2009 -0500
+++ b/dsdp/tm/tcf_0_3_x/org.eclipse.tm.tcf.core/.classpath	Mon Aug 31 16:31:13 2009 -0500
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="activator"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff -r ad78fc66e5f6 -r eb76ac5926e9 dsdp/tm/tcf_0_3_x/org.eclipse.tm.tcf.core/META-INF/MANIFEST.MF
--- a/dsdp/tm/tcf_0_3_x/org.eclipse.tm.tcf.core/META-INF/MANIFEST.MF	Fri Aug 28 13:17:24 2009 -0500
+++ b/dsdp/tm/tcf_0_3_x/org.eclipse.tm.tcf.core/META-INF/MANIFEST.MF	Mon Aug 31 16:31:13 2009 -0500
@@ -1,10 +1,16 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: TCF Core Fragment
+Bundle-Name: %pluginName
+Bundle-Vendor: %providerName
 Bundle-SymbolicName: org.eclipse.tm.tcf.core;singleton:=true
-Bundle-Version: 0.2.0.qualifier
-Fragment-Host: org.eclipse.tm.tcf;bundle-version="0.2.0"
+Bundle-Version: 0.3.0.qualifier
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-ActivationPolicy: lazy
+Eclipse-LazyStart: true
+Bundle-Activator: org.eclipse.tm.internal.tcf.Activator
+Import-Package: org.osgi.framework,
+ org.osgi.service.packageadmin,
+ org.osgi.util.tracker
 Export-Package: org.eclipse.tm.tcf.core;version="0.2.0",
  org.eclipse.tm.tcf.protocol;version="0.2.0",
  org.eclipse.tm.tcf.services;version="0.2.0",
diff -r ad78fc66e5f6 -r eb76ac5926e9 dsdp/tm/tcf_0_3_x/org.eclipse.tm.tcf.core/build.properties
--- a/dsdp/tm/tcf_0_3_x/org.eclipse.tm.tcf.core/build.properties	Fri Aug 28 13:17:24 2009 -0500
+++ b/dsdp/tm/tcf_0_3_x/org.eclipse.tm.tcf.core/build.properties	Mon Aug 31 16:31:13 2009 -0500
@@ -1,4 +1,8 @@
-source.. = src/
+source.. = src/,\
+           activator/
 output.. = bin/
 bin.includes = META-INF/,\
-               .
+               .,\
+               plugin.properties,\
+               about.html
+src.includes = about.html
diff -r ad78fc66e5f6 -r eb76ac5926e9 dsdp/tm/tcf_0_3_x/org.eclipse.tm.tcf.core/src/org/eclipse/tm/tcf/core/ChannelTCP.java
--- a/dsdp/tm/tcf_0_3_x/org.eclipse.tm.tcf.core/src/org/eclipse/tm/tcf/core/ChannelTCP.java	Fri Aug 28 13:17:24 2009 -0500
+++ b/dsdp/tm/tcf_0_3_x/org.eclipse.tm.tcf.core/src/org/eclipse/tm/tcf/core/ChannelTCP.java	Mon Aug 31 16:31:13 2009 -0500
@@ -60,7 +60,7 @@
                     out = new BufferedOutputStream(socket.getOutputStream());
                     onSocketConnected(null);
                 }
-                catch (final Exception x) {
+                catch (Exception x) {
                     onSocketConnected(x);
                 }
             }
@@ -85,7 +85,10 @@
     private void onSocketConnected(final Throwable x) {
         Protocol.invokeLater(new Runnable() {
             public void run() {
-                if (x != null) terminate(x);
+                if (x != null) {
+                    terminate(x);
+                    closed = true;
+                }
                 if (closed) {
                     try {
                         if (socket != null) {
diff -r ad78fc66e5f6 -r eb76ac5926e9 dsdp/tm/tcf_0_3_x/org.eclipse.tm.tcf.core/src/org/eclipse/tm/tcf/protocol/JSON.java
--- a/dsdp/tm/tcf_0_3_x/org.eclipse.tm.tcf.core/src/org/eclipse/tm/tcf/protocol/JSON.java	Fri Aug 28 13:17:24 2009 -0500
+++ b/dsdp/tm/tcf_0_3_x/org.eclipse.tm.tcf.core/src/org/eclipse/tm/tcf/protocol/JSON.java	Mon Aug 31 16:31:13 2009 -0500
@@ -149,6 +149,10 @@
                 ch |= (inp[inp_pos++] & 0x3f) << 6;
                 ch |= inp[inp_pos++] & 0x3f;
             }
+            else {
+                assert false : "invalid UTF-8 encoding";
+                ch &= 0xff;
+            }
         }
         return ch;
     }
diff -r ad78fc66e5f6 -r eb76ac5926e9 dsdp/tm/tcf_0_3_x/org.eclipse.tm.tcf.core/src/org/eclipse/tm/tcf/services/IFileSystem.java
--- a/dsdp/tm/tcf_0_3_x/org.eclipse.tm.tcf.core/src/org/eclipse/tm/tcf/services/IFileSystem.java	Fri Aug 28 13:17:24 2009 -0500
+++ b/dsdp/tm/tcf_0_3_x/org.eclipse.tm.tcf.core/src/org/eclipse/tm/tcf/services/IFileSystem.java	Mon Aug 31 16:31:13 2009 -0500
@@ -244,7 +244,7 @@
         S_IXGRP    = 00010,     // group has execute permission
         S_IRWXO    = 00007,     // mask for permissions for others (not in group)
         S_IROTH    = 00004,     // others have read permission
-        S_IWOTH    = 00002,     // others have write permisson
+        S_IWOTH    = 00002,     // others have write permission
         S_IXOTH    = 00001;     // others have execute permission
     
     final static class DirEntry {
diff -r ad78fc66e5f6 -r eb76ac5926e9 dsdp/tm/tcf_0_3_x/org.eclipse.tm.tcf.core/src/org/eclipse/tm/tcf/services/IProcesses.java
--- a/dsdp/tm/tcf_0_3_x/org.eclipse.tm.tcf.core/src/org/eclipse/tm/tcf/services/IProcesses.java	Fri Aug 28 13:17:24 2009 -0500
+++ b/dsdp/tm/tcf_0_3_x/org.eclipse.tm.tcf.core/src/org/eclipse/tm/tcf/services/IProcesses.java	Mon Aug 31 16:31:13 2009 -0500
@@ -199,6 +199,7 @@
     
     /**
      * Get list of signals that can be send to the process.
+     * @param context_id - process context ID or null.
      * @param done - call back interface called when operation is completed.
      * @return pending command handle, can be used to cancel the command.
      */
diff -r ad78fc66e5f6 -r eb76ac5926e9 dsdp/tm/tcf_0_3_x/org.eclipse.tm.tcf/.classpath
--- a/dsdp/tm/tcf_0_3_x/org.eclipse.tm.tcf/.classpath	Fri Aug 28 13:17:24 2009 -0500
+++ b/dsdp/tm/tcf_0_3_x/org.eclipse.tm.tcf/.classpath	Mon Aug 31 16:31:13 2009 -0500
@@ -3,6 +3,5 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry combineaccessrules="false" exported="true" kind="src" path="/org.eclipse.tm.tcf.core"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff -r ad78fc66e5f6 -r eb76ac5926e9 dsdp/tm/tcf_0_3_x/org.eclipse.tm.tcf/META-INF/MANIFEST.MF
--- a/dsdp/tm/tcf_0_3_x/org.eclipse.tm.tcf/META-INF/MANIFEST.MF	Fri Aug 28 13:17:24 2009 -0500
+++ b/dsdp/tm/tcf_0_3_x/org.eclipse.tm.tcf/META-INF/MANIFEST.MF	Mon Aug 31 16:31:13 2009 -0500
@@ -1,14 +1,15 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
+Bundle-Vendor: %providerName
 Bundle-SymbolicName: org.eclipse.tm.tcf;singleton:=true
 Bundle-Version: 0.3.0.qualifier
-Bundle-Activator: org.eclipse.tm.tcf.Activator
-Bundle-Vendor: %providerName
-Require-Bundle: org.eclipse.core.runtime
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ActivationPolicy: lazy
 Eclipse-LazyStart: true
-Eclipse-ExtensibleAPI: true
+Require-Bundle: org.eclipse.core.runtime
+Bundle-Activator: org.eclipse.tm.tcf.Activator
+Import-Package: org.eclipse.tm.tcf.core;version="0.2.0",
+ org.eclipse.tm.tcf.protocol;version="0.2.0"
 Export-Package: org.eclipse.tm.tcf.extensions,
  org.eclipse.tm.tcf.ssl;version="0.2.0"
diff -r ad78fc66e5f6 -r eb76ac5926e9 dsdp/tm/tcf_0_3_x/org.eclipse.tm.tcf/build.properties
--- a/dsdp/tm/tcf_0_3_x/org.eclipse.tm.tcf/build.properties	Fri Aug 28 13:17:24 2009 -0500
+++ b/dsdp/tm/tcf_0_3_x/org.eclipse.tm.tcf/build.properties	Mon Aug 31 16:31:13 2009 -0500
@@ -1,6 +1,5 @@
 source.. = src/
 output.. = bin/
-extra.. = ../org.eclipse.tm.tcf.core/bin
 bin.includes = META-INF/,\
                .,\
                about.html,\