[jboss-osgi-commits] JBoss-OSGI SVN: r93176 - in projects/jboss-osgi/trunk: .settings and 9 other directories.

Thursday, 3 September 2009

Author: thomas.diesler(a)jboss.com
Date: 2009-09-03 11:06:23 -0400 (Thu, 03 Sep 2009)
New Revision: 93176

Added:
   projects/jboss-osgi/trunk/.settings/
   projects/jboss-osgi/trunk/.settings/org.eclipse.jdt.core.prefs
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
  
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
  
projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/log4j.xml
   projects/jboss-osgi/trunk/pom.xml
  
projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF/jboss-osgi-bootstrap.xml
   projects/jboss-osgi/trunk/testsuite/functional/pom.xml
  
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi38/OSGI38TestCase.java
  
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi39/OSGI39TestCase.java
  
projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/jboss-osgi-bootstrap.xml
   projects/jboss-osgi/trunk/testsuite/pom.xml
Log:
Update to use OSGiClassLoaderDomain

Added: projects/jboss-osgi/trunk/.settings/org.eclipse.jdt.core.prefs
===================================================================

--- projects/jboss-osgi/trunk/.settings/org.eclipse.jdt.core.prefs	                       
(rev 0)
+++ projects/jboss-osgi/trunk/.settings/org.eclipse.jdt.core.prefs	2009-09-03 15:06:23 UTC
(rev 93176)
@@ -0,0 +1,5 @@
+#Thu Sep 03 16:29:35 CEST 2009
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.source=1.5

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
15:04:34 UTC (rev 93175)
+++
projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml	2009-09-03
15:06:23 UTC (rev 93176)
@@ -76,6 +76,10 @@
       <name>jbossSelection</name>
       <value>jboss600</value>
     </condition>
+    <condition type="variable" id="isServerMinimal">
+      <name>jbossTargetServer</name>
+      <value>minimal</value>
+    </condition>
   </conditions>
 
   <!-- Panels -->
@@ -326,12 +330,17 @@
       </fileset>
       
       <!-- deploy/osgi -->
-      <fileset dir=&quot;(a){deploy.artifacts.dir}/lib&quot;
targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/osgi"
override="true">
+      <fileset condition="isServerMinimal"
dir=&quot;(a){deploy.artifacts.dir}/lib&quot;
targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/osgi"
override="true">
+        <include name="jboss-osgi-common.jar" />
+        <include name="org.apache.felix.log.jar" />
+      </fileset>
+      <fileset condition="!isServerMinimal"
dir=&quot;(a){deploy.artifacts.dir}/lib&quot;
targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/osgi"
override="true">
         <include name="jboss-osgi-apache-xerces.jar" />
         <include name="jboss-osgi-blueprint.jar" />
         <include name="jboss-osgi-common.jar" />
         <include name="jboss-osgi-jaxb.jar" />
         <include name="jboss-osgi-webconsole.jar" />
+        <include name="jboss-osgi-xml-binding.jar" />
         <include name="org.apache.felix.http.jetty.jar" />
         <include name="org.apache.felix.log.jar" />
       </fileset>

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
15:04:34 UTC (rev 93175)
+++
projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-jbossmc.xml	2009-09-03
15:06:23 UTC (rev 93176)
@@ -1,5 +1,7 @@
 <deployment xmlns="urn:jboss:bean-deployer:2.0">
 
+  <!-- $Id: $ -->
+
   <!-- 
   ********************************
   *                              *  
@@ -17,12 +19,6 @@
       <map keyClass="java.lang.String"
valueClass="java.lang.String">
        
<entry><key>org.osgi.framework.storage</key><value>${jboss.server.data.dir}/data/osgi-store</value></entry>
        
<entry><key>org.osgi.framework.storage.clean</key><value>onFirstInit</value></entry>
-       
<entry><key>org.osgi.framework.system.packages</key><value>
-    javax.management,
-          org.jboss.logging;version=2.0,
-          org.osgi.framework;version=1.4,
-          org.osgi.service.startlevel;version=1.1,
-        </value></entry>
        
<entry><key>org.osgi.framework.system.packages.extra</key><value>
           
           org.jboss.beans.metadata.plugins;version=2.0,
@@ -31,6 +27,11 @@
           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,
