[java-identity-provider COMMIT] in /trunk: idp-distribution/src/main/resources/bin/build.xml idp-installer/src/main/w...

[noreply at shibboleth.net]

Author: rdw
Date: Fri Nov  7 06:11:33 2014
New Revision: 6860

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6860&view=rev
Log:
IDP-251 Move the selection directory to be the one where the directory goes (the user gets no choice for Jetty).  Makes for a better upgrade experience from V3.  Extra cleanup during build and some feedback when the installer is doing the Ant processing.

Modified:
    trunk/idp-distribution/src/main/resources/bin/build.xml
    trunk/idp-installer/src/main/wix/IdP.bat
    trunk/idp-installer/src/main/wix/MergeModule.wxs
    trunk/idp-installer/src/main/wix/ShibbolethIdP-gui.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/scripts/shib_set_java_idp_home.vbs
    trunk/idp-installer/src/main/wix/scripts/shib_write_configs.vbs

Modified: trunk/idp-distribution/src/main/resources/bin/build.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-distribution/src/main/resources/bin/build.xml?rev=6860&r1=6859&r2=6860&view=diff
==============================================================================
--- trunk/idp-distribution/src/main/resources/bin/build.xml (original)
+++ trunk/idp-distribution/src/main/resources/bin/build.xml Fri Nov  7 06:11:33 2014
@@ -653,6 +653,7 @@
 		<delete file="${idp.merge.properties}" failonerror="false" />
 		<delete file="${services.merge.properties}" failonerror="false" />
         <delete file="${idp.property.file}" failonerror="false" />
+        <delete file="${ldap.merge.properties}" failonerror="false" />
 	</target>
 	
 </project>

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=6860&r1=6859&r2=6860&view=diff
==============================================================================
--- trunk/idp-installer/src/main/wix/IdP.bat (original)
+++ trunk/idp-installer/src/main/wix/IdP.bat Fri Nov  7 06:11:33 2014
@@ -125,7 +125,7 @@
 
 
 
-"%WIX%/BIN/HEAT" dir idp-extract\%idpex% -platform -gg -dr IdPFolder -var var.idpSrc -cg IdPGroup -out idp_contents.wxs -srd
+"%WIX%/BIN/HEAT" dir idp-extract\%idpex% -platform -gg -dr INSTALLDIR -var var.idpSrc -cg IdPGroup -out idp_contents.wxs -srd
 if ERRORLEVEL 1 goto done
 
 REM Build

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=6860&r1=6859&r2=6860&view=diff
==============================================================================
--- trunk/idp-installer/src/main/wix/MergeModule.wxs (original)
+++ trunk/idp-installer/src/main/wix/MergeModule.wxs Fri Nov  7 06:11:33 2014
@@ -16,7 +16,7 @@
    permissions and limitations under the License.  -->
 
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-	<Module Id="Jetty" Language="1033" Version="0.0.3.0">
+	<Module Id="Jetty" Language="1033" Version="1.0.0.3">
 		<Package Id="684b3207-0d64-43e6-9e6a-3acb8b7672d7" Manufacturer="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)"/>

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=6860&r1=6859&r2=6860&view=diff
==============================================================================
--- trunk/idp-installer/src/main/wix/ShibbolethIdP-gui.wxs (original)
+++ trunk/idp-installer/src/main/wix/ShibbolethIdP-gui.wxs Fri Nov  7 06:11:33 2014
@@ -121,6 +121,8 @@
         Installed AND NOT PATCH
       </Publish>
 
+      <ProgressText Action="QtIdpAnt">Performing Installation tasks (this may take some time on initial installs)</ProgressText>
+      <ProgressText Action="QtJettyAnt">Configuring Jetty</ProgressText>
     </UI>
   </Fragment>
 </Wix>

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=6860&r1=6859&r2=6860&view=diff
==============================================================================
--- trunk/idp-installer/src/main/wix/ShibbolethIdP-main.wxs (original)
+++ trunk/idp-installer/src/main/wix/ShibbolethIdP-main.wxs Fri Nov  7 06:11:33 2014
@@ -19,8 +19,8 @@
 
 
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-  <Product Id="*" Name="Shibboleth IdP" Language="1033" Version="3.0.0.0" Manufacturer="Shibboleth Consortium" UpgradeCode="$(var.UpgradeUUID)">
-    <Package InstallerVersion="310" Compressed="yes" InstallScope="perMachine" Platform="$(var.msitype)" Description="Shibboleth IdP" Manufacturer="Shibboleth Consortium"/>

[... 171 lines stripped ...]