[jboss-cvs] JBossAS SVN: r94407 - projects/jboss-osgi/projects/osgitck/r4v42.

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

Author: thomas.diesler at jboss.com
Date: 2009-10-06 06:50:49 -0400 (Tue, 06 Oct 2009)
New Revision: 94407

Modified:
   projects/jboss-osgi/projects/osgitck/r4v42/ant.properties.example
   projects/jboss-osgi/projects/osgitck/r4v42/build.xml
Log:
Use the SVn export instead of a zip file

Modified: projects/jboss-osgi/projects/osgitck/r4v42/ant.properties.example
===================================================================
--- projects/jboss-osgi/projects/osgitck/r4v42/ant.properties.example	2009-10-06 08:57:35 UTC (rev 94406)
+++ projects/jboss-osgi/projects/osgitck/r4v42/ant.properties.example	2009-10-06 10:50:49 UTC (rev 94407)
@@ -4,7 +4,7 @@
 # $Id: ant.properties.example 3995 2007-07-26 08:52:45Z thomas.diesler at jboss.com $
 
 # The location of the OSGi TCK
-osgitck.zip=/home/hudson/svn/osgitck/r4v42-core-cmpn-final.zip
+osgitck.export=/home/hudson/svn/osgitck/r4v42-core-cmpn-final
 
 # The location od the local maven repository
 maven.local.repository=/home/hudson/.m2/repository

Modified: projects/jboss-osgi/projects/osgitck/r4v42/build.xml
===================================================================
--- projects/jboss-osgi/projects/osgitck/r4v42/build.xml	2009-10-06 08:57:35 UTC (rev 94406)
+++ projects/jboss-osgi/projects/osgitck/r4v42/build.xml	2009-10-06 10:50:49 UTC (rev 94407)
@@ -27,9 +27,9 @@
 
     <property file="${basedir}/ant.properties" />
 
-    <!-- Check if the osgitck zip is available -->
-    <available property="osgitck.zip.available" file="${osgitck.zip}" />
-    <fail message="Cannot find: ${osgitck.zip}" unless="osgitck.zip.available" />
+    <!-- Check if the osgitck export is available -->
+    <available property="osgitck.export.available" file="${osgitck.export}" />
+    <fail message="Cannot find: ${osgitck.export}" unless="osgitck.export.available" />
 
     <!-- Check if the aQute.bnd jar is available -->
     <property name="aQute.bnd.jar" value="${maven.local.repository}/biz/aQute/aQute.bnd/${aQute.bnd.version}/aQute.bnd-${aQute.bnd.version}.jar" />
@@ -52,21 +52,25 @@
   <!-- Setup                                                              -->
   <!-- ================================================================== -->
 
-  <!-- Unzip the OSGi TCK-->
-  <target name="unzip-osgitck" depends="init" unless="osgitck.dir.available">
-    <unzip src="${osgitck.zip}" dest="${target.dir}" />
+  <!-- Copy the OSGi TCK-->
+  <target name="copy-osgitck" depends="init" unless="osgitck.dir.available">
+    <copy toDir="${osgitck.dir}">
+      <fileset dir="${osgitck.export}">
+        <exclude name="**/.svn"/>
+      </fileset>
+    </copy>
     <available property="osgitck.dir.available" file="${osgitck.dir}" />
   </target>
 
   <!-- Setup the TCK to use the RI (equinox) -->
-  <target name="setup.ri" depends="init,unzip-osgitck">
+  <target name="setup.ri" description="Setup the TCK using the RI (Equinox)" depends="init,copy-osgitck">
     
     <!-- Copy the aQute.bnd -->
     <copy file="${aQute.bnd.jar}" tofile="${osgitck.dir}/licensed/repo/biz.aQute.bnd/biz.aQute.bnd-latest.jar" overwrite="true" />
   </target>
 
   <!-- Setup the TCK to use the JBoss OSGi Framework -->
-  <target name="setup.jboss" depends="init,unzip-osgitck">
+  <target name="setup.jboss" description="Setup the TCK using the JBoss OSGi Framework" depends="init,copy-osgitck">
 
     <!-- Check if the osgitck dir is available -->
     <fail message="Cannot find: ${osgitck.dir}" unless="osgitck.dir.available" />
@@ -88,15 +92,15 @@
   <!-- Hudson                                                             -->
   <!-- ================================================================== -->
 
-  <target name="hudson-setup" depends="init">
+  <target name="hudson-setup" description="Setup the TCK Hudson instance" depends="init">
     <ant dir="${basedir}/hudson" target="hudson-setup" />
   </target>
   
-  <target name="hudson-start" depends="init">
+  <target name="hudson-start" description="Start the TCK Hudson instance" depends="init">
     <ant dir="${basedir}/hudson" target="hudson-start" />
   </target>
   
-  <target name="hudson-stop" depends="init">
+  <target name="hudson-stop" description="Stop the TCK Hudson instance" depends="init">
     <ant dir="${basedir}/hudson" target="hudson-stop" />
   </target>
   
@@ -104,7 +108,7 @@
   <!-- TCK Tests                                                          -->
   <!-- ================================================================== -->
 
-  <target name="tck-core-tests" depends="init">
+  <target name="tck-core-tests" description="Run the TCK core tests" depends="init">
     <ant dir="${osgitck.dir}/osgi.ct" target="clean" />
     <ant dir="${osgitck.dir}/osgi.ct" target="publish" />
     <ant dir="${osgitck.dir}/osgi.ct" target="osgi.core.tests" />
@@ -114,7 +118,7 @@
   <!-- Clean                                                              -->
   <!-- ================================================================== -->
 
-  <target name="clean">
+  <target name="clean" description="Clean the TCK setup">
     <delete dir="${target.dir}" />
   </target>