[jboss-cvs] JBossAS SVN: r92747 - projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF.

[jboss-cvs-commits at lists.jboss.org]

Author: thomas.diesler at jboss.com
Date: 2009-08-24 11:48:16 -0400 (Mon, 24 Aug 2009)
New Revision: 92747

Modified:
   projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF/bootstrap.xml
Log:
[JBOSGI-135] Cannot handle package beeing imported and exported by the same bundle
Add test and more debugging

Modified: 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-24 15:44:15 UTC (rev 92746)
+++ projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF/bootstrap.xml	2009-08-24 15:48:16 UTC (rev 92747)
@@ -10,8 +10,48 @@
   
   <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>
+  
   <!--
   ********************************
   *                              *  
@@ -64,11 +104,11 @@
   <!-- 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>
+    <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor>
   </bean>
-  <bean name="OSGiBundleClassLoadingDeployer" class="org.jboss.osgi.plugins.deployers.bundle.OSGiBundleClassLoadingDeployer" />
+  <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" />
 
   <!--
@@ -80,17 +120,13 @@
   -->
   
   <!-- ClassLoading -->
-  <bean name="ClassLoaderSystem" class="org.jboss.test.osgi.OSGiClassLoaderSystem" />
+  <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="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" />