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

[noreply at shibboleth.net]

Author: rdw
Date: Mon Oct 20 12:08:09 2014
New Revision: 6749

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6749&view=rev
Log:
IDP-251:  make any run quietly.  
IDP-487: protect the configuration post install

Modified:
    trunk/idp-distribution/src/main/resources/bin/ant.bat
    trunk/idp-distribution/src/main/resources/bin/ant.sh
    trunk/idp-distribution/src/main/resources/bin/build.xml

Modified: trunk/idp-distribution/src/main/resources/bin/ant.bat
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-distribution/src/main/resources/bin/ant.bat?rev=6749&r1=6748&r2=6749&view=diff
==============================================================================
--- trunk/idp-distribution/src/main/resources/bin/ant.bat (original)
+++ trunk/idp-distribution/src/main/resources/bin/ant.bat Mon Oct 20 12:08:09 2014
@@ -41,4 +41,4 @@
     set LOCALCLASSPATH=%LOCALCLASSPATH%;%JAVA_HOME%\lib\classes.zip
 )
 
-%JAVACMD% -cp "%LOCALCLASSPATH%" -Dant.home="%ANT_HOME%" %ANT_OPTS% org.apache.tools.ant.Main -e -f %ANT_HOME%/build.xml %*
+%JAVACMD% -cp "%LOCALCLASSPATH%" -Dant.home="%ANT_HOME%" %ANT_OPTS% org.apache.tools.ant.Main -e -q -f %ANT_HOME%/build.xml %*

Modified: trunk/idp-distribution/src/main/resources/bin/ant.sh
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-distribution/src/main/resources/bin/ant.sh?rev=6749&r1=6748&r2=6749&view=diff
==============================================================================
--- trunk/idp-distribution/src/main/resources/bin/ant.sh (original)
+++ trunk/idp-distribution/src/main/resources/bin/ant.sh Mon Oct 20 12:08:09 2014
@@ -81,4 +81,4 @@
   JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
   LOCALCLASSPATH=`cygpath --path --windows "$LOCALCLASSPATH"`
 fi
-$JAVACMD -classpath "$LOCALCLASSPATH" -Dant.home="${ANT_HOME}" $ANT_OPTS org.apache.tools.ant.Main -e -f "${ANT_HOME}/build.xml" "$@"
+$JAVACMD -classpath "$LOCALCLASSPATH" -Dant.home="${ANT_HOME}" $ANT_OPTS org.apache.tools.ant.Main -e -q -f "${ANT_HOME}/build.xml" "$@"

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=6749&r1=6748&r2=6749&view=diff
==============================================================================
--- trunk/idp-distribution/src/main/resources/bin/build.xml (original)
+++ trunk/idp-distribution/src/main/resources/bin/build.xml Mon Oct 20 12:08:09 2014
@@ -50,7 +50,7 @@
 	</target>
 
 	<target name="install" depends="init, preload, getsource, gettarget, v2v3prepopulate, allinput, copy-distribution, install-nocopy, tidy" />
-	<target name="install-nocopy" depends="init, preload, gettarget, v2v3prepopulate, allinput, genkeys, upgrade, metadata-gen, build-war, tidy" />
+	<target name="install-nocopy" depends="init, preload, gettarget, v2v3prepopulate, allinput, genkeys, upgrade, metadata-gen, reprotect, build-war, tidy" />
 
 	<!-- USER INPUT -->
 	<target name="preload" if="idp.property.file">
@@ -264,7 +264,7 @@
 		</condition>
 		
 		<condition property="idp.ask.scope">
-            <!-- We ask for scope if there is no scope and we allow user input -->
+            <!-- We ask for scope if there is no scope and we allow user input and there is no idp properties file -->
             <and>
                 <not>
                     <isset property="idp.scope" />
@@ -272,16 +272,18 @@
             	<not>
             		<isset property="idp.noprompt" />
             	</not>
+            	<isfalse value="${idp.properties.present}" />  
             </and>
         </condition>
 
 		<condition property="idp.set.scope">
-            <!-- We set scope if there is no scope and we do not allow user input -->
+            <!-- We set scope if there is no scope and we do not allow user input and there is no idp properties file -->
             <and>
                 <not>
                     <isset property="idp.scope" />
                 </not>
                 <isset property="idp.noprompt" />
+            	<isfalse value="${idp.properties.present}" />
             </and>
         </condition>
 
@@ -526,6 +528,10 @@
 		<delete dir="${idp.target.dir}/dist" failonerror="false" />
 		<delete dir="${idp.target.dir}/doc" failonerror="false" />
 		<delete dir="${idp.target.dir}/jetty-base" failonerror="false" />
+        <mkdir dir="${idp.target.dir}/system"/> <!-- create because it wont exist first time -->
+        <attrib readonly="false">
+            <fileset dir="${idp.target.dir}/system" includes="**/*"/>
+        </attrib>
 		<delete dir="${idp.target.dir}/system" failonerror="false" />
 		<delete dir="${idp.target.dir}/webapp" failonerror="false" />
 
@@ -617,6 +623,15 @@
 		</condition>
 	</target>
 	
+	<target name="reprotect" depends="gettarget">
+        <chmod perm="755" dir="${idp.target.dir}/bin" includes="**/*.sh"/>
+        <chmod perm="600" dir="${idp.target.dir}/credentials" includes="**/*.key"/>

[... 10 lines stripped ...]