Bug 540324: [RJ-Server] Add jcommons.util bundle to server dependencies
Change-Id: I571784853e3b6979cf38fea09bdf2452be6fe015
diff --git a/core/_build/org.eclipse.statet.rj.server-consoleserver/pom.xml b/core/_build/org.eclipse.statet.rj.server-consoleserver/pom.xml
index 0bfc76c..c76aa11 100644
--- a/core/_build/org.eclipse.statet.rj.server-consoleserver/pom.xml
+++ b/core/_build/org.eclipse.statet.rj.server-consoleserver/pom.xml
@@ -34,6 +34,12 @@
<version>2.1.0-SNAPSHOT</version>
<type>eclipse-plugin</type>
</dependency>
+ <dependency>
+ <groupId>org.eclipse.statet.commons</groupId>
+ <artifactId>org.eclipse.statet.jcommons.util</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <type>eclipse-plugin</type>
+ </dependency>
</dependencies>
<build>
diff --git a/core/_build/org.eclipse.statet.rj.server-consoleserver/server.xml b/core/_build/org.eclipse.statet.rj.server-consoleserver/server.xml
index b0dda9e..05e16fa 100644
--- a/core/_build/org.eclipse.statet.rj.server-consoleserver/server.xml
+++ b/core/_build/org.eclipse.statet.rj.server-consoleserver/server.xml
@@ -45,6 +45,7 @@
<includes>
<include>org.eclipse.statet.rj:org.eclipse.statet.rj.data</include>
<include>org.eclipse.statet.rj:org.eclipse.statet.rj.server</include>
+ <include>org.eclipse.statet.commons:org.eclipse.statet.jcommons.util</include>
</includes>
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
</dependencySet>
diff --git a/core/org.eclipse.statet.rj.server.remotetools/startup.ps1 b/core/org.eclipse.statet.rj.server.remotetools/startup.ps1
index bcc4170..bd0f65a 100644
--- a/core/org.eclipse.statet.rj.server.remotetools/startup.ps1
+++ b/core/org.eclipse.statet.rj.server.remotetools/startup.ps1
@@ -109,7 +109,7 @@
# R_SHARE_DIR="/usr/share/R"
# R_INCLUDE_DIR="/usr/include/R"
# R_LIBS_SITE="/usr/local/lib/R/site-library"
-# JAVA_HOME="C:\Program Files\Java\jdk1.8.0"
+# JAVA_HOME="C:\Program Files\Java\jdk-1.8.0"
$R_HOME=""
$R_ARCH="/x64"
@@ -338,11 +338,11 @@
$JAVA_EXE="$JAVA_HOME/bin/java.exe"
if ( $DEV )
{
- $JAVA_CP="$RJS_BOOT_CP$PATH_SEP$RJS_HOME/../org.eclipse.statet.rj.server/bin$PATH_SEP$RJS_HOME/../org.eclipse.statet.rj.data/bin$PATH_SEP$RJS_HOME/bin$PATH_SEP$RJS_HOME/binShaj"
+ $JAVA_CP="$RJS_BOOT_CP$PATH_SEP$RJS_HOME/../org.eclipse.statet.rj.server/bin$PATH_SEP$RJS_HOME/../org.eclipse.statet.rj.data/bin$PATH_SEP$RJS_HOME/../org.eclipse.statet.jcommons.util/bin$PATH_SEP$RJS_HOME/bin$PATH_SEP$RJS_HOME/binShaj"
$RMI_BASE="file://$RJS_HOME/../org.eclipse.statet.rj.server/bin"
$RJAVA_CP=""
} else {
- $JAVA_CP="$RJS_BOOT_CP$PATH_SEP$RJS_HOME/org.eclipse.statet.rj.server.jar$PATH_SEP$RJS_HOME/org.eclipse.statet.rj.data.jar$PATH_SEP$JAVA_CP"
+ $JAVA_CP="$RJS_BOOT_CP$PATH_SEP$RJS_HOME/org.eclipse.statet.rj.server.jar$PATH_SEP$RJS_HOME/org.eclipse.statet.rj.data.jar$PATH_SEP$RJS_HOME/org.eclipse.statet.jcommons.util.jar$PATH_SEP$JAVA_CP"
$RMI_BASE="file://$RJS_HOME/org.eclipse.statet.rj.server.jar"
$RJAVA_CP=""
}
@@ -382,17 +382,17 @@
if ( $DEBUG ) {
# Set-ExecutionPolicy RemoteSigned -Scope Process -Force
- echo "S_HOSTADDRESS = $S_HOSTADDRESS"
- echo "S_REGISTRY_PORT = $S_REGISTRY_PORT"
- echo "PATH = $PATH"
- echo "LD_LIBRARY_PATH = $LD_LIBRARY_PATH"
- echo "R_HOME = $R_HOME"
- echo "R_ARCH = $R_ARCH"
- echo "JAVA_HOME = $JAVA_HOME"
- echo "JAVA_EXE = $JAVA_EXE"
- echo "CLASSPATH = $JAVA_CP"
- echo "JAVA_OPTIONS = $JAVA_OPTS"
- echo "AUTH = $AUTH"
+ echo "S_HOSTADDRESS= $S_HOSTADDRESS"
+ echo "S_REGISTRY_PORT= $S_REGISTRY_PORT"
+ echo "PATH= $PATH"
+ echo "LD_LIBRARY_PATH= $LD_LIBRARY_PATH"
+ echo "R_HOME= $R_HOME"
+ echo "R_ARCH= $R_ARCH"
+ echo "JAVA_HOME= $JAVA_HOME"
+ echo "JAVA_EXE= $JAVA_EXE"
+ echo "CLASSPATH= $JAVA_CP"
+ echo "JAVA_OPTIONS= $JAVA_OPTS"
+ echo "AUTH= $AUTH"
# Start server directly
& $JAVA_EXE $START_ARGS
diff --git a/core/org.eclipse.statet.rj.server.remotetools/startup.sh b/core/org.eclipse.statet.rj.server.remotetools/startup.sh
index f99ce74..7bc2529 100644
--- a/core/org.eclipse.statet.rj.server.remotetools/startup.sh
+++ b/core/org.eclipse.statet.rj.server.remotetools/startup.sh
@@ -123,7 +123,7 @@
# R_SHARE_DIR="/usr/share/R"
# R_INCLUDE_DIR="/usr/include/R"
# R_LIBS_SITE="/usr/local/lib/R/site-library"
-# JAVA_HOME="/usr/lib/jvm/java-6-sun"
+# JAVA_HOME="/usr/lib/jvm/java-1.8.0-openjdk"
R_HOME=
JAVA_HOME=
@@ -349,11 +349,11 @@
## Java config
JAVA_EXE="$JAVA_HOME/bin/java"
if [ $DEV ]; then
- JAVA_CP="$RJS_BOOT_CP$PATH_SEP$RJS_HOME/../org.eclipse.statet.rj.server/bin$PATH_SEP$RJS_HOME/../org.eclipse.statet.rj.data/bin$PATH_SEP$RJS_HOME/bin$PATH_SEP$RJS_HOME/binShaj"
+ JAVA_CP="$RJS_BOOT_CP$PATH_SEP$RJS_HOME/../org.eclipse.statet.rj.server/bin$PATH_SEP$RJS_HOME/../org.eclipse.statet.rj.data/bin$PATH_SEP$RJS_HOME/../org.eclipse.statet.jcommons.util/bin$PATH_SEP$RJS_HOME/bin$PATH_SEP$RJS_HOME/binShaj"
RMI_BASE="file://$RJS_HOME/../org.eclipse.statet.rj.server/bin"
RJAVA_CP=
else
- JAVA_CP="$RJS_BOOT_CP$PATH_SEP$RJS_HOME/org.eclipse.statet.rj.server.jar$PATH_SEP$RJS_HOME/org.eclipse.statet.rj.data.jar$PATH_SEP$JAVA_CP"
+ JAVA_CP="$RJS_BOOT_CP$PATH_SEP$RJS_HOME/org.eclipse.statet.rj.server.jar$PATH_SEP$RJS_HOME/org.eclipse.statet.rj.data.jar$PATH_SEP$RJS_HOME/org.eclipse.statet.jcommons.util.jar$PATH_SEP$JAVA_CP"
RMI_BASE="file://$RJS_HOME/org.eclipse.statet.rj.server.jar"
RJAVA_CP=
fi
diff --git a/core/org.eclipse.statet.rj.server/src/org/eclipse/statet/rj/server/util/ServerUtils.java b/core/org.eclipse.statet.rj.server/src/org/eclipse/statet/rj/server/util/ServerUtils.java
index 5674c04..401b517 100644
--- a/core/org.eclipse.statet.rj.server/src/org/eclipse/statet/rj/server/util/ServerUtils.java
+++ b/core/org.eclipse.statet.rj.server/src/org/eclipse/statet/rj/server/util/ServerUtils.java
@@ -34,8 +34,9 @@
public class ServerUtils {
- public static final String RJ_DATA_ID= "org.eclipse.statet.rj.data";
- public static final String RJ_SERVER_ID= "org.eclipse.statet.rj.server";
+ public static final String RJ_DATA_ID= "org.eclipse.statet.rj.data"; //$NON-NLS-1$
+ public static final String RJ_SERVER_ID= "org.eclipse.statet.rj.server"; //$NON-NLS-1$
+ public static final String JCOMMONS_UTIL_ID= "org.eclipse.statet.jcommons.util"; //$NON-NLS-1$
public static final int[] RJ_VERSION= new int[] { 3, 0, 0 };
diff --git a/servi/org.eclipse.statet.rj.servi/src/org/eclipse/statet/rj/servi/node/RServiImpl.java b/servi/org.eclipse.statet.rj.servi/src/org/eclipse/statet/rj/servi/node/RServiImpl.java
index 7a9f197..0c48a17 100644
--- a/servi/org.eclipse.statet.rj.servi/src/org/eclipse/statet/rj/servi/node/RServiImpl.java
+++ b/servi/org.eclipse.statet.rj.servi/src/org/eclipse/statet/rj/servi/node/RServiImpl.java
@@ -14,6 +14,7 @@
package org.eclipse.statet.rj.servi.node;
+import static org.eclipse.statet.rj.server.util.ServerUtils.JCOMMONS_UTIL_ID;
import static org.eclipse.statet.rj.server.util.ServerUtils.RJ_DATA_ID;
import static org.eclipse.statet.rj.server.util.ServerUtils.RJ_SERVER_ID;
import static org.eclipse.statet.rj.servi.RServiUtil.RJ_SERVI_ID;
@@ -38,7 +39,7 @@
private static final ImList<String> LIB_IDS= ImCollections.newList(
- RJ_DATA_ID, RJ_SERVER_ID, RJ_SERVI_ID );
+ RJ_SERVI_ID, RJ_SERVER_ID, RJ_DATA_ID, JCOMMONS_UTIL_ID );
/**
