Switch terminal.serial to using rxtx-2.1 / gnu.io namespace instead of javax.comm

releng/org.eclipse.rse.updatesite/site.xml

@@ -42,7 +42,7 @@
    <feature url="features/org.apache.oro_2.0.8.qualifier.jar" id="org.apache.oro" version="2.0.8.qualifier">
       <category name="Enabling Features"/>
    </feature>
-   <feature url="features/org.eclipse.tm.terminal.sdk_0.9.1.qualifier.jar" id="org.eclipse.tm.terminal.sdk" version="0.9.1.qualifier">
+   <feature url="features/org.eclipse.tm.terminal.sdk_0.9.100.qualifier.jar" id="org.eclipse.tm.terminal.sdk" version="0.9.100.qualifier">
       <category name="Target Management Add-ons"/>
    </feature>
    <feature url="features/org.eclipse.rse.tests_2.0.0.qualifier.jar" id="org.eclipse.rse.tests" version="2.0.0.qualifier">

terminal/org.eclipse.tm.terminal.sdk-feature/feature.xml

@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.tm.terminal.sdk"
       label="%featureName"
-      version="0.9.1.qualifier"
+      version="0.9.100.qualifier"
       provider-name="%providerName"
       image="eclipse_update_120.jpg">
 

terminal/org.eclipse.tm.terminal.serial-feature/feature.xml

@@ -3,7 +3,7 @@
       id="org.eclipse.tm.terminal.serial"
       label="%featureName"
       provider-name="%providerName"
-      version="0.9.0.qualifier">
+      version="0.9.100.qualifier">
 
    <description>
       %description

terminal/org.eclipse.tm.terminal.serial/META-INF/MANIFEST.MF

@@ -2,8 +2,9 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.tm.terminal.serial;singleton:=true
-Bundle-Version: 0.9.0.qualifier
+Bundle-Version: 0.9.1.qualifier
 Bundle-Localization: plugin
+Import-Package: gnu.io;resolution:=optional
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.tm.terminal

terminal/org.eclipse.tm.terminal.serial/README.txt

@@ -1,37 +1,23 @@
 Important note:
 
-In order to compile and run this plugin, comm has to be installed into 
+In order to compile and run this plugin, RXTX has to be installed into 
-the java installation. Once comm.jar is installed in your JRE, you'll
+the jvm. Once RXTXcomm.jar is installed in your JRE, you'll need to 
-need to quit and re-start Eclipse PDE in order to recompute the classpath.
+quit and re-start Eclipse PDE in order to recompute the classpath.
 
-Linux or Solaris:
+Installation:
------------------
+-------------
-* Get comm3.0_u1 or later from Sun at 
+* Get RXTX binaries from
-  http://www.sun.com/download/products.xml?id=43208d3d
+  ftp://ftp.qbang.org/pub/rxtx/rxtx-2.1-7-bins-r2.zip
-* Follow the installation instructions. As per 3.0_u1 on Linux, you need to
+* Copy RXTXcomm.jar into $JRE/lib/ext
-  - cp jar/comm.jar $JRE/lib/ext
+* Copy the native libs for your Platform (*.so, *.jnilib, *.dll)
-  - cp doc/javax.comm.properties $JRE/lib
+  into the respective native lib folder of your RSE 
-  - cp lib/*.so $JRE/lib/i386
+* More installation instructions are at
-
+  http://rxtx.qbang.org/wiki/index.php/Main_Page
-Windows:
+* More downloads for other platforms (currently about 30)
---------
+  are available from the "ToyBox" link on
-* Get comm.jar 2.0.3 ZIP archive from Sun at
-  http://www.sun.com/download/products.xml?id=43208d3d
-  - Extract comm.jar into %JRE%\lib\ext
-* Get rxtx-2.0-7pre1-i386-pc-mingw32.zip from
   http://users.frii.com/jarvi/rxtx/download.html
-  - Extract RXTXcomm.jar into %JRE%\lib\ext
-  - Extract rxtx*.dll into %JRE%\bin
-* Create new text file 
-	%JRE%\lib\javax.comm.properties
-  with the following line as contents:
-	driver=gnu.io.RXTXCommDriver
-
-Other platforms (MaxOS X etc):
-------------------------------
-* Get comm.jar 2.0.3 as explained for Windows
-* Get rxtx-2.0-7pre1.tar.gz sources for your platform from
-  http://users.frii.com/jarvi/rxtx/download.html
-* Follow instructions to compile and install. You'll need a 
-  javax.comm.properties file as explained for Windows.
 
+Changelog:
+----------
+0.9.100 - switched from Sun javax.comm to rxtx gnu.io for serial support
+0.9.0   - first version

terminal/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/terminal/internal/serial/SerialConnectWorker.java

@@ -16,9 +16,9 @@
  *******************************************************************************/
 package org.eclipse.tm.terminal.internal.serial;
 
-import javax.comm.CommPortIdentifier;
+import gnu.io.CommPortIdentifier;
-import javax.comm.PortInUseException;
+import gnu.io.PortInUseException;
-import javax.comm.SerialPort;
+import gnu.io.SerialPort;
 
 import org.eclipse.tm.terminal.ITerminalControl;
 import org.eclipse.tm.terminal.TerminalState;

terminal/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/terminal/internal/serial/SerialConnector.java

@@ -20,8 +20,8 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 
-import javax.comm.CommPortIdentifier;
+import gnu.io.CommPortIdentifier;
-import javax.comm.SerialPort;
+import gnu.io.SerialPort;
 
 import org.eclipse.tm.terminal.ISettingsPage;
 import org.eclipse.tm.terminal.ISettingsStore;

terminal/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/terminal/internal/serial/SerialPortHandler.java

@@ -19,9 +19,9 @@ package org.eclipse.tm.terminal.internal.serial;
 import java.io.IOException;
 import java.text.MessageFormat;
 
-import javax.comm.CommPortOwnershipListener;
+import gnu.io.CommPortOwnershipListener;
-import javax.comm.SerialPortEvent;
+import gnu.io.SerialPortEvent;
-import javax.comm.SerialPortEventListener;
+import gnu.io.SerialPortEventListener;
 
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.swt.widgets.Display;

terminal/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/terminal/internal/serial/SerialProperties.java

@@ -21,7 +21,7 @@ import java.util.Enumeration;
 import java.util.List;
 import java.util.Vector;
 
-import javax.comm.CommPortIdentifier;
+import gnu.io.CommPortIdentifier;
 
 public class SerialProperties {
 	protected List fSerialPortTable;

terminal/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/terminal/internal/serial/SerialSettings.java

@@ -16,7 +16,7 @@
  *******************************************************************************/
 package org.eclipse.tm.terminal.internal.serial;
 
-import javax.comm.SerialPort;
+import gnu.io.SerialPort;
 
 import org.eclipse.tm.terminal.ISettingsStore;