4 p.m.
Author: thomas.diesler(a)jboss.com
Date: 2009-08-22 17:00:52 -0400 (Sat, 22 Aug 2009)
New Revision: 92700
Removed:
projects/jboss-osgi/projects/runtime/deployers/trunk/src/main/java/org/jboss/osgi/runtime/deployer/
Modified:
projects/jboss-osgi/projects/runtime/deployers/trunk/src/main/java/org/jboss/osgi/deployer/BundleStructureDeployer.java
projects/jboss-osgi/projects/runtime/microcontainer/trunk/pom.xml
projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/main/java/org/jboss/osgi/plugins/deployers/bundle/OSGiBundleClassLoadingDeployer.java
projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/main/java/org/jboss/osgi/plugins/facade/bundle/OSGiBundleManager.java
projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/test/java/org/jboss/test/osgi/simple/SimpleBundleTestCase.java
projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/test/resources/bootstrap/bootstrap.xml
projects/jboss-osgi/trunk/reactor/pom.xml
projects/jboss-osgi/trunk/reactor/runtime/
Log:
[JBOSGI-130] Bundle is still in state INSTALLED after bundle.start()
Modified:
projects/jboss-osgi/projects/runtime/deployers/trunk/src/main/java/org/jboss/osgi/deployer/BundleStructureDeployer.java
===================================================================
---
projects/jboss-osgi/projects/runtime/deployers/trunk/src/main/java/org/jboss/osgi/deployer/BundleStructureDeployer.java 2009-08-22
19:14:14 UTC (rev 92699)
+++
projects/jboss-osgi/projects/runtime/deployers/trunk/src/main/java/org/jboss/osgi/deployer/BundleStructureDeployer.java 2009-08-22
21:00:52 UTC (rev 92700)
@@ -80,6 +80,11 @@
// Create a context for this jar file with META-INF as the location for
metadata
context = createContext(structureContext, "META-INF");
+ // The classpath is the root
+ addClassPath(structureContext, file, true, true, context);
+
+ // We don't process children as potential subdeployments
+
return true;
}
catch (Exception e)
Modified: projects/jboss-osgi/projects/runtime/microcontainer/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/runtime/microcontainer/trunk/pom.xml 2009-08-22 19:14:14
UTC (rev 92699)
+++ projects/jboss-osgi/projects/runtime/microcontainer/trunk/pom.xml 2009-08-22 21:00:52
UTC (rev 92700)
@@ -16,10 +16,10 @@
<version.jboss.aop>2.1.0.CR3</version.jboss.aop>
<version.jboss.deployers>2.0.8.GA</version.jboss.deployers>
<version.jboss.logging.log4j>2.1.0.GA</version.jboss.logging.log4j>
+
<version.jboss.osgi.runtime.deployers>1.0.1-SNAPSHOT</version.jboss.osgi.runtime.deployers>
<version.jboss.osgi.spi>1.0.1-SNAPSHOT</version.jboss.osgi.spi>
<version.jboss.microcontainer>2.0.6.GA</version.jboss.microcontainer>
<version.jboss.test>1.1.4.GA</version.jboss.test>
- <version.junit>4.6</version.junit>
<version.osgi>r4v42-20090728</version.osgi>
</properties>
@@ -96,6 +96,11 @@
<artifactId>jboss-osgi-spi</artifactId>
<version>${version.jboss.osgi.spi}</version>
</dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.runtime</groupId>
+ <artifactId>jboss-osgi-deployers</artifactId>
+ <version>${version.jboss.osgi.runtime.deployers}</version>
+ </dependency>
<!-- OSGi Dependencies -->
<dependency>
Modified:
projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/main/java/org/jboss/osgi/plugins/deployers/bundle/OSGiBundleClassLoadingDeployer.java
===================================================================
---
projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/main/java/org/jboss/osgi/plugins/deployers/bundle/OSGiBundleClassLoadingDeployer.java 2009-08-22
19:14:14 UTC (rev 92699)
+++
projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/main/java/org/jboss/osgi/plugins/deployers/bundle/OSGiBundleClassLoadingDeployer.java 2009-08-22
21:00:52 UTC (rev 92700)
@@ -21,6 +21,7 @@
*/
package org.jboss.osgi.plugins.deployers.bundle;
+import java.util.ArrayList;
import java.util.List;
import org.jboss.classloading.plugins.metadata.ModuleCapability;
@@ -36,12 +37,13 @@
import org.jboss.osgi.spi.metadata.PackageAttribute;
/**
- * OSGiBundleClassLoadingDeployer.<p>
+ * OSGiBundleClassLoadingDeployer.
+ * <p>
*
* This deployer maps osgi metadata into our classloading metadata.
- *
- * todo versions and attributes
- * todo require-bundle, dynamic-imports, etc.
+ *
+ * todo versions and attributes todo require-bundle, dynamic-imports, etc.
+ *
* @author <a href="adrian(a)jboss.com">Adrian Brock</a>
* @version $Revision: 1.1 $
*/
@@ -59,40 +61,51 @@
}
@Override
- public void deploy(DeploymentUnit unit, OSGiMetaData deployment) throws
DeploymentException
+ public void deploy(DeploymentUnit unit, OSGiMetaData metadata) throws
DeploymentException
{
if (unit.isAttachmentPresent(ClassLoadingMetaData.class))
return;
-
+
ClassLoadingMetaData classLoadingMetaData = new ClassLoadingMetaData();
- classLoadingMetaData.setName(deployment.getBundleSymbolicName());
- classLoadingMetaData.setVersion(deployment.getBundleVersion());
+ classLoadingMetaData.setName(metadata.getBundleSymbolicName());
+ classLoadingMetaData.setVersion(metadata.getBundleVersion());
- Capability capability = new ModuleCapability(deployment.getBundleSymbolicName(),
deployment.getBundleVersion());
+ Capability capability = new ModuleCapability(metadata.getBundleSymbolicName(),
metadata.getBundleVersion());
classLoadingMetaData.getCapabilities().addCapability(capability);
+
+ // [TODO] externalise system packages
+ ArrayList<String> systemNames = new ArrayList<String>();
+ systemNames.add("org.osgi.framework");
- List<PackageAttribute> exported = deployment.getExportPackages();
- if (exported != null && exported.isEmpty() == false)
+ ArrayList<String> exportedNames = new ArrayList<String>();
+
+ List<PackageAttribute> exported = metadata.getExportPackages();
+ if (exported != null)
{
for (PackageAttribute packageAttribute : exported)
{
String packageName = packageAttribute.getPackageInfo().getName();
- capability = new PackageCapability(packageName);
+ capability = new PackageCapability(packageName);
classLoadingMetaData.getCapabilities().addCapability(capability);
+ exportedNames.add(packageName);
}
}
-
- List<PackageAttribute> imported = deployment.getImportPackages();
- if (imported != null && imported.isEmpty() == false)
+
+ List<PackageAttribute> imported = metadata.getImportPackages();
+ if (imported != null)
{
for (PackageAttribute packageAttribute : imported)
{
String packageName = packageAttribute.getPackageInfo().getName();
- PackageRequirement requirement = new PackageRequirement(packageName);
- classLoadingMetaData.getRequirements().addRequirement(requirement);
+ if (systemNames.contains(packageName) == false &&
exportedNames.contains(packageName) == false)
+ {
+ // [TODO] add version ranges
+ PackageRequirement requirement = new PackageRequirement(packageName);
+ classLoadingMetaData.getRequirements().addRequirement(requirement);
+ }
}
}
-
+
unit.addAttachment(ClassLoadingMetaData.class, classLoadingMetaData);
}
}
Modified:
projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/main/java/org/jboss/osgi/plugins/facade/bundle/OSGiBundleManager.java
===================================================================
---
projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/main/java/org/jboss/osgi/plugins/facade/bundle/OSGiBundleManager.java 2009-08-22
19:14:14 UTC (rev 92699)
+++
projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/main/java/org/jboss/osgi/plugins/facade/bundle/OSGiBundleManager.java 2009-08-22
21:00:52 UTC (rev 92700)
@@ -24,6 +24,7 @@
import java.net.URL;
import java.security.AccessController;
import java.security.PrivilegedAction;
+import java.util.ArrayList;
import java.util.Collection;
import java.util.Comparator;
import java.util.Dictionary;
@@ -38,6 +39,12 @@
import java.util.jar.Manifest;
import java.util.jar.Attributes.Name;
+import org.jboss.classloading.spi.dependency.RequirementDependencyItem;
+import org.jboss.classloading.spi.metadata.Requirement;
+import org.jboss.dependency.spi.ControllerContext;
+import org.jboss.dependency.spi.ControllerState;
+import org.jboss.dependency.spi.DependencyInfo;
+import org.jboss.dependency.spi.DependencyItem;
import org.jboss.deployers.client.spi.DeployerClient;
import org.jboss.deployers.spi.DeploymentException;
import org.jboss.deployers.spi.deployer.DeploymentStages;
@@ -461,8 +468,36 @@
{
try
{
- // todo check actually changed state
- deployerClient.change(bundleState.getDeploymentUnit().getName(),
DeploymentStages.INSTALLED);
+ DeploymentUnit unit = bundleState.getDeploymentUnit();
+ deployerClient.change(unit.getName(), DeploymentStages.INSTALLED);
+
+ ControllerContext context = unit.getAttachment(ControllerContext.class);
+ if (context == null)
+ throw new IllegalStateException("Cannot obtain controller
context");
+
+ // check actually changed state
+ ControllerState actualState = context.getState();
+ if (actualState != ControllerState.INSTALLED)
+ {
+ ArrayList<Requirement> unresolved = new
ArrayList<Requirement>();
+ DependencyInfo depInfo = context.getDependencyInfo();
+ for (DependencyItem iDependOn :
depInfo.getIDependOn(RequirementDependencyItem.class))
+ {
+ if (iDependOn.isResolved() == false)
+ {
+ RequirementDependencyItem rdi = (RequirementDependencyItem)iDependOn;
+ unresolved.add(rdi.getRequirement());
+ }
+ }
+ if (unresolved.size() > 0)
+ {
+ throw new BundleException("Cannot start bundle " + bundleState +
", because of unresolved dependencies\n " + unresolved);
+ }
+ else
+ {
+ throw new BundleException("Cannot start bundle: " +
bundleState);
+ }
+ }
}
catch (DeploymentException e)
{
Modified:
projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/test/java/org/jboss/test/osgi/simple/SimpleBundleTestCase.java
===================================================================
---
projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/test/java/org/jboss/test/osgi/simple/SimpleBundleTestCase.java 2009-08-22
19:14:14 UTC (rev 92699)
+++
projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/test/java/org/jboss/test/osgi/simple/SimpleBundleTestCase.java 2009-08-22
21:00:52 UTC (rev 92700)
@@ -60,8 +60,7 @@
assertEquals("simple-bundle", bundle.getSymbolicName());
bundle.start();
- System.out.println("FIXME [JBOSGI-130] Bundle in state INSTALLED after
bundle.start()");
- //assertEquals("Bundle state", Bundle.ACTIVE, bundle.getState());
+ assertEquals("Bundle state", Bundle.ACTIVE, bundle.getState());
bundle.uninstall();
assertEquals("Bundle state", Bundle.UNINSTALLED, bundle.getState());
@@ -78,9 +77,8 @@
assertEquals("simple-bundle", bundle.getSymbolicName());
- System.out.println("FIXME [JBOSGI-131] BundleContext not available after
bundle install");
- //bundle.start();
- //assertEquals("Bundle state", Bundle.ACTIVE, bundle.getState());
+ bundle.start();
+ assertEquals("Bundle state", Bundle.ACTIVE, bundle.getState());
bundle.uninstall();
assertEquals("Bundle state", Bundle.UNINSTALLED, bundle.getState());
Modified:
projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/test/resources/bootstrap/bootstrap.xml
===================================================================
---
projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/test/resources/bootstrap/bootstrap.xml 2009-08-22
19:14:14 UTC (rev 92699)
+++
projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/test/resources/bootstrap/bootstrap.xml 2009-08-22
21:00:52 UTC (rev 92700)
@@ -1,127 +1,108 @@
<deployment xmlns="urn:jboss:bean-deployer:2.0">
- <!-- The MainDeployer -->
- <bean name="MainDeployer"
class="org.jboss.deployers.plugins.main.MainDeployerImpl">
- <property name="structuralDeployers"><inject
bean="StructuralDeployers"/></property>
- <property name="deployers"><inject
bean="Deployers"/></property>
- </bean>
+ <!--
+ ********************************
+ * *
+ * OSGi Framework *
+ * *
+ ********************************
+ -->
+
+ <bean name="OSGiBundleManager"
class="org.jboss.osgi.plugins.facade.bundle.OSGiBundleManager">
+ <constructor><parameter><inject bean="MainDeployer"
/></parameter></constructor>
+ </bean>
+
+ <!--
+ ********************************
+ * *
+ * OSGi Deployment *
+ * *
+ ********************************
+ -->
+
+ <!-- The MainDeployer -->
+ <bean name="MainDeployer"
class="org.jboss.deployers.plugins.main.MainDeployerImpl">
+ <property name="structuralDeployers"><inject
bean="StructuralDeployers" /></property>
+ <property name="deployers"><inject bean="Deployers"
/></property>
+ </bean>
- <!-- The holder for deployers that determine structure -->
- <bean name="StructuralDeployers"
class="org.jboss.deployers.vfs.plugins.structure.VFSStructuralDeployersImpl">
- <property name="structureBuilder">
- <!-- The consolidator of the structure information -->
- <bean name="StructureBuilder"
class="org.jboss.deployers.vfs.plugins.structure.VFSStructureBuilder"/>
- </property>
- <!-- Accept any implementor of structure deployer -->
- <incallback method="addDeployer"/>
- <uncallback method="removeDeployer"/>
- </bean>
+ <!-- The holder for deployers that determine structure -->
+ <bean name="StructuralDeployers"
class="org.jboss.deployers.vfs.plugins.structure.VFSStructuralDeployersImpl">
+ <property name="structureBuilder">
+ <!-- The consolidator of the structure information -->
+ <bean name="StructureBuilder"
class="org.jboss.deployers.vfs.plugins.structure.VFSStructureBuilder" />
+ </property>
+ <!-- Accept any implementor of structure deployer -->
+ <incallback method="addDeployer" />
+ <uncallback method="removeDeployer" />
+ </bean>
- <!-- The holder for deployers that do real deployment -->
- <bean name="Deployers"
class="org.jboss.deployers.plugins.deployers.DeployersImpl">
- <constructor><parameter><inject
bean="jboss.kernel:service=KernelController"/></parameter></constructor>
- <!-- Accept any implementor of deployer -->
- <incallback method="addDeployer"/>
- <uncallback method="removeDeployer"/>
- </bean>
+ <!-- The holder for deployers that do real deployment -->
+ <bean name="Deployers"
class="org.jboss.deployers.plugins.deployers.DeployersImpl">
+ <constructor><parameter><inject
bean="jboss.kernel:service=KernelController"
/></parameter></constructor>
+ <!-- Accept any implementor of deployer -->
+ <incallback method="addDeployer" />
+ <uncallback method="removeDeployer" />
+ </bean>
- <!-- A declared structure descriptor deployer -->
- <bean name="DeclaredStructure"
class="org.jboss.deployers.vfs.plugins.structure.explicit.DeclaredStructure"/>
+ <!-- Bundle Structure -->
+ <bean name="BundleStructure"
class="org.jboss.osgi.deployer.BundleStructureDeployer" />
+
+ <!-- JAR & File Structure (needed for negative testing) -->
+ <bean name="JARStructure"
class="org.jboss.deployers.vfs.plugins.structure.jar.JARStructure" />
+ <bean name="FileStructure"
class="org.jboss.deployers.vfs.plugins.structure.file.FileStructure" />
- <!-- JAR Structure -->
- <bean name="JARStructure"
class="org.jboss.deployers.vfs.plugins.structure.jar.JARStructure">
- <!-- Unless specified the default list of suffixes is .zip, .ear, .jar, ,.rar,
.war, .sar, .har, .aop -->
- <constructor>
- <parameter>
- <set elementClass="java.lang.String">
- <value>.zip</value>
- <value>.ear</value>
- <value>.jar</value>
- <value>.rar</value>
- <value>.war</value>
- <value>.sar</value>
- <value>.har</value>
- <value>.aop</value>
- <value>.deployer</value>
- <value>.beans</value>
- </set>
- </parameter>
- </constructor>
- <property name="candidateStructureVisitorFactory">
- <!-- Any file that is not an ordinary directory is a candidate -->
- <bean name="JARStructureCandidates"
class="org.jboss.deployers.vfs.spi.structure.helpers.DefaultCandidateStructureVisitorFactory">
- <!-- A filter to exclude some obvious non-subdeployments -->
- <property name="filter">
- <bean name="JARFilter"
class="org.jboss.virtual.plugins.vfs.helpers.SuffixesExcludeFilter">
- <constructor><parameter>
- <list elementClass="java.lang.String">
- <!-- Exclude class files as subdeployments -->
- <value>.class</value>
- </list>
- </parameter></constructor>
- </bean>
- </property>
- </bean>
- </property>
- </bean>
+ <!-- POJO Deployment -->
+ <bean name="BeanDeployer"
class="org.jboss.deployers.vfs.deployer.kernel.BeanDeployer" />
+ <bean name="KernelDeploymentDeployer"
class="org.jboss.deployers.vfs.deployer.kernel.KernelDeploymentDeployer" />
+ <bean name="BeanMetaDataDeployer"
class="org.jboss.deployers.vfs.deployer.kernel.BeanMetaDataDeployer">
+ <constructor>
+ <parameter class="org.jboss.dependency.spi.Controller"><inject
bean="jboss.kernel:service=KernelController" /></parameter>
+ </constructor>
+ </bean>
- <!-- File Structure -->
- <bean name="FileStructure"
class="org.jboss.deployers.vfs.plugins.structure.file.FileStructure">
- <!-- Unless specified the default list of suffixes is -service.xml, -beans.xml,
-ds.xml, -aop.xml -->
- <constructor>
- <parameter>
- <set elementClass="java.lang.String">
- <value>-service.xml</value>
- <value>-beans.xml</value>
- <value>-ds.xml</value>
- <value>-aop.xml</value>
- </set>
- </parameter>
- </constructor>
- </bean>
+ <!-- OSGI Deployment -->
+ <bean name="OSGiManifestParsingDeployer"
class="org.jboss.osgi.plugins.deployers.bundle.OSGiManifestParsingDeployer"
/>
+ <bean name="OSGiBundleStateDeployer"
class="org.jboss.osgi.plugins.deployers.bundle.OSGiBundleStateDeployer">
+ <constructor>
+ <parameter><inject bean="OSGiBundleManager"
/></parameter>
+ </constructor>
+ </bean>
+ <bean name="OSGiBundleClassLoadingDeployer"
class="org.jboss.osgi.plugins.deployers.bundle.OSGiBundleClassLoadingDeployer"
/>
+ <bean name="OSGiBundleActivatorDeployer"
class="org.jboss.osgi.plugins.deployers.bundle.OSGiBundleActivatorDeployer"
/>
- <!-- POJO Deployment -->
- <bean name="BeanDeployer"
class="org.jboss.deployers.vfs.deployer.kernel.BeanDeployer"/>
- <bean name="KernelDeploymentDeployer"
class="org.jboss.deployers.vfs.deployer.kernel.KernelDeploymentDeployer"/>
- <bean name="BeanMetaDataDeployer"
class="org.jboss.deployers.vfs.deployer.kernel.BeanMetaDataDeployer">
- <constructor><parameter
class="org.jboss.dependency.spi.Controller"><inject
bean="jboss.kernel:service=KernelController"/></parameter></constructor>
- </bean>
-
- <!-- OSGI Deployment -->
- <bean name="OSGiBundleManager"
class="org.jboss.osgi.plugins.facade.bundle.OSGiBundleManager">
- <constructor><parameter><inject
bean="MainDeployer"/></parameter></constructor>
- </bean>
- <bean name="OSGiManifestParsingDeployer"
class="org.jboss.osgi.plugins.deployers.bundle.OSGiManifestParsingDeployer"/>
- <bean name="OSGiBundleStateDeployer"
class="org.jboss.osgi.plugins.deployers.bundle.OSGiBundleStateDeployer">
- <constructor><parameter><inject
bean="OSGiBundleManager"/></parameter></constructor>
- </bean>
- <bean name="OSGiBundleClassLoadingDeployer"
class="org.jboss.osgi.plugins.deployers.bundle.OSGiBundleClassLoadingDeployer"/>
- <bean name="OSGiBundleActivatorDeployer"
class="org.jboss.osgi.plugins.deployers.bundle.OSGiBundleActivatorDeployer"/>
+ <!--
+ ********************************
+ * *
+ * OSGi Classloading *
+ * *
+ ********************************
+ -->
+
+ <!-- ClassLoading -->
+ <bean name="ClassLoaderSystem"
class="org.jboss.test.osgi.OSGiClassLoaderSystem" />
+ <bean name="ClassLoading"
class="org.jboss.classloading.spi.dependency.ClassLoading">
+ <incallback method="addModule" state="Configured" />
+ <uncallback method="removeModule" state="Configured" />
+ </bean>
+ <bean name="ClassLoadingMetaDataParser"
class="org.jboss.deployers.vfs.spi.deployer.SchemaResolverDeployer">
+ <constructor>
+
<parameter>org.jboss.classloading.spi.metadata.ClassLoadingMetaData</parameter>
+ </constructor>
+ <property name="name">jboss-classloading.xml</property>
+ </bean>
+ <bean name="ClassLoadingDefaultDeployer"
class="org.jboss.deployers.plugins.classloading.ClassLoadingDefaultDeployer">
+ <property name="defaultMetaData">
+ <classloading xmlns="urn:jboss:classloading:1.0"
export-all="NON_EMPTY" import-all="true" />
+ </property>
+ </bean>
+ <bean name="ClassLoaderClassPathDeployer"
class="org.jboss.deployers.vfs.plugins.classloader.VFSClassLoaderClassPathDeployer"
/>
+ <bean name="ClassLoaderDescribeDeployer"
class="org.jboss.deployers.vfs.plugins.classloader.VFSClassLoaderDescribeDeployer">
+ <property name="classLoading"><inject
bean="ClassLoading" /></property>
+ </bean>
+ <bean name="ClassLoaderDeployer"
class="org.jboss.deployers.plugins.classloading.AbstractLevelClassLoaderSystemDeployer">
+ <property name="classLoading"><inject
bean="ClassLoading" /></property>
+ <property name="system"><inject bean="ClassLoaderSystem"
/></property>
+ </bean>
- <!-- ClassLoading -->
- <bean name="ClassLoaderSystem"
class="org.jboss.test.osgi.OSGiClassLoaderSystem"/>
- <bean name="ClassLoading"
class="org.jboss.classloading.spi.dependency.ClassLoading">
- <incallback method="addModule" state="Configured"/>
- <uncallback method="removeModule" state="Configured"/>
- </bean>
- <bean name="ClassLoadingMetaDataParser"
class="org.jboss.deployers.vfs.spi.deployer.SchemaResolverDeployer">
- <constructor>
-
<parameter>org.jboss.classloading.spi.metadata.ClassLoadingMetaData</parameter>
- </constructor>
- <property name="name">jboss-classloading.xml</property>
- </bean>
- <bean name="ClassLoadingDefaultDeployer"
class="org.jboss.deployers.plugins.classloading.ClassLoadingDefaultDeployer">
- <property name="defaultMetaData">
- <classloading xmlns="urn:jboss:classloading:1.0"
export-all="NON_EMPTY" import-all="true"/>
- </property>
- </bean>
- <bean name="ClassLoaderClassPathDeployer"
class="org.jboss.deployers.vfs.plugins.classloader.VFSClassLoaderClassPathDeployer"/>
- <bean name="ClassLoaderDescribeDeployer"
class="org.jboss.deployers.vfs.plugins.classloader.VFSClassLoaderDescribeDeployer">
- <property name="classLoading"><inject
bean="ClassLoading"/></property>
- </bean>
- <bean name="ClassLoaderDeployer"
class="org.jboss.deployers.plugins.classloading.AbstractLevelClassLoaderSystemDeployer">
- <property name="classLoading"><inject
bean="ClassLoading"/></property>
- <property name="system"><inject
bean="ClassLoaderSystem"/></property>
- </bean>
-
</deployment>
Modified: projects/jboss-osgi/trunk/reactor/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/reactor/pom.xml 2009-08-22 19:14:14 UTC (rev 92699)
+++ projects/jboss-osgi/trunk/reactor/pom.xml 2009-08-22 21:00:52 UTC (rev 92700)
@@ -13,46 +13,15 @@
<!--
- The reactor is used to pull in external subprojects and build them as part of this
maven reactor build. It is a one-stop entry point to build, test and deploy
- dependent SNAPSHOTs. To pull in a particular subproject, set one or more of these
svn:external definitions
+ The reactor is used to pull in external subprojects and build them as part of this
maven reactor build.
+ It is a one-stop entry point to build, test and deploy dependent SNAPSHOTs. To pull
in a particular subproject,
+ set one or more svn:external definitions. For example
- spi
https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/spi/trunk
- bundles/apache-xerces
https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/...
- bundles/common
https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/...
- bundles/hotdeploy
https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/...
- bundles/husky
https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/...
- bundles/jaxb
https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/...
- bundles/jmx
https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/...
- bundles/jndi
https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/...
- bundles/jboss-common-core
https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/...
- bundles/jboss-xml-binding
https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/...
- bundles/microcontainer
https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/...
- bundles/remotelog
https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/...
- bundles/webconsole
https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/...
- runtime/deployers
https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/runtime/...
- runtime/equinox
https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/runtime/...
- runtime/felix
https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/runtime/...
- runtime/jbossas
https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/runtime/...
- runtime/knopflerfish
https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/runtime/...
and enable the associated maven module
+ spi
https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/spi/trunk
+ runtime/deployers
https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/runtime/...
- <module>spi</module>
- <module>runtime/equinox</module>
- <module>runtime/felix</module>
- <module>runtime/knopflerfish</module>
- <module>runtime/deployers</module>
- <module>bundles/common</module>
- <module>bundles/jboss-common-core</module>
- <module>bundles/apache-xerces</module>
- <module>bundles/jaxb</module>
- <module>bundles/jboss-xml-binding</module>
- <module>bundles/jndi</module>
- <module>bundles/jmx</module>
- <module>bundles/remotelog</module>
- <module>bundles/webconsole</module>
- <module>bundles/hotdeploy</module>
- <module>bundles/microcontainer</module>
- <module>bundles/husky</module>
- <module>runtime/jbossas</module>
+ <module>spi</module>
+ <module>runtime/deployers</module>
A release MUST NOT contain any svn:external definitions.
-->
@@ -74,6 +43,7 @@
<modules>
<module>spi</module>
+ <module>runtime/deployers</module>
<module>runtime/equinox</module>
<module>runtime/felix</module>
<module>runtime/jbossas</module>
Property changes on: projects/jboss-osgi/trunk/reactor/runtime
___________________________________________________________________
Name: svn:externals
- equinox
https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/runtime/...
felix
https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/runtime/...
jbossas
https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/runtime/...
microcontainer
https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/runtime/...
+ deployers
https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/runtime/...
equinox
https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/runtime/...
felix
https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/runtime/...
jbossas
https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/runtime/...
microcontainer
https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/runtime/...