[jboss-cvs] JBossAS SVN: r94507 - in projects/jboss-osgi/trunk/hudson: hudson-home and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: thomas.diesler at jboss.com
Date: 2009-10-08 04:25:32 -0400 (Thu, 08 Oct 2009)
New Revision: 94507

Modified:
   projects/jboss-osgi/trunk/hudson/build.xml
   projects/jboss-osgi/trunk/hudson/hudson-home/config.xml
Log:
Simplify hudson setup

Modified: projects/jboss-osgi/trunk/hudson/build.xml
===================================================================
--- projects/jboss-osgi/trunk/hudson/build.xml	2009-10-08 07:24:07 UTC (rev 94506)
+++ projects/jboss-osgi/trunk/hudson/build.xml	2009-10-08 08:25:32 UTC (rev 94507)
@@ -21,17 +21,18 @@
   <!-- Hudson Jobs                                                        -->
   <!-- ================================================================== -->
   <macrodef name="copyjobs">
-     <sequential>
-       <copyjob index="0" prefix="" job="JBoss-5.2.0"/>
-       <copyjob index="1" prefix="" job="JBoss-6.0.0"/>
-       <copyjob index="2" prefix="${hudson.job.prefix}" job="jbossosgi-embedded"/>
-       <copyjob index="3" prefix="${hudson.job.prefix}" job="jbossosgi-jdk15"/>
-       <copyjob index="4" prefix="${hudson.job.prefix}" job="jbossosgi-jdk16"/>
-       <copyjob index="5" prefix="${hudson.job.prefix}" job="jbossosgi-matrix-embedded"/>
-       <copyjob index="6" prefix="${hudson.job.prefix}" job="jbossosgi-matrix-equinox"/>
-       <copyjob index="7" prefix="${hudson.job.prefix}" job="jbossosgi-matrix-felix"/>
-       <copyjob index="8" prefix="${hudson.job.prefix}" job="jbossosgi-matrix-jbossmc"/>
-     </sequential>
+    <sequential>
+      <copy todir="${hudson.home}/jobs" overwrite="true">
+        <fileset dir="${hudson.dir}/hudson-home/jobs">
+          <include name="*/config.xml"/>
+        </fileset>
+        <filterset>
+          <filter token="hudson.osgi.url" value="${hudson.osgi.url}"/>
+          <filter token="version.id" value="${version.id}"/>
+          <filtersfile file="${hudson.dir}/ant.properties"/>
+        </filterset>
+      </copy>
+    </sequential>
   </macrodef>
   
   <!-- ================================================================== -->
@@ -47,9 +48,6 @@
     
     <xmlproperty file="${project.root.dir}/pom.xml"/>
     <property name="version.id" value="${project.version}"/>
-    <property name="hudson.job.prefix" value="V${project.version}"/>
-    
-    <echo message="${hudson.job.prefix}"/>
   </target>
   
   <target name="init-hudson" depends="init">
@@ -162,7 +160,6 @@
       </fileset>
       <filterset>
         <filter token="version.id" value="${version.id}"/>
-        <filter token="hudson.job.prefix" value="${hudson.job.prefix}"/>
         <filtersfile file="${hudson.dir}/ant.properties"/>
       </filterset>
     </copy>
@@ -213,30 +210,4 @@
 
   </target>
   
-  <macrodef name="copyjob">
-     <attribute name="index"/>
-     <attribute name="prefix"/>
-     <attribute name="job"/>
-     <sequential>
-       <condition property="job.prefix.@{index}" value="@{prefix}-" else="">
-         <and>
-         	<available file="${hudson.home}/jobs/@{job}" type="dir"/>
-            <not>
-              <equals arg1="@{prefix}" arg2=""/>
-            </not>
-         </and>
-       </condition>
-       <copy todir="${hudson.home}/jobs/${job.prefix.@{index}}@{job}" overwrite="true">
-         <fileset dir="${hudson.dir}/hudson-home/jobs/@{job}">
-           <include name="config.xml"/>
-         </fileset>
-         <filterset>
-           <filter token="hudson.osgi.url" value="${hudson.osgi.url}"/>
-           <filter token="version.id" value="${version.id}"/>
-           <filtersfile file="${hudson.dir}/ant.properties"/>
-         </filterset>
-       </copy>
-     </sequential>
-  </macrodef>
-  
 </project>

Modified: projects/jboss-osgi/trunk/hudson/hudson-home/config.xml
===================================================================
--- projects/jboss-osgi/trunk/hudson/hudson-home/config.xml	2009-10-08 07:24:07 UTC (rev 94506)
+++ projects/jboss-osgi/trunk/hudson/hudson-home/config.xml	2009-10-08 08:25:32 UTC (rev 94507)
@@ -35,14 +35,6 @@
       <owner class="hudson" reference="../../.."/>
       <name>All</name>
     </hudson.model.AllView>
-    <listView>
-      <owner class="hudson" reference="../../.."/>
-      <name>V at version.id@</name>
-      <jobNames class="tree-set">
-        <comparator class="hudson.util.CaseInsensitiveComparator"/>
-      </jobNames>
-      <includeRegex>@hudson.job.prefix at -(.*)</includeRegex>
-    </listView>
   </views>
   <primaryView>All</primaryView>
   <slaveAgentPort>0</slaveAgentPort>