Bug 537575 - Set default locale if no locale command. Also updates
version to 3.0.1
Change-Id: I71e04586dc8dc0eed7b4dc899206ef70c2d5c939
Signed-off-by: Greg Watson <g.watson@computer.org>
diff --git a/bundles/org.eclipse.remote.console/pom.xml b/bundles/org.eclipse.remote.console/pom.xml
index fd240fb..06e7a2b 100644
--- a/bundles/org.eclipse.remote.console/pom.xml
+++ b/bundles/org.eclipse.remote.console/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.remote</groupId>
<artifactId>remote-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.1-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.remote.build/pom.xml</relativePath>
</parent>
diff --git a/bundles/org.eclipse.remote.core/pom.xml b/bundles/org.eclipse.remote.core/pom.xml
index b2ce59e..db4ceb4 100644
--- a/bundles/org.eclipse.remote.core/pom.xml
+++ b/bundles/org.eclipse.remote.core/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.remote</groupId>
<artifactId>remote-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.1-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.remote.build/pom.xml</relativePath>
</parent>
diff --git a/bundles/org.eclipse.remote.doc.isv/pom.xml b/bundles/org.eclipse.remote.doc.isv/pom.xml
index 54bba78..ae83582 100644
--- a/bundles/org.eclipse.remote.doc.isv/pom.xml
+++ b/bundles/org.eclipse.remote.doc.isv/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.remote</groupId>
<artifactId>remote-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.1-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.remote.build/pom.xml</relativePath>
</parent>
diff --git a/bundles/org.eclipse.remote.jsch.core/pom.xml b/bundles/org.eclipse.remote.jsch.core/pom.xml
index 0ed3d88..81ff408 100644
--- a/bundles/org.eclipse.remote.jsch.core/pom.xml
+++ b/bundles/org.eclipse.remote.jsch.core/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.remote</groupId>
<artifactId>remote-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.1-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.remote.build/pom.xml</relativePath>
</parent>
diff --git a/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/JSchConnection.java b/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/JSchConnection.java
index ae5a0f3..7388c46 100644
--- a/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/JSchConnection.java
+++ b/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/JSchConnection.java
@@ -74,6 +74,7 @@
public static final boolean DEFAULT_IS_PASSWORD = false;
public static final boolean DEFAULT_USE_LOGIN_SHELL = true;
public static final String DEFAULT_LOGIN_SHELL_COMMAND = "/bin/bash -l -c '{0}'"; //$NON-NLS-1$
+ public static final String DEFAULT_ENCODING = "UTF-8"; //$NON-NLS-1$
public static final String EMPTY_STRING = ""; //$NON-NLS-1$
private String fWorkingDir;
@@ -693,14 +694,18 @@
String osVersion;
String osArch;
- String encoding;
+ String encoding = DEFAULT_ENCODING;
String osName = executeCommand("uname", subMon.newChild(10)); //$NON-NLS-1$
switch (osName.toLowerCase()) {
case "linux": //$NON-NLS-1$
osArch = executeCommand("uname -m", subMon.newChild(10)); //$NON-NLS-1$
osVersion = executeCommand("uname -r", subMon.newChild(10)); //$NON-NLS-1$
- encoding = executeCommand("locale charmap", subMon.newChild(10)); //$NON-NLS-1$
+ try {
+ encoding = executeCommand("locale charmap", subMon.newChild(10)); //$NON-NLS-1$
+ } catch (RemoteConnectionException e) {
+ // Use default
+ }
break;
case "darwin": //$NON-NLS-1$
@@ -713,7 +718,11 @@
osArch = "x86_64"; //$NON-NLS-1$
}
}
- encoding = executeCommand("locale charmap", subMon.newChild(10)); //$NON-NLS-1$
+ try {
+ encoding = executeCommand("locale charmap", subMon.newChild(10)); //$NON-NLS-1$
+ } catch (RemoteConnectionException e) {
+ // Use default
+ }
break;
case "aix": //$NON-NLS-1$
@@ -728,13 +737,16 @@
osArch += "64"; //$NON-NLS-1$
}
}
- encoding = executeCommand("locale charmap", subMon.newChild(10)); //$NON-NLS-1$
+ try {
+ encoding = executeCommand("locale charmap", subMon.newChild(10)); //$NON-NLS-1$
+ } catch (RemoteConnectionException e) {
+ // Use default
+ }
break;
case "qnx": //$NON-NLS-1$
osArch = executeCommand("uname -p", subMon.newChild(10)); //$NON-NLS-1$
osVersion = executeCommand("uname -r", subMon.newChild(10)); //$NON-NLS-1$
- encoding = "UTF-8"; //$NON-NLS-1$
break;
default:
diff --git a/bundles/org.eclipse.remote.jsch.ui/pom.xml b/bundles/org.eclipse.remote.jsch.ui/pom.xml
index 01e932a..763a6b3 100644
--- a/bundles/org.eclipse.remote.jsch.ui/pom.xml
+++ b/bundles/org.eclipse.remote.jsch.ui/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.remote</groupId>
<artifactId>remote-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.1-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.remote.build/pom.xml</relativePath>
</parent>
diff --git a/bundles/org.eclipse.remote.proxy.core/pom.xml b/bundles/org.eclipse.remote.proxy.core/pom.xml
index 04cd0a6..532fe00 100644
--- a/bundles/org.eclipse.remote.proxy.core/pom.xml
+++ b/bundles/org.eclipse.remote.proxy.core/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.remote</groupId>
<artifactId>remote-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.1-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.remote.build/pom.xml</relativePath>
</parent>
diff --git a/bundles/org.eclipse.remote.proxy.protocol.core/pom.xml b/bundles/org.eclipse.remote.proxy.protocol.core/pom.xml
index ac47f7a..dc22a04 100644
--- a/bundles/org.eclipse.remote.proxy.protocol.core/pom.xml
+++ b/bundles/org.eclipse.remote.proxy.protocol.core/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.remote</groupId>
<artifactId>remote-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.1-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.remote.build/pom.xml</relativePath>
</parent>
diff --git a/bundles/org.eclipse.remote.proxy.server.core/pom.xml b/bundles/org.eclipse.remote.proxy.server.core/pom.xml
index 12d5183..36c61e0 100644
--- a/bundles/org.eclipse.remote.proxy.server.core/pom.xml
+++ b/bundles/org.eclipse.remote.proxy.server.core/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.remote</groupId>
<artifactId>remote-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.1-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.remote.build/pom.xml</relativePath>
</parent>
diff --git a/bundles/org.eclipse.remote.proxy.ui/pom.xml b/bundles/org.eclipse.remote.proxy.ui/pom.xml
index 5d8898e..f8b970d 100644
--- a/bundles/org.eclipse.remote.proxy.ui/pom.xml
+++ b/bundles/org.eclipse.remote.proxy.ui/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.remote</groupId>
<artifactId>remote-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.1-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.remote.build/pom.xml</relativePath>
</parent>
diff --git a/bundles/org.eclipse.remote.serial.core/pom.xml b/bundles/org.eclipse.remote.serial.core/pom.xml
index c2f606d..34c601d 100644
--- a/bundles/org.eclipse.remote.serial.core/pom.xml
+++ b/bundles/org.eclipse.remote.serial.core/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.remote</groupId>
<artifactId>remote-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.1-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.remote.build/pom.xml</relativePath>
</parent>
diff --git a/bundles/org.eclipse.remote.serial.ui/pom.xml b/bundles/org.eclipse.remote.serial.ui/pom.xml
index 8fde0d1..5dc9417 100644
--- a/bundles/org.eclipse.remote.serial.ui/pom.xml
+++ b/bundles/org.eclipse.remote.serial.ui/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.remote</groupId>
<artifactId>remote-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.1-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.remote.build/pom.xml</relativePath>
</parent>
diff --git a/bundles/org.eclipse.remote.telnet.core/pom.xml b/bundles/org.eclipse.remote.telnet.core/pom.xml
index c96080f..bde7f48 100644
--- a/bundles/org.eclipse.remote.telnet.core/pom.xml
+++ b/bundles/org.eclipse.remote.telnet.core/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.remote</groupId>
<artifactId>remote-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.1-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.remote.build/pom.xml</relativePath>
</parent>
diff --git a/bundles/org.eclipse.remote.telnet.ui/pom.xml b/bundles/org.eclipse.remote.telnet.ui/pom.xml
index e853e52..cbf9864 100644
--- a/bundles/org.eclipse.remote.telnet.ui/pom.xml
+++ b/bundles/org.eclipse.remote.telnet.ui/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.remote</groupId>
<artifactId>remote-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.1-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.remote.build/pom.xml</relativePath>
</parent>
diff --git a/bundles/org.eclipse.remote.ui/pom.xml b/bundles/org.eclipse.remote.ui/pom.xml
index 911bd19..480813e 100644
--- a/bundles/org.eclipse.remote.ui/pom.xml
+++ b/bundles/org.eclipse.remote.ui/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.remote</groupId>
<artifactId>remote-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.1-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.remote.build/pom.xml</relativePath>
</parent>
diff --git a/features/org.eclipse.remote-feature/feature.xml b/features/org.eclipse.remote-feature/feature.xml
index f551016..4c35e73 100644
--- a/features/org.eclipse.remote-feature/feature.xml
+++ b/features/org.eclipse.remote-feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.remote"
label="%featureName"
- version="3.0.0.qualifier"
+ version="3.0.1.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">
diff --git a/features/org.eclipse.remote-feature/pom.xml b/features/org.eclipse.remote-feature/pom.xml
index ac46a39..678cb68 100644
--- a/features/org.eclipse.remote-feature/pom.xml
+++ b/features/org.eclipse.remote-feature/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.remote</groupId>
<artifactId>remote-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.1-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.remote.build/pom.xml</relativePath>
</parent>
diff --git a/features/org.eclipse.remote.console-feature/feature.xml b/features/org.eclipse.remote.console-feature/feature.xml
index 5870852..d671ade 100644
--- a/features/org.eclipse.remote.console-feature/feature.xml
+++ b/features/org.eclipse.remote.console-feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.remote.console"
label="%featureName"
- version="3.0.0.qualifier"
+ version="3.0.1.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">
diff --git a/features/org.eclipse.remote.console-feature/pom.xml b/features/org.eclipse.remote.console-feature/pom.xml
index a6bf222..62518e1 100644
--- a/features/org.eclipse.remote.console-feature/pom.xml
+++ b/features/org.eclipse.remote.console-feature/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.remote</groupId>
<artifactId>remote-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.1-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.remote.build/pom.xml</relativePath>
</parent>
diff --git a/features/org.eclipse.remote.proxy-feature/feature.xml b/features/org.eclipse.remote.proxy-feature/feature.xml
index 526bd55..6c35c4c 100644
--- a/features/org.eclipse.remote.proxy-feature/feature.xml
+++ b/features/org.eclipse.remote.proxy-feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.remote.proxy"
label="%featureName"
- version="3.0.0.qualifier"
+ version="3.0.1.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">
diff --git a/features/org.eclipse.remote.proxy-feature/pom.xml b/features/org.eclipse.remote.proxy-feature/pom.xml
index 5de7d33..d19fc27 100644
--- a/features/org.eclipse.remote.proxy-feature/pom.xml
+++ b/features/org.eclipse.remote.proxy-feature/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.remote</groupId>
<artifactId>remote-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.1-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.remote.build/pom.xml</relativePath>
</parent>
diff --git a/features/org.eclipse.remote.serial-feature/feature.xml b/features/org.eclipse.remote.serial-feature/feature.xml
index d982463..5ed6f50 100644
--- a/features/org.eclipse.remote.serial-feature/feature.xml
+++ b/features/org.eclipse.remote.serial-feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.remote.serial"
label="%featureName"
- version="3.0.0.qualifier"
+ version="3.0.1.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">
diff --git a/features/org.eclipse.remote.serial-feature/pom.xml b/features/org.eclipse.remote.serial-feature/pom.xml
index b7e675c..feafc5a 100644
--- a/features/org.eclipse.remote.serial-feature/pom.xml
+++ b/features/org.eclipse.remote.serial-feature/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.remote</groupId>
<artifactId>remote-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.1-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.remote.build/pom.xml</relativePath>
</parent>
diff --git a/features/org.eclipse.remote.telnet-feature/feature.xml b/features/org.eclipse.remote.telnet-feature/feature.xml
index 49bfac6..e427006 100644
--- a/features/org.eclipse.remote.telnet-feature/feature.xml
+++ b/features/org.eclipse.remote.telnet-feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.remote.telnet"
label="%featureName"
- version="3.0.0.qualifier"
+ version="3.0.1.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">
diff --git a/features/org.eclipse.remote.telnet-feature/pom.xml b/features/org.eclipse.remote.telnet-feature/pom.xml
index 4305e87..f94f9c8 100644
--- a/features/org.eclipse.remote.telnet-feature/pom.xml
+++ b/features/org.eclipse.remote.telnet-feature/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.remote</groupId>
<artifactId>remote-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.1-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.remote.build/pom.xml</relativePath>
</parent>
diff --git a/releng/org.eclipse.remote.build/pom.xml b/releng/org.eclipse.remote.build/pom.xml
index a7a5106..19fafe7 100644
--- a/releng/org.eclipse.remote.build/pom.xml
+++ b/releng/org.eclipse.remote.build/pom.xml
@@ -10,12 +10,12 @@
<groupId>org.eclipse.remote</groupId>
<artifactId>remote-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Remote Parent</name>
<properties>
- <remote-release>3.0.0</remote-release>
+ <remote-release>3.0.1</remote-release>
<tycho-version>1.1.0</tycho-version>
<tycho-extras-version>${tycho-version}</tycho-extras-version>
<tycho.scmUrl>scm:git:git://git.eclipse.org/gitroot/ptp/org.eclipse.remote.git</tycho.scmUrl>
@@ -161,7 +161,7 @@
<artifact>
<groupId>org.eclipse.remote</groupId>
<artifactId>org.eclipse.remote.target</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.1-SNAPSHOT</version>
<classifier>photon</classifier>
</artifact>
</target>
diff --git a/releng/org.eclipse.remote.proxy.server.linux.ppc64le/pom.xml b/releng/org.eclipse.remote.proxy.server.linux.ppc64le/pom.xml
index d1df30c..2e0a07f 100644
--- a/releng/org.eclipse.remote.proxy.server.linux.ppc64le/pom.xml
+++ b/releng/org.eclipse.remote.proxy.server.linux.ppc64le/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.remote</groupId>
<artifactId>remote-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.1-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.remote.build/pom.xml</relativePath>
</parent>
diff --git a/releng/org.eclipse.remote.proxy.server.linux.x86_64/pom.xml b/releng/org.eclipse.remote.proxy.server.linux.x86_64/pom.xml
index 2cc2434..b8bdd70 100644
--- a/releng/org.eclipse.remote.proxy.server.linux.x86_64/pom.xml
+++ b/releng/org.eclipse.remote.proxy.server.linux.x86_64/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.remote</groupId>
<artifactId>remote-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.1-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.remote.build/pom.xml</relativePath>
</parent>
diff --git a/releng/org.eclipse.remote.proxy.server.macosx.x86_64/pom.xml b/releng/org.eclipse.remote.proxy.server.macosx.x86_64/pom.xml
index 9a05a5b..a58d110 100644
--- a/releng/org.eclipse.remote.proxy.server.macosx.x86_64/pom.xml
+++ b/releng/org.eclipse.remote.proxy.server.macosx.x86_64/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.remote</groupId>
<artifactId>remote-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.1-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.remote.build/pom.xml</relativePath>
</parent>
diff --git a/releng/org.eclipse.remote.proxy.server.product/pom.xml b/releng/org.eclipse.remote.proxy.server.product/pom.xml
index 457342f..c8821f1 100644
--- a/releng/org.eclipse.remote.proxy.server.product/pom.xml
+++ b/releng/org.eclipse.remote.proxy.server.product/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.remote</groupId>
<artifactId>remote-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.1-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.remote.build/pom.xml</relativePath>
</parent>
diff --git a/releng/org.eclipse.remote.repo/pom.xml b/releng/org.eclipse.remote.repo/pom.xml
index 1657b84..3fa927f 100644
--- a/releng/org.eclipse.remote.repo/pom.xml
+++ b/releng/org.eclipse.remote.repo/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.remote</groupId>
<artifactId>remote-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.1-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.remote.build/pom.xml</relativePath>
</parent>
diff --git a/releng/org.eclipse.remote.target/pom.xml b/releng/org.eclipse.remote.target/pom.xml
index 7b7421c..9ea5964 100644
--- a/releng/org.eclipse.remote.target/pom.xml
+++ b/releng/org.eclipse.remote.target/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.remote</groupId>
<artifactId>remote-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.1-SNAPSHOT</version>
<relativePath>../org.eclipse.remote.build/pom.xml</relativePath>
</parent>
