[jboss-osgi-commits] JBoss-OSGI SVN: r101884 - in projects/jboss-osgi/trunk/testsuite: functional and 3 other directories.

Author: thomas.diesler(a)jboss.com Date: 2010-03-04 14:36:00 -0500 (Thu, 04 Mar 2010) New Revision: 101884 Modified: projects/jboss-osgi/trunk/testsuite/functional/pom.xml projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/fragments/FragmentTestCase.java projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi108/OSGi108TestCase.java projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi39/OSGi39TestCase.java projects/jboss-osgi/trunk/testsuite/pom.xml Log: Use vfs21 for functional felix/equinox tests Modified: projects/jboss-osgi/trunk/testsuite/functional/pom.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/pom.xml 2010-03-04 19:26:16 UTC (rev 101883) +++ projects/jboss-osgi/trunk/testsuite/functional/pom.xml 2010-03-04 19:36:00 UTC (rev 101884) @@ -346,7 +346,7 @@ </plugins> </build> </profile> - + </profiles> </project> Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/fragments/FragmentTestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/fragments/FragmentTestCase.java 2010-03-04 19:26:16 UTC (rev 101883) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/fragments/FragmentTestCase.java 2010-03-04 19:36:00 UTC (rev 101884) @@ -63,7 +63,7 @@ } @After - public void tearDown() + public void tearDown() throws Exception { if (runtime != null) { Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi108/OSGi108TestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi108/OSGi108TestCase.java 2010-03-04 19:26:16 UTC (rev 101883) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi108/OSGi108TestCase.java 2010-03-04 19:36:00 UTC (rev 101884) @@ -40,7 +40,6 @@ import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import org.osgi.framework.BundleException; /** * [JBOSGI-108] Investigate statics on PackageAdmin.refresh @@ -63,7 +62,7 @@ } @AfterClass - public static void afterClass() throws BundleException + public static void afterClass() throws Exception { if (runtime != null) { Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi39/OSGi39TestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi39/OSGi39TestCase.java 2010-03-04 19:26:16 UTC (rev 101883) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi39/OSGi39TestCase.java 2010-03-04 19:36:00 UTC (rev 101884) @@ -65,7 +65,7 @@ } @After - public void tearDown() + public void tearDown() throws Exception { runtime.shutdown(); } Modified: projects/jboss-osgi/trunk/testsuite/pom.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/pom.xml 2010-03-04 19:26:16 UTC (rev 101883) +++ projects/jboss-osgi/trunk/testsuite/pom.xml 2010-03-04 19:36:00 UTC (rev 101884) @@ -285,7 +285,7 @@ </dependency> <dependency> <groupId>org.jboss.osgi.vfs</groupId> - <artifactId>jboss-osgi-vfs30</artifactId> + <artifactId>jboss-osgi-vfs21</artifactId> </dependency> </dependencies> </profile> @@ -312,7 +312,7 @@ </dependency> <dependency> <groupId>org.jboss.osgi.vfs</groupId> - <artifactId>jboss-osgi-vfs30</artifactId> + <artifactId>jboss-osgi-vfs21</artifactId> </dependency> </dependencies> </profile>