[jboss-osgi-commits] JBoss-OSGI SVN: r89502 - in projects/jboss-osgi/trunk: husky/testsuite/src/test/java/org/jboss/test/osgi/husky/context and 12 other directories.

Author: thomas.diesler(a)jboss.com Date: 2009-05-28 17:25:40 -0400 (Thu, 28 May 2009) New Revision: 89502 Added: projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/OSGiBundle.java projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/OSGiPackageAdmin.java Removed: projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/AbstractBundle.java projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/AbstractPackageAdmin.java Modified: projects/jboss-osgi/trunk/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/context/BlueprintContextTestCase.java projects/jboss-osgi/trunk/husky/testsuite/src/test/java/org/jboss/test/osgi/husky/context/ContextTestCase.java projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/OSGiRuntime.java projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/internal/EmbeddedBundle.java projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/internal/EmbeddedPackageAdmin.java projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/internal/EmbeddedRuntime.java projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/internal/OSGiRuntimeImpl.java projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/internal/RemoteBundle.java projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/internal/RemotePackageAdmin.java projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/internal/RemoteRuntime.java projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/http/HttpServiceTestCase.java projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/jmx/JMXTestCase.java projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/jndi/JNDITestCase.java projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/log/LogServiceTestCase.java projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/bootstrap/CapabilityTestCase.java projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi37/OSGI37TestCase.java projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi38/OSGI38TestCase.java 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/jbosgi41/OSGI41TestCase.java projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/service/startlevel/StartLevelTestCase.java Log: Rename AbstractBundle to OSGiBundle Modified: projects/jboss-osgi/trunk/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/context/BlueprintContextTestCase.java =================================================================== --- projects/jboss-osgi/trunk/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/context/BlueprintContextTestCase.java 2009-05-28 21:21:07 UTC (rev 89501) +++ projects/jboss-osgi/trunk/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/context/BlueprintContextTestCase.java 2009-05-28 21:25:40 UTC (rev 89502) @@ -28,7 +28,7 @@ import org.jboss.osgi.husky.BridgeFactory; import org.jboss.osgi.husky.annotation.ProvideContext; -import org.jboss.osgi.spi.testing.AbstractBundle; +import org.jboss.osgi.spi.testing.OSGiBundle; import org.jboss.osgi.spi.testing.OSGiRuntime; import org.jboss.osgi.spi.testing.OSGiTest; import org.jboss.osgi.spi.testing.capability.BlueprintCapability; @@ -55,7 +55,7 @@ public BundleContext context; private OSGiRuntime runtime; - private AbstractBundle bundle; + private OSGiBundle bundle; @Before public void setUp() throws Exception Modified: projects/jboss-osgi/trunk/husky/testsuite/src/test/java/org/jboss/test/osgi/husky/context/ContextTestCase.java =================================================================== --- projects/jboss-osgi/trunk/husky/testsuite/src/test/java/org/jboss/test/osgi/husky/context/ContextTestCase.java 2009-05-28 21:21:07 UTC (rev 89501) +++ projects/jboss-osgi/trunk/husky/testsuite/src/test/java/org/jboss/test/osgi/husky/context/ContextTestCase.java 2009-05-28 21:25:40 UTC (rev 89502) @@ -27,7 +27,7 @@ import org.jboss.osgi.husky.BridgeFactory; import org.jboss.osgi.husky.annotation.ProvideContext; -import org.jboss.osgi.spi.testing.AbstractBundle; +import org.jboss.osgi.spi.testing.OSGiBundle; import org.jboss.osgi.spi.testing.OSGiRuntime; import org.jboss.osgi.spi.testing.OSGiTestHelper; import org.jboss.osgi.spi.testing.capability.HuskyCapability; @@ -51,7 +51,7 @@ public BundleContext context; private OSGiRuntime runtime; - private AbstractBundle bundle; + private OSGiBundle bundle; @Before public void setUp() throws BundleException Deleted: projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/AbstractBundle.java =================================================================== --- projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/AbstractBundle.java 2009-05-28 21:21:07 UTC (rev 89501) +++ projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/AbstractBundle.java 2009-05-28 21:25:40 UTC (rev 89502) @@ -1,53 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.osgi.spi.testing; - -import java.util.Dictionary; - -import org.osgi.framework.BundleException; - -/** - * An OSGi Test Case - * - * @author Thomas.Diesler(a)jboss.org - * @since 25-Sep-2008 - */ -public abstract class AbstractBundle -{ - public abstract long getBundleId(); - - public abstract String getSymbolicName(); - - public abstract String getVersion(); - - public abstract Dictionary<String, String> getHeaders(); - - public abstract int getState(); - - public abstract String getProperty(String key); - - public abstract void start() throws BundleException; - - public abstract void stop() throws BundleException; - - public abstract void uninstall() throws BundleException; -} Deleted: projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/AbstractPackageAdmin.java =================================================================== --- projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/AbstractPackageAdmin.java 2009-05-28 21:21:07 UTC (rev 89501) +++ projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/AbstractPackageAdmin.java 2009-05-28 21:25:40 UTC (rev 89502) @@ -1,34 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.osgi.spi.testing; - - -/** - * [TODO] - * - * @author Thomas.Diesler(a)jboss.org - * @since 25-Sep-2008 - */ -public abstract class AbstractPackageAdmin -{ - public abstract void refreshPackages(AbstractBundle[] bundles); -} Copied: projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/OSGiBundle.java (from rev 89501, projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/AbstractBundle.java) =================================================================== --- projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/OSGiBundle.java (rev 0) +++ projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/OSGiBundle.java 2009-05-28 21:25:40 UTC (rev 89502) @@ -0,0 +1,53 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.osgi.spi.testing; + +import java.util.Dictionary; + +import org.osgi.framework.BundleException; + +/** + * An OSGi Test Case + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Sep-2008 + */ +public abstract class OSGiBundle +{ + public abstract long getBundleId(); + + public abstract String getSymbolicName(); + + public abstract String getVersion(); + + public abstract Dictionary<String, String> getHeaders(); + + public abstract int getState(); + + public abstract String getProperty(String key); + + public abstract void start() throws BundleException; + + public abstract void stop() throws BundleException; + + public abstract void uninstall() throws BundleException; +} Copied: projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/OSGiPackageAdmin.java (from rev 89499, projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/AbstractPackageAdmin.java) =================================================================== --- projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/OSGiPackageAdmin.java (rev 0) +++ projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/OSGiPackageAdmin.java 2009-05-28 21:25:40 UTC (rev 89502) @@ -0,0 +1,34 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.osgi.spi.testing; + + +/** + * [TODO] + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Sep-2008 + */ +public abstract class OSGiPackageAdmin +{ + public abstract void refreshPackages(OSGiBundle[] bundles); +} Modified: projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/OSGiRuntime.java =================================================================== --- projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/OSGiRuntime.java 2009-05-28 21:21:07 UTC (rev 89501) +++ projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/OSGiRuntime.java 2009-05-28 21:25:40 UTC (rev 89502) @@ -47,13 +47,13 @@ void stopLogEntryTracking(); - AbstractBundle installBundle(String location) throws BundleException; + OSGiBundle installBundle(String location) throws BundleException; - AbstractBundle[] getBundles(); + OSGiBundle[] getBundles(); - AbstractBundle getBundle(String symbolicName, String version); + OSGiBundle getBundle(String symbolicName, String version); - AbstractPackageAdmin getPackageAdmin(); + OSGiPackageAdmin getPackageAdmin(); InitialContext getInitialContext() throws NamingException; Modified: projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/internal/EmbeddedBundle.java =================================================================== --- projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/internal/EmbeddedBundle.java 2009-05-28 21:21:07 UTC (rev 89501) +++ projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/internal/EmbeddedBundle.java 2009-05-28 21:25:40 UTC (rev 89502) @@ -24,7 +24,7 @@ import java.util.Dictionary; import org.jboss.osgi.spi.logging.ExportedPackageHelper; -import org.jboss.osgi.spi.testing.AbstractBundle; +import org.jboss.osgi.spi.testing.OSGiBundle; import org.osgi.framework.Bundle; import org.osgi.framework.BundleException; import org.osgi.framework.Constants; @@ -35,7 +35,7 @@ * @author Thomas.Diesler(a)jboss.org * @since 25-Sep-2008 */ -public class EmbeddedBundle extends AbstractBundle +public class EmbeddedBundle extends OSGiBundle { private Bundle bundle; Modified: projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/internal/EmbeddedPackageAdmin.java =================================================================== --- projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/internal/EmbeddedPackageAdmin.java 2009-05-28 21:21:07 UTC (rev 89501) +++ projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/internal/EmbeddedPackageAdmin.java 2009-05-28 21:25:40 UTC (rev 89502) @@ -21,8 +21,8 @@ */ package org.jboss.osgi.spi.testing.internal; -import org.jboss.osgi.spi.testing.AbstractBundle; -import org.jboss.osgi.spi.testing.AbstractPackageAdmin; +import org.jboss.osgi.spi.testing.OSGiBundle; +import org.jboss.osgi.spi.testing.OSGiPackageAdmin; import org.osgi.framework.Bundle; import org.osgi.service.packageadmin.PackageAdmin; @@ -32,7 +32,7 @@ * @author Thomas.Diesler(a)jboss.org * @since 25-Sep-2008 */ -public class EmbeddedPackageAdmin extends AbstractPackageAdmin +public class EmbeddedPackageAdmin extends OSGiPackageAdmin { private PackageAdmin packAdmin; @@ -42,7 +42,7 @@ } @Override - public void refreshPackages(AbstractBundle[] bundles) + public void refreshPackages(OSGiBundle[] bundles) { Bundle[] bundleArr = null; if (bundles != null) Modified: projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/internal/EmbeddedRuntime.java =================================================================== --- projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/internal/EmbeddedRuntime.java 2009-05-28 21:21:07 UTC (rev 89501) +++ projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/internal/EmbeddedRuntime.java 2009-05-28 21:25:40 UTC (rev 89502) @@ -36,8 +36,8 @@ import org.jboss.osgi.spi.framework.OSGiBootstrapProvider; import org.jboss.osgi.spi.framework.OSGiFramework; import org.jboss.osgi.spi.logging.LogEntryCache; -import org.jboss.osgi.spi.testing.AbstractBundle; -import org.jboss.osgi.spi.testing.AbstractPackageAdmin; +import org.jboss.osgi.spi.testing.OSGiBundle; +import org.jboss.osgi.spi.testing.OSGiPackageAdmin; import org.jboss.osgi.spi.testing.OSGiTestHelper; import org.jboss.osgi.spi.testing.capability.Capability; import org.osgi.framework.Bundle; @@ -61,21 +61,21 @@ super(helper); } - public AbstractBundle installBundle(String location) throws BundleException + public OSGiBundle installBundle(String location) throws BundleException { URL bundleURL = getTestHelper().getTestArchiveURL(location); Bundle bundle = getBundleContext().installBundle(bundleURL.toExternalForm()); return new EmbeddedBundle(bundle); } - public AbstractBundle[] getBundles() + public OSGiBundle[] getBundles() { - List<AbstractBundle> absBundles = new ArrayList<AbstractBundle>(); + List<OSGiBundle> absBundles = new ArrayList<OSGiBundle>(); for (Bundle bundle : getBundleContext().getBundles()) { absBundles.add(new EmbeddedBundle(bundle)); } - AbstractBundle[] bundleArr = new AbstractBundle[absBundles.size()]; + OSGiBundle[] bundleArr = new OSGiBundle[absBundles.size()]; absBundles.toArray(bundleArr); return bundleArr; } @@ -147,7 +147,7 @@ return server; } - public AbstractPackageAdmin getPackageAdmin() + public OSGiPackageAdmin getPackageAdmin() { BundleContext context = getBundleContext(); ServiceReference sref = context.getServiceReference(PackageAdmin.class.getName()); Modified: projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/internal/OSGiRuntimeImpl.java =================================================================== --- projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/internal/OSGiRuntimeImpl.java 2009-05-28 21:21:07 UTC (rev 89501) +++ projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/internal/OSGiRuntimeImpl.java 2009-05-28 21:25:40 UTC (rev 89502) @@ -36,7 +36,7 @@ import org.jboss.osgi.spi.logging.LogEntryCache; import org.jboss.osgi.spi.management.MBeanProxy; import org.jboss.osgi.spi.management.MBeanProxyException; -import org.jboss.osgi.spi.testing.AbstractBundle; +import org.jboss.osgi.spi.testing.OSGiBundle; import org.jboss.osgi.spi.testing.OSGiRuntime; import org.jboss.osgi.spi.testing.OSGiTestHelper; import org.jboss.osgi.spi.testing.capability.Capability; @@ -55,7 +55,7 @@ final Logger log = Logger.getLogger(OSGiRuntimeImpl.class); private OSGiTestHelper helper; - private Map<String, AbstractBundle> bundles = new HashMap<String, AbstractBundle>(); + private Map<String, OSGiBundle> bundles = new HashMap<String, OSGiBundle>(); private List<Capability> capabilities = new ArrayList<Capability>(); private LogReaderService logReaderService; @@ -89,7 +89,7 @@ { if (bundles.get(location) == null) { - AbstractBundle bundle = installBundle(location); + OSGiBundle bundle = installBundle(location); bundle.start(); bundles.put(location, bundle); @@ -109,7 +109,7 @@ for (String location : bundleLocations) { - AbstractBundle bundle = bundles.remove(location); + OSGiBundle bundle = bundles.remove(location); if (bundle != null) { try @@ -187,10 +187,10 @@ return helper.getServerHost(); } - public AbstractBundle getBundle(String symbolicName, String version) + public OSGiBundle getBundle(String symbolicName, String version) { - AbstractBundle bundle = null; - for (AbstractBundle aux : getBundles()) + OSGiBundle bundle = null; + for (OSGiBundle aux : getBundles()) { if (aux.getSymbolicName().equals(symbolicName)) { Modified: projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/internal/RemoteBundle.java =================================================================== --- projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/internal/RemoteBundle.java 2009-05-28 21:21:07 UTC (rev 89501) +++ projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/internal/RemoteBundle.java 2009-05-28 21:25:40 UTC (rev 89502) @@ -25,7 +25,7 @@ import org.jboss.logging.Logger; import org.jboss.osgi.spi.management.ManagedBundleMBean; -import org.jboss.osgi.spi.testing.AbstractBundle; +import org.jboss.osgi.spi.testing.OSGiBundle; import org.osgi.framework.BundleException; import org.osgi.framework.Constants; @@ -35,7 +35,7 @@ * @author Thomas.Diesler(a)jboss.org * @since 25-Sep-2008 */ -public class RemoteBundle extends AbstractBundle +public class RemoteBundle extends OSGiBundle { // Provide logging private static final Logger log = Logger.getLogger(RemoteBundle.class); Modified: projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/internal/RemotePackageAdmin.java =================================================================== --- projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/internal/RemotePackageAdmin.java 2009-05-28 21:21:07 UTC (rev 89501) +++ projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/internal/RemotePackageAdmin.java 2009-05-28 21:25:40 UTC (rev 89502) @@ -23,8 +23,8 @@ import org.jboss.osgi.spi.management.MBeanProxyException; import org.jboss.osgi.spi.management.ManagedFrameworkMBean; -import org.jboss.osgi.spi.testing.AbstractBundle; -import org.jboss.osgi.spi.testing.AbstractPackageAdmin; +import org.jboss.osgi.spi.testing.OSGiBundle; +import org.jboss.osgi.spi.testing.OSGiPackageAdmin; /** * [TODO] @@ -32,7 +32,7 @@ * @author Thomas.Diesler(a)jboss.org * @since 25-Sep-2008 */ -public class RemotePackageAdmin extends AbstractPackageAdmin +public class RemotePackageAdmin extends OSGiPackageAdmin { private RemoteRuntime runtime; @@ -42,7 +42,7 @@ } @Override - public void refreshPackages(AbstractBundle[] bundles) + public void refreshPackages(OSGiBundle[] bundles) { String[] bundleArr = null; if (bundles != null) Modified: projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/internal/RemoteRuntime.java =================================================================== --- projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/internal/RemoteRuntime.java 2009-05-28 21:21:07 UTC (rev 89501) +++ projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/internal/RemoteRuntime.java 2009-05-28 21:25:40 UTC (rev 89502) @@ -42,8 +42,8 @@ import org.jboss.osgi.spi.management.MBeanProxyException; import org.jboss.osgi.spi.management.ManagedBundleMBean; import org.jboss.osgi.spi.management.ManagedFrameworkMBean; -import org.jboss.osgi.spi.testing.AbstractBundle; -import org.jboss.osgi.spi.testing.AbstractPackageAdmin; +import org.jboss.osgi.spi.testing.OSGiBundle; +import org.jboss.osgi.spi.testing.OSGiPackageAdmin; import org.jboss.osgi.spi.testing.OSGiTestHelper; import org.jboss.osgi.spi.testing.capability.Capability; import org.jboss.osgi.spi.testing.capability.ConfigAdminCapability; @@ -87,7 +87,7 @@ ignoredCaps.add(MicrocontainerCapability.class); } - public AbstractBundle installBundle(String location) throws BundleException + public OSGiBundle installBundle(String location) throws BundleException { String symbolicName = null; try @@ -130,16 +130,16 @@ super.addCapability(capability); } - public AbstractBundle[] getBundles() + public OSGiBundle[] getBundles() { try { Set<ManagedBundleMBean> remoteBundles = getRemoteFramework().getBundles(); - Set<AbstractBundle> bundles = new HashSet<AbstractBundle>(); + Set<OSGiBundle> bundles = new HashSet<OSGiBundle>(); for (ManagedBundleMBean remoteBundle : remoteBundles) bundles.add(new RemoteBundle(this, remoteBundle, null)); - AbstractBundle[] bundleArr = new AbstractBundle[bundles.size()]; + OSGiBundle[] bundleArr = new OSGiBundle[bundles.size()]; bundles.toArray(bundleArr); return bundleArr; @@ -218,7 +218,7 @@ return mbeanServer; } - public AbstractPackageAdmin getPackageAdmin() + public OSGiPackageAdmin getPackageAdmin() { return new RemotePackageAdmin(this); } Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/http/HttpServiceTestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/http/HttpServiceTestCase.java 2009-05-28 21:21:07 UTC (rev 89501) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/http/HttpServiceTestCase.java 2009-05-28 21:25:40 UTC (rev 89502) @@ -29,7 +29,7 @@ import java.io.InputStreamReader; import java.net.URL; -import org.jboss.osgi.spi.testing.AbstractBundle; +import org.jboss.osgi.spi.testing.OSGiBundle; import org.jboss.osgi.spi.testing.OSGiRuntime; import org.jboss.osgi.spi.testing.OSGiTest; import org.jboss.osgi.spi.testing.OSGiTestHelper; @@ -48,7 +48,7 @@ public class HttpServiceTestCase extends OSGiTest { private static OSGiRuntime runtime; - private static AbstractBundle testBundle; + private static OSGiBundle testBundle; @BeforeClass public static void setUpClass() throws Exception Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/jmx/JMXTestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/jmx/JMXTestCase.java 2009-05-28 21:21:07 UTC (rev 89501) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/jmx/JMXTestCase.java 2009-05-28 21:25:40 UTC (rev 89502) @@ -30,7 +30,7 @@ import javax.naming.InitialContext; import org.jboss.osgi.spi.management.MBeanProxy; -import org.jboss.osgi.spi.testing.AbstractBundle; +import org.jboss.osgi.spi.testing.OSGiBundle; import org.jboss.osgi.spi.testing.OSGiRuntime; import org.jboss.osgi.spi.testing.OSGiTest; import org.jboss.osgi.spi.testing.OSGiTestHelper; @@ -50,7 +50,7 @@ public class JMXTestCase extends OSGiTest { private static OSGiRuntime runtime; - private static AbstractBundle bundle; + private static OSGiBundle bundle; @BeforeClass public static void setUpClass() throws Exception Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/jndi/JNDITestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/jndi/JNDITestCase.java 2009-05-28 21:21:07 UTC (rev 89501) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/jndi/JNDITestCase.java 2009-05-28 21:25:40 UTC (rev 89502) @@ -29,7 +29,7 @@ import javax.naming.InitialContext; import javax.naming.NameNotFoundException; -import org.jboss.osgi.spi.testing.AbstractBundle; +import org.jboss.osgi.spi.testing.OSGiBundle; import org.jboss.osgi.spi.testing.OSGiRuntime; import org.jboss.osgi.spi.testing.OSGiTest; import org.jboss.osgi.spi.testing.OSGiTestHelper; @@ -65,7 +65,7 @@ @Test public void testJNDIAccess() throws Exception { - AbstractBundle bundle = runtime.installBundle("example-jndi.jar"); + OSGiBundle bundle = runtime.installBundle("example-jndi.jar"); bundle.start(); assertEquals("Test bundle ACTIVE", Bundle.ACTIVE, bundle.getState()); Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/log/LogServiceTestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/log/LogServiceTestCase.java 2009-05-28 21:21:07 UTC (rev 89501) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/log/LogServiceTestCase.java 2009-05-28 21:25:40 UTC (rev 89502) @@ -29,7 +29,7 @@ import org.jboss.osgi.spi.logging.LogEntryCache; import org.jboss.osgi.spi.logging.LogEntryFilter; -import org.jboss.osgi.spi.testing.AbstractBundle; +import org.jboss.osgi.spi.testing.OSGiBundle; import org.jboss.osgi.spi.testing.OSGiRuntime; import org.jboss.osgi.spi.testing.OSGiTest; import org.jboss.osgi.spi.testing.OSGiTestHelper; @@ -71,7 +71,7 @@ public void testLogEntryFilter() throws Exception { // Install and start the test bundle - AbstractBundle bundleA = runtime.installBundle("example-log.jar"); + OSGiBundle bundleA = runtime.installBundle("example-log.jar"); bundleA.start(); // Verify that the bundle is active Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/bootstrap/CapabilityTestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/bootstrap/CapabilityTestCase.java 2009-05-28 21:21:07 UTC (rev 89501) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/bootstrap/CapabilityTestCase.java 2009-05-28 21:25:40 UTC (rev 89502) @@ -27,7 +27,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; -import org.jboss.osgi.spi.testing.AbstractBundle; +import org.jboss.osgi.spi.testing.OSGiBundle; import org.jboss.osgi.spi.testing.OSGiRuntime; import org.jboss.osgi.spi.testing.OSGiTest; import org.jboss.osgi.spi.testing.capability.JAXBCapability; @@ -53,7 +53,7 @@ OSGiRuntime runtime = getEmbeddedRuntime(); try { - AbstractBundle bundle = runtime.getBundle("jboss-osgi-apache-xerces", null); + OSGiBundle bundle = runtime.getBundle("jboss-osgi-apache-xerces", null); assertNull("Test bundle null", bundle); runtime.addCapability(new XMLParserCapability()); @@ -73,7 +73,7 @@ OSGiRuntime runtime = getEmbeddedRuntime(); try { - AbstractBundle bundle = runtime.getBundle("jboss-osgi-jaxb", null); + OSGiBundle bundle = runtime.getBundle("jboss-osgi-jaxb", null); assertNull("Test bundle null", bundle); runtime.addCapability(new JAXBCapability()); @@ -93,7 +93,7 @@ OSGiRuntime runtime = getEmbeddedRuntime(); try { - AbstractBundle bundle = runtime.getBundle("jboss-osgi-xml-binding", null); + OSGiBundle bundle = runtime.getBundle("jboss-osgi-xml-binding", null); assertNull("Test bundle null", bundle); runtime.addCapability(new XMLBindingCapability()); @@ -113,7 +113,7 @@ OSGiRuntime runtime = getEmbeddedRuntime(); try { - AbstractBundle bundle = runtime.getBundle("jboss-osgi-jndi", null); + OSGiBundle bundle = runtime.getBundle("jboss-osgi-jndi", null); assertNull("Test bundle null", bundle); runtime.addCapability(new JNDICapability()); @@ -133,7 +133,7 @@ OSGiRuntime runtime = getEmbeddedRuntime(); try { - AbstractBundle bundle = runtime.getBundle("jboss-osgi-jmx", null); + OSGiBundle bundle = runtime.getBundle("jboss-osgi-jmx", null); assertNull("Test bundle null", bundle); runtime.addCapability(new JMXCapability()); Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi37/OSGI37TestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi37/OSGI37TestCase.java 2009-05-28 21:21:07 UTC (rev 89501) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi37/OSGI37TestCase.java 2009-05-28 21:25:40 UTC (rev 89502) @@ -28,7 +28,7 @@ import java.util.ArrayList; import java.util.List; -import org.jboss.osgi.spi.testing.AbstractBundle; +import org.jboss.osgi.spi.testing.OSGiBundle; import org.jboss.osgi.spi.testing.OSGiRuntime; import org.jboss.osgi.spi.testing.OSGiTest; import org.junit.Test; @@ -50,13 +50,13 @@ OSGiRuntime runtime = getDefaultRuntime(); try { - AbstractBundle bundleA = runtime.installBundle("jbosgi37-bundleA.jar"); + OSGiBundle bundleA = runtime.installBundle("jbosgi37-bundleA.jar"); bundleA.start(); assertEquals("Bundle started", Bundle.ACTIVE, bundleA.getState()); List<String> relevant = new ArrayList<String>(); - for (AbstractBundle bundle : runtime.getBundles()) + for (OSGiBundle bundle : runtime.getBundles()) { String symbolicName = bundle.getSymbolicName(); if (symbolicName.startsWith("jbosgi37")) Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi38/OSGI38TestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi38/OSGI38TestCase.java 2009-05-28 21:21:07 UTC (rev 89501) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi38/OSGI38TestCase.java 2009-05-28 21:25:40 UTC (rev 89502) @@ -26,7 +26,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; -import org.jboss.osgi.spi.testing.AbstractBundle; +import org.jboss.osgi.spi.testing.OSGiBundle; import org.jboss.osgi.spi.testing.OSGiRuntime; import org.jboss.osgi.spi.testing.OSGiTest; import org.junit.Test; @@ -57,7 +57,7 @@ OSGiRuntime runtime = getEmbeddedRuntime(); try { - AbstractBundle bundleX = runtime.installBundle("jbosgi38-bundleX.jar"); + OSGiBundle bundleX = runtime.installBundle("jbosgi38-bundleX.jar"); assertEquals("Bundle installed", Bundle.INSTALLED, bundleX.getState()); bundleX.start(); @@ -80,10 +80,10 @@ OSGiRuntime runtime = getEmbeddedRuntime(); try { - AbstractBundle bundleX = runtime.installBundle("jbosgi38-bundleX.jar"); + OSGiBundle bundleX = runtime.installBundle("jbosgi38-bundleX.jar"); assertEquals("Bundle installed", Bundle.INSTALLED, bundleX.getState()); - AbstractBundle bundleB = runtime.installBundle("jbosgi38-bundleB.jar"); + OSGiBundle bundleB = runtime.installBundle("jbosgi38-bundleB.jar"); assertEquals("Bundle installed", Bundle.INSTALLED, bundleB.getState()); bundleB.start(); @@ -107,13 +107,13 @@ OSGiRuntime runtime = getEmbeddedRuntime(); try { - AbstractBundle bundleX = runtime.installBundle("jbosgi38-bundleX.jar"); + OSGiBundle bundleX = runtime.installBundle("jbosgi38-bundleX.jar"); assertEquals("Bundle installed", Bundle.INSTALLED, bundleX.getState()); - AbstractBundle bundleB = runtime.installBundle("jbosgi38-bundleB.jar"); + OSGiBundle bundleB = runtime.installBundle("jbosgi38-bundleB.jar"); assertEquals("Bundle installed", Bundle.INSTALLED, bundleB.getState()); - AbstractBundle bundleA = runtime.installBundle("jbosgi38-bundleA.jar"); + OSGiBundle bundleA = runtime.installBundle("jbosgi38-bundleA.jar"); assertEquals("Bundle installed", Bundle.INSTALLED, bundleA.getState()); bundleA.start(); @@ -138,7 +138,7 @@ OSGiRuntime runtime = getEmbeddedRuntime(); try { - AbstractBundle bundleB = runtime.installBundle("jbosgi38-bundleB.jar"); + OSGiBundle bundleB = runtime.installBundle("jbosgi38-bundleB.jar"); assertEquals("Bundle installed", Bundle.INSTALLED, bundleB.getState()); try @@ -151,7 +151,7 @@ // expected } - AbstractBundle bundleX = runtime.installBundle("jbosgi38-bundleX.jar"); + OSGiBundle bundleX = runtime.installBundle("jbosgi38-bundleX.jar"); assertEquals("Bundle installed", Bundle.INSTALLED, bundleX.getState()); bundleB.start(); @@ -175,10 +175,10 @@ OSGiRuntime runtime = getEmbeddedRuntime(); try { - AbstractBundle bundleA = runtime.installBundle("jbosgi38-bundleA.jar"); + OSGiBundle bundleA = runtime.installBundle("jbosgi38-bundleA.jar"); assertEquals("Bundle installed", Bundle.INSTALLED, bundleA.getState()); - AbstractBundle bundleB = runtime.installBundle("jbosgi38-bundleB.jar"); + OSGiBundle bundleB = runtime.installBundle("jbosgi38-bundleB.jar"); assertEquals("Bundle installed", Bundle.INSTALLED, bundleB.getState()); try @@ -191,7 +191,7 @@ // expected } - AbstractBundle bundleX = runtime.installBundle("jbosgi38-bundleX.jar"); + OSGiBundle bundleX = runtime.installBundle("jbosgi38-bundleX.jar"); assertEquals("Bundle installed", Bundle.INSTALLED, bundleX.getState()); bundleB.start(); 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 2009-05-28 21:21:07 UTC (rev 89501) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi39/OSGI39TestCase.java 2009-05-28 21:25:40 UTC (rev 89502) @@ -27,8 +27,8 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import org.jboss.osgi.spi.testing.AbstractBundle; -import org.jboss.osgi.spi.testing.AbstractPackageAdmin; +import org.jboss.osgi.spi.testing.OSGiBundle; +import org.jboss.osgi.spi.testing.OSGiPackageAdmin; import org.jboss.osgi.spi.testing.OSGiRuntime; import org.jboss.osgi.spi.testing.OSGiTest; import org.junit.Test; @@ -55,7 +55,7 @@ OSGiRuntime runtime = getDefaultRuntime(); try { - AbstractBundle bundleB = runtime.installBundle("jbosgi39-bundleB.jar"); + OSGiBundle bundleB = runtime.installBundle("jbosgi39-bundleB.jar"); assertEquals("Bundle installed", Bundle.INSTALLED, bundleB.getState()); try @@ -68,7 +68,7 @@ // expected } - AbstractBundle bundleX = runtime.installBundle("jbosgi39-bundleX.jar"); + OSGiBundle bundleX = runtime.installBundle("jbosgi39-bundleX.jar"); bundleB.start(); @@ -101,8 +101,8 @@ OSGiRuntime runtime = getDefaultRuntime(); try { - AbstractBundle bundleX = runtime.installBundle("jbosgi39-bundleX.jar"); - AbstractBundle bundleB = runtime.installBundle("jbosgi39-bundleB.jar"); + OSGiBundle bundleX = runtime.installBundle("jbosgi39-bundleX.jar"); + OSGiBundle bundleB = runtime.installBundle("jbosgi39-bundleB.jar"); bundleB.start(); @@ -134,8 +134,8 @@ OSGiRuntime runtime = getDefaultRuntime(); try { - AbstractBundle bundleX = runtime.installBundle("jbosgi39-bundleX.jar"); - AbstractBundle bundleB = runtime.installBundle("jbosgi39-bundleB.jar"); + OSGiBundle bundleX = runtime.installBundle("jbosgi39-bundleX.jar"); + OSGiBundle bundleB = runtime.installBundle("jbosgi39-bundleB.jar"); bundleB.start(); @@ -147,7 +147,7 @@ bundleB.uninstall(); // Forces the update (replacement) or removal of packages exported by the specified bundles. - AbstractPackageAdmin packAdmin = runtime.getPackageAdmin(); + OSGiPackageAdmin packAdmin = runtime.getPackageAdmin(); packAdmin.refreshPackages(null); // Install B without X Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi41/OSGI41TestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi41/OSGI41TestCase.java 2009-05-28 21:21:07 UTC (rev 89501) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi41/OSGI41TestCase.java 2009-05-28 21:25:40 UTC (rev 89502) @@ -31,7 +31,7 @@ import java.io.File; import java.io.FileReader; -import org.jboss.osgi.spi.testing.AbstractBundle; +import org.jboss.osgi.spi.testing.OSGiBundle; import org.jboss.osgi.spi.testing.OSGiRuntime; import org.jboss.osgi.spi.testing.OSGiTest; import org.jboss.osgi.spi.testing.capability.ConfigAdminCapability; @@ -56,7 +56,7 @@ { runtime.addCapability(new ConfigAdminCapability()); - AbstractBundle bundleA = runtime.installBundle("jbosgi41-bundleA.jar"); + OSGiBundle bundleA = runtime.installBundle("jbosgi41-bundleA.jar"); bundleA.start(); assertEquals("Bundle active", Bundle.ACTIVE, bundleA.getState()); @@ -75,7 +75,7 @@ } } - private File getBundleDataFile(AbstractBundle bundleA, String filename) + private File getBundleDataFile(OSGiBundle bundleA, String filename) { String storageRoot = bundleA.getProperty("org.osgi.framework.storage"); assertNotNull("Storage dir not null", storageRoot); Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/service/startlevel/StartLevelTestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/service/startlevel/StartLevelTestCase.java 2009-05-28 21:21:07 UTC (rev 89501) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/service/startlevel/StartLevelTestCase.java 2009-05-28 21:25:40 UTC (rev 89502) @@ -25,7 +25,7 @@ import static org.junit.Assert.assertEquals; -import org.jboss.osgi.spi.testing.AbstractBundle; +import org.jboss.osgi.spi.testing.OSGiBundle; import org.jboss.osgi.spi.testing.OSGiRuntime; import org.jboss.osgi.spi.testing.OSGiTest; import org.junit.Test; @@ -45,7 +45,7 @@ OSGiRuntime runtime = getDefaultRuntime(); try { - AbstractBundle bundle = runtime.installBundle("service/service-startlevel.jar"); + OSGiBundle bundle = runtime.installBundle("service/service-startlevel.jar"); bundle.start(); assertEquals("Bundle active", Bundle.ACTIVE, bundle.getState());