[jboss-osgi-commits] JBoss-OSGI SVN: r92701 - in projects/jboss-osgi: projects/runtime/equinox/trunk/src/main/java/org/jboss/osgi/equinox and 16 other directories.

Sunday, 23 August 2009

Author: thomas.diesler(a)jboss.com
Date: 2009-08-23 02:51:04 -0400 (Sun, 23 Aug 2009)
New Revision: 92701

Added:
  
projects/jboss-osgi/projects/runtime/equinox/trunk/src/main/java/org/jboss/osgi/equinox/EquinoxBootstrapProvider.java
  
projects/jboss-osgi/projects/runtime/felix/trunk/src/main/java/org/jboss/osgi/felix/FelixBootstrapProvider.java
   projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF/bootstrap.xml
  
projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/bootstrap.xml
Modified:
   projects/jboss-osgi/projects/runtime/equinox/trunk/pom.xml
   projects/jboss-osgi/projects/runtime/felix/trunk/pom.xml
   projects/jboss-osgi/projects/runtime/jbossas/trunk/pom.xml
   projects/jboss-osgi/projects/runtime/microcontainer/trunk/pom.xml
  
projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/main/java/org/jboss/osgi/plugins/facade/launch/OSGiFrameworkFactory.java
   projects/jboss-osgi/trunk/distribution/pom.xml
   projects/jboss-osgi/trunk/pom.xml
   projects/jboss-osgi/trunk/reactor/blueprint/pom.xml
   projects/jboss-osgi/trunk/reactor/blueprint/testsuite/.project
   projects/jboss-osgi/trunk/reactor/blueprint/testsuite/pom.xml
   projects/jboss-osgi/trunk/reactor/runtime/jbossmc/pom.xml
  
projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF/services/org.jboss.osgi.spi.framework.OSGiBootstrapProvider
  
projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/services/org.jboss.osgi.spi.framework.OSGiBootstrapProvider
   projects/jboss-osgi/trunk/testsuite/pom.xml
  
projects/jboss-osgi/trunk/testsuite/trailblazer/src/test/resources/META-INF/services/org.jboss.osgi.spi.framework.OSGiBootstrapProvider
Log:
Initial MC framework integration. 
Example run still needs startup provisioning of compendium and jboss-osgi-common bundles.

Modified: projects/jboss-osgi/projects/runtime/equinox/trunk/pom.xml
===================================================================

--- projects/jboss-osgi/projects/runtime/equinox/trunk/pom.xml	2009-08-22 21:00:52 UTC
(rev 92700)
+++ projects/jboss-osgi/projects/runtime/equinox/trunk/pom.xml	2009-08-23 06:51:04 UTC
(rev 92701)
@@ -16,7 +16,7 @@
 
   <name>JBossOSGi Runtime - Equinox</name>
 
-  <groupId>org.jboss.osgi</groupId>
+  <groupId>org.jboss.osgi.runtime</groupId>
   <artifactId>jboss-osgi-runtime-equinox</artifactId>
   <packaging>jar</packaging>
 

Added:
projects/jboss-osgi/projects/runtime/equinox/trunk/src/main/java/org/jboss/osgi/equinox/EquinoxBootstrapProvider.java
===================================================================
---
projects/jboss-osgi/projects/runtime/equinox/trunk/src/main/java/org/jboss/osgi/equinox/EquinoxBootstrapProvider.java	
                       (rev 0)
+++
projects/jboss-osgi/projects/runtime/equinox/trunk/src/main/java/org/jboss/osgi/equinox/EquinoxBootstrapProvider.java	2009-08-23
06:51:04 UTC (rev 92701)
@@ -0,0 +1,36 @@
+/*
+ * 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.equinox;
+
+//$Id$
+
+import org.jboss.osgi.spi.framework.PropertiesBootstrapProvider;
+
+/**
+ * A bootstrap provider for Equinox.
+ * 
+ * @author thomas.diesler(a)jboss.com
+ * @since 23-Aug-2009
+ */
+public class EquinoxBootstrapProvider extends PropertiesBootstrapProvider
+{
+}
\ No newline at end of file


