[Remoterengine-commits] r124 - pkg/RemoteREngine/inst/java_src/bin

[noreply at r-forge.r-project.org]

Author: ian_long
Date: 2009-09-10 19:56:41 +0200 (Thu, 10 Sep 2009)
New Revision: 124

Added:
   pkg/RemoteREngine/inst/java_src/bin/readme.txt
Modified:
   pkg/RemoteREngine/inst/java_src/bin/startserver.bat
   pkg/RemoteREngine/inst/java_src/bin/testclient.bat
Log:
Batch files tweaked - unfortunately they still contain an environment specific path to set the java.rmi.server.codebase
Also a readme.txt file to help remind us about the required parameters

Added: pkg/RemoteREngine/inst/java_src/bin/readme.txt
===================================================================
--- pkg/RemoteREngine/inst/java_src/bin/readme.txt	                        (rev 0)
+++ pkg/RemoteREngine/inst/java_src/bin/readme.txt	2009-09-10 17:56:41 UTC (rev 124)
@@ -0,0 +1,9 @@
+The Java arguments required to start the server are as follows:
+java -cp D:\eclipse\REngine\pkg\RemoteREngine\inst\java\RemoteREngine-server.jar 
+-Xmx1024M 
+-Drjava.path=C:\Progra~1\R\R-2.9.0\library\rJava\java 
+-Drjava.class.path=C:\Progra~1\R\R-2.9.0\library\rJava\java\boot;C:\Progra~1\R\R-2.9.0\library\rJava\java 
+-Djava.security.policy=D:\eclipse\REngine\pkg\RemoteREngine\inst\policy\server.policy 
+-Djava.library.path=C:\Progra~1\R\R-2.8.1\library\rJava\jri 
+-Djava.rmi.server.codebase=file:/D:/eclipse/REngine/pkg/RemoteREngine/inst/java/RemoteREngine-server.jar 
+org.rosuda.REngine.remote.server.REngineServer


Property changes on: pkg/RemoteREngine/inst/java_src/bin/readme.txt
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Modified: pkg/RemoteREngine/inst/java_src/bin/startserver.bat
===================================================================
--- pkg/RemoteREngine/inst/java_src/bin/startserver.bat	2009-09-10 17:54:39 UTC (rev 123)
+++ pkg/RemoteREngine/inst/java_src/bin/startserver.bat	2009-09-10 17:56:41 UTC (rev 124)
@@ -1,11 +1,13 @@
 rem Set jvm heap initial and maximum sizes (in megabytes).
 set JAVA_HEAP_MAX_SIZE=1024
-set CODEBASE=file:%DEFAULTDIR%\java\RemoteREngine-server.jar
 
 
 set CURRENTDIR=%cd%
-cd ..\..\inst
+cd ..\..\..\inst
 set defaultdir=%cd%
+set RJAVA_CLASSPATH=%R_HOME%\library\rJava\java\boot;%R_HOME%\library\rJava\java
+set CODEBASE=%DEFAULTDIR%\java\RemoteREngine-server.jar
+set RMICODEBASE=file:/D:/eclipse/REngine/pkg/RemoteREngine/inst/java/RemoteREngine-server.jar
 cd %CURRENTDIR%
 
 IF EXIST %R_HOME% GOTO CHECK_JRI
@@ -18,7 +20,7 @@
  GOTO END
 
 :RUN 
-java -cp %DEFAULTDIR%\java\RemoteREngine-server.jar -Xmx%JAVA_HEAP_MAX_SIZE%M -Drjava.path=%R_HOME%\library\rJava -Drjava.class.path=%R_HOME%\library\rJava\java\boot;%R_HOME%\library\rJava\java -Djava.security.policy=server.policy -Djava.library.path=%LD_LIBRARY_PATH% -Djava.rmi.server.codebase=%CODEBASE% org.rosuda.REngine.remote.server.REngineServer %1 %2 %3 %4 %5 %6
+java -cp %CODEBASE% -Xmx%JAVA_HEAP_MAX_SIZE%M -Drjava.path=%R_HOME%\library\rJava\java -Drjava.class.path=%RJAVA_CLASSPATH% -Djava.security.policy=%DEFAULTDIR%\policy\server.policy -Djava.library.path=%LD_LIBRARY_PATH% -Djava.rmi.server.codebase=%RMICODEBASE% org.rosuda.REngine.remote.server.REngineServer %1 %2 %3 %4 %5 %6
 )
 :END
 

Modified: pkg/RemoteREngine/inst/java_src/bin/testclient.bat
===================================================================
--- pkg/RemoteREngine/inst/java_src/bin/testclient.bat	2009-09-10 17:54:39 UTC (rev 123)
+++ pkg/RemoteREngine/inst/java_src/bin/testclient.bat	2009-09-10 17:56:41 UTC (rev 124)
@@ -1,3 +1,9 @@
-set DIR=..\..\inst
-java -cp %DIR%/java/RemoteREngine-client.jar -Djava.rmi.server.codebase=file:%DIR%\client.jar -Djava.security.policy=../../inst/policy/client.policy org.rosuda.REngine.remote.client.test.RemoteREngineTest
+set CURRENTDIR=%cd%
+cd ..\..\..\inst
+set DEFAULTDIR=%cd%
+set CODEBASE=%DEFAULTDIR%\java\RemoteREngine-client-junit.jar
+set RMICODEBASE=file:/D:/eclipse/REngine/pkg/RemoteREngine/inst/java/RemoteREngine-client-junit.jar
+cd %CURRENTDIR%
 
+java -cp %CODEBASE% -Djava.rmi.server.codebase=%RMICODEBASE% -Djava.security.policy=%DEFAULTDIR%/policy/client.policy org.rosuda.REngine.remote.client.test.RemoteREngineTest
+