+          org.jboss.util,
+          org.jboss.util.collection,
+          org.jboss.util.propertyeditor,
+          org.jboss.util.xml,
           
           org.jboss.osgi.spi;version=1.0,
           org.jboss.osgi.spi.capability;version=1.0,
@@ -62,6 +63,23 @@
   ********************************
   -->
 
+  <!-- [JBOSGI-147] Autostart in JBossAS recycle the bundle
+  <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>${jboss.server.home.dir}/deploy/osgi/org.osgi.compendium.jar</value>
+     </list>
+    </property>
+    <property name="autoStart">
+     <list elementClass="java.net.URL">
+     
<value>${jboss.server.home.dir}/deploy/osgi/org.apache.felix.log.jar</value>
+     
<value>${jboss.server.home.dir}/deploy/osgi/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>
@@ -90,7 +108,7 @@
     <property name="autoInstall">true</property>
   </bean>
   <bean name="OSGiBundleClassLoadingDeployer"
class="org.jboss.osgi.plugins.facade.classloading.OSGiBundleClassLoadingDeployer">
-    <property name="classLoaderSystem"><inject
bean="ClassLoaderSystem"/></property>
+    <property name="domain"><inject
bean="OSGiClassLoaderDomain"/></property>
   </bean>
   <bean name="OSGiBundleActivatorDeployer"
class="org.jboss.osgi.plugins.deployers.bundle.OSGiBundleActivatorDeployer"
/>
 
@@ -102,11 +120,10 @@
   ********************************
   -->
   
-  <!-- ClassLoading 
-  <bean name="OSGiClassLoaderSystem"
class="org.jboss.osgi.plugins.facade.classloading.OSGiClassLoaderSystem" >
-    <constructor><parameter><inject bean="OSGiBundleManager"
/></parameter></constructor>
+  <bean name="OSGiClassLoaderDomain"
class="org.jboss.osgi.plugins.facade.classloading.OSGiClassLoaderDomain" >
+    <constructor><parameter><inject bean="OSGiBundleManager"
/></parameter><parameter>OSGiDomain</parameter></constructor>
+    <property name="classLoaderSystem"><inject
bean="ClassLoaderSystem"/></property>
   </bean>
-  -->
 
   <!--
   ********************************

Modified:
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
15:04:34 UTC (rev 93175)
+++
projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-bootstrap-all.xml	2009-09-03
15:06:23 UTC (rev 93176)
@@ -139,7 +139,9 @@
   <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="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"
/>
 
   <!--
@@ -150,10 +152,13 @@
   ********************************
   -->
   
-  <!-- ClassLoading -->
-  <bean name="ClassLoaderSystem"
class="org.jboss.osgi.plugins.facade.classloading.OSGiClassLoaderSystem" >
-    <constructor><parameter><inject bean="OSGiBundleManager"
/></parameter></constructor>
+  <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" />
@@ -169,7 +174,7 @@
   </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>
+    <property name="system"><inject
bean="OSGiClassLoaderSystem" /></property>
   </bean>
 
 </deployment>
\ No newline at end of file

Modified:
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
15:04:34 UTC (rev 93175)
+++
projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-bootstrap-default.xml	2009-09-03
15:06:23 UTC (rev 93176)
@@ -128,7 +128,9 @@
   <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="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"
/>
 
   <!--
@@ -139,10 +141,13 @@
   ********************************
   -->
   
-  <!-- ClassLoading -->
-  <bean name="ClassLoaderSystem"
class="org.jboss.osgi.plugins.facade.classloading.OSGiClassLoaderSystem" >
-    <constructor><parameter><inject bean="OSGiBundleManager"
/></parameter></constructor>
+  <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" />
@@ -158,7 +163,7 @@
   </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>
+    <property name="system"><inject
bean="OSGiClassLoaderSystem" /></property>
   </bean>
 
 </deployment>
\ No newline at end of file

Modified:
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
15:04:34 UTC (rev 93175)
+++
projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-bootstrap-minimal.xml	2009-09-03
15:06:23 UTC (rev 93176)
@@ -125,7 +125,9 @@
   <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="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"
/>
 
   <!--
@@ -136,10 +138,13 @@
   ********************************
   -->
   
