https://bugs.internet2.edu/jira/browse/SIDP-355

git-svn-id: https://subversion.switch.ch/svn/shibboleth/java-idp/branches/REL_2@2909 ab3bd59b-922f-494d-bb5f-6f0a3c29deca

diff --git a/doc/RELEASE-NOTES.txt b/doc/RELEASE-NOTES.txt
index f6079bd..30f2515 100644 (file)
--- a/doc/RELEASE-NOTES.txt
+++ b/doc/RELEASE-NOTES.txt
@@ -3,6 +3,7 @@ Changes in Release 2.2.0
 [SIDP-362] - Only log exception message without stack trace for expired SAML messages
 [SIDP-360] - Session isn't being set within the attribute request context during a SAML1 attribute query
 [SIDP-359] - HttpServletHelper.getRelyingPartyConfirmationManager misnamed
+[SIDP-355] - Idp reinstall from source overwrite some config files even when "no overwrite" is specified
 
 Changes in Release 2.1.5
 =============================================

diff --git a/src/installer/resources/build.xml b/src/installer/resources/build.xml
index a59e76a..89838bf 100755 (executable)
--- a/src/installer/resources/build.xml
+++ b/src/installer/resources/build.xml
@@ -129,8 +129,12 @@
                 <stringFromFile input="${idp.home.path}/credentials/idp.crt" addProperty="idp.cert" />
                     
                 <copy todir="${idp.home.path}/bin" preservelastmodified="true" overwrite="false">
-                    <fileset dir="${tools.dir}/bash" />
-                    <fileset dir="${tools.dir}/bat" />
+                    <fileset dir="${tools.dir}/bash">
+                        <present present="srconly" targetdir="${idp.home.path}/bin"/>
+                       </fileset>
+                    <fileset dir="${tools.dir}/bat">
+                       <present present="srconly" targetdir="${idp.home.path}/bin"/>
+                       </fileset>
                     <filterset begintoken="$" endtoken="$">
                         <filter token="IDP_HOME" value="${idp.home.path}" />
                         <filter token="IDP_VERSION" value="${version}" />
@@ -138,7 +142,9 @@
                 </copy>
 
                 <copy todir="${idp.home.path}/conf" preservelastmodified="true" overwrite="false">
-                    <fileset dir="${resources.dir}/conf-tmpl" />
+                    <fileset dir="${resources.dir}/conf-tmpl">
+                       <present present="srconly" targetdir="${idp.home.path}/conf"/>
+                       </fileset>
                     <filterset begintoken="$" endtoken="$">
                         <filter token="IDP_HOME" value="${idp.home.path}" />
                         <filter token="IDP_VERSION" value="${version}" />