Author: thomas.diesler(a)jboss.com Date: 2009-11-09 11:45:35 -0500 (Mon, 09 Nov 2009) New Revision: 96181 Added: projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/plugins/ResolverPlugin.java projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/plugins/internal/AbstractPlugin.java projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/plugins/internal/AbstractServicePlugin.java projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/Resolvable.java projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/Resolver.java projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/internal/ResolvableImpl.java Removed: projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/filter/ projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/plugins/internal/AbstractPluginImpl.java projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/plugins/internal/AbstractServicePluginImpl.java projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/Resolvable.java projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/Resolver.java projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/internal/ResolvableImpl.java projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/bundle/ Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-jbossmc.xml projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-bootstrap.xml projects/jboss-osgi/trunk/reactor/blueprint/testsuite/src/test/resources/META-INF/jboss-osgi-bootstrap.xml projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/bundle/OSGiBundleManager.java projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/classloading/OSGiPackageCapability.java projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/plugins/internal/AutoInstallPluginImpl.java projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/plugins/internal/BundleStoragePluginImpl.java projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/plugins/internal/FrameworkEventsPluginImpl.java projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/plugins/internal/SystemPackagesPluginImpl.java projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/ExportPackage.java projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/ImportPackage.java projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/NamedPackage.java projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/internal/ExportPackageImpl.java projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/internal/NamedPackageImpl.java projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/internal/basic/BasicResolverImpl.java projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/internal/basic/BundleCapability.java projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/internal/basic/BundleRequirement.java projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/service/internal/DeployerServiceImpl.java projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/service/internal/LifecycleInterceptorServiceImpl.java projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/service/internal/MicrocontainerServiceImpl.java projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/service/internal/PackageAdminImpl.java projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/service/internal/StartLevelImpl.java projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/resolver/BundleResolverTest.java projects/jboss-osgi/trunk/reactor/framework/src/test/resources/META-INF/jboss-osgi-bootstrap.xml projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF/jboss-osgi-bootstrap.xml projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/jboss-osgi-bootstrap.xml Log: Add pluaggability to resolver implementation Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-jbossmc.xml =================================================================== --- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-jbossmc.xml 2009-11-09 16:25:30 UTC (rev 96180) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-jbossmc.xml 2009-11-09 16:45:35 UTC (rev 96181) @@ -97,6 +97,9 @@ </bean> --> + <bean name="OSGiBundleResolver" class="org.jboss.osgi.framework.resolver.internal.basic.BasicResolverImpl"> + <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor> + </bean> <bean name="OSGiFrameworkEventsPlugin" class="org.jboss.osgi.framework.plugins.internal.FrameworkEventsPluginImpl"> <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor> </bean> Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-bootstrap.xml =================================================================== --- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-bootstrap.xml 2009-11-09 16:25:30 UTC (rev 96180) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-bootstrap.xml 2009-11-09 16:45:35 UTC (rev 96181) @@ -90,6 +90,9 @@ </list> </property> </bean> + <bean name="OSGiBundleResolver" class="org.jboss.osgi.framework.resolver.internal.basic.BasicResolverImpl"> + <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor> + </bean> <bean name="OSGiFrameworkEventsPlugin" class="org.jboss.osgi.framework.plugins.internal.FrameworkEventsPluginImpl"> <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor> </bean> Modified: projects/jboss-osgi/trunk/reactor/blueprint/testsuite/src/test/resources/META-INF/jboss-osgi-bootstrap.xml =================================================================== --- projects/jboss-osgi/trunk/reactor/blueprint/testsuite/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2009-11-09 16:25:30 UTC (rev 96180) +++ projects/jboss-osgi/trunk/reactor/blueprint/testsuite/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2009-11-09 16:45:35 UTC (rev 96181) @@ -71,6 +71,9 @@ </list> </property> </bean> + <bean name="OSGiBundleResolver" class="org.jboss.osgi.framework.resolver.internal.basic.BasicResolverImpl"> + <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor> + </bean> <bean name="OSGiFrameworkEventsPlugin" class="org.jboss.osgi.framework.plugins.internal.FrameworkEventsPluginImpl"> <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor> <property name="synchronous">true</property> Modified: projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/bundle/OSGiBundleManager.java =================================================================== --- projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/bundle/OSGiBundleManager.java 2009-11-09 16:25:30 UTC (rev 96180) +++ projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/bundle/OSGiBundleManager.java 2009-11-09 16:45:35 UTC (rev 96181) @@ -66,13 +66,12 @@ import org.jboss.osgi.framework.metadata.OSGiMetaData; import org.jboss.osgi.framework.metadata.internal.AbstractOSGiMetaData; import org.jboss.osgi.framework.plugins.AutoInstallPlugin; +import org.jboss.osgi.framework.plugins.ResolverPlugin; import org.jboss.osgi.framework.plugins.BundleStoragePlugin; import org.jboss.osgi.framework.plugins.FrameworkEventsPlugin; import org.jboss.osgi.framework.plugins.PackageAdminServicePlugin; import org.jboss.osgi.framework.plugins.Plugin; import org.jboss.osgi.framework.plugins.ServicePlugin; -import org.jboss.osgi.framework.resolver.Resolver; -import org.jboss.osgi.framework.resolver.internal.basic.BasicResolverImpl; import org.jboss.osgi.framework.util.NoFilter; import org.jboss.util.collection.ConcurrentSet; import org.jboss.virtual.VFS; @@ -127,9 +126,6 @@ /** The os version */ private static String OSGi_FRAMEWORK_PROCESSOR; - /** The bundle resolver */ - private Resolver bundleResolver; - /** The bundles by id */ private List<AbstractBundleState> bundles = new CopyOnWriteArrayList<AbstractBundleState>(); @@ -205,7 +201,6 @@ this.kernel = kernel; this.deployerClient = deployerClient; this.deployerStructure = (MainDeployerStructure)deployerClient; - this.bundleResolver = new BasicResolverImpl(); // TODO thread factory if (executor == null) @@ -357,16 +352,6 @@ } /** - * Get the bundle resolver - * - * @return the resolver - */ - public Resolver getBundleResolver() - { - return bundleResolver; - } - - /** * Are we active * * @return true when the system is active @@ -641,9 +626,16 @@ } bundleState.setBundleManager(this); - bundleResolver.addBundle(bundleState); bundles.add(bundleState); + // Add the bundle to the resolver + // [TODO] remove this restriction + if (bundleState.getBundleId() != 0) + { + ResolverPlugin bundleResolver = getPlugin(ResolverPlugin.class); + bundleResolver.addBundle(bundleState); + } + bundleState.changeState(Bundle.INSTALLED); log.debug("Added: " + bundleState); @@ -662,7 +654,11 @@ bundleState.uninstallInternal(); bundleState.setBundleManager(null); + + // Remove the bundle from the resolver + ResolverPlugin bundleResolver = getPlugin(ResolverPlugin.class); bundleResolver.removeBundle(bundleState); + bundles.remove(bundleState); log.debug("Removed " + bundleState.getCanonicalName()); } Modified: projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/classloading/OSGiPackageCapability.java =================================================================== --- projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/classloading/OSGiPackageCapability.java 2009-11-09 16:25:30 UTC (rev 96180) +++ projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/classloading/OSGiPackageCapability.java 2009-11-09 16:45:35 UTC (rev 96181) @@ -38,11 +38,9 @@ import org.jboss.osgi.framework.metadata.Parameter; import org.jboss.osgi.framework.metadata.ParameterizedAttribute; import org.jboss.osgi.framework.metadata.internal.AbstractVersionRange; +import org.jboss.osgi.framework.plugins.ResolverPlugin; import org.jboss.osgi.framework.resolver.ExportPackage; import org.jboss.osgi.framework.resolver.Resolver; -import org.jboss.osgi.framework.resolver.Resolvable; -import org.jboss.osgi.framework.resolver.internal.basic.BundleCapability; -import org.jboss.osgi.framework.resolver.internal.basic.BasicResolverImpl; import org.osgi.framework.Constants; import org.osgi.framework.Version; @@ -146,7 +144,7 @@ // Get the bundle resolver from the bundle manager OSGiBundleManager bundleManager = bundleState.getBundleManager(); - Resolver bundleResolver = bundleManager.getBundleResolver(); + Resolver bundleResolver = bundleManager.getPlugin(ResolverPlugin.class); String location = reqModule.getContextName(); AbstractBundleState bundle = bundleManager.getBundleByLocation(location); Added: projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/plugins/ResolverPlugin.java =================================================================== --- projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/plugins/ResolverPlugin.java (rev 0) +++ projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/plugins/ResolverPlugin.java 2009-11-09 16:45:35 UTC (rev 96181) @@ -0,0 +1,37 @@ +/* + * 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.framework.plugins; + +import org.jboss.osgi.framework.resolver.Resolver; + + +//$Id$ + +/** + * A plugin that handles the resolve phase of bundles. + * + * @author thomas.diesler(a)jboss.com + * @since 09-Nov-2009 + */ +public interface ResolverPlugin extends Resolver, Plugin +{ +} \ No newline at end of file Property changes on: projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/plugins/ResolverPlugin.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Copied: projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/plugins/internal/AbstractPlugin.java (from rev 96173, projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/plugins/internal/AbstractPluginImpl.java) =================================================================== --- projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/plugins/internal/AbstractPlugin.java (rev 0) +++ projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/plugins/internal/AbstractPlugin.java 2009-11-09 16:45:35 UTC (rev 96181) @@ -0,0 +1,61 @@ +/* + * 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.framework.plugins.internal; + +//$Id$ + +import org.jboss.osgi.framework.bundle.OSGiBundleManager; +import org.jboss.osgi.framework.plugins.Plugin; + +/** + * The base class of all framework plugins. + * + * @author thomas.diesler(a)jboss.com + * @since 18-Aug-2009 + */ +public abstract class AbstractPlugin implements Plugin +{ + protected OSGiBundleManager bundleManager; + + public AbstractPlugin(OSGiBundleManager bundleManager) + { + if (bundleManager == null) + throw new IllegalArgumentException("Null bundleManager"); + + this.bundleManager = bundleManager; + } + + public OSGiBundleManager getBundleManager() + { + return bundleManager; + } + + public <T extends Plugin> T getPlugin(Class<T> clazz) + { + return bundleManager.getPlugin(clazz); + } + + public <T extends Plugin> T getOptionalPlugin(Class<T> clazz) + { + return bundleManager.getOptionalPlugin(clazz); + } +} \ No newline at end of file Deleted: projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/plugins/internal/AbstractPluginImpl.java =================================================================== --- projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/plugins/internal/AbstractPluginImpl.java 2009-11-09 16:25:30 UTC (rev 96180) +++ projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/plugins/internal/AbstractPluginImpl.java 2009-11-09 16:45:35 UTC (rev 96181) @@ -1,61 +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.framework.plugins.internal; - -//$Id$ - -import org.jboss.osgi.framework.bundle.OSGiBundleManager; -import org.jboss.osgi.framework.plugins.Plugin; - -/** - * The base class of all framework plugins. - * - * @author thomas.diesler(a)jboss.com - * @since 18-Aug-2009 - */ -public abstract class AbstractPluginImpl implements Plugin -{ - protected OSGiBundleManager bundleManager; - - public AbstractPluginImpl(OSGiBundleManager bundleManager) - { - if (bundleManager == null) - throw new IllegalArgumentException("Null bundleManager"); - - this.bundleManager = bundleManager; - } - - public OSGiBundleManager getBundleManager() - { - return bundleManager; - } - - public <T extends Plugin> T getPlugin(Class<T> clazz) - { - return bundleManager.getPlugin(clazz); - } - - public <T extends Plugin> T getOptionalPlugin(Class<T> clazz) - { - return bundleManager.getOptionalPlugin(clazz); - } -} \ No newline at end of file Copied: projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/plugins/internal/AbstractServicePlugin.java (from rev 96173, projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/plugins/internal/AbstractServicePluginImpl.java) =================================================================== --- projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/plugins/internal/AbstractServicePlugin.java (rev 0) +++ projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/plugins/internal/AbstractServicePlugin.java 2009-11-09 16:45:35 UTC (rev 96181) @@ -0,0 +1,47 @@ +/* + * 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.framework.plugins.internal; + +//$Id: AbstractPluginImpl.java 92725 2009-08-24 06:19:18Z thomas.diesler(a)jboss.com $ + +import org.jboss.osgi.framework.bundle.OSGiBundleManager; +import org.jboss.osgi.framework.plugins.ServicePlugin; +import org.osgi.framework.BundleContext; + +/** + * The base class of all service plugins. + * + * @author thomas.diesler(a)jboss.com + * @since 18-Aug-2009 + */ +public abstract class AbstractServicePlugin extends AbstractPlugin implements ServicePlugin +{ + public AbstractServicePlugin(OSGiBundleManager bundleManager) + { + super(bundleManager); + } + + public BundleContext getSystemContext() + { + return bundleManager.getSystemContext(); + } +} \ No newline at end of file Deleted: projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/plugins/internal/AbstractServicePluginImpl.java =================================================================== --- projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/plugins/internal/AbstractServicePluginImpl.java 2009-11-09 16:25:30 UTC (rev 96180) +++ projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/plugins/internal/AbstractServicePluginImpl.java 2009-11-09 16:45:35 UTC (rev 96181) @@ -1,47 +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.framework.plugins.internal; - -//$Id: AbstractPluginImpl.java 92725 2009-08-24 06:19:18Z thomas.diesler(a)jboss.com $ - -import org.jboss.osgi.framework.bundle.OSGiBundleManager; -import org.jboss.osgi.framework.plugins.ServicePlugin; -import org.osgi.framework.BundleContext; - -/** - * The base class of all service plugins. - * - * @author thomas.diesler(a)jboss.com - * @since 18-Aug-2009 - */ -public abstract class AbstractServicePluginImpl extends AbstractPluginImpl implements ServicePlugin -{ - public AbstractServicePluginImpl(OSGiBundleManager bundleManager) - { - super(bundleManager); - } - - public BundleContext getSystemContext() - { - return bundleManager.getSystemContext(); - } -} \ No newline at end of file Modified: projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/plugins/internal/AutoInstallPluginImpl.java =================================================================== --- projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/plugins/internal/AutoInstallPluginImpl.java 2009-11-09 16:25:30 UTC (rev 96180) +++ projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/plugins/internal/AutoInstallPluginImpl.java 2009-11-09 16:45:35 UTC (rev 96181) @@ -40,7 +40,7 @@ * @author thomas.diesler(a)jboss.com * @since 18-Aug-2009 */ -public class AutoInstallPluginImpl extends AbstractPluginImpl implements AutoInstallPlugin +public class AutoInstallPluginImpl extends AbstractPlugin implements AutoInstallPlugin { // Provide logging final Logger log = Logger.getLogger(AutoInstallPluginImpl.class); Modified: projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/plugins/internal/BundleStoragePluginImpl.java =================================================================== --- projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/plugins/internal/BundleStoragePluginImpl.java 2009-11-09 16:25:30 UTC (rev 96180) +++ projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/plugins/internal/BundleStoragePluginImpl.java 2009-11-09 16:45:35 UTC (rev 96181) @@ -38,7 +38,7 @@ * @author thomas.diesler(a)jboss.com * @since 18-Aug-2009 */ -public class BundleStoragePluginImpl extends AbstractPluginImpl implements BundleStoragePlugin +public class BundleStoragePluginImpl extends AbstractPlugin implements BundleStoragePlugin { // Provide logging final Logger log = Logger.getLogger(BundleStoragePluginImpl.class); Modified: projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/plugins/internal/FrameworkEventsPluginImpl.java =================================================================== --- projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/plugins/internal/FrameworkEventsPluginImpl.java 2009-11-09 16:25:30 UTC (rev 96180) +++ projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/plugins/internal/FrameworkEventsPluginImpl.java 2009-11-09 16:45:35 UTC (rev 96181) @@ -60,7 +60,7 @@ * @author thomas.diesler(a)jboss.com * @since 18-Aug-2009 */ -public class FrameworkEventsPluginImpl extends AbstractPluginImpl implements FrameworkEventsPlugin +public class FrameworkEventsPluginImpl extends AbstractPlugin implements FrameworkEventsPlugin { // Provide logging final Logger log = Logger.getLogger(FrameworkEventsPluginImpl.class); Modified: projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/plugins/internal/SystemPackagesPluginImpl.java =================================================================== --- projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/plugins/internal/SystemPackagesPluginImpl.java 2009-11-09 16:25:30 UTC (rev 96180) +++ projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/plugins/internal/SystemPackagesPluginImpl.java 2009-11-09 16:45:35 UTC (rev 96181) @@ -38,7 +38,7 @@ * @author thomas.diesler(a)jboss.com * @since 18-Aug-2009 */ -public class SystemPackagesPluginImpl extends AbstractPluginImpl implements SystemPackagesPlugin +public class SystemPackagesPluginImpl extends AbstractPlugin implements SystemPackagesPlugin { // Provide logging final Logger log = Logger.getLogger(SystemPackagesPluginImpl.class); Modified: projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/ExportPackage.java =================================================================== --- projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/ExportPackage.java 2009-11-09 16:25:30 UTC (rev 96180) +++ projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/ExportPackage.java 2009-11-09 16:45:35 UTC (rev 96181) @@ -27,21 +27,44 @@ import org.osgi.framework.Version; /** + * An abstraction of a package export. * * @author thomas.diesler(a)jboss.com - * @since 09-Noc-2009 + * @since 09-Nov-2009 */ public interface ExportPackage extends NamedPackage { + /** + * Get the version of this export. + */ Version getVersion(); - List<NamedPackage> getUses(); + /** + * Get the list of packages that is used by this export. + */ + List<String> getUses(); - Set<ImportPackage> getImporters(); - + /** + * Get the list of mandadtory attributes declared by this export. + * @return An empty list if there are no mandatory exports declared. + */ List<String> getMandatoryAttributes(); + /** + * Get the list of included classes in this package export. + * @return Null if there are no includes defined. + */ List<String> getIncludes(); + /** + * Get the list of excluded classes in this package export. + * @return Null if there are no excludes defined. + */ List<String> getExcludes(); + + /** + * Get the current set of importers of this export package. + * @return An empty set if there is no importer + */ + Set<ImportPackage> getImporters(); } \ No newline at end of file Modified: projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/ImportPackage.java =================================================================== --- projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/ImportPackage.java 2009-11-09 16:25:30 UTC (rev 96180) +++ projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/ImportPackage.java 2009-11-09 16:45:35 UTC (rev 96181) @@ -25,19 +25,43 @@ import org.osgi.framework.Version; /** + * An abstraction of a package import. * * @author thomas.diesler(a)jboss.com - * @since 09-Noc-2009 + * @since 09-Nov-2009 */ public interface ImportPackage extends NamedPackage { - ExportPackage getExporter(); - + enum Resolution + { + OPTIONAL, MANDATORY + }; + + /** + * Get the version range for this import package. + */ VersionRange getVersion(); - - String getResolution(); - + + /** + * Get the resolution directive for this import package. + */ + Resolution getResolution(); + + /** + * The bundle symbolic name of the exporting bundle. + * @return null if this attribute is not set + */ String getBundleSymbolicName(); - + + /** + * The bundle version of the exporting bundle. + * @return null if this attribute is not set + */ Version getBundleVersion(); + + /** + * Get the exporter that this import package is wired to. + * @return Null if the import is not yet resolved. + */ + ExportPackage getExporter(); } \ No newline at end of file Modified: projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/NamedPackage.java =================================================================== --- projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/NamedPackage.java 2009-11-09 16:25:30 UTC (rev 96180) +++ projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/NamedPackage.java 2009-11-09 16:45:35 UTC (rev 96181) @@ -25,15 +25,26 @@ /** + * An abstraction of an osgi package declaration. * * @author thomas.diesler(a)jboss.com - * @since 09-Noc-2009 + * @since 09-Nov-2009 */ public interface NamedPackage { + /** + * Get the bundle that owns this package decalaration + */ Resolvable getOwner(); - + + /** + * Get the package name + */ String getName(); - + + /** + * Get the associated map of arbitrary attributes. + * @return Associated map of arbitrary attributes or an empty map. + */ Map<String, String> getAttributes(); } \ No newline at end of file Deleted: projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/Resolvable.java =================================================================== --- projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/Resolvable.java 2009-11-09 16:25:30 UTC (rev 96180) +++ projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/Resolvable.java 2009-11-09 16:45:35 UTC (rev 96181) @@ -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.framework.resolver; - -import java.util.List; - -import org.osgi.framework.Bundle; -import org.osgi.framework.Version; - -/** - * - * @author thomas.diesler(a)jboss.com - * @since 09-Noc-2009 - */ -public interface Resolvable -{ - Bundle getBundle(); - - String getSymbolicName(); - - Version getVersion(); - - List<ExportPackage> getExportPackages(); - - ExportPackage getExportPackage(String packageName); - - List<ImportPackage> getImportPackages(); - - ImportPackage getImportPackage(String packageName); - - boolean isSingleton(); - - boolean isResolved(); -} \ No newline at end of file Copied: projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/Resolvable.java (from rev 96173, projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/Resolvable.java) =================================================================== --- projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/Resolvable.java (rev 0) +++ projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/Resolvable.java 2009-11-09 16:45:35 UTC (rev 96181) @@ -0,0 +1,85 @@ +/* + * 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.framework.resolver; + +import java.util.List; + +import org.osgi.framework.Bundle; +import org.osgi.framework.Version; + +/** + * An abstraction of a resolvable bundle. + * + * @author thomas.diesler(a)jboss.com + * @since 09-Nov-2009 + */ +public interface Resolvable +{ + /** + * Get the underlying bundle that this resolvable is associated with. + */ + Bundle getBundle(); + + /** + * Get the bundle's symbolic name. + */ + String getSymbolicName(); + + /** + * Get the bundle's version. + */ + Version getVersion(); + + /** + * Get the list of exported packages in the declared order. + * @return The list of exported packages or an empty list if the bundle does not export any packages. + */ + List<ExportPackage> getExportPackages(); + + /** + * Get an exported package by name. + * @return The exported package or null if the bundle does not export that package. + */ + ExportPackage getExportPackage(String packageName); + + /** + * Get the list of imported packages in the declared order. + * @return The list of imported packages or an empty list if the bundle does not import any packages. + */ + List<ImportPackage> getImportPackages(); + + /** + * Get an imported package by name. + * @return The imported package or null if the bundle does not import that package. + */ + ImportPackage getImportPackage(String packageName); + + /** + * True if this resovable is a singleton bundle. + */ + boolean isSingleton(); + + /** + * True if this resovable has been resolved. + */ + boolean isResolved(); +} \ No newline at end of file Deleted: projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/Resolver.java =================================================================== --- projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/Resolver.java 2009-11-09 16:25:30 UTC (rev 96180) +++ projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/Resolver.java 2009-11-09 16:45:35 UTC (rev 96181) @@ -1,44 +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.framework.resolver; - -import java.util.List; - -import org.osgi.framework.Bundle; - -/** - * - * @author thomas.diesler(a)jboss.com - * @since 09-Noc-2009 - */ -public interface Resolver -{ - List<Resolvable> getBundles(); - - Resolvable addBundle(Bundle bundle); - - Resolvable removeBundle(Bundle bundle); - - List<Resolvable> resolve(List<Bundle> bundles); - - ExportPackage getExporter(Bundle bundle, String importPackage); -} \ No newline at end of file Copied: projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/Resolver.java (from rev 96173, projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/Resolver.java) =================================================================== --- projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/Resolver.java (rev 0) +++ projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/Resolver.java 2009-11-09 16:45:35 UTC (rev 96181) @@ -0,0 +1,69 @@ +/* + * 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.framework.resolver; + +import java.util.List; + +import org.osgi.framework.Bundle; + +/** + * The Resolver handles the resolve phase of bundles. + * + * @author thomas.diesler(a)jboss.com + * @since 09-Nov-2009 + */ +public interface Resolver +{ + /** + * Get the registered resolvable bundles. + * @return The list of registered resolvable bundles. + */ + List<Resolvable> getBundles(); + + /** + * Add a bundle to the resolver. + * @return The resolvable associated with the added bundle. + */ + Resolvable addBundle(Bundle bundle); + + /** + * Remove a bundle from the resolver. + * @return The resolvable associated with the removed bundle. + */ + Resolvable removeBundle(Bundle bundle); + + /** + * Resolve the given list of bundles. + * + * @param bundles the bundles to resolve + * @return The list of resolved bundles in the resolve order or an empty list + */ + List<Resolvable> resolve(List<Bundle> bundles); + + /** + * Get the exporter for the given import package. + * @param bundle The bundle that imports the package. + * @param importPackage The import package name + * @return The export package that the import is wired to or null if the import is not yet resolved. + */ + ExportPackage getExporter(Bundle bundle, String importPackage); +} \ No newline at end of file Modified: projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/internal/ExportPackageImpl.java =================================================================== --- projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/internal/ExportPackageImpl.java 2009-11-09 16:25:30 UTC (rev 96180) +++ projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/internal/ExportPackageImpl.java 2009-11-09 16:45:35 UTC (rev 96181) @@ -34,7 +34,7 @@ /** * * @author thomas.diesler(a)jboss.com - * @since 09-Noc-2009 + * @since 09-Nov-2009 */ public class ExportPackageImpl extends NamedPackageImpl implements ExportPackage { @@ -63,7 +63,7 @@ throw new NotImplementedException(); } - public List<NamedPackage> getUses() + public List<String> getUses() { throw new NotImplementedException(); } Modified: projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/internal/NamedPackageImpl.java =================================================================== --- projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/internal/NamedPackageImpl.java 2009-11-09 16:25:30 UTC (rev 96180) +++ projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/internal/NamedPackageImpl.java 2009-11-09 16:45:35 UTC (rev 96181) @@ -30,7 +30,7 @@ /** * * @author thomas.diesler(a)jboss.com - * @since 09-Noc-2009 + * @since 09-Nov-2009 */ public class NamedPackageImpl implements NamedPackage { Deleted: projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/internal/ResolvableImpl.java =================================================================== --- projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/internal/ResolvableImpl.java 2009-11-09 16:25:30 UTC (rev 96180) +++ projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/internal/ResolvableImpl.java 2009-11-09 16:45:35 UTC (rev 96181) @@ -1,120 +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.framework.resolver.internal; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; - -import org.jboss.osgi.framework.bundle.OSGiBundleState; -import org.jboss.osgi.framework.metadata.OSGiMetaData; -import org.jboss.osgi.framework.metadata.PackageAttribute; -import org.jboss.osgi.framework.resolver.ExportPackage; -import org.jboss.osgi.framework.resolver.ImportPackage; -import org.jboss.osgi.framework.resolver.Resolvable; -import org.jboss.osgi.spi.NotImplementedException; -import org.osgi.framework.Bundle; -import org.osgi.framework.Version; - -/** - * - * @author thomas.diesler(a)jboss.com - * @since 09-Noc-2009 - */ -public class ResolvableImpl implements Resolvable -{ - private OSGiBundleState bundle; - private OSGiMetaData metaData; - private boolean resolved; - - private Map<String, ExportPackage> exportedPackages = new LinkedHashMap<String, ExportPackage>(); - - public ResolvableImpl(Bundle bundle) - { - this.bundle = OSGiBundleState.assertBundleState(bundle); - this.metaData = ((OSGiBundleState)bundle).getOSGiMetaData(); - - // Initialize exported packages - List<PackageAttribute> exportPackages = metaData.getExportPackages(); - if (exportPackages != null) - { - for (PackageAttribute attr: exportPackages) - { - String packageName = attr.getPackageInfo().getName(); - exportedPackages.put(packageName, new ExportPackageImpl(this, packageName)); - } - } - } - - public Bundle getBundle() - { - return bundle; - } - - public String getSymbolicName() - { - return bundle.getSymbolicName(); - } - - public Version getVersion() - { - return bundle.getVersion(); - } - - public ExportPackage getExportPackage(String packageName) - { - return exportedPackages.get(packageName); - } - - public List<ExportPackage> getExportPackages() - { - List<ExportPackage> values = new ArrayList<ExportPackage>(exportedPackages.values()); - return Collections.unmodifiableList(values); - } - - public ImportPackage getImportPackage(String name) - { - throw new NotImplementedException(); - } - - public List<ImportPackage> getImportPackages() - { - throw new NotImplementedException(); - } - - public boolean isResolved() - { - return resolved; - } - - public void setResolved(boolean resolved) - { - this.resolved = resolved; - } - - public boolean isSingleton() - { - return bundle.getOSGiMetaData().isSingleton(); - } -} \ No newline at end of file Copied: projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/internal/ResolvableImpl.java (from rev 96173, projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/internal/ResolvableImpl.java) =================================================================== --- projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/internal/ResolvableImpl.java (rev 0) +++ projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/internal/ResolvableImpl.java 2009-11-09 16:45:35 UTC (rev 96181) @@ -0,0 +1,120 @@ +/* + * 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.framework.resolver.internal; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + +import org.jboss.osgi.framework.bundle.OSGiBundleState; +import org.jboss.osgi.framework.metadata.OSGiMetaData; +import org.jboss.osgi.framework.metadata.PackageAttribute; +import org.jboss.osgi.framework.resolver.ExportPackage; +import org.jboss.osgi.framework.resolver.ImportPackage; +import org.jboss.osgi.framework.resolver.Resolvable; +import org.jboss.osgi.spi.NotImplementedException; +import org.osgi.framework.Bundle; +import org.osgi.framework.Version; + +/** + * + * @author thomas.diesler(a)jboss.com + * @since 09-Nov-2009 + */ +public class ResolvableImpl implements Resolvable +{ + private OSGiBundleState bundle; + private OSGiMetaData metaData; + private boolean resolved; + + private Map<String, ExportPackage> exportedPackages = new LinkedHashMap<String, ExportPackage>(); + + public ResolvableImpl(Bundle bundle) + { + this.bundle = OSGiBundleState.assertBundleState(bundle); + this.metaData = ((OSGiBundleState)bundle).getOSGiMetaData(); + + // Initialize exported packages + List<PackageAttribute> exportPackages = metaData.getExportPackages(); + if (exportPackages != null) + { + for (PackageAttribute attr: exportPackages) + { + String packageName = attr.getPackageInfo().getName(); + exportedPackages.put(packageName, new ExportPackageImpl(this, packageName)); + } + } + } + + public Bundle getBundle() + { + return bundle; + } + + public String getSymbolicName() + { + return bundle.getSymbolicName(); + } + + public Version getVersion() + { + return bundle.getVersion(); + } + + public ExportPackage getExportPackage(String packageName) + { + return exportedPackages.get(packageName); + } + + public List<ExportPackage> getExportPackages() + { + List<ExportPackage> values = new ArrayList<ExportPackage>(exportedPackages.values()); + return Collections.unmodifiableList(values); + } + + public ImportPackage getImportPackage(String name) + { + throw new NotImplementedException(); + } + + public List<ImportPackage> getImportPackages() + { + throw new NotImplementedException(); + } + + public boolean isResolved() + { + return resolved; + } + + public void setResolved(boolean resolved) + { + this.resolved = resolved; + } + + public boolean isSingleton() + { + return bundle.getOSGiMetaData().isSingleton(); + } +} \ No newline at end of file Modified: projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/internal/basic/BasicResolverImpl.java =================================================================== --- projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/internal/basic/BasicResolverImpl.java 2009-11-09 16:25:30 UTC (rev 96180) +++ projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/internal/basic/BasicResolverImpl.java 2009-11-09 16:45:35 UTC (rev 96181) @@ -36,14 +36,16 @@ import org.jboss.classloading.spi.version.VersionRange; import org.jboss.deployers.structure.spi.DeploymentUnit; import org.jboss.logging.Logger; +import org.jboss.osgi.framework.bundle.OSGiBundleManager; import org.jboss.osgi.framework.bundle.OSGiBundleState; import org.jboss.osgi.framework.classloading.OSGiPackageRequirement; import org.jboss.osgi.framework.metadata.OSGiMetaData; import org.jboss.osgi.framework.metadata.Parameter; import org.jboss.osgi.framework.metadata.ParameterizedAttribute; +import org.jboss.osgi.framework.plugins.ResolverPlugin; +import org.jboss.osgi.framework.plugins.internal.AbstractPlugin; import org.jboss.osgi.framework.resolver.ExportPackage; import org.jboss.osgi.framework.resolver.Resolvable; -import org.jboss.osgi.framework.resolver.Resolver; import org.jboss.osgi.framework.resolver.internal.ResolvableImpl; import org.osgi.framework.Bundle; import org.osgi.framework.Constants; @@ -54,7 +56,7 @@ * @author thomas.diesler(a)jboss.com * @since 10-Sep-2009 */ -public class BasicResolverImpl implements Resolver +public class BasicResolverImpl extends AbstractPlugin implements ResolverPlugin { /** The log */ private static final Logger log = Logger.getLogger(BasicResolverImpl.class); @@ -63,6 +65,11 @@ private Map<OSGiBundleState, List<BundleCapability>> bundleCapabilitiesMap = new ConcurrentHashMap<OSGiBundleState, List<BundleCapability>>(); private Map<OSGiBundleState, List<BundleRequirement>> bundleRequirementsMap = new ConcurrentHashMap<OSGiBundleState, List<BundleRequirement>>(); + public BasicResolverImpl(OSGiBundleManager bundleManager) + { + super(bundleManager); + } + public List<Resolvable> getBundles() { List<Resolvable> values = new ArrayList<Resolvable>(resolverBundleMap.values()); @@ -71,10 +78,6 @@ public Resolvable addBundle(Bundle bundle) { - // [TODO] remove this restriction - if (bundle.getBundleId() == 0) - return null; - OSGiBundleState bundleState = OSGiBundleState.assertBundleState(bundle); return resolverBundleMap.put(bundleState, new ResolvableImpl(bundle)); } Modified: projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/internal/basic/BundleCapability.java =================================================================== --- projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/internal/basic/BundleCapability.java 2009-11-09 16:25:30 UTC (rev 96180) +++ projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/internal/basic/BundleCapability.java 2009-11-09 16:45:35 UTC (rev 96181) @@ -38,7 +38,7 @@ * @author thomas.diesler(a)jboss.com * @since 10-Sep-2009 */ -public class BundleCapability +class BundleCapability { private OSGiBundleState bundle; private PackageCapability packageCapability; @@ -55,24 +55,24 @@ this.packageCapability = packageCapability; } - public OSGiBundleState getExportingBundle() + OSGiBundleState getExportingBundle() { return bundle; } - public Module getExportingModule() + Module getExportingModule() { OSGiBundleState bundleState = OSGiBundleState.assertBundleState(bundle); DeploymentUnit unit = bundleState.getDeploymentUnit(); return unit.getAttachment(Module.class); } - public PackageCapability getPackageCapability() + PackageCapability getPackageCapability() { return packageCapability; } - public List<BundleRequirement> getWiredRequirements() + List<BundleRequirement> getWiredRequirements() { if (wires == null) return Collections.emptyList(); Modified: projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/internal/basic/BundleRequirement.java =================================================================== --- projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/internal/basic/BundleRequirement.java 2009-11-09 16:25:30 UTC (rev 96180) +++ projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/internal/basic/BundleRequirement.java 2009-11-09 16:45:35 UTC (rev 96181) @@ -30,7 +30,7 @@ * @author thomas.diesler(a)jboss.com * @since 10-Sep-2009 */ -public class BundleRequirement +class BundleRequirement { private OSGiBundleState bundle; private PackageRequirement packageRequirement; @@ -47,17 +47,17 @@ this.packageRequirement = packageRequirement; } - public BundleCapability getWiredCapability() + BundleCapability getWiredCapability() { return wire; } - public OSGiBundleState getImportingBundle() + OSGiBundleState getImportingBundle() { return bundle; } - public PackageRequirement getPackageRequirement() + PackageRequirement getPackageRequirement() { return packageRequirement; } Modified: projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/service/internal/DeployerServiceImpl.java =================================================================== --- projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/service/internal/DeployerServiceImpl.java 2009-11-09 16:25:30 UTC (rev 96180) +++ projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/service/internal/DeployerServiceImpl.java 2009-11-09 16:45:35 UTC (rev 96181) @@ -34,7 +34,7 @@ import org.jboss.osgi.deployment.internal.SystemDeployerService; import org.jboss.osgi.framework.bundle.OSGiBundleManager; import org.jboss.osgi.framework.plugins.DeployerServicePlugin; -import org.jboss.osgi.framework.plugins.internal.AbstractServicePluginImpl; +import org.jboss.osgi.framework.plugins.internal.AbstractServicePlugin; import org.jboss.virtual.VirtualFile; import org.osgi.framework.BundleContext; import org.osgi.framework.BundleException; @@ -45,7 +45,7 @@ * @author thomas.diesler(a)jboss.com * @since 19-Oct-2009 */ -public class DeployerServiceImpl extends AbstractServicePluginImpl implements DeployerServicePlugin +public class DeployerServiceImpl extends AbstractServicePlugin implements DeployerServicePlugin { // Provide logging final Logger log = Logger.getLogger(DeployerServiceImpl.class); Modified: projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/service/internal/LifecycleInterceptorServiceImpl.java =================================================================== --- projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/service/internal/LifecycleInterceptorServiceImpl.java 2009-11-09 16:25:30 UTC (rev 96180) +++ projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/service/internal/LifecycleInterceptorServiceImpl.java 2009-11-09 16:45:35 UTC (rev 96181) @@ -36,7 +36,7 @@ import org.jboss.osgi.framework.bundle.OSGiBundleManager; import org.jboss.osgi.framework.bundle.OSGiBundleState; import org.jboss.osgi.framework.plugins.LifecycleInterceptorServicePlugin; -import org.jboss.osgi.framework.plugins.internal.AbstractServicePluginImpl; +import org.jboss.osgi.framework.plugins.internal.AbstractServicePlugin; import org.jboss.osgi.framework.util.DeploymentUnitAttachments; import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; @@ -48,7 +48,7 @@ * @author thomas.diesler(a)jboss.com * @since 19-Oct-2009 */ -public class LifecycleInterceptorServiceImpl extends AbstractServicePluginImpl implements LifecycleInterceptorServicePlugin +public class LifecycleInterceptorServiceImpl extends AbstractServicePlugin implements LifecycleInterceptorServicePlugin { // Provide logging final Logger log = Logger.getLogger(LifecycleInterceptorServiceImpl.class); Modified: projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/service/internal/MicrocontainerServiceImpl.java =================================================================== --- projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/service/internal/MicrocontainerServiceImpl.java 2009-11-09 16:25:30 UTC (rev 96180) +++ projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/service/internal/MicrocontainerServiceImpl.java 2009-11-09 16:45:35 UTC (rev 96181) @@ -43,7 +43,7 @@ import org.jboss.logging.Logger; import org.jboss.osgi.framework.bundle.OSGiBundleManager; import org.jboss.osgi.framework.plugins.MicrocontainerServicePlugin; -import org.jboss.osgi.framework.plugins.internal.AbstractServicePluginImpl; +import org.jboss.osgi.framework.plugins.internal.AbstractServicePlugin; import org.jboss.osgi.spi.management.MicrocontainerServiceMBean; import org.jboss.osgi.spi.service.MicrocontainerService; import org.osgi.framework.Constants; @@ -59,7 +59,7 @@ * @author thomas.diesler(a)jboss.com * @since 31-Aug-2009 */ -public class MicrocontainerServiceImpl extends AbstractServicePluginImpl implements MicrocontainerServicePlugin, MicrocontainerServiceMBean +public class MicrocontainerServiceImpl extends AbstractServicePlugin implements MicrocontainerServicePlugin, MicrocontainerServiceMBean { /** The log */ private static final Logger log = Logger.getLogger(MicrocontainerServiceImpl.class); Modified: projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/service/internal/PackageAdminImpl.java =================================================================== --- projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/service/internal/PackageAdminImpl.java 2009-11-09 16:25:30 UTC (rev 96180) +++ projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/service/internal/PackageAdminImpl.java 2009-11-09 16:45:35 UTC (rev 96181) @@ -37,8 +37,9 @@ import org.jboss.osgi.framework.bundle.OSGiBundleManager; import org.jboss.osgi.framework.bundle.OSGiBundleState; import org.jboss.osgi.framework.bundle.OSGiBundleWrapper; +import org.jboss.osgi.framework.plugins.ResolverPlugin; import org.jboss.osgi.framework.plugins.PackageAdminServicePlugin; -import org.jboss.osgi.framework.plugins.internal.AbstractServicePluginImpl; +import org.jboss.osgi.framework.plugins.internal.AbstractServicePlugin; import org.jboss.osgi.framework.resolver.Resolver; import org.jboss.osgi.framework.resolver.Resolvable; import org.jboss.osgi.spi.NotImplementedException; @@ -58,7 +59,7 @@ * @author thomas.diesler(a)jboss.com * @since 03-Sep-2009 */ -public class PackageAdminImpl extends AbstractServicePluginImpl implements PackageAdminServicePlugin +public class PackageAdminImpl extends AbstractServicePlugin implements PackageAdminServicePlugin { /** The log */ private static final Logger log = Logger.getLogger(PackageAdminImpl.class); @@ -179,7 +180,7 @@ return true; // Resolve the bundles through the resolver - Resolver bundleResolver = bundleManager.getBundleResolver(); + Resolver bundleResolver = bundleManager.getPlugin(ResolverPlugin.class); List<OSGiBundleState> resolvableBundles = new ArrayList<OSGiBundleState>(); for (Resolvable aux : bundleResolver.resolve(unresolvedBundles)) resolvableBundles.add(OSGiBundleState.assertBundleState(aux.getBundle())); Modified: projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/service/internal/StartLevelImpl.java =================================================================== --- projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/service/internal/StartLevelImpl.java 2009-11-09 16:25:30 UTC (rev 96180) +++ projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/service/internal/StartLevelImpl.java 2009-11-09 16:45:35 UTC (rev 96181) @@ -26,7 +26,7 @@ import org.jboss.logging.Logger; import org.jboss.osgi.framework.bundle.OSGiBundleManager; import org.jboss.osgi.framework.plugins.StartLevelPlugin; -import org.jboss.osgi.framework.plugins.internal.AbstractServicePluginImpl; +import org.jboss.osgi.framework.plugins.internal.AbstractServicePlugin; import org.osgi.framework.Bundle; import org.osgi.framework.ServiceRegistration; import org.osgi.service.startlevel.StartLevel; @@ -39,7 +39,7 @@ * @author thomas.diesler(a)jboss.com * @since 31-Aug-2009 */ -public class StartLevelImpl extends AbstractServicePluginImpl implements StartLevelPlugin +public class StartLevelImpl extends AbstractServicePlugin implements StartLevelPlugin { /** The log */ private static final Logger log = Logger.getLogger(StartLevelImpl.class); Modified: projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/resolver/BundleResolverTest.java =================================================================== --- projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/resolver/BundleResolverTest.java 2009-11-09 16:25:30 UTC (rev 96180) +++ projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/resolver/BundleResolverTest.java 2009-11-09 16:45:35 UTC (rev 96181) @@ -31,6 +31,7 @@ import org.jboss.osgi.framework.bundle.OSGiBundleManager; import org.jboss.osgi.framework.launch.OSGiFramework; +import org.jboss.osgi.framework.plugins.ResolverPlugin; import org.jboss.osgi.framework.resolver.Resolvable; import org.jboss.osgi.framework.resolver.Resolver; import org.jboss.osgi.spi.util.ServiceLoader; @@ -83,7 +84,7 @@ } OSGiBundleManager bundleManager = ((OSGiFramework)framework).getBundleManager(); - Resolver bundleResolver = bundleManager.getBundleResolver(); + Resolver bundleResolver = bundleManager.getPlugin(ResolverPlugin.class); assertEquals("All bundles installed", bundlePaths.size(), bundleResolver.getBundles().size()); List<Resolvable> resolved = bundleResolver.resolve(unresolved); Modified: projects/jboss-osgi/trunk/reactor/framework/src/test/resources/META-INF/jboss-osgi-bootstrap.xml =================================================================== --- projects/jboss-osgi/trunk/reactor/framework/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2009-11-09 16:25:30 UTC (rev 96180) +++ projects/jboss-osgi/trunk/reactor/framework/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2009-11-09 16:45:35 UTC (rev 96181) @@ -55,6 +55,9 @@ <bean name="OSGiSystemPackages" class="org.jboss.osgi.framework.plugins.internal.SystemPackagesPluginImpl"> <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor> </bean> + <bean name="OSGiBundleResolver" class="org.jboss.osgi.framework.resolver.internal.basic.BasicResolverImpl"> + <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor> + </bean> <!-- ******************************** Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF/jboss-osgi-bootstrap.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2009-11-09 16:25:30 UTC (rev 96180) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2009-11-09 16:45:35 UTC (rev 96181) @@ -71,6 +71,9 @@ </list> </property> </bean> + <bean name="OSGiBundleResolver" class="org.jboss.osgi.framework.resolver.internal.basic.BasicResolverImpl"> + <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor> + </bean> <bean name="OSGiFrameworkEventsPlugin" class="org.jboss.osgi.framework.plugins.internal.FrameworkEventsPluginImpl"> <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor> <property name="synchronous">true</property> Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/jboss-osgi-bootstrap.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2009-11-09 16:25:30 UTC (rev 96180) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2009-11-09 16:45:35 UTC (rev 96181) @@ -72,6 +72,9 @@ </list> </property> </bean> + <bean name="OSGiBundleResolver" class="org.jboss.osgi.framework.resolver.internal.basic.BasicResolverImpl"> + <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor> + </bean> <bean name="OSGiFrameworkEventsPlugin" class="org.jboss.osgi.framework.plugins.internal.FrameworkEventsPluginImpl"> <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor> </bean>