Property changes on:
projects/jboss-osgi/projects/runtime/equinox/trunk/src/main/java/org/jboss/osgi/equinox/EquinoxBootstrapProvider.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Modified: projects/jboss-osgi/projects/runtime/felix/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/runtime/felix/trunk/pom.xml	2009-08-22 21:00:52 UTC (rev
92700)
+++ projects/jboss-osgi/projects/runtime/felix/trunk/pom.xml	2009-08-23 06:51:04 UTC (rev
92701)
@@ -16,7 +16,7 @@
 
   <name>JBossOSGi Runtime - Felix</name>
 
-  <groupId>org.jboss.osgi</groupId>
+  <groupId>org.jboss.osgi.runtime</groupId>
   <artifactId>jboss-osgi-runtime-felix</artifactId>
   <packaging>jar</packaging>
 

Added:
projects/jboss-osgi/projects/runtime/felix/trunk/src/main/java/org/jboss/osgi/felix/FelixBootstrapProvider.java
===================================================================
---
projects/jboss-osgi/projects/runtime/felix/trunk/src/main/java/org/jboss/osgi/felix/FelixBootstrapProvider.java	
                       (rev 0)
+++
projects/jboss-osgi/projects/runtime/felix/trunk/src/main/java/org/jboss/osgi/felix/FelixBootstrapProvider.java	2009-08-23
06:51:04 UTC (rev 92701)
@@ -0,0 +1,36 @@
+/*
+ * 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.felix;
+
+//$Id$
+
+import org.jboss.osgi.spi.framework.PropertiesBootstrapProvider;
+
+/**
+ * A bootstrap provider for Felix.
+ * 
+ * @author thomas.diesler(a)jboss.com
+ * @since 23-Aug-2009
+ */
+public class FelixBootstrapProvider extends PropertiesBootstrapProvider
+{
+}
\ No newline at end of file


Property changes on:
projects/jboss-osgi/projects/runtime/felix/trunk/src/main/java/org/jboss/osgi/felix/FelixBootstrapProvider.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Modified: projects/jboss-osgi/projects/runtime/jbossas/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/runtime/jbossas/trunk/pom.xml	2009-08-22 21:00:52 UTC
(rev 92700)
+++ projects/jboss-osgi/projects/runtime/jbossas/trunk/pom.xml	2009-08-23 06:51:04 UTC
(rev 92701)
@@ -16,7 +16,7 @@
 
   <name>JBossOSGi Runtime - JBossAS</name>
 
-  <groupId>org.jboss.osgi</groupId>
+  <groupId>org.jboss.osgi.runtime</groupId>
   <artifactId>jboss-osgi-runtime-jbossas</artifactId>
   <packaging>jar</packaging>
 

Modified: projects/jboss-osgi/projects/runtime/microcontainer/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/runtime/microcontainer/trunk/pom.xml	2009-08-22 21:00:52
UTC (rev 92700)
+++ projects/jboss-osgi/projects/runtime/microcontainer/trunk/pom.xml	2009-08-23 06:51:04
UTC (rev 92701)
@@ -2,6 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <name>JBossOSGi Runtime - Microcontainer</name>
+  <groupId>org.jboss.osgi.runtime</groupId>
   <artifactId>jboss-osgi-runtime-microcontainer</artifactId>
   <packaging>jar</packaging>
 

Modified:
projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/main/java/org/jboss/osgi/plugins/facade/launch/OSGiFrameworkFactory.java
===================================================================
---
projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/main/java/org/jboss/osgi/plugins/facade/launch/OSGiFrameworkFactory.java	2009-08-22
21:00:52 UTC (rev 92700)
+++
projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/main/java/org/jboss/osgi/plugins/facade/launch/OSGiFrameworkFactory.java	2009-08-23
06:51:04 UTC (rev 92701)
@@ -56,16 +56,22 @@
       // Bootstrap the kernel
       AbstractBootstrap bootstrap = new BasicBootstrap();
       bootstrap.run();
