Author: thomas.diesler(a)jboss.com
Date: 2008-03-31 04:19:30 -0400 (Mon, 31 Mar 2008)
New Revision: 6178
Modified:
framework/trunk/ant-import/build-hudson.xml
Log:
Limit chmod to config.xml files, to fix long running hudson-setup
Modified: framework/trunk/ant-import/build-hudson.xml
===================================================================
--- framework/trunk/ant-import/build-hudson.xml 2008-03-31 08:18:29 UTC (rev 6177)
+++ framework/trunk/ant-import/build-hudson.xml 2008-03-31 08:19:30 UTC (rev 6178)
@@ -95,8 +95,8 @@
<!-- Configure Hudson -->
<copy todir="${hudson.home}" overwrite="true">
<fileset dir="${framework.dir}/hudson/hudson-home">
- <include name="jobs/**"/>
- <include name="users/**"/>
+ <include name="jobs/*/config.xml"/>
+ <include name="users/*/config.xml"/>
<include name="*.xml"/>
</fileset>
<filterset>
@@ -106,10 +106,10 @@
<filtersfile file="${framework.dir}/ant.properties"/>
</filterset>
</copy>
- <chmod perm="go+w">
- <fileset dir="${framework.dir}/hudson/hudson-home">
- <include name="jobs/**"/>
- <include name="users/**"/>
+ <chmod perm="g+w">
+ <fileset dir="${hudson.home}">
+ <include name="jobs/*/config.xml"/>
+ <include name="users/*/config.xml"/>
<include name="*.xml"/>
</fileset>
</chmod>
@@ -142,12 +142,23 @@
<property environment="env"/>
<fail message="unset JBOSS_REPOSITORY=${env.JBOSS_REPOSITORY}"
if="env.JBOSS_REPOSITORY"/>
+
+ <!-- When working with group-access files and directories, it is common to use
'umask 2'
+ <exec executable="umask">
+ <arg value="2"/>
+ </exec>
+ -->
<mkdir dir="${framework.dir}/output"/>
<exec executable="${hudson.tomcat}/bin/catalina.sh"
failonerror="true" output="${framework.dir}/output/hudson.log">
<env key="CATALINA_OPTS" value="-Xmx512m
-Djava.awt.headless=true"/>
<arg line="start"/>
</exec>
+ <chmod perm="g+w">
+ <fileset dir="${hudson.tomcat}">
+ <include name="logs/**"/>
+ </fileset>
+ </chmod>
<echo/>
<echo message="*************************************"/>
Show replies by date