Commit 73cb4924 authored by Dave Cridland's avatar Dave Cridland Committed by GitHub

Merge pull request #813 from speedy01/install4j-changes

Attempt to address UAC issues with Windows. Installs services on windows at inst…
parents 575e20b9 01158617
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<install4j version="6.1.3" transformSequenceNumber="5"> <install4j version="6.1.5" transformSequenceNumber="5">
<directoryPresets config="${compiler:RELEASE_FULL_PATH}/resources/security/truststore" /> <directoryPresets config="${compiler:RELEASE_FULL_PATH}/resources/security/truststore" />
<application name="${compiler:APP_NAME}" distributionSourceDir="" applicationId="${compiler:APPLICATION_ID}" mediaDir="../../target/release" mediaFilePattern="${compiler:FILE_PREFIX}_${compiler:VERSION_MAJOR}_${compiler:VERSION_MINOR}_${compiler:VERSION_REVISION}" compression="9" lzmaCompression="true" pack200Compression="false" excludeSignedFromPacking="true" commonExternalFiles="false" createMd5Sums="true" shrinkRuntime="true" shortName="${compiler:APP_SHORT_NAME}" publisher="${compiler:PUBLISHER}" publisherWeb="${compiler:PUBLISHER_URL}" version="${compiler:VERSION_MAJOR}.${compiler:VERSION_MINOR}.${compiler:VERSION_REVISION}" allPathsRelative="true" backupOnSave="false" autoSave="true" convertDotsToUnderscores="true" macSignature="????" macVolumeId="419a18ebe125f2bf" javaMinVersion="1.5" javaMaxVersion="" allowBetaVM="true" jdkMode="runtimeJre" jdkName=""> <application name="${compiler:APP_NAME}" distributionSourceDir="" applicationId="${compiler:APPLICATION_ID}" mediaDir="../../target/release" mediaFilePattern="${compiler:FILE_PREFIX}_${compiler:VERSION_MAJOR}_${compiler:VERSION_MINOR}_${compiler:VERSION_REVISION}" compression="9" lzmaCompression="true" pack200Compression="false" excludeSignedFromPacking="true" commonExternalFiles="false" createMd5Sums="true" shrinkRuntime="true" shortName="${compiler:APP_SHORT_NAME}" publisher="${compiler:PUBLISHER}" publisherWeb="${compiler:PUBLISHER_URL}" version="${compiler:VERSION_MAJOR}.${compiler:VERSION_MINOR}.${compiler:VERSION_REVISION}" allPathsRelative="true" backupOnSave="false" autoSave="true" convertDotsToUnderscores="true" macSignature="????" macVolumeId="419a18ebe125f2bf" javaMinVersion="1.5" javaMaxVersion="" allowBetaVM="true" jdkMode="runtimeJre" jdkName="">
<languages skipLanguageSelection="false" languageSelectionInPrincipalLanguage="false"> <languages skipLanguageSelection="false" languageSelectionInPrincipalLanguage="false">
...@@ -209,7 +209,7 @@ ...@@ -209,7 +209,7 @@
<customAttributes /> <customAttributes />
</autoUpdate> </autoUpdate>
<applications> <applications>
<application name="" id="installer" customizedId="" beanClass="com.install4j.runtime.beans.applications.InstallerApplication" enabled="true" commentSet="false" comment="" actionElevationType="none" fileset="" customIcnsFile="" customIcoFile="" macEntitlementsFile="" automaticLauncherIntegration="false" launchMode="startupFirstWindow" launchInNewProcess="false" launchSchedule="updateSchedule" allLaunchers="true"> <application name="" id="installer" customizedId="" beanClass="com.install4j.runtime.beans.applications.InstallerApplication" enabled="true" commentSet="false" comment="" actionElevationType="elevated" fileset="" customIcnsFile="" customIcoFile="" macEntitlementsFile="" automaticLauncherIntegration="false" launchMode="startupFirstWindow" launchInNewProcess="false" launchSchedule="updateSchedule" allLaunchers="true">
<serializedBean> <serializedBean>
<java class="java.beans.XMLDecoder"> <java class="java.beans.XMLDecoder">
<object class="com.install4j.runtime.beans.applications.InstallerApplication"> <object class="com.install4j.runtime.beans.applications.InstallerApplication">
...@@ -248,6 +248,15 @@ ...@@ -248,6 +248,15 @@
<void property="failIfNotRootUnix"> <void property="failIfNotRootUnix">
<boolean>true</boolean> <boolean>true</boolean>
</void> </void>
<void property="obtainIfAdminMac">
<boolean>true</boolean>
</void>
<void property="obtainIfNormalMac">
<boolean>true</boolean>
</void>
<void property="obtainIfNormalWin">
<boolean>true</boolean>
</void>
</object> </object>
</java> </java>
</serializedBean> </serializedBean>
...@@ -375,7 +384,7 @@ ...@@ -375,7 +384,7 @@
<preActivation /> <preActivation />
<postActivation /> <postActivation />
<actions> <actions>
<action name="" id="61" customizedId="" beanClass="com.install4j.runtime.beans.actions.UninstallPreviousAction" enabled="true" commentSet="false" comment="" actionElevationType="none" rollbackBarrier="false" multiExec="false" failureStrategy="1" errorMessage=""> <action name="" id="61" customizedId="" beanClass="com.install4j.runtime.beans.actions.UninstallPreviousAction" enabled="true" commentSet="false" comment="" actionElevationType="inherit" rollbackBarrier="false" multiExec="false" failureStrategy="1" errorMessage="">
<serializedBean> <serializedBean>
<java class="java.beans.XMLDecoder"> <java class="java.beans.XMLDecoder">
<object class="com.install4j.runtime.beans.actions.UninstallPreviousAction" /> <object class="com.install4j.runtime.beans.actions.UninstallPreviousAction" />
...@@ -436,6 +445,21 @@ ...@@ -436,6 +445,21 @@
</serializedBean> </serializedBean>
<condition /> <condition />
</action> </action>
<action name="" id="1346" customizedId="" beanClass="com.install4j.runtime.beans.actions.services.InstallServiceAction" enabled="true" commentSet="false" comment="" actionElevationType="elevated" rollbackBarrier="false" multiExec="false" failureStrategy="1" errorMessage="">
<serializedBean>
<java class="java.beans.XMLDecoder">
<object class="com.install4j.runtime.beans.actions.services.InstallServiceAction">
<void property="description">
<string>Openfire Service</string>
</void>
<void property="launcherId">
<string>2</string>
</void>
</object>
</java>
</serializedBean>
<condition />
</action>
</actions> </actions>
<formComponents /> <formComponents />
</screen> </screen>
...@@ -450,17 +474,32 @@ ...@@ -450,17 +474,32 @@
<preActivation /> <preActivation />
<postActivation /> <postActivation />
<actions> <actions>
<action name="" id="1292" customizedId="" beanClass="com.install4j.runtime.beans.actions.finish.ExecuteLauncherAction" enabled="true" commentSet="false" comment="" actionElevationType="none" rollbackBarrier="false" multiExec="false" failureStrategy="1" errorMessage=""> <action name="" id="1347" customizedId="" beanClass="com.install4j.runtime.beans.actions.services.StartServiceAction" enabled="true" commentSet="false" comment="" actionElevationType="elevated" rollbackBarrier="false" multiExec="false" failureStrategy="1" errorMessage="">
<serializedBean> <serializedBean>
<java class="java.beans.XMLDecoder"> <java class="java.beans.XMLDecoder">
<object class="com.install4j.runtime.beans.actions.finish.ExecuteLauncherAction"> <object class="com.install4j.runtime.beans.actions.services.StartServiceAction">
<void property="autostartOnly">
<boolean>true</boolean>
</void>
<void property="launcherId"> <void property="launcherId">
<string>12</string> <string>2</string>
</void> </void>
</object> </object>
</java> </java>
</serializedBean> </serializedBean>
<condition>context.getBooleanVariable("executeLauncherAction") &amp;&amp; (!context.isUnattended())</condition> <condition />
</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="">
<serializedBean>
<java class="java.beans.XMLDecoder">
<object class="com.install4j.runtime.beans.actions.finish.ShowURLAction">
<void property="urlSpec">
<string>http://localhost:9090</string>
</void>
</object>
</java>
</serializedBean>
<condition>!context.isUnattended()</condition>
</action> </action>
</actions> </actions>
<formComponents> <formComponents>
...@@ -487,7 +526,7 @@ ...@@ -487,7 +526,7 @@
</screen> </screen>
</screens> </screens>
</application> </application>
<application name="" id="uninstaller" customizedId="" beanClass="com.install4j.runtime.beans.applications.UninstallerApplication" enabled="true" commentSet="false" comment="" actionElevationType="none" fileset="" customIcnsFile="" customIcoFile="" macEntitlementsFile="" automaticLauncherIntegration="false" launchMode="startupFirstWindow" launchInNewProcess="false" launchSchedule="updateSchedule" allLaunchers="true"> <application name="" id="uninstaller" customizedId="" beanClass="com.install4j.runtime.beans.applications.UninstallerApplication" enabled="true" commentSet="false" comment="" actionElevationType="elevated" fileset="" customIcnsFile="" customIcoFile="" macEntitlementsFile="" automaticLauncherIntegration="false" launchMode="startupFirstWindow" launchInNewProcess="false" launchSchedule="updateSchedule" allLaunchers="true">
<serializedBean> <serializedBean>
<java class="java.beans.XMLDecoder"> <java class="java.beans.XMLDecoder">
<object class="com.install4j.runtime.beans.applications.UninstallerApplication"> <object class="com.install4j.runtime.beans.applications.UninstallerApplication">
...@@ -541,6 +580,27 @@ ...@@ -541,6 +580,27 @@
</serializedBean> </serializedBean>
<condition /> <condition />
</action> </action>
<action name="" id="1350" customizedId="" beanClass="com.install4j.runtime.beans.actions.misc.RequestPrivilegesAction" enabled="true" commentSet="false" comment="" actionElevationType="none" rollbackBarrier="false" multiExec="false" failureStrategy="1" errorMessage="">
<serializedBean>
<java class="java.beans.XMLDecoder">
<object class="com.install4j.runtime.beans.actions.misc.RequestPrivilegesAction">
<void property="failIfNotRootUnix">
<boolean>true</boolean>
</void>
<void property="obtainIfAdminMac">
<boolean>true</boolean>
</void>
<void property="obtainIfNormalMac">
<boolean>true</boolean>
</void>
<void property="obtainIfNormalWin">
<boolean>true</boolean>
</void>
</object>
</java>
</serializedBean>
<condition />
</action>
</actions> </actions>
<formComponents /> <formComponents />
</screen> </screen>
...@@ -570,7 +630,19 @@ ...@@ -570,7 +630,19 @@
<preActivation /> <preActivation />
<postActivation /> <postActivation />
<actions> <actions>
<action name="" id="72" customizedId="" beanClass="com.install4j.runtime.beans.actions.UninstallFilesAction" enabled="true" commentSet="false" comment="" actionElevationType="elevated" rollbackBarrier="false" multiExec="false" failureStrategy="1" errorMessage=""> <action name="" id="1349" customizedId="" beanClass="com.install4j.runtime.beans.actions.services.StopServiceAction" enabled="true" commentSet="false" comment="" actionElevationType="elevated" rollbackBarrier="false" multiExec="false" failureStrategy="1" errorMessage="">
<serializedBean>
<java class="java.beans.XMLDecoder">
<object class="com.install4j.runtime.beans.actions.services.StopServiceAction">
<void property="launcherId">
<string>2</string>
</void>
</object>
</java>
</serializedBean>
<condition />
</action>
<action name="" id="72" customizedId="" beanClass="com.install4j.runtime.beans.actions.UninstallFilesAction" enabled="true" commentSet="false" comment="" actionElevationType="inherit" rollbackBarrier="false" multiExec="false" failureStrategy="1" errorMessage="">
<serializedBean> <serializedBean>
<java class="java.beans.XMLDecoder"> <java class="java.beans.XMLDecoder">
<object class="com.install4j.runtime.beans.actions.UninstallFilesAction" /> <object class="com.install4j.runtime.beans.actions.UninstallFilesAction" />
...@@ -578,7 +650,7 @@ ...@@ -578,7 +650,7 @@
</serializedBean> </serializedBean>
<condition /> <condition />
</action> </action>
<action name="Delete lib directory" id="1263" customizedId="" beanClass="com.install4j.runtime.beans.actions.files.DeleteFileAction" enabled="true" commentSet="false" comment="" actionElevationType="elevated" rollbackBarrier="false" multiExec="false" failureStrategy="1" errorMessage=""> <action name="Delete lib directory" id="1263" customizedId="" beanClass="com.install4j.runtime.beans.actions.files.DeleteFileAction" enabled="true" commentSet="false" comment="" actionElevationType="inherit" rollbackBarrier="false" multiExec="false" failureStrategy="1" errorMessage="">
<serializedBean> <serializedBean>
<java class="java.beans.XMLDecoder"> <java class="java.beans.XMLDecoder">
<object class="com.install4j.runtime.beans.actions.files.DeleteFileAction"> <object class="com.install4j.runtime.beans.actions.files.DeleteFileAction">
...@@ -731,6 +803,27 @@ ...@@ -731,6 +803,27 @@
<customAttributes /> <customAttributes />
</autoUpdate> </autoUpdate>
</windowsArchive> </windowsArchive>
<windows name="Windows x64" id="1354" customizedId="" mediaFileName="" 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 />
<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>
</mediaSets> </mediaSets>
<buildIds buildAll="false"> <buildIds buildAll="false">
<mediaSet refId="3" /> <mediaSet refId="3" />
......
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