[jboss-osgi-commits] JBoss-OSGI SVN: r101073 - in projects/jboss-osgi/trunk: distribution/installer/src/main/resources/installer and 11 other directories.

Author: thomas.diesler(a)jboss.com Date: 2010-02-17 08:56:24 -0500 (Wed, 17 Feb 2010) New Revision: 101073 Removed: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/javax/xml/ Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/conf/jboss-osgi-equinox.properties projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/conf/jboss-osgi-felix.properties projects/jboss-osgi/trunk/distribution/pom.xml projects/jboss-osgi/trunk/testsuite/example/.classpath projects/jboss-osgi/trunk/testsuite/example/.settings/org.eclipse.jdt.core.prefs projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/enterprise/jmx/JMXEnterpriseTestCase.java projects/jboss-osgi/trunk/testsuite/functional/.classpath projects/jboss-osgi/trunk/testsuite/functional/.settings/org.eclipse.jdt.core.prefs projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-bundles.xml projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbossas/jbosgi36/OSGi36TestCase.java projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbossas/jbosgi58/OSGi58TestCase.java projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbossas/jbosgi58/ejb/StatelessBean.java projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbossas/jbosgi58/ejb/StatelessBeanImpl.java Log: [JBOSGI-126] Replace the SPI JMX functionality by RFC-139 API Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml =================================================================== --- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml 2010-02-17 13:55:15 UTC (rev 101072) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml 2010-02-17 13:56:24 UTC (rev 101073) @@ -209,6 +209,8 @@ <include name="jboss-osgi-jmx.jar" /> <include name="jboss-osgi-jndi.jar" /> <include name="org.apache.felix.eventadmin.jar" /> + <include name="org.apache.aries.jmx.jar" /> + <include name="org.apache.aries.util.jar" /> </fileset> <!-- Server Web --> @@ -219,6 +221,8 @@ <include name="jboss-osgi-jmx.jar" /> <include name="jboss-osgi-jndi.jar" /> <include name="org.apache.felix.eventadmin.jar" /> + <include name="org.apache.aries.jmx.jar" /> + <include name="org.apache.aries.util.jar" /> <!-- web --> <include name="org.apache.felix.configadmin.jar" /> <include name="org.apache.felix.metatype.jar" /> @@ -234,6 +238,8 @@ <include name="jboss-osgi-jmx.jar" /> <include name="jboss-osgi-jndi.jar" /> <include name="org.apache.felix.eventadmin.jar" /> + <include name="org.apache.aries.jmx.jar" /> + <include name="org.apache.aries.util.jar" /> <!-- web --> <include name="jboss-osgi-webconsole.jar" /> <include name="org.apache.felix.configadmin.jar" /> @@ -247,7 +253,6 @@ <include name="jboss-osgi-jta.jar" /> <include name="jboss-osgi-reflect.jar" /> <include name="jboss-osgi-xml-binding.jar" /> - <include name="org.apache.aries.util.jar" /> </fileset> <!-- Felix Integration --> @@ -410,6 +415,7 @@ <include name="jboss-osgi-webconsole.jar" /> <include name="jboss-osgi-reflect.jar" /> <include name="jboss-osgi-xml-binding.jar" /> + <include name="org.apache.aries.jmx.jar" /> <include name="org.apache.aries.util.jar" /> <include name="org.apache.felix.log.jar" /> <include name="pax-web-jetty-bundle.jar" /> Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/conf/jboss-osgi-equinox.properties =================================================================== --- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/conf/jboss-osgi-equinox.properties 2010-02-17 13:55:15 UTC (rev 101072) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/conf/jboss-osgi-equinox.properties 2010-02-17 13:56:24 UTC (rev 101073) @@ -17,28 +17,28 @@ # Extra System Packages org.osgi.framework.system.packages.extra=\ org.apache.log4j;version=1.2, \ - org.jboss.logging;version=2.1, \ - org.jboss.net.protocol, \ - org.jboss.osgi.deployment.common;version=1.0, \ - org.jboss.osgi.deployment.deployer;version=1.0, \ - org.jboss.osgi.deployment.interceptor;version=1.0, \ + org.jboss.logging;version=2.1, \ + org.jboss.net.protocol, \ + org.jboss.osgi.deployment.common;version=1.0, \ + 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, \ - 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.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, \ - org.osgi.framework;version=1.5 + org.jboss.osgi.spi;version=1.0, \ + org.jboss.osgi.spi.capability;version=1.0, \ + org.jboss.osgi.spi.framework;version=1.0, \ + 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.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, \ + org.osgi.framework;version=1.5 # Bundles that need to be installed with the Framework automatically org.jboss.osgi.spi.framework.autoInstall=\ - file://${osgi.home}/server/minimal/deploy/org.eclipse.osgi.services.jar \ + file://${osgi.home}/server/minimal/deploy/org.eclipse.osgi.services.jar \ file://${osgi.home}/server/minimal/deploy/org.eclipse.osgi.util.jar # Bundles that need to be started automatically Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/conf/jboss-osgi-felix.properties =================================================================== --- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/conf/jboss-osgi-felix.properties 2010-02-17 13:55:15 UTC (rev 101072) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/conf/jboss-osgi-felix.properties 2010-02-17 13:56:24 UTC (rev 101073) @@ -17,28 +17,28 @@ # Extra System Packages org.osgi.framework.system.packages.extra=\ org.apache.log4j;version=1.2, \ - org.jboss.logging;version=2.1, \ - org.jboss.net.protocol, \ - org.jboss.osgi.deployment.common;version=1.0, \ - org.jboss.osgi.deployment.deployer;version=1.0, \ - org.jboss.osgi.deployment.interceptor;version=1.0, \ + org.jboss.logging;version=2.1, \ + org.jboss.net.protocol, \ + org.jboss.osgi.deployment.common;version=1.0, \ + 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, \ - 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.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, \ - org.osgi.framework;version=1.5 + org.jboss.osgi.spi;version=1.0, \ + org.jboss.osgi.spi.capability;version=1.0, \ + org.jboss.osgi.spi.framework;version=1.0, \ + 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.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, \ + org.osgi.framework;version=1.5 # Bundles that need to be installed with the Framework automatically org.jboss.osgi.spi.framework.autoInstall=\ - file://${osgi.home}/server/minimal/deploy/org.osgi.compendium.jar + file://${osgi.home}/server/minimal/deploy/org.osgi.compendium.jar # Bundles that need to be started automatically org.jboss.osgi.spi.framework.autoStart=\ Modified: projects/jboss-osgi/trunk/distribution/pom.xml =================================================================== --- projects/jboss-osgi/trunk/distribution/pom.xml 2010-02-17 13:55:15 UTC (rev 101072) +++ projects/jboss-osgi/trunk/distribution/pom.xml 2010-02-17 13:56:24 UTC (rev 101073) @@ -346,6 +346,14 @@ <!-- Aries Dependencies --> <dependency> + <groupId>org.apache.aries.jmx</groupId> + <artifactId>org.apache.aries.jmx</artifactId> + </dependency> + <dependency> + <groupId>org.apache.aries.jndi</groupId> + <artifactId>org.apache.aries.jndi</artifactId> + </dependency> + <dependency> <groupId>org.apache.aries</groupId> <artifactId>org.apache.aries.util</artifactId> </dependency> Modified: projects/jboss-osgi/trunk/testsuite/example/.classpath =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/.classpath 2010-02-17 13:55:15 UTC (rev 101072) +++ projects/jboss-osgi/trunk/testsuite/example/.classpath 2010-02-17 13:56:24 UTC (rev 101073) @@ -2,7 +2,7 @@ <classpath> <classpathentry kind="src" output="target/test-classes" path="src/test/java"/> <classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/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="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="output" path="target/classes"/> </classpath> Modified: projects/jboss-osgi/trunk/testsuite/example/.settings/org.eclipse.jdt.core.prefs =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/.settings/org.eclipse.jdt.core.prefs 2010-02-17 13:55:15 UTC (rev 101072) +++ projects/jboss-osgi/trunk/testsuite/example/.settings/org.eclipse.jdt.core.prefs 2010-02-17 13:56:24 UTC (rev 101073) @@ -1,5 +1,12 @@ -#Wed Feb 04 11:13:20 CET 2009 +#Wed Feb 17 12:16:57 CET 2010 eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.source=1.5 Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/enterprise/jmx/JMXEnterpriseTestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/enterprise/jmx/JMXEnterpriseTestCase.java 2010-02-17 13:55:15 UTC (rev 101072) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/enterprise/jmx/JMXEnterpriseTestCase.java 2010-02-17 13:56:24 UTC (rev 101073) @@ -59,10 +59,6 @@ OSGiTestHelper helper = new OSGiTestHelper(); runtime = helper.getDefaultRuntime(); runtime.addCapability(new JMXCapability()); - - // Optionally install/start the Apache Aries JMX bundle - if (runtime.getBundle("org.apache.aries.jmx", null) == null) - runtime.installBundle("bundles/org.apache.aries.jmx.jar").start(); } @AfterClass Modified: projects/jboss-osgi/trunk/testsuite/functional/.classpath =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/.classpath 2010-02-17 13:55:15 UTC (rev 101072) +++ projects/jboss-osgi/trunk/testsuite/functional/.classpath 2010-02-17 13:56:24 UTC (rev 101073) @@ -2,7 +2,7 @@ <classpath> <classpathentry kind="src" output="target/test-classes" path="src/test/java"/> <classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/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="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="output" path="target/classes"/> </classpath> Modified: projects/jboss-osgi/trunk/testsuite/functional/.settings/org.eclipse.jdt.core.prefs =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/.settings/org.eclipse.jdt.core.prefs 2010-02-17 13:55:15 UTC (rev 101072) +++ projects/jboss-osgi/trunk/testsuite/functional/.settings/org.eclipse.jdt.core.prefs 2010-02-17 13:56:24 UTC (rev 101073) @@ -1,5 +1,12 @@ -#Wed Feb 04 11:13:20 CET 2009 +#Wed Feb 17 12:17:20 CET 2010 eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -org.eclipse.jdt.core.compiler.compliance=1.5 -org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.6 Modified: projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-bundles.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-bundles.xml 2010-02-17 13:55:15 UTC (rev 101072) +++ projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-bundles.xml 2010-02-17 13:56:24 UTC (rev 101073) @@ -27,6 +27,8 @@ <include>*:jboss-osgi-webapp:jar</include> <include>*:jboss-osgi-xml-binding:jar</include> <include>*:org.apache.aries.blueprint:jar</include> + <include>*:org.apache.aries.jmx:jar</include> + <include>*:org.apache.aries.jndi:jar</include> <include>*:org.apache.aries.util:jar</include> <include>*:org.apache.felix.configadmin:jar</include> <include>*:org.apache.felix.eventadmin:jar</include> Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbossas/jbosgi36/OSGi36TestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbossas/jbosgi36/OSGi36TestCase.java 2010-02-17 13:55:15 UTC (rev 101072) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbossas/jbosgi36/OSGi36TestCase.java 2010-02-17 13:56:24 UTC (rev 101073) @@ -28,7 +28,6 @@ import org.jboss.osgi.jmx.JMXCapability; import org.jboss.osgi.spi.management.MBeanProxy; -import org.jboss.osgi.spi.management.MBeanProxyException; import org.jboss.osgi.testing.OSGiTest; import org.jboss.osgi.testing.OSGiTestHelper; import org.jboss.osgi.testing.internal.RemoteRuntime; @@ -104,7 +103,7 @@ } } - private FooMBean getFooMBean() throws MBeanProxyException + private FooMBean getFooMBean() { FooMBean foo = (FooMBean)MBeanProxy.get(runtime.getMBeanServer(), FooMBean.OBJECT_NAME, FooMBean.class); return foo; Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbossas/jbosgi58/OSGi58TestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbossas/jbosgi58/OSGi58TestCase.java 2010-02-17 13:55:15 UTC (rev 101072) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbossas/jbosgi58/OSGi58TestCase.java 2010-02-17 13:56:24 UTC (rev 101073) @@ -56,7 +56,7 @@ try { StatelessBean bean = getRemoteBean(StatelessBean.class); - String symbolicName = bean.getFraemworkSymbolicName(); + String symbolicName = bean.getFrameworkSymbolicName(); assertEquals("foo", symbolicName); } finally Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbossas/jbosgi58/ejb/StatelessBean.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbossas/jbosgi58/ejb/StatelessBean.java 2010-02-17 13:55:15 UTC (rev 101072) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbossas/jbosgi58/ejb/StatelessBean.java 2010-02-17 13:56:24 UTC (rev 101073) @@ -26,5 +26,5 @@ public interface StatelessBean { - String getFraemworkSymbolicName(); + String getFrameworkSymbolicName(); } \ No newline at end of file Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbossas/jbosgi58/ejb/StatelessBeanImpl.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbossas/jbosgi58/ejb/StatelessBeanImpl.java 2010-02-17 13:55:15 UTC (rev 101072) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbossas/jbosgi58/ejb/StatelessBeanImpl.java 2010-02-17 13:56:24 UTC (rev 101073) @@ -23,24 +23,30 @@ //$Id$ +import java.io.IOException; + import javax.ejb.Remote; import javax.ejb.Stateless; -import javax.management.ObjectName; import org.jboss.ejb3.annotation.Depends; -import org.jboss.osgi.spi.management.ManagedBundle; -import org.jboss.osgi.spi.management.ManagedFrameworkMBean; +import org.osgi.jmx.framework.BundleStateMBean; @Remote @Stateless(name="StatelessBean") public class StatelessBeanImpl implements StatelessBean { - @Depends("jboss.osgi:service=ManagedFramework") - ManagedFrameworkMBean framework; + @Depends(BundleStateMBean.OBJECTNAME) + BundleStateMBean framework; - public String getFraemworkSymbolicName() + public String getFrameworkSymbolicName() { - ObjectName bundle = framework.getBundle(0); - return bundle.getKeyProperty(ManagedBundle.PROPERTY_SYMBOLIC_NAME); + try + { + return framework.getSymbolicName(0); + } + catch (IOException ex) + { + throw new IllegalStateException(ex); + } } } \ No newline at end of file