[java-identity-provider COMMIT] in /trunk/idp-installer/src/main/wix: ShibbolethIdP-main.wxs ShibbolethIdP-registry.w...

[noreply at shibboleth.net]

Author: rdw
Date: Sun Apr 12 13:08:58 2015
New Revision: 7481

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7481&view=rev
Log:
IDP-686 Capture Max Memory into property and repopulate.  Turn up default

Modified:
    trunk/idp-installer/src/main/wix/ShibbolethIdP-main.wxs
    trunk/idp-installer/src/main/wix/ShibbolethIdP-registry.wxs
    trunk/idp-installer/src/main/wix/procrun.wxs

Modified: trunk/idp-installer/src/main/wix/ShibbolethIdP-main.wxs
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-installer/src/main/wix/ShibbolethIdP-main.wxs?rev=7481&r1=7480&r2=7481&view=diff
==============================================================================
--- trunk/idp-installer/src/main/wix/ShibbolethIdP-main.wxs (original)
+++ trunk/idp-installer/src/main/wix/ShibbolethIdP-main.wxs Sun Apr 12 13:08:58 2015
@@ -121,6 +121,12 @@
         <CustomAction Id="RunJettyAnt" Directory="INSTALLDIR" ExeCommand="[QtJettyAnt]" Execute="deferred" Impersonate="no" />
         <CustomAction Id="QtJettyAnt" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Impersonate="no" />
 
+        <?if $(var.msitype) = "x86" ?>
+        <CustomAction Id="SetJavaJvmMx" Property="JAVA_JVMMX" Value="#768" />
+        <?else?>
+        <CustomAction Id="SetJavaJvmMx" Property="JAVA_JVMMX" Value="#1024" />
+        <?endif ?>
+
         <InstallUISequence>
 
             <!-- inherit installationDir if there is something to inherit (Conditions set in ShibolethIdP-registry) -->
@@ -148,22 +154,18 @@
         <InstallExecuteSequence>
 
             <!-- Duplicate actions from the UI case - but only for auto 3->3 upgrades -->
-            <Custom Action="InheritInstallDir" After="AppSearch">
-        OLD_INSTALLDIR
-      </Custom>
+            <Custom Action="InheritInstallDir" After="AppSearch">OLD_INSTALLDIR</Custom>
 
-            <Custom Action="InheritInstallJetty" After="AppSearch">
-        OLD_JETTY_INSTALL AND NOT JETTY_INSTALL
-      </Custom>
+            <Custom Action="InheritInstallJetty" After="AppSearch">OLD_JETTY_INSTALL AND NOT JETTY_INSTALL</Custom>
 
             <!-- Setup JAVA_IDP_HOME before we use it -->
 
             <Custom Action="SetJavaIdpHome" Before="SetIdpAnt" />
 
             <!-- Could we find JAVA.EXE ?-->
-            <Custom Action="NoJavaBin" After="AppSearch">
-        NOT JAVA_EXECUTABLE
-      </Custom>
+            <Custom Action="NoJavaBin" After="AppSearch">NOT JAVA_EXECUTABLE</Custom>
+            <!-- Preserve Jetty parms -->
+            <Custom Action="SetJavaJvmMx" After="AppSearch">(NOT Installed) AND INSTALL_JETTY AND (NOT JAVA_JVMMX)</Custom>
 
             <!-- Work -->
 

Modified: trunk/idp-installer/src/main/wix/ShibbolethIdP-registry.wxs
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-installer/src/main/wix/ShibbolethIdP-registry.wxs?rev=7481&r1=7480&r2=7481&view=diff
==============================================================================
--- trunk/idp-installer/src/main/wix/ShibbolethIdP-registry.wxs (original)
+++ trunk/idp-installer/src/main/wix/ShibbolethIdP-registry.wxs Sun Apr 12 13:08:58 2015
@@ -43,7 +43,7 @@
                     <RegistryValue Name="Options" Type="multiString">
                         <MultiStringValue>-Didp.home=[JAVA_IDP_HOME]</MultiStringValue>
                     </RegistryValue>
-
+                    <RegistryValue Name="JvmMx" Value="[JAVA_JVMMX]" Type="string" /><!-- Its an integer, but we added the # -->
                 </RegistryKey>
                 <RegistryKey Key="SOFTWARE\Apache Software Foundation\Procrun 2.0\$(var.ServiceName)\Parameters\Start" Root="HKLM">
                     <RegistryValue Name="Params" Type="multiString" Action="append">
@@ -68,6 +68,10 @@
             <RegistrySearch Id="OldInstallJetty" Root="HKLM" Key="SOFTWARE\Shibboleth\IdP" Name="InstallJetty" Type="raw" Win64="no" />
         </Property>
 
+        <Property Id="JAVA_JVMMX" Secure="yes">
+            <RegistrySearch Id="JvmMx" Root="HKLM" Key="SOFTWARE\Apache Software Foundation\Procrun 2.0\shibd_idp\Parameters\Java" Name="JvmMx" Type="raw" Win64="no" />
+        </Property>
+
         <!-- Make a best effort to find where the Quick Installer was installed to -->
         <Property Id="QI_INSTALL_DIR" Secure="yes">
             <RegistrySearch Id="OldQIDir" Root="HKLM" Key="SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{D54EF89F-F134-450C-A64D-593F5602F175}" Name="InstallLocation" Type="raw" Win64="no" />

Modified: trunk/idp-installer/src/main/wix/procrun.wxs
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-installer/src/main/wix/procrun.wxs?rev=7481&r1=7480&r2=7481&view=diff
==============================================================================
--- trunk/idp-installer/src/main/wix/procrun.wxs (original)
+++ trunk/idp-installer/src/main/wix/procrun.wxs Sun Apr 12 13:08:58 2015
@@ -114,15 +114,15 @@
                     <RegistryValue Name="StdOutput" Value="auto" Type="string" />
                 </RegistryKey>
             </Component>

[... 15 lines stripped ...]