-      
+
       Kernel kernel = bootstrap.getKernel();
-      
+
       BasicXMLDeployer deployer = new BasicXMLDeployer(kernel,
ControllerMode.AUTOMATIC);
-      
-      String common = "/bootstrap/bootstrap.xml";
-      URL url = getClass().getResource(common);
+
+      URL url = null;
+      String[] bootstraps = new String[] { "/bootstrap/bootstrap.xml",
"/META-INF/bootstrap.xml" };
+      for (String xml : bootstraps)
+      {
+         url = getClass().getResource(xml);
+         if (url != null)
+            break;
+      }
       if (url == null)
-         throw new IllegalStateException(common + " not found");
-      
+         throw new IllegalStateException("Cannot find any bootstrap: " +
bootstraps);
+
       try
       {
          deployer.deploy(url);
@@ -78,14 +84,14 @@
       ControllerContext managerContext =
kernel.getController().getInstalledContext(OSGiBundleManager.BEAN_BUNDLE_MANAGER);
       if (managerContext == null)
          throw new IllegalStateException("Cannot obtain installed bean: " +
OSGiBundleManager.BEAN_BUNDLE_MANAGER);
-      
+
       OSGiBundleManager manager = (OSGiBundleManager)managerContext.getTarget();
       OSGiBundleState sysBundle = manager.getBundle(0);
-      
+
       // [TODO] Remove hack that forces the initial state to installed
       if (sysBundle.getState() != Bundle.INSTALLED)
          sysBundle.changeState(Bundle.INSTALLED);
-      
+
       return new OSGiFramework(manager, sysBundle);
    }
 

Modified: projects/jboss-osgi/trunk/distribution/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/pom.xml	2009-08-22 21:00:52 UTC (rev 92700)
+++ projects/jboss-osgi/trunk/distribution/pom.xml	2009-08-23 06:51:04 UTC (rev 92701)
@@ -67,18 +67,18 @@
       <classifier>sources</classifier>
     </dependency>
     <dependency>
-      <groupId>org.jboss.osgi</groupId>
+      <groupId>org.jboss.osgi.runtime</groupId>
       <artifactId>jboss-osgi-runtime-jbossas</artifactId>
       <version>${version.jboss.osgi.runtime.jbossas}</version>
     </dependency>
     <dependency>
-      <groupId>org.jboss.osgi</groupId>
+      <groupId>org.jboss.osgi.runtime</groupId>
       <artifactId>jboss-osgi-runtime-jbossas</artifactId>
       <version>${version.jboss.osgi.runtime.jbossas}</version>
       <classifier>config</classifier>
     </dependency>
     <dependency>
-      <groupId>org.jboss.osgi</groupId>
+      <groupId>org.jboss.osgi.runtime</groupId>
       <artifactId>jboss-osgi-runtime-jbossas</artifactId>
       <version>${version.jboss.osgi.runtime.jbossas}</version>
       <classifier>sources</classifier>
@@ -306,12 +306,12 @@
 
     <!-- Equinox Dependencies -->
     <dependency>
-      <groupId>org.jboss.osgi</groupId>
+      <groupId>org.jboss.osgi.runtime</groupId>
       <artifactId>jboss-osgi-runtime-equinox</artifactId>
       <version>${version.jboss.osgi.runtime.equinox}</version>
     </dependency>
     <dependency>
-      <groupId>org.jboss.osgi</groupId>
+      <groupId>org.jboss.osgi.runtime</groupId>
       <artifactId>jboss-osgi-runtime-equinox</artifactId>
       <version>${version.jboss.osgi.runtime.equinox}</version>
       <classifier>sources</classifier>
