You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@chemistry.apache.org by fm...@apache.org on 2017/11/12 11:53:19 UTC

svn commit: r1815006 - in /chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/start: runscript.bat workbench.bat

Author: fmui
Date: Sun Nov 12 11:53:19 2017
New Revision: 1815006

URL: http://svn.apache.org/viewvc?rev=1815006&view=rev
Log:
CMIS-1046: fixed workbench.bat

Modified:
    chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/start/runscript.bat
    chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/start/workbench.bat

Modified: chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/start/runscript.bat
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/start/runscript.bat?rev=1815006&r1=1815005&r2=1815006&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/start/runscript.bat (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/start/runscript.bat Sun Nov 12 11:53:19 2017
@@ -25,8 +25,11 @@ rem set https_proxy=https://<proxy>:<por
 rem set no_proxy=localhost,127.0.0.0,.local
 
 
-for /F "delims=/" %%x in ('"java -classpath .;%~dp0\lib\* org.apache.chemistry.opencmis.workbench.JavaDetector"') do set "JAVA_VERSION_OPTS=%%x"
-for /F "delims=/" %%x in ('"java -classpath .;%~dp0\lib\* org.apache.chemistry.opencmis.workbench.ProxyDetector -j -s"') do set "JAVA_PROXY_CONF=%%x"
+set JAVADETECTOR_CMD=java -classpath ".;%~dp0\lib\*" org.apache.chemistry.opencmis.workbench.JavaDetector
+for /F "delims=/" %%x in ('%JAVADETECTOR_CMD%') do set "JAVA_VERSION_OPTS=%%x"
+set PROXY_CMD=java -classpath ".;%~dp0\lib\*" org.apache.chemistry.opencmis.workbench.ProxyDetector -j -s
+for /F "delims=/" %%x in ('%PROXY_CMD%') do set "JAVA_PROXY_CONF=%%x"
+
 set JAVA_OPTS=%JAVA_VERSION_OPTS% %JAVA_PROXY_CONF%
 
 java %JAVA_OPTS% %CUSTOM_JAVA_OPTS% -classpath ".;%~dp0\lib\*" org.apache.chemistry.opencmis.script.ScriptExecutor %*
\ No newline at end of file

Modified: chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/start/workbench.bat
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/start/workbench.bat?rev=1815006&r1=1815005&r2=1815006&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/start/workbench.bat (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/start/workbench.bat Sun Nov 12 11:53:19 2017
@@ -25,8 +25,11 @@ rem set https_proxy=https://<proxy>:<por
 rem set no_proxy=localhost,127.0.0.0,.local
 
 
-for /F "delims=/" %%x in ('"java -classpath .;%~dp0\lib\* org.apache.chemistry.opencmis.workbench.JavaDetector"') do set "JAVA_VERSION_OPTS=%%x"
-for /F "delims=/" %%x in ('"java -classpath .;%~dp0\lib\* org.apache.chemistry.opencmis.workbench.ProxyDetector -j -s"') do set "JAVA_PROXY_CONF=%%x"
+set JAVADETECTOR_CMD=java -classpath ".;%~dp0\lib\*" org.apache.chemistry.opencmis.workbench.JavaDetector
+for /F "delims=/" %%x in ('%JAVADETECTOR_CMD%') do set "JAVA_VERSION_OPTS=%%x"
+set PROXY_CMD=java -classpath ".;%~dp0\lib\*" org.apache.chemistry.opencmis.workbench.ProxyDetector -j -s
+for /F "delims=/" %%x in ('%PROXY_CMD%') do set "JAVA_PROXY_CONF=%%x"
+
 set JAVA_OPTS=%JAVA_VERSION_OPTS% %JAVA_PROXY_CONF%
 
 start /B javaw %JAVA_OPTS% %CUSTOM_JAVA_OPTS% -classpath ".;%~dp0\lib\*" org.apache.chemistry.opencmis.workbench.Workbench
\ No newline at end of file