[jboss-osgi-commits] JBoss-OSGI SVN: r88228 - in projects/jboss-osgi/trunk: spi/src/main/java/org/jboss/osgi/spi/framework and 3 other directories.

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

Author: thomas.diesler at jboss.com
Date: 2009-05-05 15:42:24 -0400 (Tue, 05 May 2009)
New Revision: 88228

Modified:
   projects/jboss-osgi/trunk/build/distribution/runtime/conf/jboss-osgi-framework.properties
   projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/framework/OSGiBootstrap.java
   projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/junit/IntegrationTestHelper.java
   projects/jboss-osgi/trunk/testsuite/example/pom.xml
   projects/jboss-osgi/trunk/testsuite/functional/pom.xml
Log:
WIP

Modified: projects/jboss-osgi/trunk/build/distribution/runtime/conf/jboss-osgi-framework.properties
===================================================================
--- projects/jboss-osgi/trunk/build/distribution/runtime/conf/jboss-osgi-framework.properties	2009-05-05 19:25:56 UTC (rev 88227)
+++ projects/jboss-osgi/trunk/build/distribution/runtime/conf/jboss-osgi-framework.properties	2009-05-05 19:42:24 UTC (rev 88228)
@@ -8,7 +8,30 @@
 org.jboss.osgi.spi.framework.impl=org.jboss.osgi.felix.framework.FelixIntegration
 
 # Properties to configure the Framework
+org.osgi.framework.storage=${osgi.home}/data/osgi-store
 org.osgi.framework.storage.clean=onFirstInit
+
+# HTTP Service Port
+org.osgi.service.http.port=8090
+
+# Config Admin Service
+felix.cm.dir=${osgi.home}/data/osgi-configadmin
+
+# JMX bundle properties  	
+org.jboss.osgi.jmx.host=${jboss.bind.address}
+org.jboss.osgi.jmx.rmi.port=1098
+
+# JNDI bundle properties  	
+org.jboss.osgi.jndi.host=${jboss.bind.address}
+org.jboss.osgi.jndi.rmi.port=1098
+org.jboss.osgi.jndi.port=1099
+
+# Remote Logging
+org.jboss.osgi.service.remote.log.sender=true
+org.jboss.osgi.service.remote.log.host=${jboss.bind.address}
+org.jboss.osgi.service.remote.log.port=5400
+
+# Extra System Packages
 org.osgi.framework.system.packages.extra=\
 	org.jboss.logging, \
   	org.jboss.osgi.spi, \
@@ -35,5 +58,9 @@
 	file://${osgi.home}/bundles/jboss-osgi-logging.jar \
 	file://${osgi.home}/bundles/jboss-osgi-jndi.jar \
 	file://${osgi.home}/bundles/jboss-osgi-jmx.jar \
-	file://${osgi.home}/bundles/jboss-osgi-microcontainer.jar
+	file://${osgi.home}/bundles/jboss-osgi-microcontainer.jar \
+	file://${osgi.home}/bundles/org.apache.felix.metatype.jar \
+	file://${osgi.home}/bundles/org.apache.felix.configadmin.jar \
+	file://${osgi.home}/bundles/org.apache.felix.http.jetty.jar \
+	file://${osgi.home}/bundles/jboss-osgi-webconsole.jar
 	
\ No newline at end of file

Modified: projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/framework/OSGiBootstrap.java
===================================================================
--- projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/framework/OSGiBootstrap.java	2009-05-05 19:25:56 UTC (rev 88227)
+++ projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/framework/OSGiBootstrap.java	2009-05-05 19:42:24 UTC (rev 88228)
@@ -105,6 +105,8 @@
 
    public static void main(String[] args)
    {
+      initSystemProperties();
+         
       OSGiBootstrapProvider bootProvider = getBootstrapProvider();
       OSGiFramework framework = bootProvider.getFramework();
 
@@ -115,6 +117,14 @@
       thread.start();
    }
 
+   private static void initSystemProperties()
+   {
+      // Set the default bind address
+      String bindAddress = System.getProperty("jboss.bind.address");
+      if (bindAddress == null)
+         System.setProperty("jboss.bind.address", "localhost");
+   }
+
    static class StartupThread extends Thread
    {
       private OSGiFramework framework;

Modified: projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/junit/IntegrationTestHelper.java
===================================================================
--- projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/junit/IntegrationTestHelper.java	2009-05-05 19:25:56 UTC (rev 88227)
+++ projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/junit/IntegrationTestHelper.java	2009-05-05 19:42:24 UTC (rev 88228)
@@ -219,6 +219,9 @@
          public RemoteBundle getBundle(String symbolicName)
          {
             ObjectName bundleOName = managedFramework.getBundle(symbolicName);
+            if (bundleOName == null)
+               throw new IllegalArgumentException("Cannot remote bundle for: " + symbolicName);
+            
             try
             {
                return MBeanProxy.get(ManagedBundleMBean.class, bundleOName, getServer());

Modified: projects/jboss-osgi/trunk/testsuite/example/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/pom.xml	2009-05-05 19:25:56 UTC (rev 88227)
+++ projects/jboss-osgi/trunk/testsuite/example/pom.xml	2009-05-05 19:42:24 UTC (rev 88228)
@@ -62,6 +62,18 @@
     </dependency>
     <dependency>
       <groupId>org.jboss.osgi.bundles</groupId>
+      <artifactId>jboss-osgi-jmx</artifactId>
+      <version>${version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.osgi.bundles</groupId>
+      <artifactId>jboss-osgi-jndi</artifactId>
+      <version>${version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.osgi.bundles</groupId>
       <artifactId>jboss-osgi-logging</artifactId>
       <version>${version}</version>
       <scope>provided</scope>

Modified: projects/jboss-osgi/trunk/testsuite/functional/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/pom.xml	2009-05-05 19:25:56 UTC (rev 88227)
+++ projects/jboss-osgi/trunk/testsuite/functional/pom.xml	2009-05-05 19:42:24 UTC (rev 88228)
@@ -68,6 +68,18 @@
     </dependency>
     <dependency>
       <groupId>org.jboss.osgi.bundles</groupId>
+      <artifactId>jboss-osgi-jmx</artifactId>
+      <version>${version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.osgi.bundles</groupId>
+      <artifactId>jboss-osgi-jndi</artifactId>
+      <version>${version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.osgi.bundles</groupId>
       <artifactId>jboss-osgi-remotelog</artifactId>
       <version>${version}</version>
       <scope>provided</scope>