@@ -319,12 +319,12 @@
 
     <!-- Felix Dependencies -->
     <dependency>
-      <groupId>org.jboss.osgi</groupId>
+      <groupId>org.jboss.osgi.runtime</groupId>
       <artifactId>jboss-osgi-runtime-felix</artifactId>
       <version>${version.jboss.osgi.runtime.felix}</version>
     </dependency>
     <dependency>
-      <groupId>org.jboss.osgi</groupId>
+      <groupId>org.jboss.osgi.runtime</groupId>
       <artifactId>jboss-osgi-runtime-felix</artifactId>
       <version>${version.jboss.osgi.runtime.felix}</version>
       <classifier>sources</classifier>

Modified: projects/jboss-osgi/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/pom.xml	2009-08-22 21:00:52 UTC (rev 92700)
+++ projects/jboss-osgi/trunk/pom.xml	2009-08-23 06:51:04 UTC (rev 92701)
@@ -56,7 +56,7 @@
    
<version.jboss.osgi.runtime.equinox>3.5-SNAPSHOT</version.jboss.osgi.runtime.equinox>
    
<version.jboss.osgi.runtime.felix>1.9.0-SNAPSHOT</version.jboss.osgi.runtime.felix>
    
<version.jboss.osgi.runtime.jbossas>1.0.1-SNAPSHOT</version.jboss.osgi.runtime.jbossas>
-   
<version.jboss.osgi.runtime.jbossmc>1.0.0-SNAPSHOT</version.jboss.osgi.runtime.jbossmc>
+   
<version.jboss.osgi.runtime.jbossmc>1.0.2-SNAPSHOT</version.jboss.osgi.runtime.jbossmc>
     <version.jboss.osgi.spi>1.0.1-SNAPSHOT</version.jboss.osgi.spi>
     <version.jboss.osgi.webconsole>1.0.0</version.jboss.osgi.webconsole>
     <version.jboss.osgi.xml.binding>2.0.1</version.jboss.osgi.xml.binding>

Modified: projects/jboss-osgi/trunk/reactor/blueprint/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/reactor/blueprint/pom.xml	2009-08-22 21:00:52 UTC (rev
92700)
+++ projects/jboss-osgi/trunk/reactor/blueprint/pom.xml	2009-08-23 06:51:04 UTC (rev
92701)
@@ -69,7 +69,7 @@
         <version>${version.jboss.osgi.microcontainer}</version>
       </dependency>
       <dependency>
-        <groupId>org.jboss.osgi</groupId>
+        <groupId>org.jboss.osgi.runtime</groupId>
         <artifactId>jboss-osgi-runtime-felix</artifactId>
         <version>${version.jboss.osgi.runtime.felix}</version>
       </dependency>

Modified: projects/jboss-osgi/trunk/reactor/blueprint/testsuite/.project
===================================================================
--- projects/jboss-osgi/trunk/reactor/blueprint/testsuite/.project	2009-08-22 21:00:52 UTC
(rev 92700)
+++ projects/jboss-osgi/trunk/reactor/blueprint/testsuite/.project	2009-08-23 06:51:04 UTC
(rev 92701)
@@ -17,7 +17,7 @@
 		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.maven.ide.eclipse.maven2Nature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.maven.ide.eclipse.maven2Nature</nature>
 	</natures>
 </projectDescription>

Modified: projects/jboss-osgi/trunk/reactor/blueprint/testsuite/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/reactor/blueprint/testsuite/pom.xml	2009-08-22 21:00:52 UTC
(rev 92700)
+++ projects/jboss-osgi/trunk/reactor/blueprint/testsuite/pom.xml	2009-08-23 06:51:04 UTC
(rev 92701)
@@ -49,7 +49,7 @@
       <artifactId>bnd</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.jboss.osgi</groupId>
+      <groupId>org.jboss.osgi.runtime</groupId>
       <artifactId>jboss-osgi-runtime-felix</artifactId>
     </dependency>
 

