Author: thomas.diesler(a)jboss.com Date: 2009-12-10 05:12:48 -0500 (Thu, 10 Dec 2009) New Revision: 97688 Added: projects/jboss-osgi/projects/osgitck/trunk/overlay/org.osgi.test.cases.startlevel/ projects/jboss-osgi/projects/osgitck/trunk/overlay/org.osgi.test.cases.startlevel/bnd.bnd Removed: projects/jboss-osgi/projects/osgitck/trunk/hudson/hudson-home/jobs/osgi.blueprint.tests/ Modified: projects/jboss-osgi/projects/osgitck/trunk/build.xml Log: Reduce start level test timeouts to 20sec Modified: projects/jboss-osgi/projects/osgitck/trunk/build.xml =================================================================== --- projects/jboss-osgi/projects/osgitck/trunk/build.xml 2009-12-10 09:46:05 UTC (rev 97687) +++ projects/jboss-osgi/projects/osgitck/trunk/build.xml 2009-12-10 10:12:48 UTC (rev 97688) @@ -61,7 +61,6 @@ <!-- Check if the osgitck dir is available --> <available property="osgitck.dir.available" file="${osgitck.dir}" /> - <property name="jboss.framework.repo.dir" value="${osgitck.dir}/licensed/repo/org.jboss.osgi.framework" /> </target> @@ -100,8 +99,8 @@ </copy> <!-- Copy the OSGi Framework --> - <mkdir dir="${jboss.framework.repo.dir}" /> - <copy file="${jboss.osgi.framework.jar}" tofile="${jboss.framework.repo.dir}/org.jboss.osgi.framework-1.0.0.jar" overwrite="true" /> + <mkdir dir="${osgitck.dir}/licensed/repo/org.jboss.osgi.framework" /> + <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" /> <!-- Copy the aQute.bnd --> <copy file="${aQute.bnd.jar}" tofile="${osgitck.dir}/licensed/repo/biz.aQute.bnd/biz.aQute.bnd-latest.jar" overwrite="true" /> Added: projects/jboss-osgi/projects/osgitck/trunk/overlay/org.osgi.test.cases.startlevel/bnd.bnd =================================================================== --- projects/jboss-osgi/projects/osgitck/trunk/overlay/org.osgi.test.cases.startlevel/bnd.bnd (rev 0) +++ projects/jboss-osgi/projects/osgitck/trunk/overlay/org.osgi.test.cases.startlevel/bnd.bnd 2009-12-10 10:12:48 UTC (rev 97688) @@ -0,0 +1,35 @@ +Bundle-Description: Tests the Start Level service control bundle +Bundle-Version : 4.2.0.${project.build} + +Private-Package = org.osgi.test.support.*, \ + ${p}.junit.* + +Export-Package = \ + + +Include-Resource = \ + tb1.jar, \ + tb2.jar, \ + tb3.jar, \ + tb4.jar, \ + tb5.jar + +Test-Cases = ${testcases} +-signaturetest = org.osgi.service.startlevel + +-buildpath = \ + org.osgi.test.support; version=project , \ + org.osgi.service.startlevel; version=project , \ + osgi.core; version=4.2 , \ + ee.minimum; version=1.2 , \ + ${junit} + +-runbundles = \ + + +-runproperties = report=true, \ + osgi.compatibility.bootdelegation=false, \ + osgi.resolverMode=strict + +# TDI: Reduce start level test timeouts to 20sec +-runvm = osgi.tc.startlevel.sleeptime=200, osgi.tc.startlevel.timeout=100 \ No newline at end of file