[jboss-cvs] JBossAS SVN: r88426 - in projects/jboss-osgi/trunk: bundle/microcontainer and 1 other directories.

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

Author: thomas.diesler at jboss.com
Date: 2009-05-08 08:33:38 -0400 (Fri, 08 May 2009)
New Revision: 88426

Modified:
   projects/jboss-osgi/trunk/build/distribution/runtime/conf/jboss-osgi-framework.properties
   projects/jboss-osgi/trunk/bundle/microcontainer/.classpath
   projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/internal/OSGiRuntimeImpl.java
Log:
All tests pass against runtime

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-08 12:19:19 UTC (rev 88425)
+++ projects/jboss-osgi/trunk/build/distribution/runtime/conf/jboss-osgi-framework.properties	2009-05-08 12:33:38 UTC (rev 88426)
@@ -33,34 +33,46 @@
 
 # Extra System Packages
 org.osgi.framework.system.packages.extra=\
-	org.jboss.logging, \
-  	org.jboss.osgi.spi, \
-  	org.jboss.osgi.spi.management, \
-  	org.jboss.virtual, \
-  	org.jboss.virtual.plugins.registry, \
-  	org.jboss.virtual.plugins.context.jar, \
-  	org.jboss.virtual.plugins.vfs.helpers, \
-  	org.jboss.net.protocol, \
-  	org.jboss.virtual.protocol
+   org.jboss.logging, \
+   org.jboss.net.protocol, \
+   org.jboss.osgi.spi, \
+   org.jboss.osgi.spi.logging, \
+   org.jboss.osgi.spi.management, \
+   org.jboss.virtual, \
+   org.jboss.virtual.plugins.registry, \
+   org.jboss.virtual.plugins.context.jar, \
+   org.jboss.virtual.plugins.vfs.helpers, \
+   org.jboss.virtual.protocol, \
+   org.apache.log4j, \
+   org.jboss.util, \
+   org.jboss.util.id, \
+   org.jboss.util.threadpool, \
+   org.jboss.util.propertyeditor 
 
+# These are needed by jboss-remoting
+#   org.apache.log4j, \
+#   org.jboss.util, \
+#   org.jboss.util.id, \
+#   org.jboss.util.threadpool, \
+#   org.jboss.util.propertyeditor 
+
 # Bundles that need to be installed with the Framework automatically 
 org.jboss.osgi.spi.framework.autoInstall=\
 	file://${osgi.home}/bundles/org.osgi.compendium.jar
 
 # Bundles that need to be started automatically 
 org.jboss.osgi.spi.framework.autoStart=\
-	file://${osgi.home}/bundles/org.apache.felix.log.jar \
-	file://${osgi.home}/bundles/apache-xerces-bundle.jar \
-	file://${osgi.home}/bundles/jboss-common-core-bundle.jar \
-	file://${osgi.home}/bundles/jaxb-bundle.jar \
-	file://${osgi.home}/bundles/jbossxb-bundle.jar \
-	file://${osgi.home}/bundles/jboss-osgi-common.jar \
-	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/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
+   file://${osgi.home}/bundles/org.apache.felix.log.jar \
+   file://${osgi.home}/bundles/apache-xerces-bundle.jar \
+   file://${osgi.home}/bundles/jboss-common-core-bundle.jar \
+   file://${osgi.home}/bundles/jaxb-bundle.jar \
+   file://${osgi.home}/bundles/jbossxb-bundle.jar \
+   file://${osgi.home}/bundles/jboss-osgi-common.jar \
+   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/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

Modified: projects/jboss-osgi/trunk/bundle/microcontainer/.classpath
===================================================================
--- projects/jboss-osgi/trunk/bundle/microcontainer/.classpath	2009-05-08 12:19:19 UTC (rev 88425)
+++ projects/jboss-osgi/trunk/bundle/microcontainer/.classpath	2009-05-08 12:33:38 UTC (rev 88426)
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
+	<classpathentry kind="src" path="src/main/java"/>
+	<classpathentry excluding="**" kind="src" path="src/main/resources"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
 	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
 	<classpathentry kind="output" path="target/classes"/>

Modified: projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/internal/OSGiRuntimeImpl.java
===================================================================
--- projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/internal/OSGiRuntimeImpl.java	2009-05-08 12:19:19 UTC (rev 88425)
+++ projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/internal/OSGiRuntimeImpl.java	2009-05-08 12:33:38 UTC (rev 88426)
@@ -152,7 +152,7 @@
 
    private void invokeMainDeployer(String method, URL archiveURL) throws Exception
    {
-      ObjectName oname = new ObjectName("jboss.system:service=MainDeployer");
+      ObjectName oname = new ObjectName("jboss.osgi:service=MicrocontainerService");
       getMBeanServer().invoke(oname, method, new Object[] { archiveURL }, new String[] { "java.net.URL" });
    }