[jboss-cvs] JBossAS SVN: r84125 - in projects/jboss-felix/trunk/modules: integration/deployer/src/main/resources and 1 other directories.

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

Author: thomas.diesler at jboss.com
Date: 2009-02-12 09:25:43 -0500 (Thu, 12 Feb 2009)
New Revision: 84125

Modified:
   projects/jboss-felix/trunk/modules/distribution/src/main/resources/installer/install-definition.xml
   projects/jboss-felix/trunk/modules/integration/deployer/src/main/resources/osgi-deployers-jboss-beans.xml
   projects/jboss-felix/trunk/modules/integration/felix/src/main/java/org/jboss/osgi/felix/framework/FelixIntegration.java
Log:
webconsole ok

Modified: projects/jboss-felix/trunk/modules/distribution/src/main/resources/installer/install-definition.xml
===================================================================
--- projects/jboss-felix/trunk/modules/distribution/src/main/resources/installer/install-definition.xml	2009-02-12 14:02:13 UTC (rev 84124)
+++ projects/jboss-felix/trunk/modules/distribution/src/main/resources/installer/install-definition.xml	2009-02-12 14:25:43 UTC (rev 84125)
@@ -70,7 +70,6 @@
       <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer" override="true">
         <include name="jboss-osgi-deployer.jar" />
         <include name="jboss-osgi-felix.jar" />
-        <include name="jboss-osgi-service-http.jar" />
         <include name="jboss-osgi-spi.jar" />
         <include name="org.apache.felix.framework.jar" />
         <include name="org.osgi.compendium.jar" />
@@ -79,6 +78,13 @@
       <fileset dir="@{deploy.artifacts.dir}/resources/jboss-osgi-deployer-config" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer/META-INF" override="true">
         <include name="osgi-deployers-jboss-beans.xml" />
       </fileset>
+      
+      <!-- OSGi Bundles -->
+      <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/osgi" override="true">
+        <include name="jboss-osgi-service-http.jar" />
+        <include name="org.apache.felix.webconsole.jar" />
+      </fileset>
+      
     </pack>
 
     <!-- 

Modified: projects/jboss-felix/trunk/modules/integration/deployer/src/main/resources/osgi-deployers-jboss-beans.xml
===================================================================
--- projects/jboss-felix/trunk/modules/integration/deployer/src/main/resources/osgi-deployers-jboss-beans.xml	2009-02-12 14:02:13 UTC (rev 84124)
+++ projects/jboss-felix/trunk/modules/integration/deployer/src/main/resources/osgi-deployers-jboss-beans.xml	2009-02-12 14:25:43 UTC (rev 84125)
@@ -20,6 +20,7 @@
             javax.servlet.http,
             javax.management,
             javax.security.jacc,
+            javax.xml.parsers,
             org.jboss.classloading.spi,
             org.jboss.deployers.client.plugins.deployment,
             org.jboss.deployers.client.spi,
@@ -37,7 +38,16 @@
             org.jboss.web,
             org.jboss.virtual,
             org.osgi.framework; version=1.4,
-            org.osgi.service.startlevel
+            org.osgi.service.cm,
+            org.osgi.service.deploymentadmin, 
+            org.osgi.service.event,
+            org.osgi.service.http; version=1.2,
+            org.osgi.service.log,
+            org.osgi.service.metatype,
+            org.osgi.service.packageadmin,
+            org.osgi.service.prefs,
+            org.osgi.service.startlevel,
+            org.xml.sax
           </value>
         </entry>
       </map>
@@ -45,7 +55,6 @@
     <property name="autoStart">
      <list elementClass="java.net.URI">
       <value>${jboss.server.home.url}/deployers/osgi.deployer/org.osgi.compendium.jar</value>
-      <value>${jboss.server.home.url}/deployers/osgi.deployer/jboss-osgi-service-http.jar</value>
      </list>
     </property>
   </bean>

Modified: projects/jboss-felix/trunk/modules/integration/felix/src/main/java/org/jboss/osgi/felix/framework/FelixIntegration.java
===================================================================
--- projects/jboss-felix/trunk/modules/integration/felix/src/main/java/org/jboss/osgi/felix/framework/FelixIntegration.java	2009-02-12 14:02:13 UTC (rev 84124)
+++ projects/jboss-felix/trunk/modules/integration/felix/src/main/java/org/jboss/osgi/felix/framework/FelixIntegration.java	2009-02-12 14:25:43 UTC (rev 84125)
@@ -162,21 +162,6 @@
         log.error("Cannot start bundle: " + bundleURI, ex);
       }
     }
-    
-    // List registered services
-    try
-    {
-      ServiceReference[] refs = context.getAllServiceReferences(null, null);
-      for (ServiceReference sref : refs)
-      {
-        Object service = context.getService(sref);
-        log.info("Registered Service: " + service.getClass().getName());
-      }
-    }
-    catch (InvalidSyntaxException ex)
-    {
-      log.error("Cannot list registered services", ex);
-    }
   }
 
   public void stop()