[jboss-osgi-commits] JBoss-OSGI SVN: r97291 - in projects/jboss-osgi/trunk: distribution/installer/src/main/resources/runtime/server/conf and 2 other directories.

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

Author: thomas.diesler at jboss.com
Date: 2009-12-02 09:47:14 -0500 (Wed, 02 Dec 2009)
New Revision: 97291

Modified:
   projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-extra-all.properties
   projects/jboss-osgi/trunk/pom.xml
   projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi41/OSGI41TestCase.java
   projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jboss-osgi-equinox.properties
Log:
Equinox remote example testing

Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-extra-all.properties
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-extra-all.properties	2009-12-02 14:12:58 UTC (rev 97290)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-extra-all.properties	2009-12-02 14:47:14 UTC (rev 97291)
@@ -35,6 +35,7 @@
     org.jboss.net.protocol, \
     org.jboss.osgi.deployment.deployer;version=1.0, \
     org.jboss.osgi.deployment.interceptor;version=1.0, \
+    org.jboss.osgi.deployment.internal;version=1.0, \
     org.jboss.osgi.spi;version=1.0, \
     org.jboss.osgi.spi.capability;version=1.0, \
     org.jboss.osgi.spi.framework;version=1.0, \
@@ -42,7 +43,7 @@
     org.jboss.osgi.spi.service;version=1.0, \
     org.jboss.osgi.spi.util;version=1.0, \
   	org.jboss.virtual;version=2.1, \
-  	org.jboss.virtual.plugins.registry;version=2.1, \
-  	org.jboss.virtual.plugins.context.jar;version=2.1, \
-  	org.jboss.virtual.plugins.vfs.helpers;version=2.1, \
-  	org.jboss.virtual.protocol;version=2.1
\ No newline at end of file
+    org.jboss.virtual.plugins.registry;version=2.1, \
+    org.jboss.virtual.plugins.context.jar;version=2.1, \
+    org.jboss.virtual.plugins.vfs.helpers;version=2.1, \
+    org.jboss.virtual.protocol;version=2.1
\ No newline at end of file

Modified: projects/jboss-osgi/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/pom.xml	2009-12-02 14:12:58 UTC (rev 97290)
+++ projects/jboss-osgi/trunk/pom.xml	2009-12-02 14:47:14 UTC (rev 97291)
@@ -51,7 +51,7 @@
     <version.izpack>4.3.1</version.izpack>
     <version.jboss.osgi.apache.xerces>2.9.1-SNAPSHOT</version.jboss.osgi.apache.xerces>
     <version.jboss.osgi.blueprint>1.0.0.Alpha3</version.jboss.osgi.blueprint>
-    <version.jboss.osgi.common>1.0.4-SNAPSHOT</version.jboss.osgi.common>
+    <version.jboss.osgi.common>1.0.3-SNAPSHOT</version.jboss.osgi.common>
     <version.jboss.osgi.common.core>2.2.13.GA</version.jboss.osgi.common.core>
     <version.jboss.osgi.deployment>1.0.0-SNAPSHOT</version.jboss.osgi.deployment>
     <version.jboss.osgi.framework>1.0.0.Alpha2-SNAPSHOT</version.jboss.osgi.framework>

Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi41/OSGI41TestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi41/OSGI41TestCase.java	2009-12-02 14:12:58 UTC (rev 97290)
+++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi41/OSGI41TestCase.java	2009-12-02 14:47:14 UTC (rev 97291)
@@ -77,7 +77,8 @@
 
    private File getBundleDataFile(OSGiBundle bundleA, String filename)
    {
-      String storageRoot = bundleA.getProperty("org.osgi.framework.storage");
+      OSGiBundle systemBundle = bundleA.getRuntime().getBundle(0);
+      String storageRoot = systemBundle.getProperty("org.osgi.framework.storage");
       assertNotNull("Storage dir not null", storageRoot);
 
       File dataFile;

Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jboss-osgi-equinox.properties
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jboss-osgi-equinox.properties	2009-12-02 14:12:58 UTC (rev 97290)
+++ projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jboss-osgi-equinox.properties	2009-12-02 14:47:14 UTC (rev 97291)
@@ -25,7 +25,7 @@
   	org.jboss.osgi.spi.management;version=1.0, \
   	org.jboss.osgi.spi.service;version=1.0, \
   	org.jboss.osgi.spi.util;version=1.0, \
-  	org.jboss.virtual;version=2.1, \
+    org.jboss.virtual;version=2.1, \
   	org.jboss.virtual.plugins.registry;version=2.1, \
   	org.jboss.virtual.plugins.context.jar;version=2.1, \
   	org.jboss.virtual.plugins.vfs.helpers;version=2.1, \