[jboss-cvs] JBossAS SVN: r92867 - in projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src: main/java/org/jboss/osgi/plugins/facade/launch and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Aug 27 10:04:29 EDT 2009
Author: thomas.diesler at jboss.com
Date: 2009-08-27 10:04:28 -0400 (Thu, 27 Aug 2009)
New Revision: 92867
Modified:
projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/facade/bundle/AbstractBundleState.java
projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/facade/bundle/OSGiBundleManager.java
projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/facade/bundle/OSGiBundleState.java
projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/facade/bundle/OSGiServiceState.java
projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/facade/bundle/OSGiSystemState.java
projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/facade/launch/OSGiFrameworkFactory.java
projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/facade/plugins/SystemPackagesPluginImpl.java
projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/test/resources/bootstrap/bootstrap.xml
Log:
WIP
Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/facade/bundle/AbstractBundleState.java
===================================================================
--- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/facade/bundle/AbstractBundleState.java 2009-08-27 14:04:13 UTC (rev 92866)
+++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/facade/bundle/AbstractBundleState.java 2009-08-27 14:04:28 UTC (rev 92867)
@@ -25,8 +25,6 @@
import java.io.InputStream;
import java.net.MalformedURLException;
import java.net.URL;
-import java.security.AccessControlContext;
-import java.security.AccessController;
import java.security.Permission;
import java.security.cert.X509Certificate;
import java.util.ArrayList;
@@ -42,6 +40,7 @@
import org.jboss.logging.Logger;
import org.jboss.osgi.plugins.facade.api.BundleStoragePlugin;
+import org.jboss.osgi.plugins.facade.api.FrameworkEventsPlugin;
import org.jboss.osgi.plugins.filter.NoFilter;
import org.jboss.osgi.spi.NotImplementedException;
import org.jboss.osgi.spi.metadata.OSGiMetaData;
@@ -55,11 +54,9 @@
import org.osgi.framework.BundleListener;
import org.osgi.framework.Constants;
import org.osgi.framework.Filter;
-import org.osgi.framework.FrameworkEvent;
import org.osgi.framework.FrameworkListener;
import org.osgi.framework.FrameworkUtil;
import org.osgi.framework.InvalidSyntaxException;
-import org.osgi.framework.ServiceEvent;
import org.osgi.framework.ServiceListener;
import org.osgi.framework.ServiceReference;
import org.osgi.framework.ServiceRegistration;
@@ -109,7 +106,7 @@
private List<FrameworkListener> frameworkListeners = new CopyOnWriteArrayList<FrameworkListener>();
/** The service listeners */
- private Map<ServiceListener, ServiceListenerRegistration> serviceListeners = new ConcurrentHashMap<ServiceListener, ServiceListenerRegistration>();
+ private Map<ServiceListener, FrameworkEventsPlugin.ServiceListenerRegistration> serviceListeners = new ConcurrentHashMap<ServiceListener, FrameworkEventsPlugin.ServiceListenerRegistration>();
/**
* Create a new BundleState for the system bundle.
@@ -304,7 +301,9 @@
filter = NoFilter.INSTANCE;
checkValidBundleContext();
- serviceListeners.put(listener, new ServiceListenerRegistration(filter));
+ serviceListeners.put(listener, new FrameworkEventsPlugin.ServiceListenerRegistration(filter));
+ FrameworkEventsPlugin plugin = getBundleManager().getPlugin(FrameworkEventsPlugin.class);
+ plugin.addServiceListener(listener, filter);
}
public void removeServiceListener(ServiceListener listener)
@@ -315,6 +314,8 @@
checkValidBundleContext();
serviceListeners.remove(listener);
+ FrameworkEventsPlugin plugin = getBundleManager().getPlugin(FrameworkEventsPlugin.class);
+ plugin.removeServiceListener(listener);
}
/**
@@ -507,6 +508,9 @@
return;
bundleListeners.add(listener);
+
+ FrameworkEventsPlugin plugin = getBundleManager().getPlugin(FrameworkEventsPlugin.class);
+ plugin.addBundleListener(listener);
}
public void removeBundleListener(BundleListener listener)
@@ -520,6 +524,9 @@
checkAdminPermission(AdminPermission.LISTENER);
bundleListeners.remove(listener);
+
+ FrameworkEventsPlugin plugin = getBundleManager().getPlugin(FrameworkEventsPlugin.class);
+ plugin.removeBundleListener(listener);
}
public void start() throws BundleException
@@ -577,6 +584,9 @@
return;
frameworkListeners.add(listener);
+
+ FrameworkEventsPlugin plugin = getBundleManager().getPlugin(FrameworkEventsPlugin.class);
+ plugin.addFrameworkListener(listener);
}
public void removeFrameworkListener(FrameworkListener listener)
@@ -587,6 +597,9 @@
checkValidBundleContext();
frameworkListeners.remove(listener);
+
+ FrameworkEventsPlugin plugin = getBundleManager().getPlugin(FrameworkEventsPlugin.class);
+ plugin.removeFrameworkListener(listener);
}
public Bundle installBundle(String location, InputStream input) throws BundleException
@@ -738,131 +751,12 @@
}
this.state.set(state);
log.debug(this + " change state=" + ConstantsHelper.bundleState(state));
- BundleEvent event = new BundleEvent(type, getBundleInternal());
- fireBundleEvent(event);
+
+ FrameworkEventsPlugin plugin = getBundleManager().getPlugin(FrameworkEventsPlugin.class);
+ plugin.fireBundleEvent(this, type);
}
/**
- * Fire a bundle event
- *
- * @param event the event
- */
- void fireBundleEvent(BundleEvent event)
- {
- // Nobody is interested
- if (bundleListeners.isEmpty())
- return;
-
- // Are we active?
- if (getBundleManager().isActive() == false)
- return;
-
- // Synchronous listeners first
- for (BundleListener listener : bundleListeners)
- {
- try
- {
- if (listener instanceof SynchronousBundleListener)
- listener.bundleChanged(event);
- }
- catch (Throwable t)
- {
- log.warn("Error while firing bundle event: " + event.getType() + " for bundle " + getCanonicalName(), t);
- }
- }
- // Normal listeners after, if required
- int type = event.getType();
- if (type != BundleEvent.STARTING && type != BundleEvent.STOPPING && type != BundleEvent.LAZY_ACTIVATION)
- {
- for (BundleListener listener : bundleListeners)
- {
- try
- {
- if (listener instanceof SynchronousBundleListener == false)
- listener.bundleChanged(event);
- }
- catch (Throwable t)
- {
- log.warn("Error while firing bundle event: " + event.getType() + " for bundle " + this, t);
- }
- }
- }
- }
-
- /**
- * Fire a framework event
- *
- * @param type the type of event
- * @param throwable any throwable
- */
- void fireFrameworkEvent(int type, Throwable throwable)
- {
- // Nobody is interested
- if (frameworkListeners.isEmpty())
- return;
-
- // Are we active?
- if (getBundleManager().isActive() == false)
- return;
-
- // Call the listeners
- FrameworkEvent event = new FrameworkEvent(type, getBundleInternal(), throwable);
- for (FrameworkListener listener : frameworkListeners)
- {
- try
- {
- listener.frameworkEvent(event);
- }
- catch (Throwable t)
- {
- log.warn("Error while firing framework event: " + event.getType() + " for bundle " + getCanonicalName(), t);
- }
- }
- }
-
- /**
- * Fire a service event
- *
- * @param type the type
- * @param service the service
- */
- void fireServiceEvent(int type, OSGiServiceState service)
- {
- if (service == null)
- throw new IllegalArgumentException("No serviceReference");
-
- // Nobody is interested
- if (serviceListeners.isEmpty())
- return;
-
- // Are we active?
- if (getBundleManager().isActive() == false)
- return;
-
- ServiceEvent event = new ServiceEvent(type, service.getReferenceInternal());
-
- // Call the listeners
- for (Map.Entry<ServiceListener, ServiceListenerRegistration> entry : serviceListeners.entrySet())
- {
- ServiceListener listener = entry.getKey();
- ServiceListenerRegistration registration = entry.getValue();
- try
- {
- if (registration.filter.match(service))
- {
- AccessControlContext accessControlContext = registration.accessControlContext;
- if (accessControlContext == null || service.hasPermission(accessControlContext))
- listener.serviceChanged(event);
- }
- }
- catch (Throwable t)
- {
- log.warn("Error while firing service event: " + type + " for service " + service, t);
- }
- }
- }
-
- /**
* Check the bundle is installed
*
* @throws IllegalStateException when the bundle is not installed
@@ -918,29 +812,4 @@
return true;
}
}
-
- /**
- * ServiceListenerRegistration.
- */
- private static class ServiceListenerRegistration
- {
- // Any filter
- Filter filter;
-
- // Any access control context
- AccessControlContext accessControlContext;
-
- /**
- * Create a new ServiceListenerRegistration.
- *
- * @param filter the filter
- */
- public ServiceListenerRegistration(Filter filter)
- {
- this.filter = filter;
-
- if (System.getSecurityManager() != null)
- accessControlContext = AccessController.getContext();
- }
- }
}
Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/facade/bundle/OSGiBundleManager.java
===================================================================
--- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/facade/bundle/OSGiBundleManager.java 2009-08-27 14:04:13 UTC (rev 92866)
+++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/facade/bundle/OSGiBundleManager.java 2009-08-27 14:04:28 UTC (rev 92867)
@@ -50,6 +50,7 @@
import org.jboss.osgi.plugins.facade.api.AbstractPlugin;
import org.jboss.osgi.plugins.facade.api.AutoInstallPlugin;
import org.jboss.osgi.plugins.facade.api.BundleStoragePlugin;
+import org.jboss.osgi.plugins.facade.api.FrameworkEventsPlugin;
import org.jboss.osgi.plugins.filter.NoFilter;
import org.jboss.osgi.plugins.metadata.AbstractOSGiMetaData;
import org.jboss.osgi.spi.metadata.OSGiMetaData;
@@ -171,20 +172,17 @@
executor = Executors.newFixedThreadPool(10);
this.executor = executor;
-
- // Create the system bundle
- createSystemBundle();
}
- private void createSystemBundle()
+ public void start()
{
+ // createSystemBundle
Manifest manifest = new Manifest();
Attributes attributes = manifest.getMainAttributes();
attributes.put(new Name(Constants.BUNDLE_NAME), Constants.SYSTEM_BUNDLE_SYMBOLICNAME);
attributes.put(new Name(Constants.BUNDLE_SYMBOLICNAME), Constants.SYSTEM_BUNDLE_SYMBOLICNAME);
OSGiMetaData systemMetaData = new AbstractOSGiMetaData(manifest);
- this.systemBundle = new OSGiSystemState(systemMetaData);
- addBundle(systemBundle);
+ addBundle(systemBundle = new OSGiSystemState(this, systemMetaData));
}
/**
@@ -512,6 +510,7 @@
}
bundleState.setBundleManager(this);
+ bundleState.changeState(Bundle.INSTALLED);
bundlesById.put(bundleState.getBundleId(), bundleState);
log.debug("Added " + bundleState.getCanonicalName() + " id=" + bundleState.getBundleId());
}
@@ -760,7 +759,8 @@
OSGiServiceState result = new OSGiServiceState(bundleState, clazzes, service, properties);
result.internalRegister();
registeredServices.add(result);
- bundleState.fireServiceEvent(ServiceEvent.REGISTERED, result);
+ FrameworkEventsPlugin plugin = getPlugin(FrameworkEventsPlugin.class);
+ plugin.fireServiceEvent(bundleState, ServiceEvent.REGISTERED, result);
log.debug("Registered service : " + result.toLongString());
return result;
}
@@ -773,7 +773,8 @@
void unregisterService(OSGiServiceState serviceState)
{
log.debug("Unregistering service: " + serviceState.toLongString());
- serviceState.getBundleState().fireServiceEvent(ServiceEvent.UNREGISTERING, serviceState);
+ FrameworkEventsPlugin plugin = getPlugin(FrameworkEventsPlugin.class);
+ plugin.fireServiceEvent(serviceState.getBundleState(), ServiceEvent.UNREGISTERING, serviceState);
registeredServices.remove(serviceState);
serviceState.internalUnregister();
}
@@ -884,7 +885,8 @@
systemBundle.changeState(Bundle.ACTIVE);
// A framework event of type STARTED is fired
- systemBundle.fireFrameworkEvent(FrameworkEvent.STARTED, null);
+ FrameworkEventsPlugin plugin = getPlugin(FrameworkEventsPlugin.class);
+ plugin.fireFrameworkEvent(systemBundle, FrameworkEvent.STARTED, null);
}
/**
@@ -957,12 +959,13 @@
void fireError(AbstractBundleState bundleState, String context, Throwable t)
{
OSGiSystemState systemBundle = getSystemBundle();
+ FrameworkEventsPlugin plugin = getPlugin(FrameworkEventsPlugin.class);
if (t instanceof BundleException)
- systemBundle.fireFrameworkEvent(FrameworkEvent.ERROR, t);
+ plugin.fireFrameworkEvent(systemBundle, FrameworkEvent.ERROR, t);
else if (bundleState != null)
- systemBundle.fireFrameworkEvent(FrameworkEvent.ERROR, new BundleException("Error " + context + " bundle: " + bundleState.getCanonicalName(), t));
+ plugin.fireFrameworkEvent(systemBundle, FrameworkEvent.ERROR, new BundleException("Error " + context + " bundle: " + bundleState.getCanonicalName(), t));
else
- systemBundle.fireFrameworkEvent(FrameworkEvent.ERROR, new BundleException("Error " + context, t));
+ plugin.fireFrameworkEvent(systemBundle, FrameworkEvent.ERROR, new BundleException("Error " + context, t));
}
/**
@@ -973,12 +976,13 @@
void fireWarning(AbstractBundleState bundleState, String context, Throwable t)
{
OSGiSystemState systemBundle = getSystemBundle();
+ FrameworkEventsPlugin plugin = getPlugin(FrameworkEventsPlugin.class);
if (t instanceof BundleException)
- systemBundle.fireFrameworkEvent(FrameworkEvent.WARNING, t);
+ plugin.fireFrameworkEvent(systemBundle, FrameworkEvent.WARNING, t);
else if (bundleState != null)
- systemBundle.fireFrameworkEvent(FrameworkEvent.WARNING, new BundleException("Error " + context + " bundle: " + bundleState.getCanonicalName(), t));
+ plugin.fireFrameworkEvent(systemBundle, FrameworkEvent.WARNING, new BundleException("Error " + context + " bundle: " + bundleState.getCanonicalName(), t));
else
- systemBundle.fireFrameworkEvent(FrameworkEvent.WARNING, new BundleException("Error " + context, t));
+ plugin.fireFrameworkEvent(systemBundle, FrameworkEvent.WARNING, new BundleException("Error " + context, t));
}
/**
Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/facade/bundle/OSGiBundleState.java
===================================================================
--- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/facade/bundle/OSGiBundleState.java 2009-08-27 14:04:13 UTC (rev 92866)
+++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/facade/bundle/OSGiBundleState.java 2009-08-27 14:04:28 UTC (rev 92867)
@@ -78,7 +78,6 @@
this.unit = unit;
this.bundleId = bundleIDGenerator.incrementAndGet();
unit.getMutableMetaData().addMetaData(unit, DeploymentUnit.class);
- changeState(Bundle.INSTALLED);
}
public long getBundleId()
Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/facade/bundle/OSGiServiceState.java
===================================================================
--- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/facade/bundle/OSGiServiceState.java 2009-08-27 14:04:13 UTC (rev 92866)
+++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/facade/bundle/OSGiServiceState.java 2009-08-27 14:04:28 UTC (rev 92867)
@@ -31,6 +31,7 @@
import java.util.concurrent.atomic.AtomicLong;
import org.jboss.logging.Logger;
+import org.jboss.osgi.plugins.facade.api.FrameworkEventsPlugin;
import org.jboss.osgi.plugins.util.CaseInsensitiveDictionary;
import org.jboss.util.collection.ConcurrentSet;
import org.osgi.framework.Bundle;
@@ -184,7 +185,8 @@
catch (Throwable t)
{
log.error("Error from getService for " + this, t);
- getBundleState().fireFrameworkEvent(FrameworkEvent.ERROR, new BundleException("Error using service factory:" + serviceFactory, t));
+ FrameworkEventsPlugin plugin = bundleState.getBundleManager().getPlugin(FrameworkEventsPlugin.class);
+ plugin.fireFrameworkEvent(bundleState, FrameworkEvent.ERROR, new BundleException("Error using service factory:" + serviceFactory, t));
return null;
}
}
@@ -267,7 +269,9 @@
this.properties = null;
else
this.properties = new CaseInsensitiveDictionary(properties);
- bundleState.fireServiceEvent(ServiceEvent.MODIFIED, this);
+
+ FrameworkEventsPlugin plugin = bundleState.getBundleManager().getPlugin(FrameworkEventsPlugin.class);
+ plugin.fireServiceEvent(bundleState, ServiceEvent.MODIFIED, this);
}
/**
@@ -526,7 +530,8 @@
catch (Throwable t)
{
log.warn("Error from ungetService for " + this, t);
- getBundleState().fireFrameworkEvent(FrameworkEvent.WARNING, new BundleException("Error using service factory:" + serviceFactory, t));
+ FrameworkEventsPlugin plugin = bundleState.getBundleManager().getPlugin(FrameworkEventsPlugin.class);
+ plugin.fireFrameworkEvent(bundleState, FrameworkEvent.WARNING, new BundleException("Error using service factory:" + serviceFactory, t));
}
finally
{
@@ -654,7 +659,7 @@
* @param accessControlContext
* @return true when the caller has permission
*/
- boolean hasPermission(AccessControlContext accessControlContext)
+ public boolean hasPermission(AccessControlContext accessControlContext)
{
try
{
Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/facade/bundle/OSGiSystemState.java
===================================================================
--- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/facade/bundle/OSGiSystemState.java 2009-08-27 14:04:13 UTC (rev 92866)
+++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/facade/bundle/OSGiSystemState.java 2009-08-27 14:04:28 UTC (rev 92867)
@@ -43,13 +43,12 @@
{
/**
* Create a new OSGiSystemBundle.
- *
+ * @param bundleManager the bundle manager associated with the system bundle
* @param osgiMetaData the metadata for the system bundle
*/
- public OSGiSystemState(OSGiMetaData osgiMetaData)
+ public OSGiSystemState(OSGiBundleManager bundleManager, OSGiMetaData osgiMetaData)
{
super(osgiMetaData);
- changeState(Bundle.INSTALLED);
}
@Override
Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/facade/launch/OSGiFrameworkFactory.java
===================================================================
--- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/facade/launch/OSGiFrameworkFactory.java 2009-08-27 14:04:13 UTC (rev 92866)
+++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/facade/launch/OSGiFrameworkFactory.java 2009-08-27 14:04:28 UTC (rev 92867)
@@ -35,7 +35,6 @@
import org.jboss.kernel.plugins.deployment.xml.BasicXMLDeployer;
import org.jboss.logging.Logger;
import org.jboss.osgi.plugins.facade.bundle.OSGiBundleManager;
-import org.jboss.osgi.plugins.facade.bundle.AbstractBundleState;
import org.jboss.osgi.plugins.facade.bundle.OSGiSystemState;
import org.osgi.framework.launch.Framework;
import org.osgi.framework.launch.FrameworkFactory;
Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/facade/plugins/SystemPackagesPluginImpl.java
===================================================================
--- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/facade/plugins/SystemPackagesPluginImpl.java 2009-08-27 14:04:13 UTC (rev 92866)
+++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/facade/plugins/SystemPackagesPluginImpl.java 2009-08-27 14:04:28 UTC (rev 92867)
@@ -64,11 +64,35 @@
{
// The default system packages
allPackages.add("javax.management");
+ allPackages.add("javax.management.remote");
+ allPackages.add("javax.naming");
+ allPackages.add("javax.naming.spi");
+
+ allPackages.add("javax.xml.datatype");
+ allPackages.add("javax.xml.namespace");
+ allPackages.add("javax.xml.parsers");
+ allPackages.add("javax.xml.validation");
+ allPackages.add("javax.xml.transform");
+ allPackages.add("javax.xml.transform.dom");
+ allPackages.add("javax.xml.transform.sax");
+ allPackages.add("javax.xml.transform.stream");
+
+ allPackages.add("org.w3c.dom");
+ allPackages.add("org.w3c.dom.ls");
+ allPackages.add("org.w3c.dom.events");
+ allPackages.add("org.w3c.dom.ranges");
+ allPackages.add("org.w3c.dom.views");
+ allPackages.add("org.w3c.dom.traversal");
+ allPackages.add("org.xml.sax");
+ allPackages.add("org.xml.sax.ext");
+ allPackages.add("org.xml.sax.helpers");
+
allPackages.add("org.osgi.framework");
allPackages.add("org.osgi.service.startlevel");
allPackages.add("org.osgi.service.packageadmin");
allPackages.add("org.osgi.util.tracker");
+
String asString = packagesAsString(allPackages);
bundleManager.setProperty(Constants.FRAMEWORK_SYSTEMPACKAGES, asString);
}
Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/test/resources/bootstrap/bootstrap.xml
===================================================================
--- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/test/resources/bootstrap/bootstrap.xml 2009-08-27 14:04:13 UTC (rev 92866)
+++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/test/resources/bootstrap/bootstrap.xml 2009-08-27 14:04:28 UTC (rev 92867)
@@ -16,9 +16,11 @@
<entry><key>org.osgi.framework.storage.clean</key><value>onFirstInit</value></entry>
<entry><key>org.osgi.framework.system.packages.extra</key><value>
org.jboss.logging;version=2.0,
+ org.jboss.osgi.spi.capability;version=1.0,
org.jboss.osgi.spi.logging;version=1.0,
org.jboss.osgi.spi.management;version=1.0,
org.jboss.osgi.spi.service;version=1.0,
+ org.jboss.osgi.spi.testing;version=1.0,
org.jboss.osgi.spi.util;version=1.0
</value></entry>
</map>
@@ -27,12 +29,15 @@
<uncallback method="removePlugin" />
</bean>
- <bean name="OSGiSystemPackages" class="org.jboss.osgi.plugins.facade.plugins.SystemPackagesPluginImpl">
+ <bean name="OSGiFrameworkEventsPlugin" class="org.jboss.osgi.plugins.facade.plugins.FrameworkEventsPluginImpl">
<constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor>
</bean>
<bean name="OSGiStoragePlugin" class="org.jboss.osgi.plugins.facade.plugins.BundleStoragePluginImpl">
<constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor>
</bean>
+ <bean name="OSGiSystemPackages" class="org.jboss.osgi.plugins.facade.plugins.SystemPackagesPluginImpl">
+ <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor>
+ </bean>
<!--
********************************
More information about the jboss-cvs-commits
mailing list