[jboss-osgi-commits] JBoss-OSGI SVN: r102656 - projects/jboss-osgi/projects/osgitck/trunk.

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

Author: thomas.diesler at jboss.com
Date: 2010-03-19 21:04:47 -0400 (Fri, 19 Mar 2010)
New Revision: 102656

Modified:
   projects/jboss-osgi/projects/osgitck/trunk/build.xml
   projects/jboss-osgi/projects/osgitck/trunk/readme.txt
Log:
Fix the tck build (somewhat)

Modified: projects/jboss-osgi/projects/osgitck/trunk/build.xml
===================================================================
--- projects/jboss-osgi/projects/osgitck/trunk/build.xml	2010-03-20 01:03:36 UTC (rev 102655)
+++ projects/jboss-osgi/projects/osgitck/trunk/build.xml	2010-03-20 01:04:47 UTC (rev 102656)
@@ -52,7 +52,7 @@
     <fail message="Cannot find: ${aQute.bnd.jar}" unless="aQute.bnd.available" />
 
     <!-- Check if the jboss.osgi.framework jar is available -->
-    <property name="jboss.osgi.framework.jar" value="${maven.local.repository}/org/jboss/osgi/runtime/jboss-osgi-framework/${framework.version}/jboss-osgi-framework-${framework.version}-all.jar" />
+    <property name="jboss.osgi.framework.jar" value="${maven.local.repository}/org/jboss/osgi/framework/jboss-osgi-framework/${framework.version}/jboss-osgi-framework-${framework.version}-all.jar" />
     <available property="jboss.osgi.framework.available" file="${jboss.osgi.framework.jar}" />
     <fail message="Cannot find: ${jboss.osgi.framework.jar}" unless="jboss.osgi.framework.available" />
 
@@ -91,6 +91,7 @@
   <target name="update-framework" description="Update the JBoss OSGi Framework" depends="init">
     <!-- Copy the OSGi Framework -->
     <mkdir dir="${osgitck.dir}/licensed/repo/org.jboss.osgi.framework" />
+  	<echo message="jboss.osgi.framework.jar=${jboss.osgi.framework.jar}"/>
     <copy file="${jboss.osgi.framework.jar}" tofile="${osgitck.dir}/licensed/repo/org.jboss.osgi.framework/org.jboss.osgi.framework-1.0.0.jar"
       overwrite="true" />
   </target>

Modified: projects/jboss-osgi/projects/osgitck/trunk/readme.txt
===================================================================
--- projects/jboss-osgi/projects/osgitck/trunk/readme.txt	2010-03-20 01:03:36 UTC (rev 102655)
+++ projects/jboss-osgi/projects/osgitck/trunk/readme.txt	2010-03-20 01:04:47 UTC (rev 102656)
@@ -14,13 +14,13 @@
 Running the OSGi TCK against the RI (Equinox)
 
     ant clean setup.ri
-    ant run-tests
+    ant run-core-tests
     ant test-reports
 
 Running the OSGi TCK against the JBoss OSGi Framework
 
-    ant clean setup.jboss
-    ant run-tests
+    ant clean setup.vi
+    ant run-core-tests
     ant test-reports
 
 Setup the OSGi TCK Hudson instance
@@ -34,4 +34,4 @@
 Running Tests with JPDA
 -----------------------
 
-export ANT_OPTS="-Djpda=-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y"
\ No newline at end of file
+export ANT_OPTS="-Djpda=-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y"