Integrated changes made by Paul

Author: kayyagari

tools/install4j/oie-installer-config.install4j

@@ -16,7 +16,31 @@
       <mountPoint id="24" />
     </mountPoints>
     <entries>
-      <dirEntry mountPoint="24" file="${compiler:installer:mediaRoot}/server/setup" subDirectory="setup" />
+      <dirEntry mountPoint="24" file="${compiler:installer:mediaRoot}/server/setup" subDirectory="setup">
+        <exclude>
+          <entry location="oieserver.vmoptions" />
+          <entry location="oieservice.vmoptions" />
+          <entry location="conf" />
+        </exclude>
+      </dirEntry>
+      <dirEntry mountPoint="24" file="${compiler:installer:mediaRoot}/server/setup" overwriteMode="0" uninstallMode="1" overrideOverwriteMode="true" overrideUninstallMode="true">
+        <exclude>
+          <entry location="server-lib" />
+          <entry location="webapps" />
+          <entry location="mirth-manager-launcher.jar" />
+          <entry location="public_html" />
+          <entry location="cli-lib" />
+          <entry location="server-launcher-lib" />
+          <entry location="mirth-server-launcher.jar" />
+          <entry location="public_api_html" />
+          <entry location="docs" />
+          <entry location="extensions" />
+          <entry location="manager-lib" />
+          <entry location="mirth-cli-launcher.jar" />
+          <entry location="logs" />
+          <entry location="client-lib" />
+        </exclude>
+      </dirEntry>
     </entries>
   </files>
   <launchers>
@@ -81,13 +105,14 @@
         <startup>
           <screen id="1" beanClass="com.install4j.runtime.beans.screens.StartupScreen" rollbackBarrierExitCode="0">
             <actions>
-              <action id="22" beanClass="com.install4j.runtime.beans.actions.misc.RequestPrivilegesAction" actionElevationType="none" rollbackBarrierExitCode="0">
+              <action id="22" beanClass="com.install4j.runtime.beans.actions.misc.RequestPrivilegesAction" actionElevationType="none" rollbackBarrierExitCode="0" failureStrategy="ask">
                 <serializedBean>
                   <property name="failIfNotObtainedLinux" type="boolean" value="true" />
-                  <property name="failIfNotObtainedMac" type="boolean" value="false" />
                   <property name="linuxPrivilegeRequirement" type="enum" class="com.install4j.runtime.beans.actions.misc.PrivilegeRequirement" value="OBTAIN" />
-                  <property name="obtainIfAdminWin" type="boolean" value="false" />
+                  <property name="obtainIfAdminMac" type="boolean" value="true" />
+                  <property name="obtainIfNormalMac" type="boolean" value="true" />
                   <property name="obtainIfNormalWin" type="boolean" value="true" />
+                  <property name="updateInstallationDirectory" type="boolean" value="false" />
                 </serializedBean>
               </action>
             </actions>
@@ -245,6 +270,7 @@ return console.askOkCancel(message, true);
   &lt;p&gt;
     This release is recommended for users already familiar with Mirth Connect. 
     It installs a fully functional version of the engine with minimal prompts.
+    As you have seen - this does require admin permissions to run and install services, we will be updating that!
   &lt;/p&gt;
   &lt;h2&gt;Notes&lt;/h2&gt;
   &lt;ul&gt;
@@ -365,50 +391,12 @@ return true;
                   <property name="itemName" type="string">${compiler:sys.fullName} ${compiler:sys.version}</property>
                 </serializedBean>
               </action>
-              <action id="26" beanClass="com.install4j.runtime.beans.actions.services.InstallServiceAction" actionElevationType="elevated" rollbackBarrierExitCode="0">
+              <action id="26" beanClass="com.install4j.runtime.beans.actions.services.InstallServiceAction" actionElevationType="elevated" rollbackBarrierExitCode="0" failureStrategy="ask">
                 <serializedBean>
                   <property name="launcherId" type="string">25</property>
                   <property name="macosIdentifier" type="string">com.oie.oieservice</property>
                 </serializedBean>
               </action>
