Commit cd2fcb38 authored by Speedy's avatar Speedy Committed by akrherz

OF-1342 Remove "Run Openfire" from the final step of the installer. C… (#819)

* OF-1342 Remove "Run Openfire" from the final step of the installer. Changed to "Start Openfire Service"

* OF-1342 Remove "Run Openfire" from the final step of the installer. Changed to "Start Openfire Service"

* OF-1349 Create separate Windows installer with and without JRE
parent a30961b4
...@@ -487,7 +487,7 @@ ...@@ -487,7 +487,7 @@
</object> </object>
</java> </java>
</serializedBean> </serializedBean>
<condition /> <condition>context.getBooleanVariable("executeLauncherAction") &amp;&amp; (!context.isUnattended())</condition>
</action> </action>
<action name="" id="1348" customizedId="" beanClass="com.install4j.runtime.beans.actions.finish.ShowURLAction" enabled="true" commentSet="false" comment="" actionElevationType="none" rollbackBarrier="false" multiExec="false" failureStrategy="1" errorMessage=""> <action name="" id="1348" customizedId="" beanClass="com.install4j.runtime.beans.actions.finish.ShowURLAction" enabled="true" commentSet="false" comment="" actionElevationType="none" rollbackBarrier="false" multiExec="false" failureStrategy="1" errorMessage="">
<serializedBean> <serializedBean>
...@@ -499,7 +499,7 @@ ...@@ -499,7 +499,7 @@
</object> </object>
</java> </java>
</serializedBean> </serializedBean>
<condition>!context.isUnattended()</condition> <condition>context.getBooleanVariable("executeLauncherAction") &amp;&amp; (!context.isUnattended())</condition>
</action> </action>
</actions> </actions>
<formComponents> <formComponents>
...@@ -508,7 +508,7 @@ ...@@ -508,7 +508,7 @@
<java class="java.beans.XMLDecoder"> <java class="java.beans.XMLDecoder">
<object class="com.install4j.runtime.beans.formcomponents.CheckboxComponent"> <object class="com.install4j.runtime.beans.formcomponents.CheckboxComponent">
<void property="checkboxText"> <void property="checkboxText">
<string>${i18n:RunEntryExec("${compiler:sys.fullName}")}</string> <string>Start Openfire Service</string>
</void> </void>
<void property="initiallySelected"> <void property="initiallySelected">
<boolean>true</boolean> <boolean>true</boolean>
...@@ -705,7 +705,7 @@ ...@@ -705,7 +705,7 @@
</applications> </applications>
</installerGui> </installerGui>
<mediaSets> <mediaSets>
<windows name="Windows" id="3" customizedId="" mediaFileName="" installDir="${compiler:WINDOWS_INSTALL_DIR}" overridePrincipalLanguage="true" jreBitType="32" runPostProcessor="false" postProcessor="" failOnPostProcessorError="false" useLegacyMediaFileIds="false" legacyMediaFileIds="" downloadURL="" includeAllDownloadableComponents="false" includedJRE="windows-x86-1.8.0_131" manualJREEntry="false" bundleType="1" jreURL="" jreShared="false" directDownload="false" installOnlyIfNecessary="false" customInstallBaseDir="" contentFilesType="1" verifyIntegrity="true"> <windows name="Windows x86" id="3" customizedId="" mediaFileName="" installDir="${compiler:WINDOWS_INSTALL_DIR}" overridePrincipalLanguage="true" jreBitType="32" runPostProcessor="false" postProcessor="" failOnPostProcessorError="false" useLegacyMediaFileIds="false" legacyMediaFileIds="" downloadURL="" includeAllDownloadableComponents="false" includedJRE="" manualJREEntry="false" bundleType="1" jreURL="" jreShared="false" directDownload="false" installOnlyIfNecessary="false" customInstallBaseDir="" contentFilesType="1" verifyIntegrity="true">
<excludedComponents /> <excludedComponents />
<includedDownloadableComponents /> <includedDownloadableComponents />
<excludedLaunchers> <excludedLaunchers>
...@@ -803,7 +803,49 @@ ...@@ -803,7 +803,49 @@
<customAttributes /> <customAttributes />
</autoUpdate> </autoUpdate>
</windowsArchive> </windowsArchive>
<windows name="Windows x64" id="1354" customizedId="" mediaFileName="${compiler:FILE_PREFIX}_${compiler:VERSION_MAJOR}_${compiler:VERSION_MINOR}_${compiler:VERSION_REVISION}_x64" installDir="${compiler:WINDOWS_INSTALL_DIR}" overridePrincipalLanguage="true" jreBitType="64" runPostProcessor="false" postProcessor="" failOnPostProcessorError="false" useLegacyMediaFileIds="false" legacyMediaFileIds="" downloadURL="" includeAllDownloadableComponents="false" includedJRE="windows-amd64-1.8.0_131" manualJREEntry="false" bundleType="1" jreURL="" jreShared="false" directDownload="false" installOnlyIfNecessary="false" customInstallBaseDir="" contentFilesType="1" verifyIntegrity="true"> <windows name="Windows x64" id="1354" customizedId="" mediaFileName="${compiler:FILE_PREFIX}_${compiler:VERSION_MAJOR}_${compiler:VERSION_MINOR}_${compiler:VERSION_REVISION}_x64" installDir="${compiler:WINDOWS_INSTALL_DIR}" overridePrincipalLanguage="true" jreBitType="64" runPostProcessor="false" postProcessor="" failOnPostProcessorError="false" useLegacyMediaFileIds="false" legacyMediaFileIds="" downloadURL="" includeAllDownloadableComponents="false" includedJRE="" manualJREEntry="false" bundleType="1" jreURL="" jreShared="false" directDownload="false" installOnlyIfNecessary="false" customInstallBaseDir="" contentFilesType="1" verifyIntegrity="true">
<excludedComponents />
<includedDownloadableComponents />
<excludedLaunchers>
<launcher id="22" />
</excludedLaunchers>
<excludedBeans />
<overriddenPrincipalLanguage id="en" customLocalizationFile="" />
<exclude>
<entry location="bin/extra/redhat-postinstall.sh" fileType="regular" />
<entry location="bin/extra/openfired" fileType="regular" />
<entry location="bin/openfire.bat" fileType="regular" />
<entry location="bin/openfire.sh" fileType="regular" />
<entry location="documentation/javadoc" fileType="regular" />
</exclude>
<variables />
<autoUpdate useMinUpdatableVersion="false" minUpdatableVersion="" useMaxUpdatableVersion="false" maxUpdatableVersion="">
<commentFiles />
<customAttributes />
</autoUpdate>
</windows>
<windows name="Windows Bundled JRE x86" id="1394" customizedId="" mediaFileName="${compiler:FILE_PREFIX}_${compiler:VERSION_MAJOR}_${compiler:VERSION_MINOR}_${compiler:VERSION_REVISION}_bundledJRE" installDir="${compiler:WINDOWS_INSTALL_DIR}" overridePrincipalLanguage="true" jreBitType="32" runPostProcessor="false" postProcessor="" failOnPostProcessorError="false" useLegacyMediaFileIds="false" legacyMediaFileIds="" downloadURL="" includeAllDownloadableComponents="false" includedJRE="windows-x86-1.8.0_131" manualJREEntry="false" bundleType="1" jreURL="" jreShared="false" directDownload="false" installOnlyIfNecessary="false" customInstallBaseDir="" contentFilesType="1" verifyIntegrity="true">
<excludedComponents />
<includedDownloadableComponents />
<excludedLaunchers>
<launcher id="22" />
</excludedLaunchers>
<excludedBeans />
<overriddenPrincipalLanguage id="en" customLocalizationFile="" />
<exclude>
<entry location="bin/extra/redhat-postinstall.sh" fileType="regular" />
<entry location="bin/extra/openfired" fileType="regular" />
<entry location="bin/openfire.bat" fileType="regular" />
<entry location="bin/openfire.sh" fileType="regular" />
<entry location="documentation/javadoc" fileType="regular" />
</exclude>
<variables />
<autoUpdate useMinUpdatableVersion="false" minUpdatableVersion="" useMaxUpdatableVersion="false" maxUpdatableVersion="">
<commentFiles />
<customAttributes />
</autoUpdate>
</windows>
<windows name="Windows Bundled JRE x64" id="1396" customizedId="" mediaFileName="${compiler:FILE_PREFIX}_${compiler:VERSION_MAJOR}_${compiler:VERSION_MINOR}_${compiler:VERSION_REVISION}_bundledJRE_x64" installDir="${compiler:WINDOWS_INSTALL_DIR}" overridePrincipalLanguage="true" jreBitType="64" runPostProcessor="false" postProcessor="" failOnPostProcessorError="false" useLegacyMediaFileIds="false" legacyMediaFileIds="" downloadURL="" includeAllDownloadableComponents="false" includedJRE="windows-amd64-1.8.0_131" manualJREEntry="false" bundleType="1" jreURL="" jreShared="false" directDownload="false" installOnlyIfNecessary="false" customInstallBaseDir="" contentFilesType="1" verifyIntegrity="true">
<excludedComponents /> <excludedComponents />
<includedDownloadableComponents /> <includedDownloadableComponents />
<excludedLaunchers> <excludedLaunchers>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment