[jboss-osgi-commits] JBoss-OSGI SVN: r93182 - in projects/jboss-osgi/trunk/distribution/installer/src/main/resources: jbossas and 1 other directories.

jboss-osgi-commits at lists.jboss.org jboss-osgi-commits at lists.jboss.org
Thu Sep 3 12:32:25 EDT 2009


Author: thomas.diesler at jboss.com
Date: 2009-09-03 12:32:24 -0400 (Thu, 03 Sep 2009)
New Revision: 93182

Added:
   projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-bootstrap.xml
Removed:
   projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-bootstrap-all.xml
   projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-bootstrap-default.xml
   projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-bootstrap-minimal.xml
   projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-bootstrap-web.xml
Modified:
   projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml
   projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-jbossmc.xml
Log:
Remove redundant scripts

Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml	2009-09-03 16:23:55 UTC (rev 93181)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml	2009-09-03 16:32:24 UTC (rev 93182)
@@ -267,10 +267,10 @@
       
       <!-- JBossMC Integration -->
       
-      <singlefile condition="isJBossMC" src="@{runtime.dir}/server/conf/jboss-osgi-bootstrap-minimal.xml" target="$INSTALL_PATH/runtime/server/minimal/conf/jboss-osgi-bootstrap.xml" override="true"/>
-      <singlefile condition="isJBossMC" src="@{runtime.dir}/server/conf/jboss-osgi-bootstrap-default.xml" target="$INSTALL_PATH/runtime/server/default/conf/jboss-osgi-bootstrap.xml" override="true"/>
-      <singlefile condition="isJBossMC" src="@{runtime.dir}/server/conf/jboss-osgi-bootstrap-web.xml" target="$INSTALL_PATH/runtime/server/web/conf/jboss-osgi-bootstrap.xml" override="true"/>
-      <singlefile condition="isJBossMC" src="@{runtime.dir}/server/conf/jboss-osgi-bootstrap-all.xml" target="$INSTALL_PATH/runtime/server/all/conf/jboss-osgi-bootstrap.xml" override="true"/>
+      <singlefile condition="isJBossMC" src="@{runtime.dir}/server/conf/jboss-osgi-bootstrap.xml" target="$INSTALL_PATH/runtime/server/minimal/conf/jboss-osgi-bootstrap.xml" override="true"/>
+      <singlefile condition="isJBossMC" src="@{runtime.dir}/server/conf/jboss-osgi-bootstrap.xml" target="$INSTALL_PATH/runtime/server/default/conf/jboss-osgi-bootstrap.xml" override="true"/>
+      <singlefile condition="isJBossMC" src="@{runtime.dir}/server/conf/jboss-osgi-bootstrap.xml" target="$INSTALL_PATH/runtime/server/web/conf/jboss-osgi-bootstrap.xml" override="true"/>
+      <singlefile condition="isJBossMC" src="@{runtime.dir}/server/conf/jboss-osgi-bootstrap.xml" target="$INSTALL_PATH/runtime/server/all/conf/jboss-osgi-bootstrap.xml" override="true"/>
       <fileset condition="isJBossMC" dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/runtime/lib" override="true">
         <include name="jaxb-api.jar" />
         <include name="jboss-classloader.jar" />

Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-jbossmc.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-jbossmc.xml	2009-09-03 16:23:55 UTC (rev 93181)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-jbossmc.xml	2009-09-03 16:32:24 UTC (rev 93182)
@@ -105,7 +105,6 @@
   <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>
-    <property name="autoInstall">true</property>
   </bean>
   <bean name="OSGiBundleClassLoadingDeployer" class="org.jboss.osgi.plugins.facade.classloading.OSGiBundleClassLoadingDeployer">
     <property name="domain"><inject bean="OSGiClassLoaderDomain"/></property>

Deleted: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-bootstrap-all.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-bootstrap-all.xml	2009-09-03 16:23:55 UTC (rev 93181)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-bootstrap-all.xml	2009-09-03 16:32:24 UTC (rev 93182)
@@ -1,180 +0,0 @@
-<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="jboss.kernel:service=Kernel" /></parameter>
-      <parameter><inject bean="MainDeployer" /></parameter>
-    </constructor>
-    <property name="properties">
-      <map keyClass="java.lang.String" valueClass="java.lang.String">
-        <entry><key>org.osgi.framework.storage</key><value>${osgi.server.home}/data/osgi-store</value></entry>
-        <entry><key>org.osgi.framework.storage.clean</key><value>onFirstInit</value></entry>
-        <entry><key>org.osgi.framework.system.packages.extra</key><value>
-          <!-- [JBOSGI-145]  JAXB classes are loaded from the system classpath -->
-          com.sun.xml.internal.bind.v2,
-          
-          org.jboss.beans.metadata.plugins;version=2.0,
-          org.jboss.beans.metadata.plugins.builder;version=2.0,
-          org.jboss.beans.metadata.spi;version=2.0,
-          org.jboss.beans.metadata.spi.builder;version=2.0,
-          org.jboss.dependency.spi;version=2.0,
-          org.jboss.kernel.spi.dependency;version=2.0,
-          org.jboss.logging;version=2.0,
-          
-          org.jboss.osgi.spi;version=1.0,
-          org.jboss.osgi.spi.capability;version=1.0,
-          org.jboss.osgi.spi.framework;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>
-        <!-- Hot Deployment -->
-        <entry><key>org.jboss.osgi.hotdeploy.scandir</key><value>${osgi.server.home}/deploy</value></entry>
-        <!-- Husky socket connector properties -->
-        <entry><key>org.jboss.osgi.husky.runtime.connector.host</key><value>${jboss.bind.address}</value></entry>
-        <entry><key>org.jboss.osgi.husky.runtime.connector.port</key><value>5401</value></entry>
-        <!-- HTTP Service Port -->
-        <entry><key>org.osgi.service.http.port</key><value>8090</value></entry>
-        <!-- Config Admin Service -->
-        <entry><key>felix.cm.dir</key><value>${osgi.server.home}/data/osgi-configadmin</value></entry>
-        <!-- JMX bundle properties -->
-        <entry><key>org.jboss.osgi.jmx.host</key><value>${jboss.bind.address}</value></entry>
-        <entry><key>org.jboss.osgi.jmx.port</key><value>1098</value></entry>
-        <!-- JNDI bundle properties -->
-        <entry><key>org.jboss.osgi.jndi.host</key><value>${jboss.bind.address}</value></entry>
-        <entry><key>org.jboss.osgi.jndi.rmi.port</key><value>1098</value></entry>
-        <entry><key>org.jboss.osgi.jndi.port</key><value>1099</value></entry>
-      </map>
-    </property>
-    <incallback method="addPlugin" />
-    <uncallback method="removePlugin" />
-  </bean>
-  
-  <bean name="OSGiAutoInstallPlugin" class="org.jboss.osgi.plugins.facade.plugins.AutoInstallPluginImpl">
-    <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor>
-    <property name="autoInstall">
-     <list elementClass="java.net.URL">
-      <value>${osgi.home}/server/minimal/deploy/org.osgi.compendium.jar</value>
-     </list>
-    </property>
-    <property name="autoStart">
-     <list elementClass="java.net.URL">
-      <value>${osgi.home}/server/minimal/deploy/org.apache.felix.log.jar</value>
-      <value>${osgi.home}/server/minimal/deploy/jboss-osgi-common.jar</value>
-      <value>${osgi.home}/server/minimal/deploy/jboss-osgi-hotdeploy.jar</value>
-     </list>
-    </property>
-  </bean>
-  <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>
-  
-  <!--
-  ********************************
-  *                              *  
-  *  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.facade.classloading.OSGiBundleClassLoadingDeployer">
-    <property name="domain"><inject bean="OSGiClassLoaderDomain"/></property>
-  </bean>
-  <bean name="OSGiBundleActivatorDeployer" class="org.jboss.osgi.plugins.deployers.bundle.OSGiBundleActivatorDeployer" />
-
-  <!--
-  ********************************
-  *                              *  
-  *  OSGi Classloading           *
-  *                              *
-  ********************************
-  -->
-  
-  <bean name="OSGiClassLoaderSystem" class="org.jboss.osgi.plugins.facade.classloading.OSGiClassLoaderSystem" />
-  <bean name="OSGiClassLoaderDomain" class="org.jboss.osgi.plugins.facade.classloading.OSGiClassLoaderDomain" >
-    <constructor><parameter>OSGiClassLoaderDomain</parameter></constructor>
-    <property name="classLoaderSystem"><inject bean="OSGiClassLoaderSystem"/></property>
-    <property name="bundleManager"><inject bean="OSGiBundleManager" /></property>
-  </bean>
-  
-  <bean name="ClassLoading" class="org.jboss.classloading.spi.dependency.ClassLoading">
-    <incallback method="addModule" state="Configured" />
-    <uncallback method="removeModule" state="Configured" />
-  </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="OSGiClassLoaderSystem" /></property>
-  </bean>
-
-</deployment>
\ No newline at end of file

Deleted: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-bootstrap-default.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-bootstrap-default.xml	2009-09-03 16:23:55 UTC (rev 93181)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-bootstrap-default.xml	2009-09-03 16:32:24 UTC (rev 93182)
@@ -1,169 +0,0 @@
-<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="jboss.kernel:service=Kernel" /></parameter>
-      <parameter><inject bean="MainDeployer" /></parameter>
-    </constructor>
-    <property name="properties">
-      <map keyClass="java.lang.String" valueClass="java.lang.String">
-        <entry><key>org.osgi.framework.storage</key><value>${osgi.server.home}/data/osgi-store</value></entry>
-        <entry><key>org.osgi.framework.storage.clean</key><value>onFirstInit</value></entry>
-        <entry><key>org.osgi.framework.system.packages.extra</key><value>
-          <!-- [JBOSGI-145]  JAXB classes are loaded from the system classpath -->
-          com.sun.xml.internal.bind.v2,
-          
-          org.jboss.beans.metadata.plugins;version=2.0,
-          org.jboss.beans.metadata.plugins.builder;version=2.0,
-          org.jboss.beans.metadata.spi;version=2.0,
-          org.jboss.beans.metadata.spi.builder;version=2.0,
-          org.jboss.dependency.spi;version=2.0,
-          org.jboss.kernel.spi.dependency;version=2.0,
-          org.jboss.logging;version=2.0,
-          
-          org.jboss.osgi.spi;version=1.0,
-          org.jboss.osgi.spi.capability;version=1.0,
-          org.jboss.osgi.spi.framework;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>
-        <!-- Hot Deployment -->
-        <entry><key>org.jboss.osgi.hotdeploy.scandir</key><value>${osgi.server.home}/deploy</value></entry>
-        <!-- Husky socket connector properties -->
-        <entry><key>org.jboss.osgi.husky.runtime.connector.host</key><value>${jboss.bind.address}</value></entry>
-        <entry><key>org.jboss.osgi.husky.runtime.connector.port</key><value>5401</value></entry>
-      </map>
-    </property>
-    <incallback method="addPlugin" />
-    <uncallback method="removePlugin" />
-  </bean>
-  
-  <bean name="OSGiAutoInstallPlugin" class="org.jboss.osgi.plugins.facade.plugins.AutoInstallPluginImpl">
-    <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor>
-    <property name="autoInstall">
-     <list elementClass="java.net.URL">
-      <value>${osgi.home}/server/minimal/deploy/org.osgi.compendium.jar</value>
-     </list>
-    </property>
-    <property name="autoStart">
-     <list elementClass="java.net.URL">
-      <value>${osgi.home}/server/minimal/deploy/org.apache.felix.log.jar</value>
-      <value>${osgi.home}/server/minimal/deploy/jboss-osgi-common.jar</value>
-      <value>${osgi.home}/server/minimal/deploy/jboss-osgi-hotdeploy.jar</value>
-     </list>
-    </property>
-  </bean>
-  <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>
-  
-  <!--
-  ********************************
-  *                              *  
-  *  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.facade.classloading.OSGiBundleClassLoadingDeployer">
-    <property name="domain"><inject bean="OSGiClassLoaderDomain"/></property>
-  </bean>
-  <bean name="OSGiBundleActivatorDeployer" class="org.jboss.osgi.plugins.deployers.bundle.OSGiBundleActivatorDeployer" />
-
-  <!--
-  ********************************
-  *                              *  
-  *  OSGi Classloading           *
-  *                              *
-  ********************************
-  -->
-  
-  <bean name="OSGiClassLoaderSystem" class="org.jboss.osgi.plugins.facade.classloading.OSGiClassLoaderSystem" />
-  <bean name="OSGiClassLoaderDomain" class="org.jboss.osgi.plugins.facade.classloading.OSGiClassLoaderDomain" >
-    <constructor><parameter>OSGiClassLoaderDomain</parameter></constructor>
-    <property name="classLoaderSystem"><inject bean="OSGiClassLoaderSystem"/></property>
-    <property name="bundleManager"><inject bean="OSGiBundleManager" /></property>
-  </bean>
-  
-  <bean name="ClassLoading" class="org.jboss.classloading.spi.dependency.ClassLoading">
-    <incallback method="addModule" state="Configured" />
-    <uncallback method="removeModule" state="Configured" />
-  </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="OSGiClassLoaderSystem" /></property>
-  </bean>
-
-</deployment>
\ No newline at end of file

Deleted: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-bootstrap-minimal.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-bootstrap-minimal.xml	2009-09-03 16:23:55 UTC (rev 93181)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-bootstrap-minimal.xml	2009-09-03 16:32:24 UTC (rev 93182)
@@ -1,166 +0,0 @@
-<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="jboss.kernel:service=Kernel" /></parameter>
-      <parameter><inject bean="MainDeployer" /></parameter>
-    </constructor>
-    <property name="properties">
-      <map keyClass="java.lang.String" valueClass="java.lang.String">
-        <entry><key>org.osgi.framework.storage</key><value>${osgi.server.home}/data/osgi-store</value></entry>
-        <entry><key>org.osgi.framework.storage.clean</key><value>onFirstInit</value></entry>
-        <entry><key>org.osgi.framework.system.packages.extra</key><value>
-          <!-- [JBOSGI-145]  JAXB classes are loaded from the system classpath -->
-          com.sun.xml.internal.bind.v2,
-          
-          org.jboss.beans.metadata.plugins;version=2.0,
-          org.jboss.beans.metadata.plugins.builder;version=2.0,
-          org.jboss.beans.metadata.spi;version=2.0,
-          org.jboss.beans.metadata.spi.builder;version=2.0,
-          org.jboss.dependency.spi;version=2.0,
-          org.jboss.kernel.spi.dependency;version=2.0,
-          org.jboss.logging;version=2.0,
-          
-          org.jboss.osgi.spi;version=1.0,
-          org.jboss.osgi.spi.capability;version=1.0,
-          org.jboss.osgi.spi.framework;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>
-        <!-- Hot Deployment -->
-        <entry><key>org.jboss.osgi.hotdeploy.scandir</key><value>${osgi.server.home}/deploy</value></entry>
-      </map>
-    </property>
-    <incallback method="addPlugin" />
-    <uncallback method="removePlugin" />
-  </bean>
-  
-  <bean name="OSGiAutoInstallPlugin" class="org.jboss.osgi.plugins.facade.plugins.AutoInstallPluginImpl">
-    <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor>
-    <property name="autoInstall">
-     <list elementClass="java.net.URL">
-      <value>${osgi.home}/server/minimal/deploy/org.osgi.compendium.jar</value>
-     </list>
-    </property>
-    <property name="autoStart">
-     <list elementClass="java.net.URL">
-      <value>${osgi.home}/server/minimal/deploy/org.apache.felix.log.jar</value>
-      <value>${osgi.home}/server/minimal/deploy/jboss-osgi-common.jar</value>
-      <value>${osgi.home}/server/minimal/deploy/jboss-osgi-hotdeploy.jar</value>
-     </list>
-    </property>
-  </bean>
-  <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>
-  
-  <!--
-  ********************************
-  *                              *  
-  *  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.facade.classloading.OSGiBundleClassLoadingDeployer">
-    <property name="domain"><inject bean="OSGiClassLoaderDomain"/></property>
-  </bean>
-  <bean name="OSGiBundleActivatorDeployer" class="org.jboss.osgi.plugins.deployers.bundle.OSGiBundleActivatorDeployer" />
-
-  <!--
-  ********************************
-  *                              *  
-  *  OSGi Classloading           *
-  *                              *
-  ********************************
-  -->
-  
-  <bean name="OSGiClassLoaderSystem" class="org.jboss.osgi.plugins.facade.classloading.OSGiClassLoaderSystem" />
-  <bean name="OSGiClassLoaderDomain" class="org.jboss.osgi.plugins.facade.classloading.OSGiClassLoaderDomain" >
-    <constructor><parameter>OSGiClassLoaderDomain</parameter></constructor>
-    <property name="classLoaderSystem"><inject bean="OSGiClassLoaderSystem"/></property>
-    <property name="bundleManager"><inject bean="OSGiBundleManager" /></property>
-  </bean>
-  
-  <bean name="ClassLoading" class="org.jboss.classloading.spi.dependency.ClassLoading">
-    <incallback method="addModule" state="Configured" />
-    <uncallback method="removeModule" state="Configured" />
-  </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="OSGiClassLoaderSystem" /></property>
-  </bean>
-
-</deployment>
\ No newline at end of file

Deleted: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-bootstrap-web.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-bootstrap-web.xml	2009-09-03 16:23:55 UTC (rev 93181)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-bootstrap-web.xml	2009-09-03 16:32:24 UTC (rev 93182)
@@ -1,180 +0,0 @@
-<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="jboss.kernel:service=Kernel" /></parameter>
-      <parameter><inject bean="MainDeployer" /></parameter>
-    </constructor>
-    <property name="properties">
-      <map keyClass="java.lang.String" valueClass="java.lang.String">
-        <entry><key>org.osgi.framework.storage</key><value>${osgi.server.home}/data/osgi-store</value></entry>
-        <entry><key>org.osgi.framework.storage.clean</key><value>onFirstInit</value></entry>
-        <entry><key>org.osgi.framework.system.packages.extra</key><value>
-          <!-- [JBOSGI-145]  JAXB classes are loaded from the system classpath -->
-          com.sun.xml.internal.bind.v2,
-          
-          org.jboss.beans.metadata.plugins;version=2.0,
-          org.jboss.beans.metadata.plugins.builder;version=2.0,
-          org.jboss.beans.metadata.spi;version=2.0,
-          org.jboss.beans.metadata.spi.builder;version=2.0,
-          org.jboss.dependency.spi;version=2.0,
-          org.jboss.kernel.spi.dependency;version=2.0,
-          org.jboss.logging;version=2.0,
-          
-          org.jboss.osgi.spi;version=1.0,
-          org.jboss.osgi.spi.capability;version=1.0,
-          org.jboss.osgi.spi.framework;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>
-        <!-- Hot Deployment -->
-        <entry><key>org.jboss.osgi.hotdeploy.scandir</key><value>${osgi.server.home}/deploy</value></entry>
-        <!-- Husky socket connector properties -->
-        <entry><key>org.jboss.osgi.husky.runtime.connector.host</key><value>${jboss.bind.address}</value></entry>
-        <entry><key>org.jboss.osgi.husky.runtime.connector.port</key><value>5401</value></entry>
-        <!-- HTTP Service Port -->
-        <entry><key>org.osgi.service.http.port</key><value>8090</value></entry>
-        <!-- Config Admin Service -->
-        <entry><key>felix.cm.dir</key><value>${osgi.server.home}/data/osgi-configadmin</value></entry>
-        <!-- JMX bundle properties -->
-        <entry><key>org.jboss.osgi.jmx.host</key><value>${jboss.bind.address}</value></entry>
-        <entry><key>org.jboss.osgi.jmx.port</key><value>1098</value></entry>
-        <!-- JNDI bundle properties -->
-        <entry><key>org.jboss.osgi.jndi.host</key><value>${jboss.bind.address}</value></entry>
-        <entry><key>org.jboss.osgi.jndi.rmi.port</key><value>1098</value></entry>
-        <entry><key>org.jboss.osgi.jndi.port</key><value>1099</value></entry>
-      </map>
-    </property>
-    <incallback method="addPlugin" />
-    <uncallback method="removePlugin" />
-  </bean>
-  
-  <bean name="OSGiAutoInstallPlugin" class="org.jboss.osgi.plugins.facade.plugins.AutoInstallPluginImpl">
-    <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor>
-    <property name="autoInstall">
-     <list elementClass="java.net.URL">
-      <value>${osgi.home}/server/minimal/deploy/org.osgi.compendium.jar</value>
-     </list>
-    </property>
-    <property name="autoStart">
-     <list elementClass="java.net.URL">
-      <value>${osgi.home}/server/minimal/deploy/org.apache.felix.log.jar</value>
-      <value>${osgi.home}/server/minimal/deploy/jboss-osgi-common.jar</value>
-      <value>${osgi.home}/server/minimal/deploy/jboss-osgi-hotdeploy.jar</value>
-     </list>
-    </property>
-  </bean>
-  <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>
-  
-  <!--
-  ********************************
-  *                              *  
-  *  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.facade.classloading.OSGiBundleClassLoadingDeployer">
-    <property name="domain"><inject bean="OSGiClassLoaderDomain"/></property>
-  </bean>
-  <bean name="OSGiBundleActivatorDeployer" class="org.jboss.osgi.plugins.deployers.bundle.OSGiBundleActivatorDeployer" />
-
-  <!--
-  ********************************
-  *                              *  
-  *  OSGi Classloading           *
-  *                              *
-  ********************************
-  -->
-  
-  <bean name="OSGiClassLoaderSystem" class="org.jboss.osgi.plugins.facade.classloading.OSGiClassLoaderSystem" />
-  <bean name="OSGiClassLoaderDomain" class="org.jboss.osgi.plugins.facade.classloading.OSGiClassLoaderDomain" >
-    <constructor><parameter>OSGiClassLoaderDomain</parameter></constructor>
-    <property name="classLoaderSystem"><inject bean="OSGiClassLoaderSystem"/></property>
-    <property name="bundleManager"><inject bean="OSGiBundleManager" /></property>
-  </bean>
-  
-  <bean name="ClassLoading" class="org.jboss.classloading.spi.dependency.ClassLoading">
-    <incallback method="addModule" state="Configured" />
-    <uncallback method="removeModule" state="Configured" />
-  </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="OSGiClassLoaderSystem" /></property>
-  </bean>
-
-</deployment>
\ No newline at end of file

