[java-identity-provider COMMIT] in /branches/3.2/idp-installer/src/main/wix: ShibbolethIdP-install-dlg.wxs Shibboleth...

[noreply at shibboleth.net]

Author: rdw
Date: Wed May 18 10:00:25 2016
New Revision: 8246

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8246&view=rev
Log:
IDP-983 Support Jetty 9.3

https://issues.shibboleth.net/jira/browse/IDP-983

Minor GUI changes to warn (in red) that if you install Jetty you 
need Java 8 installed.

Also rev the patch and subpatch versions


Modified:
    branches/3.2/idp-installer/src/main/wix/ShibbolethIdP-install-dlg.wxs
    branches/3.2/idp-installer/src/main/wix/ShibbolethIdP-main.wxs
    branches/3.2/idp-installer/src/main/wix/ShibbolethIdP-update-dlg.wxs

Modified: branches/3.2/idp-installer/src/main/wix/ShibbolethIdP-install-dlg.wxs
URL: http://svn.shibboleth.net/view/java-identity-provider/branches/3.2/idp-installer/src/main/wix/ShibbolethIdP-install-dlg.wxs?rev=8246&r1=8245&r2=8246&view=diff
==============================================================================
--- branches/3.2/idp-installer/src/main/wix/ShibbolethIdP-install-dlg.wxs	(original)
+++ branches/3.2/idp-installer/src/main/wix/ShibbolethIdP-install-dlg.wxs	Wed May 18 10:00:25 2016
@@ -22,6 +22,8 @@
     <Fragment>
 
         <UI>
+         
+          <TextStyle Id="JettyWarning_Font" Bold="yes" Red="200" Green="0" Blue="0" Size="8" FaceName="Tahoma"/>
 
       <!-- This Dialog sets up:
            - INSTALLDIR
@@ -51,7 +53,8 @@
                 </Control>
 
                 <!-- Jetty? -->
-                <Control Id="InstallJetty" Type="CheckBox" X="25" Y="128" Height="20" Width="150" Property="INSTALL_JETTY" CheckBoxValue="TRUE" Text="Install &Jetty" />
+                <Control Id="InstallJetty" Type="CheckBox" X="25" Y="128" Height="20" Width="60" Property="INSTALL_JETTY" CheckBoxValue="TRUE" Text="Install &Jetty"/>
+                <Control Id="InstallJWarn" Type="Text" X="85" Y="132" Height="20" Width="80" Text="{\JettyWarning_Font}Requires Java 1.8" />
                 <!-- AD?=" -->
 
                 <Control Id="ConfigureAD" Type="CheckBox" X="185" Y="128" Height="20" Width="150" Property="CONFIGURE_AD" CheckBoxValue="TRUE" Text="Configure for &Active Directory" />

Modified: branches/3.2/idp-installer/src/main/wix/ShibbolethIdP-main.wxs
URL: http://svn.shibboleth.net/view/java-identity-provider/branches/3.2/idp-installer/src/main/wix/ShibbolethIdP-main.wxs?rev=8246&r1=8245&r2=8246&view=diff
==============================================================================
--- branches/3.2/idp-installer/src/main/wix/ShibbolethIdP-main.wxs	(original)
+++ branches/3.2/idp-installer/src/main/wix/ShibbolethIdP-main.wxs	Wed May 18 10:00:25 2016
@@ -19,7 +19,7 @@
 
 
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-    <Product Id="*" Name="Shibboleth IdP V3" Language="1033" Version="3.2.0.3" Manufacturer="The Shibboleth Consortium" UpgradeCode="$(var.UpgradeUUID)">
+    <Product Id="*" Name="Shibboleth IdP V3" Language="1033" Version="3.2.1.1" Manufacturer="The Shibboleth Consortium" UpgradeCode="$(var.UpgradeUUID)">
         <Package InstallerVersion="310" Compressed="yes" InstallScope="perMachine" Platform="$(var.msitype)" Description="Shibboleth IdP V3.2" Manufacturer="The Shibboleth Consortium" />
 
         <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." AllowSameVersionUpgrades="yes" Schedule="afterInstallInitialize" />

Modified: branches/3.2/idp-installer/src/main/wix/ShibbolethIdP-update-dlg.wxs
URL: http://svn.shibboleth.net/view/java-identity-provider/branches/3.2/idp-installer/src/main/wix/ShibbolethIdP-update-dlg.wxs?rev=8246&r1=8245&r2=8246&view=diff
==============================================================================
--- branches/3.2/idp-installer/src/main/wix/ShibbolethIdP-update-dlg.wxs	(original)
+++ branches/3.2/idp-installer/src/main/wix/ShibbolethIdP-update-dlg.wxs	Wed May 18 10:00:25 2016
@@ -32,7 +32,8 @@
                 <Control Id="DescriptionLine1" Type="Text" X="25" Y="51" Height="24" Width="320" Text="The updated files for [ProductName] will be installed to [INSTALLDIR]" />
 
                 <!-- Jetty? -->
-                <Control Id="UpdateJetty" Type="CheckBox" X="25" Y="80" Height="17" Width="80" CheckBoxPropertyRef="INSTALL_JETTY" CheckBoxValue="TRUE" Text="Install Jetty" />
+                <Control Id="UpdateJetty" Type="CheckBox" X="25" Y="80" Height="17" Width="60" CheckBoxPropertyRef="INSTALL_JETTY" CheckBoxValue="TRUE" Text="Install Jetty"/>
+                <Control Id="InstallJWarn" Type="Text" X="85" Y="83" Height="17" Width="80" Text="{\JettyWarning_Font}Requires Java 1.8" />
 
                 <!-- Stuff at the bottom: line, Back,Next, [space] Cancel -->
                 <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="1" />