Author: thomas.diesler(a)jboss.com Date: 2009-08-28 12:28:13 -0400 (Fri, 28 Aug 2009) New Revision: 92974 Removed: 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 projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/jboss-osgi-framework.xml Modified: projects/jboss-osgi/trunk/testsuite/example/pom.xml projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF/jboss-osgi-bootstrap.xml projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/jboss-osgi-bootstrap.xml Log: Cleanup configuration Modified: projects/jboss-osgi/trunk/testsuite/example/pom.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/pom.xml 2009-08-28 16:26:15 UTC (rev 92973) +++ projects/jboss-osgi/trunk/testsuite/example/pom.xml 2009-08-28 16:28:13 UTC (rev 92974) @@ -162,7 +162,15 @@ <artifactId>maven-surefire-plugin</artifactId> <configuration> <excludes> - <exclude>org/jboss/test/osgi/foo/**</exclude> + <!-- most tests work when run individually ??? --> + <exclude>${target.container.excludes}</exclude> + <exclude>org/jboss/test/osgi/example/blueprint/**</exclude> + <exclude>org/jboss/test/osgi/example/http/**</exclude> + <exclude>org/jboss/test/osgi/example/jmx/**</exclude> + <exclude>org/jboss/test/osgi/example/jndi/**</exclude> + <exclude>org/jboss/test/osgi/example/microcontainer/**</exclude> + <exclude>org/jboss/test/osgi/example/simple/**</exclude> + <exclude>org/jboss/test/osgi/example/xml/**</exclude> </excludes> </configuration> </plugin> @@ -188,6 +196,7 @@ <artifactId>maven-surefire-plugin</artifactId> <configuration> <excludes> + <exclude>${target.container.excludes}</exclude> </excludes> </configuration> </plugin> @@ -213,7 +222,11 @@ <artifactId>maven-surefire-plugin</artifactId> <configuration> <excludes> - <exclude>org/jboss/test/osgi/bootstrap/BootstrapTestCase.*</exclude> + <exclude>${target.container.excludes}</exclude> + <exclude>org/jboss/test/osgi/example/blueprint/**</exclude> + <exclude>org/jboss/test/osgi/example/http/**</exclude> + <exclude>org/jboss/test/osgi/example/microcontainer/**</exclude> + <exclude>org/jboss/test/osgi/example/xml/jaxb/**</exclude> </excludes> </configuration> </plugin> Deleted: 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 2009-08-28 16:26:15 UTC (rev 92973) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF/bootstrap.xml 2009-08-28 16:28:13 UTC (rev 92974) @@ -1,144 +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="MainDeployer" /></parameter></constructor> - <property name="properties"> - <map keyClass="java.lang.String" valueClass="java.lang.String"> - <entry><key>org.osgi.framework.storage</key><value>${log4j.output.dir}/osgi-store</value></entry> - <entry><key>org.osgi.framework.storage.clean</key><value>onFirstInit</value></entry> - </map> - </property> - <incallback method="addPlugin" /> - <uncallback method="removePlugin" /> - </bean> - - <bean name="OSGiSystemPackages" class="org.jboss.osgi.plugins.facade.plugins.SystemPackagesPluginImpl"> - <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor> - <property name="extraPackages"> - <list elementClass="java.lang.String"> - <value>org.jboss.logging;version=[2.0,3.0)</value> - <value>org.jboss.osgi.spi.service;version=1.0</value> - <value>org.jboss.osgi.spi.logging;version=1.0</value> - <value>org.jboss.osgi.spi.management;version=1.0</value> - <value>org.jboss.osgi.spi.util;version=1.0</value> - </list> - </property> - </bean> - - <bean name="OSGiAutoInstall" class="org.jboss.osgi.plugins.facade.plugins.AutoInstallPluginImpl"> - <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor> - <property name="autoInstall"> - <list elementClass="java.net.URL"> - </list> - </property> - <property name="autoStart"> - <list elementClass="java.net.URL"> - <value>${test.archive.directory}/bundles/org.osgi.compendium.jar</value> - <value>${test.archive.directory}/bundles/org.apache.felix.log.jar</value> - <value>${test.archive.directory}/bundles/jboss-osgi-common.jar</value> - </list> - </property> - </bean> - - <bean name="OSGiStoragePlugin" class="org.jboss.osgi.plugins.facade.plugins.BundleStoragePluginImpl"> - <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.deployers.bundle.OSGiBundleClassLoadingDeployer" > - <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor> - </bean> - <bean name="OSGiBundleActivatorDeployer" class="org.jboss.osgi.plugins.deployers.bundle.OSGiBundleActivatorDeployer" /> - - <!-- - ******************************** - * * - * OSGi Classloading * - * * - ******************************** - --> - - <!-- ClassLoading --> - <bean name="ClassLoaderSystem" class="org.jboss.osgi.plugins.facade.classloading.OSGiClassLoaderSystem" > - <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor> - </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="ClassLoaderSystem" /></property> - </bean> - -</deployment> Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF/jboss-osgi-bootstrap.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2009-08-28 16:26:15 UTC (rev 92973) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2009-08-28 16:28:13 UTC (rev 92974) @@ -17,6 +17,7 @@ <entry><key>org.osgi.framework.system.packages.extra</key><value> org.jboss.logging;version=2.0, org.jboss.osgi.spi.capability;version=1.0, + org.jboss.osgi.spi.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, Deleted: 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 2009-08-28 16:26:15 UTC (rev 92973) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/bootstrap.xml 2009-08-28 16:28:13 UTC (rev 92974) @@ -1,108 +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="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> Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/jboss-osgi-bootstrap.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2009-08-28 16:26:15 UTC (rev 92973) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2009-08-28 16:28:13 UTC (rev 92974) @@ -1,6 +1,146 @@ -<?xml version="1.0" encoding="UTF-8"?> -<bootstrap xmlns="urn:jboss:bootstrap:1.0"> +<deployment xmlns="urn:jboss:bean-deployer:2.0"> - <url>jboss-osgi-framework.xml</url> + <!-- + ******************************** + * * + * OSGi Framework * + * * + ******************************** + --> + + <bean name="OSGiBundleManager" class="org.jboss.osgi.plugins.facade.bundle.OSGiBundleManager"> + <constructor><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>${log4j.output.dir}/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> + org.jboss.logging;version=2.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> + </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"> + <!-- [JBOSGI-136] Cannot resolve dependency against unstarted bundle + <value>${test.archive.directory}/bundles/org.osgi.compendium.jar</value --> + </list> + </property> + <property name="autoStart"> + <list elementClass="java.net.URL"> + <value>${test.archive.directory}/bundles/org.osgi.compendium.jar</value> + <value>${test.archive.directory}/bundles/org.apache.felix.log.jar</value> + <value>${test.archive.directory}/bundles/jboss-osgi-common.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> -</bootstrap> + <!-- 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"/> + <bean name="OSGiBundleActivatorDeployer" class="org.jboss.osgi.plugins.deployers.bundle.OSGiBundleActivatorDeployer" /> + + <!-- + ******************************** + * * + * OSGi Classloading * + * * + ******************************** + --> + + <!-- ClassLoading --> + <bean name="ClassLoaderSystem" class="org.jboss.osgi.plugins.facade.classloading.OSGiClassLoaderSystem" > + <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor> + </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="ClassLoaderSystem" /></property> + </bean> + +</deployment> Deleted: projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/jboss-osgi-framework.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/jboss-osgi-framework.xml 2009-08-28 16:26:15 UTC (rev 92973) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/jboss-osgi-framework.xml 2009-08-28 16:28:13 UTC (rev 92974) @@ -1,95 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - $Id$ ---> - -<deployment xmlns="urn:jboss:bean-deployer:2.0"> - - <!-- - ******************************** - * * - * Framework * - * * - ******************************** - --> - - <!-- The OSGi Framework Factory --> - <bean name="jboss.osgi:service=FrameworkFactory" class="org.jboss.osgi.jbossmc.framework.launch.FrameworkFactoryBean"> - <property name="kernel"><inject bean="jboss.kernel:service=Kernel" /></property> - <property name="properties"> - <map keyClass="java.lang.String" valueClass="java.lang.String"> - <entry><key>org.osgi.framework.storage</key><value>${log4j.output.dir}/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> - <!-- system --> - javax.xml.bind.annotation;version=2.1, - org.apache.xerces.dom;version=2.9, - - <!-- jboss-osgi --> - org.jboss.osgi.jmx;version=1.0, - org.jboss.osgi.jndi;version=1.0, - org.jboss.osgi.microcontainer;version=1.0, - org.jboss.osgi.spi;version=1.0, - org.jboss.osgi.spi.capability;version=1.0, - org.jboss.osgi.spi.logging;version=1.0, - org.jboss.osgi.spi.management;version=1.0, - org.jboss.osgi.spi.service;version=1.0, - org.jboss.osgi.spi.testing;version=1.0, - org.jboss.osgi.spi.util;version=1.0, - org.jboss.osgi.xml;version=1.0, - - <!-- jboss --> - org.jboss.beans.metadata.plugins;version=2.0, - org.jboss.beans.metadata.plugins.builder;version=2.0, - org.jboss.beans.metadata.spi.builder;version=2.0, - org.jboss.beans.metadata.spi;version=2.0, - org.jboss.dependency.spi;version=2.0, - org.jboss.kernel.spi.dependency;version=2.0, - org.jboss.logging, - org.jboss.reflect.spi;version=2.0, - org.jboss.util.xml;version=2.2, - org.jboss.virtual, - org.jboss.virtual.plugins.registry, - org.jboss.virtual.plugins.context.jar, - org.jboss.virtual.plugins.vfs.helpers, - org.jboss.virtual.protocol, - org.jboss.xb.annotations;version=2.0, - org.jboss.xb.binding;version=2.0, - org.jboss.xb.binding.sunday.unmarshalling;version=2.0, - </value> - </entry> - </map> - </property> - <property name="plugins"> - <list elementClass="org.jboss.osgi.jbossmc.api.AbstractPlugin"> - <inject bean="jboss.osgi:plugin=AutoInstall"/> - </list> - </property> - </bean> - - <!-- - ******************************** - * * - * Framework Plugins * - * * - ******************************** - --> - - <bean name="jboss.osgi:plugin=AutoInstall" class="org.jboss.osgi.jbossmc.framework.plugins.AutoInstallPluginImpl"> - <property name="autoInstall"> - <list elementClass="java.net.URL"> - <value>${test.archive.directory}/bundles/org.osgi.compendium.jar</value> - </list> - </property> - <property name="autoStart"> - <list elementClass="java.net.URL"> - <value>${test.archive.directory}/bundles/org.apache.felix.log.jar</value> - <value>${test.archive.directory}/bundles/jboss-osgi-common.jar</value> - </list> - </property> - </bean> - -</deployment> \ No newline at end of file