Copied: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-bootstrap.xml (from rev 93176, projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-bootstrap-all.xml)
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-bootstrap.xml	                        (rev 0)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-bootstrap.xml	2009-09-03 16:32:24 UTC (rev 93182)
@@ -0,0 +1,180 @@
+<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="jboss.kernel:service=Kernel" /></parameter>
+      <parameter><inject bean="MainDeployer" /></parameter>
+    </constructor>
+    <property name="properties">
+      <map keyClass="java.lang.String" valueClass="java.lang.String">
+        <entry><key>org.osgi.framework.storage</key><value>${osgi.server.home}/data/osgi-store</value></entry>
+        <entry><key>org.osgi.framework.storage.clean</key><value>onFirstInit</value></entry>
+        <entry><key>org.osgi.framework.system.packages.extra</key><value>
+          <!-- [JBOSGI-145]  JAXB classes are loaded from the system classpath -->
+          com.sun.xml.internal.bind.v2,
+          
+          org.jboss.beans.metadata.plugins;version=2.0,
+          org.jboss.beans.metadata.plugins.builder;version=2.0,
+          org.jboss.beans.metadata.spi;version=2.0,
+          org.jboss.beans.metadata.spi.builder;version=2.0,
+          org.jboss.dependency.spi;version=2.0,
+          org.jboss.kernel.spi.dependency;version=2.0,
+          org.jboss.logging;version=2.0,
+          
+          org.jboss.osgi.spi;version=1.0,
+          org.jboss.osgi.spi.capability;version=1.0,
+          org.jboss.osgi.spi.framework;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>
+        <!-- Hot Deployment -->
+        <entry><key>org.jboss.osgi.hotdeploy.scandir</key><value>${osgi.server.home}/deploy</value></entry>
+        <!-- Husky socket connector properties -->
+        <entry><key>org.jboss.osgi.husky.runtime.connector.host</key><value>${jboss.bind.address}</value></entry>
+        <entry><key>org.jboss.osgi.husky.runtime.connector.port</key><value>5401</value></entry>
+        <!-- HTTP Service Port -->
+        <entry><key>org.osgi.service.http.port</key><value>8090</value></entry>
+        <!-- Config Admin Service -->
+        <entry><key>felix.cm.dir</key><value>${osgi.server.home}/data/osgi-configadmin</value></entry>
+        <!-- JMX bundle properties -->
+        <entry><key>org.jboss.osgi.jmx.host</key><value>${jboss.bind.address}</value></entry>
+        <entry><key>org.jboss.osgi.jmx.port</key><value>1098</value></entry>
+        <!-- JNDI bundle properties -->
+        <entry><key>org.jboss.osgi.jndi.host</key><value>${jboss.bind.address}</value></entry>
+        <entry><key>org.jboss.osgi.jndi.rmi.port</key><value>1098</value></entry>
+        <entry><key>org.jboss.osgi.jndi.port</key><value>1099</value></entry>
+      </map>
+    </property>
+    <incallback method="addPlugin" />
+    <uncallback method="removePlugin" />
+  </bean>
+  
+  <bean name="OSGiAutoInstallPlugin" class="org.jboss.osgi.plugins.facade.plugins.AutoInstallPluginImpl">
+    <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor>
+    <property name="autoInstall">
+     <list elementClass="java.net.URL">
+      <value>${osgi.home}/server/minimal/deploy/org.osgi.compendium.jar</value>
+     </list>
+    </property>
+    <property name="autoStart">
+     <list elementClass="java.net.URL">
+      <value>${osgi.home}/server/minimal/deploy/org.apache.felix.log.jar</value>
+      <value>${osgi.home}/server/minimal/deploy/jboss-osgi-common.jar</value>
+      <value>${osgi.home}/server/minimal/deploy/jboss-osgi-hotdeploy.jar</value>
+     </list>
+    </property>
+  </bean>
+  <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>
+  
+  <!--
+  ********************************
+  *                              *  
+  *  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.facade.classloading.OSGiBundleClassLoadingDeployer">
+    <property name="domain"><inject bean="OSGiClassLoaderDomain"/></property>
+  </bean>
+  <bean name="OSGiBundleActivatorDeployer" class="org.jboss.osgi.plugins.deployers.bundle.OSGiBundleActivatorDeployer" />
+
+  <!--
+  ********************************
+  *                              *  
+  *  OSGi Classloading           *
+  *                              *
+  ********************************
+  -->
+  
+  <bean name="OSGiClassLoaderSystem" class="org.jboss.osgi.plugins.facade.classloading.OSGiClassLoaderSystem" />
+  <bean name="OSGiClassLoaderDomain" class="org.jboss.osgi.plugins.facade.classloading.OSGiClassLoaderDomain" >
+    <constructor><parameter>OSGiClassLoaderDomain</parameter></constructor>
+    <property name="classLoaderSystem"><inject bean="OSGiClassLoaderSystem"/></property>
+    <property name="bundleManager"><inject bean="OSGiBundleManager" /></property>
+  </bean>
+  
+  <bean name="ClassLoading" class="org.jboss.classloading.spi.dependency.ClassLoading">
+    <incallback method="addModule" state="Configured" />
+    <uncallback method="removeModule" state="Configured" />
+  </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="OSGiClassLoaderSystem" /></property>
+  </bean>
+
+</deployment>
\ No newline at end of file



More information about the jboss-osgi-commits mailing list