-  <!-- ClassLoading -->
-  <bean name="ClassLoaderSystem"
class="org.jboss.osgi.plugins.facade.classloading.OSGiClassLoaderSystem" >
-    <constructor><parameter><inject bean="OSGiBundleManager"
/></parameter></constructor>
+  <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" />
@@ -155,7 +160,7 @@
   </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>
+    <property name="system"><inject
bean="OSGiClassLoaderSystem" /></property>
   </bean>
 
 </deployment>
\ No newline at end of file

Modified:
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
15:04:34 UTC (rev 93175)
+++
projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-bootstrap-web.xml	2009-09-03
15:06:23 UTC (rev 93176)
@@ -139,7 +139,9 @@
   <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="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"
/>
 
   <!--
@@ -150,10 +152,13 @@
   ********************************
   -->
   
-  <!-- ClassLoading -->
-  <bean name="ClassLoaderSystem"
class="org.jboss.osgi.plugins.facade.classloading.OSGiClassLoaderSystem" >
-    <constructor><parameter><inject bean="OSGiBundleManager"
/></parameter></constructor>
+  <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" />
@@ -169,7 +174,7 @@
   </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>
+    <property name="system"><inject
bean="OSGiClassLoaderSystem" /></property>
   </bean>
 
 </deployment>
\ No newline at end of file

Modified:
projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/log4j.xml
===================================================================
---
projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/log4j.xml	2009-09-03
15:04:34 UTC (rev 93175)
+++
projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/log4j.xml	2009-09-03
15:06:23 UTC (rev 93176)
@@ -32,10 +32,11 @@
   <!-- Limit categories -->
   <!-- ================ -->
 
-  <!-- Show jboss deployer tracesraces --> 
+  <!-- Show jboss deployer traces  
   <category name="org.jboss.deployers">
     <priority value="TRACE" />
   </category>
+  -->
 
   <!-- ======================= -->
   <!-- Setup the Root category -->

Modified: projects/jboss-osgi/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/pom.xml	2009-09-03 15:04:34 UTC (rev 93175)
+++ projects/jboss-osgi/trunk/pom.xml	2009-09-03 15:06:23 UTC (rev 93176)
@@ -46,7 +46,7 @@
     <version.jboss.osgi.blueprint>1.0.0.Beta1</version.jboss.osgi.blueprint>
     <version.jboss.osgi.common>1.0.1-SNAPSHOT</version.jboss.osgi.common>
    
<version.jboss.osgi.common.core>2.2.13-SNAPSHOT</version.jboss.osgi.common.core>
-    <version.jboss.osgi.hotdeploy>1.0.0</version.jboss.osgi.hotdeploy>
+   
<version.jboss.osgi.hotdeploy>1.0.1-SNAPSHOT</version.jboss.osgi.hotdeploy>
     <version.jboss.osgi.husky>1.0.0</version.jboss.osgi.husky>
     <version.jboss.osgi.jaxb>2.1.10-SNAPSHOT</version.jboss.osgi.jaxb>
     <version.jboss.osgi.jmx>1.0.1-SNAPSHOT</version.jboss.osgi.jmx>

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-09-03
15:04:34 UTC (rev 93175)
+++
projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF/jboss-osgi-bootstrap.xml	2009-09-03
15:06:23 UTC (rev 93176)
@@ -122,7 +122,9 @@
   <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="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"
/>
 
   <!--
@@ -133,10 +135,13 @@
   ********************************
   -->
   
-  <!-- ClassLoading -->
-  <bean name="ClassLoaderSystem"
class="org.jboss.osgi.plugins.facade.classloading.OSGiClassLoaderSystem" >
-    <constructor><parameter><inject bean="OSGiBundleManager"
/></parameter></constructor>
+  <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" />
@@ -152,7 +157,7 @@
   </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>
+    <property name="system"><inject
bean="OSGiClassLoaderSystem" /></property>
   </bean>
 
 </deployment>

Modified: projects/jboss-osgi/trunk/testsuite/functional/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/pom.xml	2009-09-03 15:04:34 UTC (rev
93175)
+++ projects/jboss-osgi/trunk/testsuite/functional/pom.xml	2009-09-03 15:06:23 UTC (rev
93176)
@@ -171,11 +171,17 @@
         </plugins>
       </build>
     </profile>
+    
+    <!--
+      Name: framework-jbossmc
+      Descr: Setup for JBossMC framework integration testing
+    -->
     <profile>
