Windows package with embedded JRE (#2486)

* packaging changes for self contained jre for windows

* Updating the path for JRE

* add jre path in settings file

* added profiles for two diferent windows packages build

* removing commented duplicate code

* Build windows package without an embedded JRE by default

Co-authored-by: Antonin Delpeuch <antonin@delpeuch.eu>

packaging/pom.xml

@@ -19,6 +19,12 @@
     <webapp.target>../main/target</webapp.target>
     <icon.path>../graphics/icon/openrefine.icns</icon.path>
     <mac.jre.path>/opt/jre1.8.0_181.jre</mac.jre.path>
+
+    <!-- default options for windows: no embedded JRE. Use the "embedded-jre" from ../settings.xml to add a JRE -->
+    <windows.package.jre.path>%JAVA_HOME%;%PATH%</windows.package.jre.path>
+    <windows.package.jre.directory>null</windows.package.jre.directory>
+    <windows.package.jre.outputDirectory>jre</windows.package.jre.outputDirectory>
+    <windows.package.jre.prefix></windows.package.jre.prefix>
   </properties>
 
   <profiles>
@@ -305,7 +311,7 @@
                 <postCp>server/target/lib/*.jar</postCp>
               </classPath>
               <jre>
-                <path>%JAVA_HOME%;%PATH%</path>
+                <path>${windows.package.jre.path}</path>
                 <minVersion>1.8.0</minVersion>
                 <bundledJreAsFallback>true</bundledJreAsFallback>
                 <initialHeapSize>512</initialHeapSize>

packaging/windows.xml

@@ -1,11 +1,18 @@
 <assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	  xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
-  <id>win-${project.version}</id>
+  <id>win-${windows.package.jre.prefix}${project.version}</id>
   <formats>
     <format>zip</format>
   </formats>
   <baseDirectory>${project.build.finalName}-${project.version}</baseDirectory>
   <fileSets>
+   <fileSet>
+    <directory>${windows.package.jre.directory}</directory>
+    <outputDirectory>${windows.package.jre.outputDirectory}</outputDirectory>
+    <includes>
+    <include>**</include>
+    </includes>
+   </fileSet>
     <fileSet>
       <directory>${rootdir}/server/target/lib</directory>
       <outputDirectory>server/target/lib</outputDirectory>
@@ -23,7 +30,6 @@
     <fileSet>
       <directory>${rootdir}/main/webapp</directory>
       <outputDirectory>webapp</outputDirectory>
-      
       <excludes>
 	<exclude>**/*.java</exclude>
 	<exclude>**/butterfly.properties</exclude>

settings.xml

@@ -0,0 +1,25 @@
+<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
+      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+      xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
+                          http://maven.apache.org/xsd/settings-1.0.0.xsd">
+  <profiles>
+    <profile>
+      <id>inject-windows-jre-home</id>
+      <properties>
+        <windows.jre.home>C:\jre1.8.0_241</windows.jre.home>
+      </properties>
+    </profile>
+    <profile>
+      <id>embedded-jre</id>
+      <properties>
+        <windows.package.jre.path>server/target/jre</windows.package.jre.path>
+        <windows.package.jre.directory>${windows.jre.home}</windows.package.jre.directory>
+        <windows.package.jre.outputDirectory>server/target/jre</windows.package.jre.outputDirectory>
+        <windows.package.jre.prefix>with-java-</windows.package.jre.prefix>
+      </properties>
+    </profile>
+  </profiles>
+  <activeProfiles>
+    <activeProfile>inject-windows-jre-home</activeProfile>
+  </activeProfiles>
+  </settings>