Modified: projects/jboss-osgi/trunk/reactor/runtime/jbossmc/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/reactor/runtime/jbossmc/pom.xml	2009-08-22 21:00:52 UTC (rev
92700)
+++ projects/jboss-osgi/trunk/reactor/runtime/jbossmc/pom.xml	2009-08-23 06:51:04 UTC (rev
92701)
@@ -20,7 +20,7 @@
   <artifactId>jboss-osgi-runtime-jbossmc</artifactId>
   <packaging>jar</packaging>
 
-  <version>1.0.0-SNAPSHOT</version>
+  <version>1.0.2-SNAPSHOT</version>
 
   <!-- Parent -->
   <parent>

Added:
projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF/bootstrap.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF/bootstrap.xml	
                       (rev 0)
+++
projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF/bootstrap.xml	2009-08-23
06:51:04 UTC (rev 92701)
@@ -0,0 +1,108 @@
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+  <!-- 
+  ********************************
+  *                              *  
+  *  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 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>
+
+  <!-- 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" />
+
+  <!-- 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="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>
+
+</deployment>


Property changes on:
projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF/bootstrap.xml
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Modified:
projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF/services/org.jboss.osgi.spi.framework.OSGiBootstrapProvider
===================================================================
---
projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF/services/org.jboss.osgi.spi.framework.OSGiBootstrapProvider	2009-08-22
21:00:52 UTC (rev 92700)
+++
projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF/services/org.jboss.osgi.spi.framework.OSGiBootstrapProvider	2009-08-23
06:51:04 UTC (rev 92701)
@@ -1,2 +1,4 @@
-org.jboss.osgi.jbossmc.framework.launch.FrameworkBootstrapProvider
-org.jboss.osgi.spi.framework.PropertiesBootstrapProvider
\ No newline at end of file
+org.jboss.osgi.plugins.facade.launch.OSGiFrameworkBootstrapProvider  # The MC Facade
bootstrap provider
+org.jboss.osgi.jbossmc.framework.launch.FrameworkBootstrapProvider   # The legacy MC
based framework bootstrap provider
+org.jboss.osgi.equinox.EquinoxBootstrapProvider                      # The Equinox
bootstrap provider  
+org.jboss.osgi.felix.FelixBootstrapProvider                          # The Felix
bootstrap provider
\ No newline at end of file

Added:
projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/bootstrap.xml
===================================================================
---
projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/bootstrap.xml	 
                      (rev 0)
+++
projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/bootstrap.xml	2009-08-23
06:51:04 UTC (rev 92701)
@@ -0,0 +1,108 @@
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+  <!-- 
+  ********************************
+  *                              *  
+  *  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 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>
+
+  <!-- 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" />
+
+  <!-- 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="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>
+
+</deployment>


Property changes on:
projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/bootstrap.xml
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Modified:
projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/services/org.jboss.osgi.spi.framework.OSGiBootstrapProvider
===================================================================
---
projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/services/org.jboss.osgi.spi.framework.OSGiBootstrapProvider	2009-08-22
21:00:52 UTC (rev 92700)
+++
projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/services/org.jboss.osgi.spi.framework.OSGiBootstrapProvider	2009-08-23
06:51:04 UTC (rev 92701)
@@ -1,2 +1,4 @@
-org.jboss.osgi.jbossmc.framework.launch.FrameworkBootstrapProvider
-org.jboss.osgi.spi.framework.PropertiesBootstrapProvider
\ No newline at end of file
+org.jboss.osgi.plugins.facade.launch.OSGiFrameworkBootstrapProvider  # The MC Facade
bootstrap provider
+org.jboss.osgi.jbossmc.framework.launch.FrameworkBootstrapProvider   # The legacy MC
based framework bootstrap provider
+org.jboss.osgi.equinox.EquinoxBootstrapProvider                      # The Equinox
bootstrap provider  
+org.jboss.osgi.felix.FelixBootstrapProvider                          # The Felix
bootstrap provider
\ No newline at end of file

