[jboss-osgi-commits] JBoss-OSGI SVN: r87330 - in projects/jboss-osgi/trunk: runtime/felix/src/test/java/org/jboss/test/osgi/felix and 3 other directories.

Author: thomas.diesler(a)jboss.com Date: 2009-04-15 06:57:57 -0400 (Wed, 15 Apr 2009) New Revision: 87330 Modified: projects/jboss-osgi/trunk/pom.xml projects/jboss-osgi/trunk/runtime/felix/src/test/java/org/jboss/test/osgi/felix/SystemBundleTestCase.java projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/example/http/HttpServiceRemoteTestCase.java projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/example/log/LogServiceRemoteTestCase.java projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/example/log/LogServiceTestCase.java projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/example/microcontainer/MBeanServiceRemoteTestCase.java Log: [JBOSGI-65] Update to Felix 1.6.0 Modified: projects/jboss-osgi/trunk/pom.xml =================================================================== --- projects/jboss-osgi/trunk/pom.xml 2009-04-15 10:34:21 UTC (rev 87329) +++ projects/jboss-osgi/trunk/pom.xml 2009-04-15 10:57:57 UTC (rev 87330) @@ -38,7 +38,7 @@ <version.aqute.bnd>0.0.315</version.aqute.bnd> <version.equinox>3.4.2</version.equinox> <version.felix.configadmin>1.0.10</version.felix.configadmin> - <version.felix.framework>1.4.1</version.felix.framework> + <version.felix.framework>1.6.0</version.felix.framework> <version.felix.http.jetty>0.9.0-20090218-R745505</version.felix.http.jetty> <version.felix.javax.servlet>1.0.0</version.felix.javax.servlet> <version.felix.log>0.9.0-20090211-R743531</version.felix.log> Modified: projects/jboss-osgi/trunk/runtime/felix/src/test/java/org/jboss/test/osgi/felix/SystemBundleTestCase.java =================================================================== --- projects/jboss-osgi/trunk/runtime/felix/src/test/java/org/jboss/test/osgi/felix/SystemBundleTestCase.java 2009-04-15 10:34:21 UTC (rev 87329) +++ projects/jboss-osgi/trunk/runtime/felix/src/test/java/org/jboss/test/osgi/felix/SystemBundleTestCase.java 2009-04-15 10:57:57 UTC (rev 87330) @@ -47,7 +47,7 @@ Bundle bundle = framework.getSystemBundle(); assertEquals("BundleId == 0", 0, bundle.getBundleId()); - assertEquals("SymbolicName", "system.bundle", bundle.getSymbolicName()); + assertEquals("SymbolicName", "org.apache.felix.framework", bundle.getSymbolicName()); } public void testSystemBundle() @@ -57,6 +57,6 @@ Bundle bundle = framework.getSystemBundle(); assertEquals("BundleId == 0", 0, bundle.getBundleId()); - assertEquals("SymbolicName", "system.bundle", bundle.getSymbolicName()); + assertEquals("SymbolicName", "org.apache.felix.framework", bundle.getSymbolicName()); } } \ No newline at end of file Modified: projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/example/http/HttpServiceRemoteTestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/example/http/HttpServiceRemoteTestCase.java 2009-04-15 10:34:21 UTC (rev 87329) +++ projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/example/http/HttpServiceRemoteTestCase.java 2009-04-15 10:57:57 UTC (rev 87330) @@ -43,7 +43,7 @@ { public static Test suite() { - return new IntegrationTestSetup(HttpServiceRemoteTestCase.class, "http-service.jar"); + return new IntegrationTestSetup(HttpServiceRemoteTestCase.class, "example/example-http.jar"); } public void testServletAccess() throws Exception @@ -64,7 +64,7 @@ { URL url = new URL("http://" + getServerHost() + ":8090/servlet?test=context"); BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream())); - assertEquals("http-service-test", br.readLine()); + assertEquals("example-http", br.readLine()); } public void testServletStartLevel() throws Exception Modified: projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/example/log/LogServiceRemoteTestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/example/log/LogServiceRemoteTestCase.java 2009-04-15 10:34:21 UTC (rev 87329) +++ projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/example/log/LogServiceRemoteTestCase.java 2009-04-15 10:57:57 UTC (rev 87330) @@ -80,13 +80,13 @@ deployBundle("bundles/jboss-osgi-remotelog.jar"); // Deploy the test bundle - RemoteBundle bundleA = deployBundle("example/example-log-bundleA.jar"); + RemoteBundle bundleA = deployBundle("example/example-log.jar"); // Verify that the bundle is active assertEquals("Remote bundle ACTIVE", Bundle.ACTIVE, bundleA.getState()); // Undeploy the test bundle - undeployBundle("example/example-log-bundleA.jar"); + undeployBundle("example/example-log.jar"); // Uneploy the RemoteLogListener from the remote OSGiFramework. undeployBundle("bundles/jboss-osgi-remotelog.jar"); Modified: projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/example/log/LogServiceTestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/example/log/LogServiceTestCase.java 2009-04-15 10:34:21 UTC (rev 87329) +++ projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/example/log/LogServiceTestCase.java 2009-04-15 10:57:57 UTC (rev 87330) @@ -82,7 +82,7 @@ commonBundle.start(); // Install and start the test bundle - testURL = getTestArchiveURL("example/example-log-bundleA.jar"); + testURL = getTestArchiveURL("example/example-log.jar"); Bundle bundleA = sysContext.installBundle(testURL.toExternalForm()); bundleA.start(); Modified: projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/example/microcontainer/MBeanServiceRemoteTestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/example/microcontainer/MBeanServiceRemoteTestCase.java 2009-04-15 10:34:21 UTC (rev 87329) +++ projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/example/microcontainer/MBeanServiceRemoteTestCase.java 2009-04-15 10:57:57 UTC (rev 87330) @@ -41,7 +41,7 @@ { public static Test suite() { - return new IntegrationTestSetup(MBeanServiceRemoteTestCase.class, "microcontainer-service.jar"); + return new IntegrationTestSetup(MBeanServiceRemoteTestCase.class, "example/example-microcontainer.jar"); } public void testMBeanAccess() throws Exception