[jboss-cvs] JBossAS SVN: r85414 - in projects/jboss-osgi/trunk: runtime/deployer/src/main/resources and 1 other directories.

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

Author: thomas.diesler at jboss.com
Date: 2009-03-06 08:38:27 -0500 (Fri, 06 Mar 2009)
New Revision: 85414

Modified:
   projects/jboss-osgi/trunk/build/distribution/src/main/resources/installer/install-definition.xml
   projects/jboss-osgi/trunk/runtime/deployer/src/main/resources/osgi-deployers-jboss-beans.xml
   projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/service/startlevel/bundle/ServiceActivator.java
Log:
Web Console - ALL GOOD

Modified: projects/jboss-osgi/trunk/build/distribution/src/main/resources/installer/install-definition.xml
===================================================================
--- projects/jboss-osgi/trunk/build/distribution/src/main/resources/installer/install-definition.xml	2009-03-06 13:38:20 UTC (rev 85413)
+++ projects/jboss-osgi/trunk/build/distribution/src/main/resources/installer/install-definition.xml	2009-03-06 13:38:27 UTC (rev 85414)
@@ -77,7 +77,6 @@
         <include name="jboss-osgi-runtime-felix.jar" />
         <include name="jboss-osgi-runtime-spi.jar" />
         <include name="org.apache.felix.framework.jar" />
-        <include name="org.osgi.compendium.jar" />
         <include name="org.osgi.core.jar" />
       </fileset>
       <fileset dir="@{deploy.artifacts.dir}/resources/jboss-osgi-runtime-deployer-config" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer/META-INF" override="true">
@@ -89,6 +88,7 @@
         <include name="org.apache.felix.configadmin.jar" />
         <include name="org.apache.felix.http.jetty.jar" />
         <include name="org.apache.felix.log.jar" />
+        <include name="org.osgi.compendium.jar" />
         <include name="jboss-osgi-service-logging.jar" />
         <include name="jboss-osgi-service-webconsole.jar" />
       </fileset>

Modified: projects/jboss-osgi/trunk/runtime/deployer/src/main/resources/osgi-deployers-jboss-beans.xml
===================================================================
--- projects/jboss-osgi/trunk/runtime/deployer/src/main/resources/osgi-deployers-jboss-beans.xml	2009-03-06 13:38:20 UTC (rev 85413)
+++ projects/jboss-osgi/trunk/runtime/deployer/src/main/resources/osgi-deployers-jboss-beans.xml	2009-03-06 13:38:27 UTC (rev 85414)
@@ -19,6 +19,8 @@
             org.jboss.osgi.service,
             org.jboss.osgi.spi.management,
             org.osgi.framework; version=1.4,
+            org.osgi.service.packageadmin; version=1.2,
+            org.osgi.service.startlevel; version=1.1,
             org.xml.sax
           </value>
         </entry>
@@ -31,8 +33,7 @@
     </property>
     <property name="autoStart">
      <list elementClass="java.net.URI">
-      <value>${jboss.server.home.url}/deployers/osgi.deployer/org.osgi.core.jar</value>
-      <value>${jboss.server.home.url}/deployers/osgi.deployer/org.osgi.compendium.jar</value>
+      <value>${jboss.server.home.url}/deploy/osgi/org.osgi.compendium.jar</value>
       <value>${jboss.server.home.url}/deploy/osgi/jboss-osgi-service-logging.jar</value>
      </list>
     </property>

Modified: projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/service/startlevel/bundle/ServiceActivator.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/service/startlevel/bundle/ServiceActivator.java	2009-03-06 13:38:20 UTC (rev 85413)
+++ projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/service/startlevel/bundle/ServiceActivator.java	2009-03-06 13:38:27 UTC (rev 85414)
@@ -45,6 +45,9 @@
       tracker.open();
       
       StartLevel service = (StartLevel)tracker.getService();
+      if (service == null)
+         System.err.println("Cannot get StartLevel. Loaded with: " + StartLevel.class.getClassLoader());
+      
       int level = service.getStartLevel();
       System.out.println("StartLevel: " + level);
    }