-      <id>framework-default</id>
+      <id>framework-jbossmc</id>
       <activation>
         <property>
-          <name>!framework</name>
+          <name>framework</name>
+          <value>jbossmc</value>
         </property>
       </activation>
       <build>
@@ -185,24 +191,22 @@
             <configuration>
               <excludes>
                 <exclude>${target.container.excludes}</exclude>
-                <exclude>org/jboss/test/osgi/jbosgi142/**</exclude>
+                <exclude>org/jboss/test/osgi/jbosgi39/**</exclude>
+                <exclude>org/jboss/test/osgi/jbosgi41/**</exclude>
+                <exclude>org/jboss/test/osgi/jbosgi108/**</exclude>
+                <exclude>org/jboss/test/osgi/jbosgi143/**</exclude>
+               
<exclude>org/jboss/test/osgi/service/microcontainer/**</exclude>
               </excludes>
             </configuration>
           </plugin>
         </plugins>
       </build>
     </profile>
-    
-    <!--
-      Name: framework-jbossmc
-      Descr: Setup for JBossMC framework integration testing
-    -->
     <profile>
-      <id>framework-jbossmc</id>
+      <id>framework-default</id>
       <activation>
         <property>
-          <name>framework</name>
-          <value>jbossmc</value>
+          <name>!framework</name>
         </property>
       </activation>
       <build>
@@ -212,13 +216,11 @@
             <configuration>
               <excludes>
                 <exclude>${target.container.excludes}</exclude>
-                <exclude>org/jboss/test/osgi/jbosgi38/**</exclude>
                 <exclude>org/jboss/test/osgi/jbosgi39/**</exclude>
                 <exclude>org/jboss/test/osgi/jbosgi41/**</exclude>
                 <exclude>org/jboss/test/osgi/jbosgi108/**</exclude>
                 <exclude>org/jboss/test/osgi/jbosgi143/**</exclude>
                
<exclude>org/jboss/test/osgi/service/microcontainer/**</exclude>
-                <exclude>org/jboss/test/osgi/service/startlevel/**</exclude>
               </excludes>
             </configuration>
           </plugin>

Modified:
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi38/OSGI38TestCase.java
===================================================================
---
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi38/OSGI38TestCase.java	2009-09-03
15:04:34 UTC (rev 93175)
+++
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi38/OSGI38TestCase.java	2009-09-03
15:06:23 UTC (rev 93176)
@@ -24,6 +24,7 @@
 //$Id: OSGI38TestCase.java 87103 2009-04-09 22:18:31Z thomas.diesler(a)jboss.com $
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
 import org.jboss.osgi.spi.testing.OSGiBundle;
@@ -58,7 +59,7 @@
       try
       {
          OSGiBundle bundleX = runtime.installBundle("jbosgi38-bundleX.jar");
-         assertEquals("Bundle installed", Bundle.INSTALLED,
bundleX.getState());
+         assertTrue("Bundle installed", bundleX.getState() <=
Bundle.RESOLVED);
 
          bundleX.start();
          assertEquals("Bundle active", Bundle.ACTIVE, bundleX.getState());
@@ -81,10 +82,10 @@
       try
       {
          OSGiBundle bundleX = runtime.installBundle("jbosgi38-bundleX.jar");
-         assertEquals("Bundle installed", Bundle.INSTALLED,
bundleX.getState());
+         assertTrue("Bundle installed", bundleX.getState() <=
Bundle.RESOLVED);
 
          OSGiBundle bundleB = runtime.installBundle("jbosgi38-bundleB.jar");
-         assertEquals("Bundle installed", Bundle.INSTALLED,
bundleB.getState());
+         assertTrue("Bundle installed", bundleB.getState() <=
Bundle.RESOLVED);
 
          bundleB.start();
          assertEquals("Bundle active", Bundle.ACTIVE, bundleB.getState());
@@ -108,13 +109,13 @@
       try
       {
          OSGiBundle bundleX = runtime.installBundle("jbosgi38-bundleX.jar");
-         assertEquals("Bundle installed", Bundle.INSTALLED,
bundleX.getState());
+         assertTrue("Bundle installed", bundleX.getState() <=
Bundle.RESOLVED);
 
          OSGiBundle bundleB = runtime.installBundle("jbosgi38-bundleB.jar");
-         assertEquals("Bundle installed", Bundle.INSTALLED,
bundleB.getState());
+         assertTrue("Bundle installed", bundleB.getState() <=
Bundle.RESOLVED);
 
          OSGiBundle bundleA = runtime.installBundle("jbosgi38-bundleA.jar");
-         assertEquals("Bundle installed", Bundle.INSTALLED,
bundleA.getState());
+         assertTrue("Bundle installed", bundleA.getState() <=
Bundle.RESOLVED);
 
          bundleA.start();
          assertEquals("Bundle active", Bundle.ACTIVE, bundleA.getState());
@@ -152,7 +153,7 @@
          }
 
          OSGiBundle bundleX = runtime.installBundle("jbosgi38-bundleX.jar");
-         assertEquals("Bundle installed", Bundle.INSTALLED,
bundleX.getState());
+         assertTrue("Bundle installed", bundleX.getState() <=
Bundle.RESOLVED);
 
          bundleB.start();
          assertEquals("Bundle active", Bundle.ACTIVE, bundleB.getState());
@@ -192,7 +193,7 @@
          }
 
          OSGiBundle bundleX = runtime.installBundle("jbosgi38-bundleX.jar");
-         assertEquals("Bundle installed", Bundle.INSTALLED,
bundleX.getState());
+         assertTrue("Bundle installed", bundleX.getState() <=
Bundle.RESOLVED);
 
          bundleB.start();
          assertEquals("Bundle active", Bundle.ACTIVE, bundleB.getState());

Modified:
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi39/OSGI39TestCase.java
===================================================================
---
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi39/OSGI39TestCase.java	2009-09-03
15:04:34 UTC (rev 93175)
+++
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi39/OSGI39TestCase.java	2009-09-03
15:06:23 UTC (rev 93176)
@@ -72,7 +72,7 @@
          
          bundleB.start();
          
-         assertTrue("Bundle resolved", + Bundle.RESOLVED == bundleX.getState()
|| Bundle.ACTIVE == bundleX.getState());
+         assertTrue("Bundle resolved", bundleX.getState() <=
Bundle.ACTIVE);
          assertEquals("Bundle active", Bundle.ACTIVE, bundleB.getState());
          
          bundleB.uninstall();

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-09-03
15:04:34 UTC (rev 93175)
+++
projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/jboss-osgi-bootstrap.xml	2009-09-03
15:06:23 UTC (rev 93176)
@@ -18,7 +18,18 @@
        
<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>
+          <!-- [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,
@@ -111,7 +122,9 @@
   <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="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"
/>
 
   <!--
@@ -122,10 +135,13 @@
   ********************************
   -->
   
-  <!-- ClassLoading -->
-  <bean name="ClassLoaderSystem"
class="org.jboss.osgi.plugins.facade.classloading.OSGiClassLoaderSystem" >
-    <constructor><parameter><inject bean="OSGiBundleManager"
/></parameter></constructor>
+  <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" />
@@ -141,7 +157,7 @@
   </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>
+    <property name="system"><inject
bean="OSGiClassLoaderSystem" /></property>
   </bean>
 
 </deployment>

Modified: projects/jboss-osgi/trunk/testsuite/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/pom.xml	2009-09-03 15:04:34 UTC (rev 93175)
+++ projects/jboss-osgi/trunk/testsuite/pom.xml	2009-09-03 15:06:23 UTC (rev 93176)
@@ -180,7 +180,7 @@
         </property>
       </activation>
       
-      <!-- default to jbossmc 
+      <!-- default to jbossmc -->
       <dependencies>
         <dependency>
           <groupId>org.jboss.osgi.runtime</groupId>
@@ -189,9 +189,8 @@
           <scope>provided</scope>
         </dependency>
       </dependencies>
-      -->
       
-      <!-- default to felix -->     
+      <!-- default to felix      
       <properties>
        
<jboss.osgi.framework.properties>jboss-osgi-felix.properties</jboss.osgi.framework.properties>
       </properties>
@@ -203,6 +202,7 @@
           <scope>provided</scope>
         </dependency>
       </dependencies>
+      -->
       
     </profile>
 


    

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

[jboss-osgi-commits] JBoss-OSGI SVN: r93176 - in projects/jboss-osgi/trunk: .settings and 9 other directories.