Modified: projects/jboss-osgi/trunk/testsuite/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/pom.xml	2009-08-22 21:00:52 UTC (rev 92700)
+++ projects/jboss-osgi/trunk/testsuite/pom.xml	2009-08-23 06:51:04 UTC (rev 92701)
@@ -188,6 +188,17 @@
       <dependencies>
         <dependency>
           <groupId>org.jboss.osgi.runtime</groupId>
+          <artifactId>jboss-osgi-runtime-microcontainer</artifactId>
+          <version>${version.jboss.osgi.runtime.jbossmc}</version>
+          <scope>provided</scope>
+        </dependency>
+      </dependencies>
+      -->
+      
+      <!-- default to jbossmc (legacy) 
+      <dependencies>
+        <dependency>
+          <groupId>org.jboss.osgi.runtime</groupId>
           <artifactId>jboss-osgi-runtime-jbossmc</artifactId>
           <version>${version.jboss.osgi.runtime.jbossmc}</version>
           <scope>provided</scope>
@@ -195,10 +206,10 @@
       </dependencies>
       -->
       
-      <!-- default to felix -->  
+      <!-- default to felix -->   
       <dependencies>
         <dependency>
-          <groupId>org.jboss.osgi</groupId>
+          <groupId>org.jboss.osgi.runtime</groupId>
           <artifactId>jboss-osgi-runtime-felix</artifactId>
           <version>${version.jboss.osgi.runtime.felix}</version>
           <scope>provided</scope>
@@ -221,7 +232,7 @@
       </activation>
       <dependencies>
         <dependency>
-          <groupId>org.jboss.osgi</groupId>
+          <groupId>org.jboss.osgi.runtime</groupId>
           <artifactId>jboss-osgi-runtime-felix</artifactId>
           <version>${version.jboss.osgi.runtime.felix}</version>
           <scope>provided</scope>
@@ -243,7 +254,7 @@
       </activation>
       <dependencies>
         <dependency>
-          <groupId>org.jboss.osgi</groupId>
+          <groupId>org.jboss.osgi.runtime</groupId>
           <artifactId>jboss-osgi-runtime-equinox</artifactId>
           <version>${version.jboss.osgi.runtime.equinox}</version>
           <scope>provided</scope>

Modified:
projects/jboss-osgi/trunk/testsuite/trailblazer/src/test/resources/META-INF/services/org.jboss.osgi.spi.framework.OSGiBootstrapProvider
===================================================================
---
projects/jboss-osgi/trunk/testsuite/trailblazer/src/test/resources/META-INF/services/org.jboss.osgi.spi.framework.OSGiBootstrapProvider	2009-08-22
21:00:52 UTC (rev 92700)
+++
projects/jboss-osgi/trunk/testsuite/trailblazer/src/test/resources/META-INF/services/org.jboss.osgi.spi.framework.OSGiBootstrapProvider	2009-08-23
06:51:04 UTC (rev 92701)
@@ -1 +1,4 @@
-org.jboss.osgi.spi.framework.PropertiesBootstrapProvider
\ No newline at end of file
+org.jboss.osgi.plugins.facade.launch.OSGiFrameworkBootstrapProvider  # The MC Facade
bootstrap provider
+org.jboss.osgi.jbossmc.framework.launch.FrameworkBootstrapProvider   # The legacy MC
based framework bootstrap provider
+org.jboss.osgi.equinox.EquinoxBootstrapProvider                      # The Equinox
bootstrap provider  
+org.jboss.osgi.felix.FelixBootstrapProvider                          # The Felix
bootstrap provider
\ No newline at end of file


    

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

[jboss-osgi-commits] JBoss-OSGI SVN: r92701 - in projects/jboss-osgi: projects/runtime/equinox/trunk/src/main/java/org/jboss/osgi/equinox and 16 other directories.