[java-identity-provider COMMIT] in /trunk/idp-installer/src/main/wix: MergeModule.wxs ShibbolethIdP-adconfig-dlg.wxs ...
noreply at shibboleth.net
noreply at shibboleth.net
Sat Dec 13 10:59:36 EST 2014
Author: rdw
Date: Sat Dec 13 10:59:36 2014
New Revision: 7087
URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7087&view=rev
Log:
Indentation (done automatuically with WixCop)
Modified:
trunk/idp-installer/src/main/wix/MergeModule.wxs
trunk/idp-installer/src/main/wix/ShibbolethIdP-adconfig-dlg.wxs
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/ShibbolethIdP-registry.wxs
trunk/idp-installer/src/main/wix/ShibbolethIdP-update-dlg.wxs
trunk/idp-installer/src/main/wix/procrun.wxs
Modified: trunk/idp-installer/src/main/wix/MergeModule.wxs
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-installer/src/main/wix/MergeModule.wxs?rev=7087&r1=7086&r2=7087&view=diff
==============================================================================
--- trunk/idp-installer/src/main/wix/MergeModule.wxs (original)
+++ trunk/idp-installer/src/main/wix/MergeModule.wxs Sat Dec 13 10:59:36 2014
@@ -16,17 +16,15 @@
permissions and limitations under the License. -->
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
- <Module Id="Jetty" Language="1033" Version="1.0.0.3">
- <Package Id="684b3207-0d64-43e6-9e6a-3acb8b7672d7" Manufacturer="The Shibboleth Consortium" InstallerVersion="310" Description="Merge Module for Jetty"
- Comments="This module is built by the Shibboleth Consortium. Includes Jetty (from Eclipse) and Procrun (from Apache)"
- Platform="$(var.msitype)"/>
- <Directory Id="TARGETDIR" Name="SourceDir">
- <Directory Id="JETTYROOT" Name="Jetty"/>
- <Directory Id="PROCRUNROOT" Name="ProcRun"/>
- </Directory>
+ <Module Id="Jetty" Language="1033" Version="1.0.0.3">
+ <Package Id="684b3207-0d64-43e6-9e6a-3acb8b7672d7" Manufacturer="The Shibboleth Consortium" InstallerVersion="310" Description="Merge Module for Jetty" Comments="This module is built by the Shibboleth Consortium. Includes Jetty (from Eclipse) and Procrun (from Apache)" Platform="$(var.msitype)" />
+ <Directory Id="TARGETDIR" Name="SourceDir">
+ <Directory Id="JETTYROOT" Name="Jetty" />
+ <Directory Id="PROCRUNROOT" Name="ProcRun" />
+ </Directory>
- <ComponentGroupRef Id="JettyGroup"/>
- <ComponentGroupRef Id="ProcrunGroup"/>
+ <ComponentGroupRef Id="JettyGroup" />
+ <ComponentGroupRef Id="ProcrunGroup" />
- </Module>
+ </Module>
</Wix>
Modified: trunk/idp-installer/src/main/wix/ShibbolethIdP-adconfig-dlg.wxs
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-installer/src/main/wix/ShibbolethIdP-adconfig-dlg.wxs?rev=7087&r1=7086&r2=7087&view=diff
==============================================================================
--- trunk/idp-installer/src/main/wix/ShibbolethIdP-adconfig-dlg.wxs (original)
+++ trunk/idp-installer/src/main/wix/ShibbolethIdP-adconfig-dlg.wxs Sat Dec 13 10:59:36 2014
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
<!-- Licensed to the University Corporation for Advanced Internet
Development, Inc. (UCAID) under one or more contributor license
@@ -19,9 +19,9 @@
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<!-- This file contains the description of the dialog which captures installation
values for first time installs -->
- <Fragment>
+ <Fragment>
- <UI>
+ <UI>
<!-- This Dialog sets up:
@@ -32,61 +32,49 @@
-->
- <Dialog Id="ConfigADDlg" Width="370" Height="270" Title="[ProductName] Setup">
- <!-- Stuff at the top: picture, some text, a line -->
- <Control Id="TopBitMap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" Text="WixUI_Bmp_Banner" />
- <Control Id="TopInfo" Type="Text" X="15" Y="6" Width="150" Height="12"
- Text="{\WixUI_Font_Title}Configure for Active Directory" Transparent="yes"/>
- <Control Id="TopDetailed" Type="Text" X="25" Y="24" Width="320" Height="12"
- Text="This will set up the ldap options for authorization and attribute resolution" Transparent="yes"/>
- <Control Id="TopLine" Type="Line" X="0" Y="44" Width="370" Height="1" />
-
-
- <Control Id="ADDescriptionLine1" Type="Text" X="25" Y="51" Height="18" Width="320"
- Text="Fill in details about your Active Directory Install"/>
-
-
- <Control Id="ADDescriptionLine2" Type="Text" X="25" Y="71" Height="18" Width="150"
- Text="Specify the Active Directory Domain" />
- <Control Id="ADDomain" Type="Edit" X="185" Y="71" Height="18" Width="150"
- Property="AD_DOMAIN" Text="[AD_DOMAIN]"/>
-
- <Control Id="UseGC" Type="CheckBox" X="25" Y="91" Height="18" Width="150"
- Property="AD_USE_GC" CheckBoxValue="TRUE"
- Text="Use Global Catalog"/>
-
- <Control Id="ADDescriptionLine3" Type="Text" X="25" Y="111" Height="18" Width="320"
[... 1115 lines stripped ...]
More information about the commits
mailing list