[java-identity-provider COMMIT] in /trunk/idp-installer/src/main/wix: IdP.bat IdP.wixproj ShibbolethIdP-adconfig-dlg....

[noreply at shibboleth.net]

Author: rdw
Date: Sun Oct 26 12:44:03 2014
New Revision: 6787

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6787&view=rev
Log:
IDP-469 Add (optional) capture and configuration of Active Directory configuration (into LDAP.properties).  Testing still pending

Added:
    trunk/idp-installer/src/main/wix/ShibbolethIdP-adconfig-dlg.wxs
Modified:
    trunk/idp-installer/src/main/wix/IdP.bat
    trunk/idp-installer/src/main/wix/IdP.wixproj
    trunk/idp-installer/src/main/wix/ShibbolethIdP-gui.wxs
    trunk/idp-installer/src/main/wix/ShibbolethIdP-install-dlg.wxs
    trunk/idp-installer/src/main/wix/ShibbolethIdP-main.wxs
    trunk/idp-installer/src/main/wix/scripts/shib_write_configs.vbs

Modified: trunk/idp-installer/src/main/wix/IdP.bat
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-installer/src/main/wix/IdP.bat?rev=6787&r1=6786&r2=6787&view=diff
==============================================================================
--- trunk/idp-installer/src/main/wix/IdP.bat (original)
+++ trunk/idp-installer/src/main/wix/IdP.bat Sun Oct 26 12:44:03 2014
@@ -134,10 +134,10 @@
 
 "%WIX%/BIN/CANDLE" -nologo -arch x86 -dProjectDir=. ShibbolethIdP-registry.wxs ShibbolethIdP-main.wxs -dmsitype=x86
 
-"%WIX%/BIN/CANDLE" -nologo -arch x86 -dProjectDir=. ShibbolethIdP-gui.wxs ShibbolethIdP-install-dlg.wxs ShibbolethIdP-update-dlg.wxs
+"%WIX%/BIN/CANDLE" -nologo -arch x86 -dProjectDir=. ShibbolethIdP-gui.wxs ShibbolethIdP-install-dlg.wxs ShibbolethIdP-adconfig-dlg.wxs ShibbolethIdP-update-dlg.wxs
 if ERRORLEVEL 1 goto done
 
-"%WIX%/BIN/LIGHT" -nologo -out idp-x86.msi -ext WixUIExtension ShibbolethIdP-main.wixobj idp_contents.wixobj ShibbolethIdP-registry.wixobj ShibbolethIdP-gui.wixobj ShibbolethIdP-install-dlg.wixobj ShibbolethIdP-update-dlg.wixobj -ext WixUtilExtension.dll -sice:ICE61
+"%WIX%/BIN/LIGHT" -nologo -out idp-x86.msi -ext WixUIExtension ShibbolethIdP-main.wixobj idp_contents.wixobj ShibbolethIdP-registry.wixobj ShibbolethIdP-gui.wixobj ShibbolethIdP-install-dlg.wixobj ShibbolethIdP-adconfig-dlg.wixobj ShibbolethIdP-update-dlg.wixobj -ext WixUtilExtension.dll -sice:ICE61
 if ERRORLEVEL 1 goto done
 
 del ShibbolethIdP-main.wixobj
@@ -145,7 +145,7 @@
 "%WIX%/BIN/CANDLE" -nologo -arch x64 -dProjectDir=. ShibbolethIdP-main.wxs ShibbolethIdP-registry.wxs -dmsitype=x64
 if ERRORLEVEL 1 goto done
 
-"%WIX%/BIN/LIGHT" -nologo -out idp-x64.msi -ext WixUIExtension ShibbolethIdP-main.wixobj idp_contents.wixobj ShibbolethIdP-registry.wixobj ShibbolethIdP-gui.wixobj ShibbolethIdP-install-dlg.wixobj ShibbolethIdP-update-dlg.wixobj -ext WixUtilExtension.dll -sice:ICE61
+"%WIX%/BIN/LIGHT" -nologo -out idp-x64.msi -ext WixUIExtension ShibbolethIdP-main.wixobj idp_contents.wixobj ShibbolethIdP-registry.wixobj ShibbolethIdP-gui.wixobj ShibbolethIdP-install-dlg.wixobj ShibbolethIdP-adconfig-dlg.wixobj ShibbolethIdP-update-dlg.wixobj -ext WixUtilExtension.dll -sice:ICE61
 if ERRORLEVEL 1 goto done
 
 

Modified: trunk/idp-installer/src/main/wix/IdP.wixproj
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-installer/src/main/wix/IdP.wixproj?rev=6787&r1=6786&r2=6787&view=diff
==============================================================================
--- trunk/idp-installer/src/main/wix/IdP.wixproj (original)
+++ trunk/idp-installer/src/main/wix/IdP.wixproj Sun Oct 26 12:44:03 2014
@@ -25,6 +25,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="idp_contents.wxs" />
+    <Compile Include="ShibbolethIdP-adconfig-dlg.wxs" />
     <Compile Include="ShibbolethIdP-gui.wxs" />
     <Compile Include="ShibbolethIdP-install-dlg.wxs" />
     <Compile Include="ShibbolethIdP-main.wxs" />

Modified: trunk/idp-installer/src/main/wix/ShibbolethIdP-gui.wxs
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-installer/src/main/wix/ShibbolethIdP-gui.wxs?rev=6787&r1=6786&r2=6787&view=diff
==============================================================================
--- trunk/idp-installer/src/main/wix/ShibbolethIdP-gui.wxs (original)
+++ trunk/idp-installer/src/main/wix/ShibbolethIdP-gui.wxs Sun Oct 26 12:44:03 2014
@@ -69,6 +69,7 @@
       <!-- We also define two dialogs -->
       <DialogRef Id="UpdateDlgShib" />
       <DialogRef Id="InstallDirDlgShib" />
+      <DialogRef Id="ConfigADDlg" />
 
       <!-- Text Styles (from Orca) -->
       <TextStyle Id="WixUI_Font_Normal" FaceName="Tahoma" Size="8" />
@@ -107,8 +108,11 @@
       <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg">
         Installed AND PATCH
       </Publish>
+      <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="ConfigADDlg">
+        (NOT Installed) AND (NOT ALREADYINSTALLED) AND CONFIGURE_AD="TRUE"
+      </Publish>
       <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="InstallDirDlgShib">
-        (NOT Installed) AND (NOT ALREADYINSTALLED)
+        (NOT Installed) AND (NOT ALREADYINSTALLED) AND CONFIGURE_AD &lt;&gt;"TRUE"
       </Publish>

[... 287 lines stripped ...]