[prev in list] [next in list] [prev in thread] [next in thread] 

List:       openejb-cvs
Subject:    tomee git commit: Detect java version and act on it. After java 11: - Remove jre references because 
From:       jgallimore () apache ! org
Date:       2018-10-24 13:03:15
Message-ID: ed0d002835fa4a41b1a8678eabd1e523 () git ! apache ! org
[Download RAW message or body]

Repository: tomee
Updated Branches:
  refs/heads/tomee-7.1.x ba15cc22c -> 43774cc82


Detect java version and act on it. After java 11: - Remove jre references because \
they are invalid when using the JDK. - Remove endorced property def. because is no \
longer supported.

Signed-off-by: brunobat <brunobat@gmail.com>


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/43774cc8
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/43774cc8
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/43774cc8

Branch: refs/heads/tomee-7.1.x
Commit: 43774cc82aa3afa4c204db6184a37412acde3582
Parents: ba15cc2
Author: brunobat <brunobat@gmail.com>
Authored: Tue Oct 23 12:14:22 2018 +0100
Committer: Jonathan Gallimore <jon@jrg.me.uk>
Committed: Wed Oct 24 15:02:58 2018 +0200

----------------------------------------------------------------------
 .../apache-tomee/src/main/resources/service.bat | 26 ++++++++++++++------
 1 file changed, 19 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tomee/blob/43774cc8/tomee/apache-tomee/src/main/resources/service.bat
                
----------------------------------------------------------------------
diff --git a/tomee/apache-tomee/src/main/resources/service.bat \
b/tomee/apache-tomee/src/main/resources/service.bat index 900526b..3483e98 100644
--- a/tomee/apache-tomee/src/main/resources/service.bat
+++ b/tomee/apache-tomee/src/main/resources/service.bat
@@ -90,11 +90,18 @@ if not exist "%JRE_HOME%\bin\java.exe" goto noJavaHome
 if not exist "%JRE_HOME%\bin\javaw.exe" goto noJavaHome
 goto okJavaHome
 :gotJdkHome
-if not exist "%JAVA_HOME%\jre\bin\java.exe" goto noJavaHome
-if not exist "%JAVA_HOME%\jre\bin\javaw.exe" goto noJavaHome
+for /f tokens^=2-5^ delims^=.-_^" %%j in ('%JAVA_HOME%\bin\java.exe -fullversion \
2^>^&1') do set "JAVA_MAJOR_VERSION=%%j" +if JAVA_MAJOR_VERSION lss 11 (
+    if not exist "%JAVA_HOME%\jre\bin\java.exe" goto noJavaHome
+    if not exist "%JAVA_HOME%\jre\bin\javaw.exe" goto noJavaHome
+)
 if not exist "%JAVA_HOME%\bin\javac.exe" goto noJavaHome
 if not "%JRE_HOME%" == "" goto okJavaHome
-set "JRE_HOME=%JAVA_HOME%\jre"
+if %JAVA_MAJOR_VERSION% lss 11 (
+    set "JRE_HOME=%JAVA_HOME%\jre"
+) else (
+    set "JRE_HOME=%JAVA_HOME%"
+)
 goto okJavaHome
 :noJavaHome
 echo The JAVA_HOME environment variable is not defined correctly
@@ -190,9 +197,9 @@ echo Using JVM:              "%PR_JVM%"
     --StopMode jvm ^
     --LogLevel Info ^
     --LogPrefix TomEE
-    
+
 echo Installed, will now configure TomEE
-    
+
 if not errorlevel 1 goto installed
 echo Failed installing '%SERVICE_NAME%' service
 goto end
@@ -207,8 +214,13 @@ set PR_CLASSPATH=
 set PR_JVM=
 
 rem Set extra parameters
-"%EXECUTABLE%" //US//%SERVICE_NAME% ^
-	++JvmOptions "-javaagent:%CATALINA_HOME%\lib\openejb-javaagent.jar;-Dcatalina.base=% \
CATALINA_BASE%;-Dcatalina.home=%CATALINA_HOME%;-Djava.endorsed.dirs=%CATALINA_HOME%\endorsed"
 +if %JAVA_MAJOR_VERSION% lss 11 (
+    "%EXECUTABLE%" //US//%SERVICE_NAME% ^
+    	++JvmOptions "-javaagent:%CATALINA_HOME%\lib\openejb-javaagent.jar;-Dcatalina.ba \
se=%CATALINA_BASE%;-Dcatalina.home=%CATALINA_HOME%;-Djava.endorsed.dirs=%CATALINA_HOME%\endorsed"
 +) else (
+    "%EXECUTABLE%" //US//%SERVICE_NAME% ^
+	    ++JvmOptions "-javaagent:%CATALINA_HOME%\lib\openejb-javaagent.jar;-Dcatalina.base=%CATALINA_BASE%;-Dcatalina.home=%CATALINA_HOME%"
 +)
 
 rem More extra parameters
 set "PR_LOGPATH=%CATALINA_BASE%\logs"


[prev in list] [next in list] [prev in thread] [next in thread]