-              <action id="51" beanClass="com.install4j.runtime.beans.actions.text.WriteTextFileAction" enabled="false" actionElevationType="elevated" rollbackBarrierExitCode="0">
-                <serializedBean>
-                  <property name="file">
-                    <object class="java.io.File">
-                      <string>${compiler:sys.fullName} Server.vmoptions</string>
-                    </object>
-                  </property>
-                  <property name="text" type="string"># Lines begining with a # are ignored as comments.
-# Do not add customizations to this file.
-
--include-options conf/base_includes.vmoptions
-
-# Comment out the following line if you are running on Java 8
--include-options conf/default_modules.vmoptions
-
-# Put any custom options in the following file
--include-options conf/custom.vmoptions</property>
-                </serializedBean>
-              </action>
-              <action id="52" beanClass="com.install4j.runtime.beans.actions.text.WriteTextFileAction" enabled="false" actionElevationType="elevated" rollbackBarrierExitCode="0">
-                <serializedBean>
-                  <property name="file">
-                    <object class="java.io.File">
-                      <string>${compiler:sys.fullName} Server.vmoptions</string>
-                    </object>
-                  </property>
-                  <property name="text" type="string"># Lines begining with a # are ignored as comments.
-# Do not add customizations to this file.
-
--include-options conf/base_includes.vmoptions
-
-# Comment out the following line if you are running on Java 8
--include-options conf/default_modules.vmoptions
-
-# Put any custom options in the following file
--include-options conf/custom.vmoptions</property>
-                </serializedBean>
-              </action>
             </actions>
             <formComponents>
               <formComponent id="16" beanClass="com.install4j.runtime.beans.formcomponents.ProgressComponent">
@@ -725,22 +713,23 @@ return console.askYesNo(message, true);
     </styles>
   </installerGui>
   <mediaSets>
-    <windows name="Windows" id="27" mediaFileName="${compiler:sys.fullName}_${compiler:sys.platform}_${compiler:sys.version}" installDir="OpenIntegrationEngine" architecture="64">
+    <windows name="Windows x64" id="27" mediaFileName="${compiler:sys.fullName}_${compiler:sys.platform}_${compiler:sys.version}" installDir="OpenIntegrationEngine" architecture="64">
       <excludedLaunchers>
         <launcher id="56" />
       </excludedLaunchers>
-      <jreBundle jreBundleSource="none" />
+      <jreBundle usePack200="false" jreBundleSource="none" />
     </windows>
     <unixInstaller name="Unix Installer" id="42" mediaFileName="${compiler:sys.fullName}_${compiler:sys.platform}_${compiler:sys.version}">
       <excludedLaunchers>
         <launcher id="56" />
       </excludedLaunchers>
+      <jreBundle usePack200="false" jreBundleSource="none" />
     </unixInstaller>
     <macosFolder name="macOS Folder - ARM" id="43" mediaFileName="${compiler:sys.fullName}_${compiler:sys.platform}_${compiler:sys.version}-aarch" installDir="OpenIntegrationEngine">
       <excludedLaunchers>
         <launcher id="56" />
       </excludedLaunchers>
-      <jreBundle jreBundleSource="none" />
+      <jreBundle usePack200="false" jreBundleSource="none" />
     </macosFolder>
     <unixArchive name="Unix Archive" id="44" mediaFileName="${compiler:sys.fullName}_${compiler:sys.platform}_${compiler:sys.version}">
       <excludedLaunchers>
@@ -755,11 +744,16 @@ return console.askYesNo(message, true);
       <excludedLaunchers>
         <launcher id="56" />
       </excludedLaunchers>
-      <jreBundle jreBundleSource="none" />
+      <jreBundle usePack200="false" jreBundleSource="none" />
     </macosFolder>
+    <windows name="Windows ARM" id="119" mediaFileName="${compiler:sys.fullName}_${compiler:sys.platform}_${compiler:sys.version}" installDir="OpenIntegrationEngine" architecture="arm64">
+      <excludedLaunchers>
+        <launcher id="56" />
+      </excludedLaunchers>
+      <jreBundle jreBundleSource="none" />
+    </windows>
   </mediaSets>
   <buildIds>
     <mediaSet refId="43" />
   </buildIds>
-  <buildOptions disableJreBundling="true" />
 </install4j>