[jboss-cvs] JBossAS SVN: r94343 - in projects/jboss-osgi/projects/osgitck/r4v42: hudson/hudson-home/jobs/osgi.core.tests and 1 other directory.

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

Author: thomas.diesler at jboss.com
Date: 2009-10-05 04:00:08 -0400 (Mon, 05 Oct 2009)
New Revision: 94343

Modified:
   projects/jboss-osgi/projects/osgitck/r4v42/build.xml
   projects/jboss-osgi/projects/osgitck/r4v42/hudson/hudson-home/jobs/osgi.core.tests/config.xml
Log:
Add setup.ri

Modified: projects/jboss-osgi/projects/osgitck/r4v42/build.xml
===================================================================
--- projects/jboss-osgi/projects/osgitck/r4v42/build.xml	2009-10-05 07:48:06 UTC (rev 94342)
+++ projects/jboss-osgi/projects/osgitck/r4v42/build.xml	2009-10-05 08:00:08 UTC (rev 94343)
@@ -11,7 +11,7 @@
 
 <!-- $Id: build.xml 93515 2009-09-15 07:18:21Z thomas.diesler at jboss.com $ -->
 
-<project default="setup">
+<project default="setup.jboss">
 
   <property name="target.dir" value="${basedir}/target" />
 
@@ -58,8 +58,16 @@
     <available property="osgitck.dir.available" file="${osgitck.dir}" />
   </target>
 
-  <target name="setup" depends="init,unzip-osgitck">
+  <!-- Setup the TCK to use the RI (equinox) -->
+  <target name="setup.ri" depends="init,unzip-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">
+
     <!-- Check if the osgitck dir is available -->
     <fail message="Cannot find: ${osgitck.dir}" unless="osgitck.dir.available" />
 

Modified: projects/jboss-osgi/projects/osgitck/r4v42/hudson/hudson-home/jobs/osgi.core.tests/config.xml
===================================================================
--- projects/jboss-osgi/projects/osgitck/r4v42/hudson/hudson-home/jobs/osgi.core.tests/config.xml	2009-10-05 07:48:06 UTC (rev 94342)
+++ projects/jboss-osgi/projects/osgitck/r4v42/hudson/hudson-home/jobs/osgi.core.tests/config.xml	2009-10-05 08:00:08 UTC (rev 94343)
@@ -28,7 +28,7 @@
 cp ant.properties.example ant.properties
 
 # Setup the TCK
-ant clean setup
+ant clean setup.jboss
 
 # Run the core tests
 ant tck-core-tests