[jboss-osgi-commits] JBoss-OSGI SVN: r101925 - in projects/jboss-osgi/trunk/testsuite: functional/src/test/java/org/jboss/test/osgi/jbosgi99 and 1 other directory.

Author: thomas.diesler(a)jboss.com Date: 2010-03-04 22:45:41 -0500 (Thu, 04 Mar 2010) New Revision: 101925 Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi99/OSGi99TestCase.java projects/jboss-osgi/trunk/testsuite/pom.xml Log: Promote the framework core dependencies Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi99/OSGi99TestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi99/OSGi99TestCase.java 2010-03-05 03:44:26 UTC (rev 101924) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi99/OSGi99TestCase.java 2010-03-05 03:45:41 UTC (rev 101925) @@ -130,12 +130,12 @@ } @Test - // [JBOSGI-210] Bundle installed but not started with hot deploy public void testHotDeploy() throws Exception { if (runtime.isRemoteRuntime() == false) return; + // [JBOSGI-210] Bundle installed but not started with hot deploy File inFile = getTestArchiveFile("jbosgi99-allgood.jar"); // Copy the bundle to the data directory @@ -148,7 +148,7 @@ File deployFile = new File(outPath + "deploy/jbosgi99-allgood.jar"); outFile.renameTo(deployFile); - int timeout = 5000; + int timeout = 8000; OSGiBundle bundle = null; while (timeout > 0) { @@ -166,7 +166,7 @@ // Delete the bundle from the deploy directory deployFile.delete(); - timeout = 5000; + timeout = 8000; while (timeout > 0) { if (bundle.getState() == Bundle.UNINSTALLED) Modified: projects/jboss-osgi/trunk/testsuite/pom.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/pom.xml 2010-03-05 03:44:26 UTC (rev 101924) +++ projects/jboss-osgi/trunk/testsuite/pom.xml 2010-03-05 03:45:41 UTC (rev 101925) @@ -330,8 +330,14 @@ </property> </activation> <dependencies> + <!-- Promote the framework core dependencies --> <dependency> <groupId>org.jboss.osgi.framework</groupId> + <artifactId>jboss-osgi-framework-core</artifactId> + <version>${version.jboss.osgi.framework}</version> + </dependency> + <dependency> + <groupId>org.jboss.osgi.framework</groupId> <artifactId>jboss-osgi-framework</artifactId> </dependency> <dependency> @@ -348,8 +354,14 @@ </property> </activation> <dependencies> + <!-- Promote the framework core dependencies --> <dependency> <groupId>org.jboss.osgi.framework</groupId> + <artifactId>jboss-osgi-framework-core</artifactId> + <version>${version.jboss.osgi.framework}</version> + </dependency> + <dependency> + <groupId>org.jboss.osgi.framework</groupId> <artifactId>jboss-osgi-framework</artifactId> </dependency> <dependency> @@ -453,7 +465,7 @@ <groupId>org.jboss.osgi.runtime</groupId> <artifactId>jmx-invoker-adaptor-client</artifactId> <version>${version.jmx.invoker.adaptor.client}</version> - <scope>provided</scope> + <scope>test</scope> <type>pom</type> </dependency> </dependencies> @@ -479,7 +491,7 @@ <groupId>org.jboss.osgi.runtime</groupId> <artifactId>jmx-invoker-adaptor-client</artifactId> <version>${version.jmx.invoker.adaptor.client}</version> - <scope>provided</scope> + <scope>test</scope> <type>pom</type> </dependency> </dependencies> @@ -504,8 +516,8 @@ <dependency> <groupId>org.jboss.jbossas</groupId> <artifactId>jboss-as-client</artifactId> - <version>6.0.0.M1</version> - <scope>provided</scope> + <version>6.0.0.20100216-M2</version> + <scope>test</scope> <type>pom</type> <exclusions> <exclusion> @@ -536,8 +548,8 @@ <dependency> <groupId>org.jboss.jbossas</groupId> <artifactId>jboss-as-client</artifactId> - <version>6.0.0.M1</version> - <scope>provided</scope> + <version>6.0.0.20100216-M2</version> + <scope>test</scope> <type>pom</type> <exclusions> <exclusion>