[jboss-cvs] JBossAS SVN: r101391 - in projects/jboss-osgi: projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/bundle and 7 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Feb 24 07:58:51 EST 2010
Author: thomas.diesler at jboss.com
Date: 2010-02-24 07:58:50 -0500 (Wed, 24 Feb 2010)
New Revision: 101391
Added:
projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/deployers/OSGiBundleStateResolveDeployer.java
Modified:
projects/jboss-osgi/projects/runtime/framework/trunk/src/etc/osgitck/jboss-osgi-bootstrap.xml
projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/bundle/OSGiBundleManager.java
projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/deployers/AbstractOSGiClassLoadingDeployer.java
projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/deployers/OSGiFragmentAttachmentDeployer.java
projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/packageadmin/PackageAdminImpl.java
projects/jboss-osgi/projects/runtime/framework/trunk/src/test/resources/bootstrap/jboss-osgi-bootstrap.xml
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/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:
[JBDEPLOY-226] Allow multiple deployments to change state at once
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/src/etc/osgitck/jboss-osgi-bootstrap.xml
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/src/etc/osgitck/jboss-osgi-bootstrap.xml 2010-02-24 12:25:12 UTC (rev 101390)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/src/etc/osgitck/jboss-osgi-bootstrap.xml 2010-02-24 12:58:50 UTC (rev 101391)
@@ -153,6 +153,7 @@
<constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor>
</bean>
<bean name="OSGiBundleStateInstallDeployer" class="org.jboss.osgi.framework.deployers.OSGiBundleStateInstallDeployer"/>
+ <bean name="OSGiBundleStateResolveDeployer" class="org.jboss.osgi.framework.deployers.OSGiBundleStateResolveDeployer"/>
<bean name="OSGiContextTrackerDeployer" class="org.jboss.osgi.framework.deployers.OSGiContextTrackerDeployer" />
<bean name="OSGiManifestParsingDeployer" class="org.jboss.osgi.framework.deployers.OSGiManifestParsingDeployer" />
<bean name="OSGiNativeCodeMetaDataDeployer" class="org.jboss.osgi.framework.deployers.OSGiNativeCodeMetaDataDeployer" />
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/bundle/OSGiBundleManager.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/bundle/OSGiBundleManager.java 2010-02-24 12:25:12 UTC (rev 101390)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/bundle/OSGiBundleManager.java 2010-02-24 12:58:50 UTC (rev 101391)
@@ -46,15 +46,12 @@
import java.util.concurrent.atomic.AtomicInteger;
import org.jboss.classloading.spi.metadata.ClassLoadingMetaData;
-import org.jboss.dependency.spi.ControllerContext;
-import org.jboss.dependency.spi.ControllerState;
import org.jboss.deployers.client.spi.DeployerClient;
import org.jboss.deployers.client.spi.IncompleteDeploymentException;
import org.jboss.deployers.client.spi.IncompleteDeployments;
import org.jboss.deployers.client.spi.MissingDependency;
import org.jboss.deployers.spi.DeploymentException;
import org.jboss.deployers.spi.attachments.MutableAttachments;
-import org.jboss.deployers.spi.deployer.DeploymentStage;
import org.jboss.deployers.spi.deployer.DeploymentStages;
import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.deployers.structure.spi.main.MainDeployerStructure;
@@ -1088,85 +1085,6 @@
}
/**
- * Resolve a bundle
- *
- * @param bundleState the bundle state
- * @param errorOnFail whether to throw an error if it cannot be resolved
- * @return true when resolved
- */
- public boolean resolveBundle(OSGiBundleState bundleState, boolean errorOnFail) throws BundleException
- {
- int state = bundleState.getState();
- if (state != Bundle.INSTALLED)
- return true;
-
- // A bundle can only resolve if the framework is running on a VM which
- // implements one of the listed required execution environments.
- List<String> reqExecEnvironments = bundleState.getOSGiMetaData().getRequiredExecutionEnvironment();
- if (reqExecEnvironments != null)
- {
- boolean foundExecEnv = false;
- String fwExecEnvs = getProperty(Constants.FRAMEWORK_EXECUTIONENVIRONMENT);
- for (String aux : reqExecEnvironments)
- {
- if (fwExecEnvs.contains(aux))
- {
- foundExecEnv = true;
- break;
- }
- }
-
- if (foundExecEnv == false)
- {
- String msg = "Cannot find any of the required execution environments " + reqExecEnvironments + ", we have: " + fwExecEnvs;
- if (errorOnFail == true)
- throw new BundleException(msg);
-
- log.error(msg);
- return false;
- }
- }
-
- DeploymentUnit unit = bundleState.getDeploymentUnit();
- String unitName = unit.getName();
-
- ControllerContext context = unit.getAttachment(ControllerContext.class);
- ControllerState requiredState = context.getRequiredState();
- DeploymentStage requiredStage = unit.getRequiredStage();
-
- // TODO [JBDEPLOY-226] Allow multiple deployments to change state at once
- try
- {
- deployerClient.change(unitName, DeploymentStages.CLASSLOADER);
- deployerClient.checkComplete(unitName);
-
- // Advance the attached fragments to CLASSLOADER
- for (OSGiFragmentState fragment : bundleState.getAttachedFragments())
- {
- String fragUnitName = fragment.getDeploymentUnit().getName();
- deployerClient.change(fragUnitName, DeploymentStages.CLASSLOADER);
- deployerClient.checkComplete(fragUnitName);
- }
-
- bundleState.changeState(Bundle.RESOLVED);
- for (OSGiFragmentState fragment : bundleState.getAttachedFragments())
- fragment.changeState(Bundle.RESOLVED);
-
- return true;
- }
- catch (DeploymentException ex)
- {
- unit.setRequiredStage(requiredStage);
- context.setRequiredState(requiredState);
-
- if (errorOnFail)
- throw new BundleException("Error resolving bundle: " + bundleState, ex);
-
- return false;
- }
- }
-
- /**
* Start a bundle.
*
* Stating a bundle is done in an attempt to move the bundle's DeploymentUnit to state INSTALLED.
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/deployers/AbstractOSGiClassLoadingDeployer.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/deployers/AbstractOSGiClassLoadingDeployer.java 2010-02-24 12:25:12 UTC (rev 101390)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/deployers/AbstractOSGiClassLoadingDeployer.java 2010-02-24 12:58:50 UTC (rev 101391)
@@ -47,7 +47,7 @@
import org.jboss.osgi.framework.plugins.SystemPackagesPlugin;
/**
- * An abstract OSGi classloading deployer, that maps osgi metadata into classloading metadata.
+ * An abstract OSGi classloading deployer, that maps {@link OSGiMetaData} into {@link ClassLoadingMetaData}.
*
* @author Thomas.Diesler at jboss.com
* @since 07-Jan-2010
Added: projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/deployers/OSGiBundleStateResolveDeployer.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/deployers/OSGiBundleStateResolveDeployer.java (rev 0)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/deployers/OSGiBundleStateResolveDeployer.java 2010-02-24 12:58:50 UTC (rev 101391)
@@ -0,0 +1,59 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2009, Red Hat Middleware LLC, and individual contributors
+* as indicated by the @author tags. See the copyright.txt file 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.deployers;
+
+import org.jboss.deployers.spi.DeploymentException;
+import org.jboss.deployers.spi.deployer.DeploymentStages;
+import org.jboss.deployers.spi.deployer.helpers.AbstractSimpleRealDeployer;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.osgi.framework.bundle.OSGiBundleState;
+import org.jboss.osgi.framework.bundle.OSGiFragmentState;
+import org.osgi.framework.Bundle;
+
+/**
+ * A deployer that sets the bundle state to RESOLVED when the ClassLoader becomes available.
+ *
+ * @author Thomas.Diesler at jboss.com
+ * @since 24-Feb-2010
+ */
+public class OSGiBundleStateResolveDeployer extends AbstractSimpleRealDeployer<OSGiBundleState>
+{
+ // The relative order at which to change the bindle state to RESOLVED
+ static final int RELATIVE_ORDER = 200;
+
+ public OSGiBundleStateResolveDeployer()
+ {
+ super(OSGiBundleState.class);
+ setStage(DeploymentStages.CLASSLOADER);
+ setRelativeOrder(RELATIVE_ORDER);
+ setTopLevelOnly(true);
+ }
+
+ @Override
+ public void deploy(DeploymentUnit unit, OSGiBundleState bundleState) throws DeploymentException
+ {
+ // Change the bundle state to RESOLVED
+ bundleState.changeState(Bundle.RESOLVED);
+ for (OSGiFragmentState fragment : bundleState.getAttachedFragments())
+ fragment.changeState(Bundle.RESOLVED);
+ }
+}
\ No newline at end of file
Property changes on: projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/deployers/OSGiBundleStateResolveDeployer.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/deployers/OSGiFragmentAttachmentDeployer.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/deployers/OSGiFragmentAttachmentDeployer.java 2010-02-24 12:25:12 UTC (rev 101390)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/deployers/OSGiFragmentAttachmentDeployer.java 2010-02-24 12:58:50 UTC (rev 101391)
@@ -49,10 +49,14 @@
*/
public class OSGiFragmentAttachmentDeployer extends AbstractSimpleRealDeployer<ClassLoadingMetaData>
{
+ // The relative order at which the fragments get attached
+ static final int RELATIVE_ORDER = 100;
+
public OSGiFragmentAttachmentDeployer()
{
super(ClassLoadingMetaData.class);
setStage(DeploymentStages.CLASSLOADER);
+ setRelativeOrder(RELATIVE_ORDER);
setTopLevelOnly(true);
}
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/packageadmin/PackageAdminImpl.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/packageadmin/PackageAdminImpl.java 2010-02-24 12:25:12 UTC (rev 101390)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/packageadmin/PackageAdminImpl.java 2010-02-24 12:58:50 UTC (rev 101391)
@@ -33,7 +33,13 @@
import org.jboss.classloading.spi.metadata.CapabilitiesMetaData;
import org.jboss.classloading.spi.metadata.Capability;
import org.jboss.classloading.spi.metadata.ClassLoadingMetaData;
+import org.jboss.dependency.spi.ControllerContext;
+import org.jboss.dependency.spi.ControllerState;
+import org.jboss.deployers.client.spi.DeployerClient;
import org.jboss.deployers.plugins.classloading.AbstractDeploymentClassLoaderPolicyModule;
+import org.jboss.deployers.spi.DeploymentException;
+import org.jboss.deployers.spi.deployer.DeploymentStage;
+import org.jboss.deployers.spi.deployer.DeploymentStages;
import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.logging.Logger;
import org.jboss.osgi.framework.bundle.AbstractBundleState;
@@ -52,6 +58,7 @@
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.BundleException;
+import org.osgi.framework.Constants;
import org.osgi.service.packageadmin.ExportedPackage;
import org.osgi.service.packageadmin.PackageAdmin;
import org.osgi.service.packageadmin.RequiredBundle;
@@ -170,7 +177,7 @@
public ExportedPackage[] getExportedPackages(String name)
{
List<ExportedPackage> exported = new ArrayList<ExportedPackage>();
-
+
for (AbstractBundleState auxBundle : getBundleManager().getBundles())
{
ExportedPackage[] exportedPackages = getExportedPackages(auxBundle);
@@ -183,7 +190,7 @@
}
}
}
-
+
if (exported.size() == 0)
return null;
@@ -198,17 +205,17 @@
AbstractBundleState absBundleState = AbstractBundleState.assertBundleState(bundle);
if (absBundleState instanceof OSGiBundleState == false)
return null;
-
+
List<Bundle> bundles = new ArrayList<Bundle>();
-
+
OSGiBundleState bundleState = (OSGiBundleState)absBundleState;
List<OSGiFragmentState> fragments = bundleState.getAttachedFragments();
for (OSGiFragmentState aux : fragments)
bundles.add(aux.getBundleInternal());
-
+
if (bundles.isEmpty())
return null;
-
+
return bundles.toArray(new Bundle[bundles.size()]);
}
@@ -217,9 +224,9 @@
AbstractBundleState absBundleState = AbstractBundleState.assertBundleState(bundle);
if (absBundleState instanceof OSGiFragmentState == false)
return null;
-
+
List<Bundle> bundles = new ArrayList<Bundle>();
-
+
// [TODO] Add support for multiple hosts
OSGiFragmentState bundleState = (OSGiFragmentState)absBundleState;
OSGiBundleState fragmentHost = bundleState.getFragmentHost();
@@ -227,10 +234,10 @@
{
bundles.add(fragmentHost.getBundle());
}
-
+
if (bundles.isEmpty())
return null;
-
+
return bundles.toArray(new Bundle[bundles.size()]);
}
@@ -270,69 +277,134 @@
if (unresolvedBundles.isEmpty())
return true;
+ // The list of bundle deployments which should be able to advance to CLASSLOADER stage
List<OSGiBundleState> resolvableBundles = new ArrayList<OSGiBundleState>();
// Check if the external resolver plugin is available
Resolver bundleResolver = getBundleManager().getOptionalPlugin(ResolverPlugin.class);
if (bundleResolver != null)
{
- // Resolve the bundles through the resolver
+ // Resolve the bundles through the resolver. The return is the list of
+ // bundles that the external resolver could actually resolve
for (ResolverBundle aux : bundleResolver.resolve(unresolvedBundles))
- resolvableBundles.add(OSGiBundleState.assertBundleState(aux.getBundle()));
+ {
+ OSGiBundleState bundleState = OSGiBundleState.assertBundleState(aux.getBundle());
+ resolvableBundles.add(bundleState);
+ }
}
else
{
- // Every unresolved bundle is automatically copied
- // to the list of externaly resolved bundles
+ // Every unresolved bundle is automatically copied to the list of resolvable bundles
for (Bundle aux : unresolvedBundles)
- resolvableBundles.add(OSGiBundleState.assertBundleState(aux));
+ {
+ OSGiBundleState bundleState = OSGiBundleState.assertBundleState(aux);
+ resolvableBundles.add(bundleState);
+ }
}
+ // Remove the bundles that do not pass the execution env check
+ Iterator<OSGiBundleState> itBundles = resolvableBundles.iterator();
+ while(itBundles.hasNext())
+ {
+ OSGiBundleState bundleState = itBundles.next();
+ try
+ {
+ verifyExecutionEnvironment(bundleState, true);
+ }
+ catch (BundleException ex)
+ {
+ itBundles.remove();
+ }
+ }
+
+ // We can only return true if all bundles are resolvable.
boolean allResolved = resolvableBundles.containsAll(unresolvedBundles);
// TODO [JBDEPLOY-226] Allow multiple deployments to change state at once
- int resolved = 1;
- while (resolved > 0)
+ resolveBundles(resolvableBundles);
+
+ try
{
- resolved = 0;
- Iterator<OSGiBundleState> it = resolvableBundles.iterator();
- while (it.hasNext())
+ DeployerClient deployerClient = getBundleManager().getDeployerClient();
+ deployerClient.checkComplete();
+ }
+ catch (DeploymentException ex)
+ {
+ log.error("Error resolving bundles: " + resolvableBundles, ex);
+ allResolved = false;
+ }
+
+ return allResolved;
+ }
+
+ private void resolveBundles(List<OSGiBundleState> resolvableBundles)
+ {
+ for (OSGiBundleState bundleState: resolvableBundles)
+ {
+ // If the bundle is in any other state but INSTALLED there is nothing to do
+ if (bundleState.getState() != Bundle.INSTALLED)
+ continue;
+
+ DeploymentUnit unit = bundleState.getDeploymentUnit();
+ String unitName = unit.getName();
+
+ ControllerContext context = unit.getAttachment(ControllerContext.class);
+ ControllerState requiredState = context.getRequiredState();
+ DeploymentStage requiredStage = unit.getRequiredStage();
+
+ try
{
- OSGiBundleState bundleState = it.next();
- try
+ DeployerClient deployerClient = getBundleManager().getDeployerClient();
+ deployerClient.change(unitName, DeploymentStages.CLASSLOADER);
+
+ // Advance the attached fragments to CLASSLOADER
+ for (OSGiFragmentState fragment : bundleState.getAttachedFragments())
{
- boolean bundleResolved = getBundleManager().resolveBundle(bundleState, false);
- if (bundleResolved)
- {
- it.remove();
- resolved++;
- }
+ String fragUnitName = fragment.getDeploymentUnit().getName();
+ deployerClient.change(fragUnitName, DeploymentStages.CLASSLOADER);
}
- catch (BundleException ex)
- {
- // ignore
- }
+
+ // bundleState.changeState(Bundle.RESOLVED);
+ // for (OSGiFragmentState fragment : bundleState.getAttachedFragments())
+ // fragment.changeState(Bundle.RESOLVED);
}
+ catch (DeploymentException ex)
+ {
+ unit.setRequiredStage(requiredStage);
+ context.setRequiredState(requiredState);
+ log.error("Error resolving bundle: " + bundleState, ex);
+ }
}
+ }
- // Sanity check, that the controller could actually also resolve these bundles
- if (resolvableBundles.isEmpty() == false)
+ private boolean verifyExecutionEnvironment(OSGiBundleState bundleState, boolean errorOnFail) throws BundleException
+ {
+ // A bundle can only resolve if the framework is running on a VM which
+ // implements one of the listed required execution environments.
+ List<String> reqExecEnvs = bundleState.getOSGiMetaData().getRequiredExecutionEnvironment();
+ if (reqExecEnvs == null)
+ return true;
+
+ boolean foundExecEnv = false;
+ String fwExecEnvs = getBundleManager().getProperty(Constants.FRAMEWORK_EXECUTIONENVIRONMENT);
+ for (String aux : reqExecEnvs)
{
- log.error("Controller could not resolve: " + resolvableBundles);
- for (OSGiBundleState bundleState : resolvableBundles)
+ if (fwExecEnvs.contains(aux))
{
- try
- {
- getBundleManager().resolveBundle(bundleState, true);
- }
- catch (Exception ex)
- {
- log.debug("Cannot resolve: " + bundleState, ex);
- }
+ foundExecEnv = true;
+ break;
}
}
+
+ if (foundExecEnv == false)
+ {
+ String msg = "Cannot find any of the required execution environments " + reqExecEnvs + ", we have: " + fwExecEnvs;
+ if (errorOnFail == true)
+ throw new BundleException(msg);
- allResolved = allResolved && resolvableBundles.isEmpty();
- return allResolved;
+ log.error(msg);
+ }
+
+ return foundExecEnv;
}
}
\ No newline at end of file
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/src/test/resources/bootstrap/jboss-osgi-bootstrap.xml
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/src/test/resources/bootstrap/jboss-osgi-bootstrap.xml 2010-02-24 12:25:12 UTC (rev 101390)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/src/test/resources/bootstrap/jboss-osgi-bootstrap.xml 2010-02-24 12:58:50 UTC (rev 101391)
@@ -164,6 +164,7 @@
<constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor>
</bean>
<bean name="OSGiBundleStateInstallDeployer" class="org.jboss.osgi.framework.deployers.OSGiBundleStateInstallDeployer"/>
+ <bean name="OSGiBundleStateResolveDeployer" class="org.jboss.osgi.framework.deployers.OSGiBundleStateResolveDeployer"/>
<bean name="OSGiContextTrackerDeployer" class="org.jboss.osgi.framework.deployers.OSGiContextTrackerDeployer" />
<bean name="OSGiManifestParsingDeployer" class="org.jboss.osgi.framework.deployers.OSGiManifestParsingDeployer" />
<bean name="OSGiNativeCodeMetaDataDeployer" class="org.jboss.osgi.framework.deployers.OSGiNativeCodeMetaDataDeployer" />
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 2010-02-24 12:25:12 UTC (rev 101390)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-jbossmc.xml 2010-02-24 12:58:50 UTC (rev 101391)
@@ -176,6 +176,7 @@
<constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor>
</bean>
<bean name="OSGiBundleStateInstallDeployer" class="org.jboss.osgi.framework.deployers.OSGiBundleStateInstallDeployer"/>
+ <bean name="OSGiBundleStateResolveDeployer" class="org.jboss.osgi.framework.deployers.OSGiBundleStateResolveDeployer"/>
<bean name="OSGiBundleStructure" class="org.jboss.osgi.deployer.BundleStructureDeployer" />
<bean name="OSGiContextTrackerDeployer" class="org.jboss.osgi.framework.deployers.OSGiContextTrackerDeployer" />
<bean name="OSGiManifestParsingDeployer" class="org.jboss.osgi.framework.deployers.OSGiManifestParsingDeployer" />
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 2010-02-24 12:25:12 UTC (rev 101390)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-bootstrap.xml 2010-02-24 12:58:50 UTC (rev 101391)
@@ -207,6 +207,7 @@
<constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor>
</bean>
<bean name="OSGiBundleStateInstallDeployer" class="org.jboss.osgi.framework.deployers.OSGiBundleStateInstallDeployer"/>
+ <bean name="OSGiBundleStateResolveDeployer" class="org.jboss.osgi.framework.deployers.OSGiBundleStateResolveDeployer"/>
<bean name="OSGiContextTrackerDeployer" class="org.jboss.osgi.framework.deployers.OSGiContextTrackerDeployer" />
<bean name="OSGiManifestParsingDeployer" class="org.jboss.osgi.framework.deployers.OSGiManifestParsingDeployer" />
<bean name="OSGiNativeCodeMetaDataDeployer" class="org.jboss.osgi.framework.deployers.OSGiNativeCodeMetaDataDeployer" />
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 2010-02-24 12:25:12 UTC (rev 101390)
+++ projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2010-02-24 12:58:50 UTC (rev 101391)
@@ -190,6 +190,7 @@
<constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor>
</bean>
<bean name="OSGiBundleStateInstallDeployer" class="org.jboss.osgi.framework.deployers.OSGiBundleStateInstallDeployer"/>
+ <bean name="OSGiBundleStateResolveDeployer" class="org.jboss.osgi.framework.deployers.OSGiBundleStateResolveDeployer"/>
<bean name="OSGiContextTrackerDeployer" class="org.jboss.osgi.framework.deployers.OSGiContextTrackerDeployer" />
<bean name="OSGiManifestParsingDeployer" class="org.jboss.osgi.framework.deployers.OSGiManifestParsingDeployer" />
<bean name="OSGiNativeCodeMetaDataDeployer" class="org.jboss.osgi.framework.deployers.OSGiNativeCodeMetaDataDeployer" />
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 2010-02-24 12:25:12 UTC (rev 101390)
+++ projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2010-02-24 12:58:50 UTC (rev 101391)
@@ -164,6 +164,7 @@
<constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor>
</bean>
<bean name="OSGiBundleStateInstallDeployer" class="org.jboss.osgi.framework.deployers.OSGiBundleStateInstallDeployer"/>
+ <bean name="OSGiBundleStateResolveDeployer" class="org.jboss.osgi.framework.deployers.OSGiBundleStateResolveDeployer"/>
<bean name="OSGiContextTrackerDeployer" class="org.jboss.osgi.framework.deployers.OSGiContextTrackerDeployer" />
<bean name="OSGiManifestParsingDeployer" class="org.jboss.osgi.framework.deployers.OSGiManifestParsingDeployer" />
<bean name="OSGiNativeCodeMetaDataDeployer" class="org.jboss.osgi.framework.deployers.OSGiNativeCodeMetaDataDeployer" />
More information about the jboss-cvs-commits
mailing list