diff --git a/releng/org.eclipse.rse.updatesite/site.xml b/releng/org.eclipse.rse.updatesite/site.xml index 94b94eff379..6241eba3f9c 100644 --- a/releng/org.eclipse.rse.updatesite/site.xml +++ b/releng/org.eclipse.rse.updatesite/site.xml @@ -42,7 +42,7 @@ - + diff --git a/terminal/org.eclipse.tm.terminal.sdk-feature/feature.xml b/terminal/org.eclipse.tm.terminal.sdk-feature/feature.xml index 69aa224d78e..1d5fc68306d 100644 --- a/terminal/org.eclipse.tm.terminal.sdk-feature/feature.xml +++ b/terminal/org.eclipse.tm.terminal.sdk-feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/terminal/org.eclipse.tm.terminal.serial-feature/feature.xml b/terminal/org.eclipse.tm.terminal.serial-feature/feature.xml index c12d85251c9..f73e7c99d27 100644 --- a/terminal/org.eclipse.tm.terminal.serial-feature/feature.xml +++ b/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 diff --git a/terminal/org.eclipse.tm.terminal.serial/META-INF/MANIFEST.MF b/terminal/org.eclipse.tm.terminal.serial/META-INF/MANIFEST.MF index 4dbf7a525cb..e1309be6bff 100644 --- a/terminal/org.eclipse.tm.terminal.serial/META-INF/MANIFEST.MF +++ b/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 diff --git a/terminal/org.eclipse.tm.terminal.serial/README.txt b/terminal/org.eclipse.tm.terminal.serial/README.txt index a2edcc54b59..f3f09daf07d 100644 --- a/terminal/org.eclipse.tm.terminal.serial/README.txt +++ b/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 -the java installation. Once comm.jar is installed in your JRE, you'll -need to quit and re-start Eclipse PDE in order to recompute the classpath. +In order to compile and run this plugin, RXTX has to be installed into +the jvm. Once RXTXcomm.jar is installed in your JRE, you'll need to +quit and re-start Eclipse PDE in order to recompute the classpath. -Linux or Solaris: ------------------ -* Get comm3.0_u1 or later from Sun at - http://www.sun.com/download/products.xml?id=43208d3d -* Follow the installation instructions. As per 3.0_u1 on Linux, you need to - - cp jar/comm.jar $JRE/lib/ext - - cp doc/javax.comm.properties $JRE/lib - - cp lib/*.so $JRE/lib/i386 - -Windows: --------- -* 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 +Installation: +------------- +* Get RXTX binaries from + ftp://ftp.qbang.org/pub/rxtx/rxtx-2.1-7-bins-r2.zip +* Copy RXTXcomm.jar into $JRE/lib/ext +* Copy the native libs for your Platform (*.so, *.jnilib, *.dll) + into the respective native lib folder of your RSE +* More installation instructions are at + http://rxtx.qbang.org/wiki/index.php/Main_Page +* More downloads for other platforms (currently about 30) + are available from the "ToyBox" link on 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. - \ No newline at end of file +Changelog: +---------- +0.9.100 - switched from Sun javax.comm to rxtx gnu.io for serial support +0.9.0 - first version \ No newline at end of file diff --git a/terminal/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/terminal/internal/serial/SerialConnectWorker.java b/terminal/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/terminal/internal/serial/SerialConnectWorker.java index a8b3426a4b8..9a1944a07b1 100644 --- a/terminal/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/terminal/internal/serial/SerialConnectWorker.java +++ b/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 javax.comm.PortInUseException; -import javax.comm.SerialPort; +import gnu.io.CommPortIdentifier; +import gnu.io.PortInUseException; +import gnu.io.SerialPort; import org.eclipse.tm.terminal.ITerminalControl; import org.eclipse.tm.terminal.TerminalState; diff --git a/terminal/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/terminal/internal/serial/SerialConnector.java b/terminal/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/terminal/internal/serial/SerialConnector.java index 5112e304347..e89e04efdd6 100644 --- a/terminal/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/terminal/internal/serial/SerialConnector.java +++ b/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 javax.comm.SerialPort; +import gnu.io.CommPortIdentifier; +import gnu.io.SerialPort; import org.eclipse.tm.terminal.ISettingsPage; import org.eclipse.tm.terminal.ISettingsStore; diff --git a/terminal/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/terminal/internal/serial/SerialPortHandler.java b/terminal/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/terminal/internal/serial/SerialPortHandler.java index ec5e6dc8e64..562d0fa21c5 100644 --- a/terminal/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/terminal/internal/serial/SerialPortHandler.java +++ b/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 javax.comm.SerialPortEvent; -import javax.comm.SerialPortEventListener; +import gnu.io.CommPortOwnershipListener; +import gnu.io.SerialPortEvent; +import gnu.io.SerialPortEventListener; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.swt.widgets.Display; diff --git a/terminal/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/terminal/internal/serial/SerialProperties.java b/terminal/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/terminal/internal/serial/SerialProperties.java index aaca3d5eb9b..2fdac236386 100644 --- a/terminal/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/terminal/internal/serial/SerialProperties.java +++ b/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; diff --git a/terminal/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/terminal/internal/serial/SerialSettings.java b/terminal/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/terminal/internal/serial/SerialSettings.java index 8e7444e3578..59dad9e783b 100644 --- a/terminal/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/terminal/internal/serial/SerialSettings.java +++ b/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;