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

[noreply at shibboleth.net]

Author: scantor
Date: Tue Feb 14 20:43:10 2017
New Revision: 8620

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8620&view=rev
Log:
IDP-1116 - Rework handling of webapp customization

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

Untested MSI cleanup.


Modified:
    trunk/idp-installer/src/main/wix/IdP.bat
    trunk/idp-installer/src/main/wix/ShibbolethIdP-main.wxs

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=8620&r1=8619&r2=8620&view=diff
==============================================================================
--- trunk/idp-installer/src/main/wix/IdP.bat	(original)
+++ trunk/idp-installer/src/main/wix/IdP.bat	Tue Feb 14 20:43:10 2017
@@ -159,7 +159,14 @@
   goto done;
 )
 
-rem The file names gets too big....
+rd/s/q %idpex%\webapp
+if ERRORLEVEL 1 (
+  cd ..
+  echo Webapp directory not found?
+  goto done;
+)
+
+rem The file name gets too big....
 rename %idpex% IdPEx
 set idpex=IdPEx
 

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=8620&r1=8619&r2=8620&view=diff
==============================================================================
--- trunk/idp-installer/src/main/wix/ShibbolethIdP-main.wxs	(original)
+++ trunk/idp-installer/src/main/wix/ShibbolethIdP-main.wxs	Tue Feb 14 20:43:10 2017
@@ -117,11 +117,11 @@
         <CustomAction Id="SetDefaultInstallDir" Property="DefaultInstallDir" Value="[WindowsVolume]opt\shibboleth-idp\" />
 
         <!-- Ant actions -->
-        <CustomAction Id="SetIdpAnt" Property="QtIdpAnt" Value=""[JAVA_EXECUTABLE]" -cp "[INSTALLDIR]\bin\lib\*;[INSTALLDIR]\webapp\WEB-INF\lib\*" -Didp.home="[JAVA_IDP_HOME]" org.apache.tools.ant.Main -e -f "[INSTALLDIR]\bin\build.xml" -Didp.property.file=idp.install.properties install-nocopy" />
+        <CustomAction Id="SetIdpAnt" Property="QtIdpAnt" Value=""[JAVA_EXECUTABLE]" -cp "[INSTALLDIR]\bin\lib\*;[INSTALLDIR]\dist\webapp\WEB-INF\lib\*" -Didp.home="[JAVA_IDP_HOME]" org.apache.tools.ant.Main -e -f "[INSTALLDIR]\bin\build.xml" -Didp.property.file=idp.install.properties install-nocopy" />
         <CustomAction Id="RunIdpAnt" Directory="ProgramFilesFolder" ExeCommand="[QtIdpAnt]" Execute="deferred" Impersonate="no" />
         <CustomAction Id="QtIdpAnt" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Impersonate="no" />
 
-        <CustomAction Id="SetJettyAnt" Property="QtJettyAnt" Value=""[JAVA_EXECUTABLE]" -cp "[INSTALLDIR]\bin\lib\*;[INSTALLDIR]\webapp\WEB-INF\lib\*" org.apache.tools.ant.Main -e -f "[INSTALLDIR]\bin\ant-jetty.xml" -Djetty.property.file=jetty.install.properties install" />
+        <CustomAction Id="SetJettyAnt" Property="QtJettyAnt" Value=""[JAVA_EXECUTABLE]" -cp "[INSTALLDIR]\bin\lib\*;[INSTALLDIR]\dist\webapp\WEB-INF\lib\*" org.apache.tools.ant.Main -e -f "[INSTALLDIR]\bin\ant-jetty.xml" -Djetty.property.file=jetty.install.properties install" />
         <CustomAction Id="RunJettyAnt" Directory="INSTALLDIR" ExeCommand="[QtJettyAnt]" Execute="deferred" Impersonate="no" />
         <CustomAction Id="QtJettyAnt" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Impersonate="no" />