February 2010 - jboss-osgi-commits

JBoss-OSGI SVN: r101467 - in projects/jboss-osgi/trunk: distribution and 2 other directories.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2010-02-25 06:48:11 -0500 (Thu, 25 Feb 2010) New Revision: 101467 Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml projects/jboss-osgi/trunk/distribution/pom.xml projects/jboss-osgi/trunk/pom.xml projects/jboss-osgi/trunk/testsuite/pom.xml Log: Update felix & equinox runtimes 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-25 11:45:51 UTC (rev 101466) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml 2010-02-25 11:48:11 UTC (rev 101467) @@ -147,9 +147,9 @@ <include name="jboss-osgi-jndi-sources.jar" /> <include name="jboss-osgi-jta-sources.jar" /> <include name="jboss-osgi-reflect-sources.jar" /> - <include name="jboss-osgi-runtime-equinox-sources.jar" /> - <include name="jboss-osgi-runtime-felix-sources.jar" /> - <include name="jboss-osgi-runtime-jbossas-sources.jar" /> + <include name="jboss-osgi-equinox-sources.jar" /> + <include name="jboss-osgi-felix-sources.jar" /> + <include name="jboss-osgi-jbossas-sources.jar" /> <include name="jboss-osgi-spi-sources.jar" /> <include name="jboss-osgi-testing-sources.jar" /> <include name="jboss-osgi-webapp-sources.jar" /> @@ -270,7 +270,7 @@ <singlefile condition="isFelix" src="@{runtime.dir}/server/conf/jboss-osgi-extra-all.properties" target="$INSTALL_PATH/runtime/server/all/conf/jboss-osgi-extra.properties" override="true" /> <fileset condition="isFelix" dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/runtime/lib" override="true"> - <include name="jboss-osgi-runtime-felix.jar" /> + <include name="jboss-osgi-felix.jar" /> <include name="org.apache.felix.framework.jar" /> </fileset> <fileset condition="isFelix" dir="@{deploy.artifacts.dir}/lib/org.osgi" targetdir="$INSTALL_PATH/runtime/server/minimal/deploy" override="true"> @@ -296,7 +296,7 @@ <singlefile condition="isEquinox" src="@{runtime.dir}/server/conf/jboss-osgi-extra-all.properties" target="$INSTALL_PATH/runtime/server/all/conf/jboss-osgi-extra.properties" override="true" /> <fileset condition="isEquinox" dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/runtime/lib" override="true"> - <include name="jboss-osgi-runtime-equinox.jar" /> + <include name="jboss-osgi-equinox.jar" /> <include name="org.eclipse.osgi.jar" /> </fileset> <fileset condition="isEquinox" dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/runtime/server/minimal/deploy" override="true"> @@ -400,7 +400,7 @@ <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer" override="true"> <include name="jboss-osgi-deployers.jar" /> <include name="jboss-osgi-deployment.jar" /> - <include name="jboss-osgi-runtime-jbossas.jar" /> + <include name="jboss-osgi-jbossas.jar" /> <include name="jboss-osgi-spi.jar" /> <include name="jboss-osgi-testing.jar" /> </fileset> @@ -431,7 +431,7 @@ <fileset condition="isFelix" dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer" override="true"> - <include name="jboss-osgi-runtime-felix.jar" /> + <include name="jboss-osgi-felix.jar" /> <include name="org.apache.felix.framework.jar" /> </fileset> <singlefile condition="isFelix" src="@{deploy.artifacts.dir}/resources/jbossas/jboss-beans-felix.xml" target="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer/META-INF/jboss-osgi-jboss-beans.xml" @@ -450,7 +450,7 @@ <fileset condition="isEquinox" dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer" override="true"> - <include name="jboss-osgi-runtime-equinox.jar" /> + <include name="jboss-osgi-equinox.jar" /> <include name="org.apache.equinox.framework.jar" /> <include name="org.eclipse.osgi.jar" /> </fileset> Modified: projects/jboss-osgi/trunk/distribution/pom.xml =================================================================== --- projects/jboss-osgi/trunk/distribution/pom.xml 2010-02-25 11:45:51 UTC (rev 101466) +++ projects/jboss-osgi/trunk/distribution/pom.xml 2010-02-25 11:48:11 UTC (rev 101467) @@ -354,15 +354,15 @@ </dependency> <dependency> <groupId>org.jboss.osgi.runtime</groupId> - <artifactId>jboss-osgi-runtime-jbossas</artifactId> + <artifactId>jboss-osgi-jbossas</artifactId> </dependency> <dependency> <groupId>org.jboss.osgi.runtime</groupId> - <artifactId>jboss-osgi-runtime-jbossas</artifactId> + <artifactId>jboss-osgi-jbossas</artifactId> <version>${version.jboss.osgi.runtime.jbossas}</version> <classifier>sources</classifier> </dependency> -  +   <dependency> @@ -381,11 +381,11 @@  <dependency> <groupId>org.jboss.osgi.runtime</groupId> - <artifactId>jboss-osgi-runtime-equinox</artifactId> + <artifactId>jboss-osgi-equinox</artifactId> </dependency> <dependency> <groupId>org.jboss.osgi.runtime</groupId> - <artifactId>jboss-osgi-runtime-equinox</artifactId> + <artifactId>jboss-osgi-equinox</artifactId> <version>${version.jboss.osgi.runtime.equinox}</version> <classifier>sources</classifier> </dependency> @@ -393,11 +393,11 @@  <dependency> <groupId>org.jboss.osgi.runtime</groupId> - <artifactId>jboss-osgi-runtime-felix</artifactId> + <artifactId>jboss-osgi-felix</artifactId> </dependency> <dependency> <groupId>org.jboss.osgi.runtime</groupId> - <artifactId>jboss-osgi-runtime-felix</artifactId> + <artifactId>jboss-osgi-felix</artifactId> <version>${version.jboss.osgi.runtime.felix}</version> <classifier>sources</classifier> </dependency> Modified: projects/jboss-osgi/trunk/pom.xml =================================================================== --- projects/jboss-osgi/trunk/pom.xml 2010-02-25 11:45:51 UTC (rev 101466) +++ projects/jboss-osgi/trunk/pom.xml 2010-02-25 11:48:11 UTC (rev 101467) @@ -71,7 +71,7 @@ <version.jboss.osgi.runtime.deployers>1.0.5-SNAPSHOT</version.jboss.osgi.runtime.deployers> <version.jboss.osgi.runtime.equinox>3.5.1.SP1-SNAPSHOT</version.jboss.osgi.runtime.equinox> <version.jboss.osgi.runtime.felix>2.0.2.SP1-SNAPSHOT</version.jboss.osgi.runtime.felix> - <version.jboss.osgi.runtime.jbossas>1.0.2</version.jboss.osgi.runtime.jbossas> + <version.jboss.osgi.runtime.jbossas>1.0.3-SNAPSHOT</version.jboss.osgi.runtime.jbossas> <version.jboss.osgi.serviceloader>1.0.0</version.jboss.osgi.serviceloader> <version.jboss.osgi.spi>1.0.5-SNAPSHOT</version.jboss.osgi.spi> <version.jboss.osgi.testing>1.0.0-SNAPSHOT</version.jboss.osgi.testing> @@ -221,21 +221,21 @@ </dependency> <dependency> <groupId>org.jboss.osgi.runtime</groupId> - <artifactId>jboss-osgi-runtime-jbossas</artifactId> + <artifactId>jboss-osgijbossas</artifactId> <version>${version.jboss.osgi.runtime.jbossas}</version> </dependency>  <dependency> <groupId>org.jboss.osgi.runtime</groupId> - <artifactId>jboss-osgi-runtime-equinox</artifactId> + <artifactId>jboss-osgi-equinox</artifactId> <version>${version.jboss.osgi.runtime.equinox}</version> </dependency>  <dependency> <groupId>org.jboss.osgi.runtime</groupId> - <artifactId>jboss-osgi-runtime-felix</artifactId> + <artifactId>jboss-osgi-felix</artifactId> <version>${version.jboss.osgi.runtime.felix}</version> </dependency> <dependency> Modified: projects/jboss-osgi/trunk/testsuite/pom.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/pom.xml 2010-02-25 11:45:51 UTC (rev 101466) +++ projects/jboss-osgi/trunk/testsuite/pom.xml 2010-02-25 11:48:11 UTC (rev 101467) @@ -281,7 +281,7 @@ <dependencies> <dependency> <groupId>org.jboss.osgi.runtime</groupId> - <artifactId>jboss-osgi-runtime-equinox</artifactId> + <artifactId>jboss-osgi-equinox</artifactId> </dependency> </dependencies> </profile> @@ -304,7 +304,7 @@ <dependencies> <dependency> <groupId>org.jboss.osgi.runtime</groupId> - <artifactId>jboss-osgi-runtime-felix</artifactId> + <artifactId>jboss-osgi-felix</artifactId> </dependency> </dependencies> </profile>

15 years, 10 months

1
0
0 / 0

JBoss-OSGI SVN: r101466 - in projects/jboss-osgi/projects/runtime/jbossas/trunk: .settings and 1 other directories.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2010-02-25 06:45:51 -0500 (Thu, 25 Feb 2010) New Revision: 101466 Removed: projects/jboss-osgi/projects/runtime/jbossas/trunk/src/main/java/org/jboss/osgi/integration/jbossas/MicrocontainerDeployerServiceBean.java projects/jboss-osgi/projects/runtime/jbossas/trunk/src/main/java/org/jboss/osgi/integration/jbossas/MicrocontainerServiceBean.java Modified: projects/jboss-osgi/projects/runtime/jbossas/trunk/.classpath projects/jboss-osgi/projects/runtime/jbossas/trunk/.project projects/jboss-osgi/projects/runtime/jbossas/trunk/.settings/org.eclipse.jdt.core.prefs projects/jboss-osgi/projects/runtime/jbossas/trunk/pom.xml Log: Remove MC services. These should only be available with the native framework Modified: projects/jboss-osgi/projects/runtime/jbossas/trunk/.classpath =================================================================== --- projects/jboss-osgi/projects/runtime/jbossas/trunk/.classpath 2010-02-25 11:42:58 UTC (rev 101465) +++ projects/jboss-osgi/projects/runtime/jbossas/trunk/.classpath 2010-02-25 11:45:51 UTC (rev 101466) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" output="target/classes" path="src/main/java"/> - <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/projects/runtime/jbossas/trunk/.project =================================================================== --- projects/jboss-osgi/projects/runtime/jbossas/trunk/.project 2010-02-25 11:42:58 UTC (rev 101465) +++ projects/jboss-osgi/projects/runtime/jbossas/trunk/.project 2010-02-25 11:45:51 UTC (rev 101466) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>jboss-osgi-runtime-jbossas</name> + <name>jboss-osgi-jbossas</name> <comment></comment> <projects> </projects> Modified: projects/jboss-osgi/projects/runtime/jbossas/trunk/.settings/org.eclipse.jdt.core.prefs =================================================================== --- projects/jboss-osgi/projects/runtime/jbossas/trunk/.settings/org.eclipse.jdt.core.prefs 2010-02-25 11:42:58 UTC (rev 101465) +++ projects/jboss-osgi/projects/runtime/jbossas/trunk/.settings/org.eclipse.jdt.core.prefs 2010-02-25 11:45:51 UTC (rev 101466) @@ -1,12 +1,13 @@ -#Wed Feb 04 09:36:33 CET 2009 +#Thu Feb 25 12:26:19 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.targetPlatform=1.6 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.5 +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.5 +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.source=1.6 Modified: projects/jboss-osgi/projects/runtime/jbossas/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/runtime/jbossas/trunk/pom.xml 2010-02-25 11:42:58 UTC (rev 101465) +++ projects/jboss-osgi/projects/runtime/jbossas/trunk/pom.xml 2010-02-25 11:45:51 UTC (rev 101466) @@ -17,7 +17,7 @@ <name>JBossOSGi Runtime - JBossAS</name> <groupId>org.jboss.osgi.runtime</groupId> - <artifactId>jboss-osgi-runtime-jbossas</artifactId> + <artifactId>jboss-osgi-jbossas</artifactId> <packaging>jar</packaging> <version>1.0.3-SNAPSHOT</version> @@ -26,7 +26,7 @@ <parent> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-parent</artifactId> - <version>1.0.4</version> + <version>1.0.5-SNAPSHOT</version> </parent>  @@ -38,8 +38,7 @@  <properties> - <version.jboss.osgi.jta>1.0.0</version.jboss.osgi.jta> - <version.jboss.osgi.microcontainer>2.2.0-SNAPSHOT</version.jboss.osgi.microcontainer> + <version.jboss.osgi.jta>1.0.1-SNAPSHOT</version.jboss.osgi.jta> <version.osgi>4.2.0</version.osgi> </properties> @@ -51,11 +50,6 @@ <version>${version.jboss.osgi.jta}</version> </dependency> <dependency> - <groupId>org.jboss.osgi.bundles</groupId> - <artifactId>jboss-osgi-microcontainer</artifactId> - <version>${version.jboss.osgi.microcontainer}</version> - </dependency> - <dependency> <groupId>org.osgi</groupId> <artifactId>org.osgi.core</artifactId> <version>${version.osgi}</version> @@ -72,31 +66,6 @@  <build> <plugins> - <plugin> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <phase>process-resources</phase> - <goals> - <goal>unpack-dependencies</goal> - </goals> - </execution> - </executions> - <configuration> - <outputDirectory>target/classes</outputDirectory> - <includeGroupIds>org.jboss.osgi.bundles</includeGroupIds> -  - <includeArtifactIds> - jboss-osgi-microcontainer - </includeArtifactIds> - <includes> - org/jboss/osgi/microcontainer/*.class - </includes> - </configuration> - </plugin> </plugins> </build> Deleted: projects/jboss-osgi/projects/runtime/jbossas/trunk/src/main/java/org/jboss/osgi/integration/jbossas/MicrocontainerDeployerServiceBean.java =================================================================== --- projects/jboss-osgi/projects/runtime/jbossas/trunk/src/main/java/org/jboss/osgi/integration/jbossas/MicrocontainerDeployerServiceBean.java 2010-02-25 11:42:58 UTC (rev 101465) +++ projects/jboss-osgi/projects/runtime/jbossas/trunk/src/main/java/org/jboss/osgi/integration/jbossas/MicrocontainerDeployerServiceBean.java 2010-02-25 11:45:51 UTC (rev 101466) @@ -1,89 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.osgi.integration.jbossas; - -//$Id$ - -import java.util.Properties; - -import org.jboss.deployers.client.spi.main.MainDeployer; -import org.jboss.logging.Logger; -import org.jboss.osgi.deployment.deployer.DeployerService; -import org.jboss.osgi.microcontainer.AbstractMicrocontainerDeployerService; -import org.osgi.framework.BundleContext; -import org.osgi.framework.Constants; -import org.osgi.framework.ServiceRegistration; - -/** - * An implementation of the {@link DeployerService} which is installed as MC bean in jbossas. - * - * @author thomas.diesler(a)jboss.com - * @since 05-May-2009 - */ -public class MicrocontainerDeployerServiceBean extends AbstractMicrocontainerDeployerService -{ - // Provide logging - private static Logger log = Logger.getLogger(MicrocontainerDeployerServiceBean.class); - - private MainDeployer mainDeployer; - private BundleContext context; - private ServiceRegistration serviceReg; - - public MainDeployer getMainDeployer() - { - return mainDeployer; - } - - public void setMainDeployer(MainDeployer mainDeployer) - { - this.mainDeployer = mainDeployer; - } - - public BundleContext getBundleContext() - { - return context; - } - - public void setBundleContext(BundleContext context) - { - this.context = context; - } - - public void start() - { - // Register the DeployerService - Properties props = new Properties(); - props.setProperty("provider", "microcontainer"); - props.put(Constants.SERVICE_RANKING, Integer.MAX_VALUE); - serviceReg = context.registerService(DeployerService.class.getName(), this, props); - log.debug("DeployerService registered"); - } - - void stop() - { - if (serviceReg != null) - { - serviceReg.unregister(); - serviceReg = null; - } - } -} \ No newline at end of file Deleted: projects/jboss-osgi/projects/runtime/jbossas/trunk/src/main/java/org/jboss/osgi/integration/jbossas/MicrocontainerServiceBean.java =================================================================== --- projects/jboss-osgi/projects/runtime/jbossas/trunk/src/main/java/org/jboss/osgi/integration/jbossas/MicrocontainerServiceBean.java 2010-02-25 11:42:58 UTC (rev 101465) +++ projects/jboss-osgi/projects/runtime/jbossas/trunk/src/main/java/org/jboss/osgi/integration/jbossas/MicrocontainerServiceBean.java 2010-02-25 11:45:51 UTC (rev 101466) @@ -1,98 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.osgi.integration.jbossas; - - -//$Id$ - -import javax.management.MBeanServer; - -import org.jboss.kernel.Kernel; -import org.jboss.kernel.spi.dependency.KernelController; -import org.jboss.logging.Logger; -import org.jboss.osgi.microcontainer.AbstractMicrocontainerService; -import org.jboss.osgi.spi.management.MicrocontainerServiceMBean; -import org.jboss.osgi.spi.service.MicrocontainerService; -import org.osgi.framework.BundleContext; - -/** - * An implementation of the {@link MicrocontainerService} - * which is installed as MC bean in jbossas. - * - * @author thomas.diesler(a)jboss.com - * @since 05-May-2009 - */ -public class MicrocontainerServiceBean extends AbstractMicrocontainerService implements MicrocontainerServiceMBean -{ - // Provide logging - private static Logger log = Logger.getLogger(MicrocontainerServiceBean.class); - - private BundleContext context; - private MBeanServer mbeanServer; - private Kernel kernel; - - public void setBundleContext(BundleContext bundleContext) - { - this.context = bundleContext; - } - - public void setMbeanServer(MBeanServer mbeanServer) - { - this.mbeanServer = mbeanServer; - } - - public void setKernel(Kernel kernel) - { - this.kernel = kernel; - } - - public Kernel getKernel() - { - return kernel; - } - - public void start() throws Exception - { - Kernel kernel = getKernel(); - KernelController controller = kernel.getController(); - - // Preregister some MC beans - installBean(controller, BEAN_BUNDLE_CONTEXT, context); - installBean(controller, BEAN_KERNEL, kernel); - installBean(controller, BEAN_KERNEL_CONTROLLER, controller); - installBean(controller, BEAN_MBEAN_SERVER, mbeanServer); - - // Register the MicrocontainerService - log.debug("Register MicrocontainerService"); - context.registerService(MicrocontainerService.class.getName(), this, null); - log.debug("MicrocontainerService registered"); - - // Register the MicrocontainerServiceMBean - registerMicrocontainerServiceMBean(mbeanServer); - log.debug("MicrocontainerServiceMBean registered"); - } - - void stop() - { - unregisterMicrocontainerServiceMBean(mbeanServer); - } -} \ No newline at end of file

15 years, 10 months

1
0
0 / 0

JBoss-OSGI SVN: r101465 - projects/jboss-osgi/projects/runtime/deployers/trunk/.settings.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2010-02-25 06:42:58 -0500 (Thu, 25 Feb 2010) New Revision: 101465 Modified: projects/jboss-osgi/projects/runtime/deployers/trunk/.settings/org.eclipse.jdt.core.prefs Log: eclipse prefs Modified: projects/jboss-osgi/projects/runtime/deployers/trunk/.settings/org.eclipse.jdt.core.prefs =================================================================== --- projects/jboss-osgi/projects/runtime/deployers/trunk/.settings/org.eclipse.jdt.core.prefs 2010-02-25 11:33:32 UTC (rev 101464) +++ projects/jboss-osgi/projects/runtime/deployers/trunk/.settings/org.eclipse.jdt.core.prefs 2010-02-25 11:42:58 UTC (rev 101465) @@ -1,12 +1,12 @@ -#Thu Feb 25 08:25:55 CET 2010 +#Thu Feb 25 12:30:55 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.targetPlatform=1.6 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.5 +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.5 +org.eclipse.jdt.core.compiler.source=1.6

15 years, 10 months

1
0
0 / 0

JBoss-OSGI SVN: r101463 - in projects/jboss-osgi: projects/runtime/framework/trunk/src/test/resources/bootstrap and 5 other directories.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2010-02-25 06:20:58 -0500 (Thu, 25 Feb 2010) New Revision: 101463 Removed: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/microcontainer-service-jboss-beans.xml Modified: projects/jboss-osgi/projects/runtime/framework/trunk/src/etc/osgitck/jboss-osgi-bootstrap.xml projects/jboss-osgi/projects/runtime/framework/trunk/src/test/resources/bootstrap/jboss-osgi-bootstrap.xml projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-equinox.xml projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-felix.xml projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-jbossmc.xml projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-bootstrap.xml projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF/jboss-osgi-bootstrap.xml projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/jboss-osgi-bootstrap.xml Log: Remove references to spi.management Modified: projects/jboss-osgi/projects/runtime/framework/trunk/src/etc/osgitck/jboss-osgi-bootstrap.xml =================================================================== --- projects/jboss-osgi/projects/runtime/framework/trunk/src/etc/osgitck/jboss-osgi-bootstrap.xml 2010-02-25 11:14:22 UTC (rev 101462) +++ projects/jboss-osgi/projects/runtime/framework/trunk/src/etc/osgitck/jboss-osgi-bootstrap.xml 2010-02-25 11:20:58 UTC (rev 101463) @@ -35,7 +35,6 @@ 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.osgi.testing;version=1.0 Modified: projects/jboss-osgi/projects/runtime/framework/trunk/src/test/resources/bootstrap/jboss-osgi-bootstrap.xml =================================================================== --- projects/jboss-osgi/projects/runtime/framework/trunk/src/test/resources/bootstrap/jboss-osgi-bootstrap.xml 2010-02-25 11:14:22 UTC (rev 101462) +++ projects/jboss-osgi/projects/runtime/framework/trunk/src/test/resources/bootstrap/jboss-osgi-bootstrap.xml 2010-02-25 11:20:58 UTC (rev 101463) @@ -35,7 +35,6 @@ 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.osgi.testing;version=1.0 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-25 11:14:22 UTC (rev 101462) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml 2010-02-25 11:20:58 UTC (rev 101463) @@ -445,9 +445,6 @@ override="true"> <include name="org.osgi.compendium.jar" /> </fileset> - <fileset condition="isFelix" dir="@{deploy.artifacts.dir}/resources/jbossas" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/osgi" override="true"> - <include name="microcontainer-service-jboss-beans.xml" /> - </fileset>  @@ -466,9 +463,6 @@ <include name="org.eclipse.osgi.util.jar" /> <include name="pax-web-extender-war.jar" /> </fileset> - <fileset condition="isEquinox" dir="@{deploy.artifacts.dir}/resources/jbossas" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/osgi" override="true"> - <include name="microcontainer-service-jboss-beans.xml" /> - </fileset>  Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-equinox.xml =================================================================== --- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-equinox.xml 2010-02-25 11:14:22 UTC (rev 101462) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-equinox.xml 2010-02-25 11:20:58 UTC (rev 101463) @@ -51,7 +51,6 @@ 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.osgi.testing;version=1.0, Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-felix.xml =================================================================== --- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-felix.xml 2010-02-25 11:14:22 UTC (rev 101462) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-felix.xml 2010-02-25 11:20:58 UTC (rev 101463) @@ -51,7 +51,6 @@ 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.osgi.testing;version=1.0, Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-jbossmc.xml =================================================================== --- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-jbossmc.xml 2010-02-25 11:14:22 UTC (rev 101462) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-jbossmc.xml 2010-02-25 11:20:58 UTC (rev 101463) @@ -40,7 +40,6 @@ 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.osgi.testing;version=1.0 Deleted: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/microcontainer-service-jboss-beans.xml =================================================================== --- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/microcontainer-service-jboss-beans.xml 2010-02-25 11:14:22 UTC (rev 101462) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/microcontainer-service-jboss-beans.xml 2010-02-25 11:20:58 UTC (rev 101463) @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - -<deployment xmlns="urn:jboss:bean-deployer:2.0"> - -  - <bean name="jboss.osgi:service=Microcontainer" class="org.jboss.osgi.integration.jbossas.MicrocontainerServiceBean"> - <property name="bundleContext"><inject bean="jboss.osgi:service=Framework" property="bundleContext"/></property> - <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property> - <property name="kernel"><inject bean="jboss.kernel:service=Kernel" /></property> - </bean> - -  - <bean name="jboss.osgi:service=MicrocontainerDeployer" class="org.jboss.osgi.integration.jbossas.MicrocontainerDeployerServiceBean"> - <property name="bundleContext"><inject bean="jboss.osgi:service=Framework" property="bundleContext"/></property> - <property name="mainDeployer"><inject bean="MainDeployer"/></property> - </bean> - -</deployment> Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-bootstrap.xml =================================================================== --- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-bootstrap.xml 2010-02-25 11:14:22 UTC (rev 101462) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-bootstrap.xml 2010-02-25 11:20:58 UTC (rev 101463) @@ -38,7 +38,6 @@ 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.osgi.testing;version=1.0 Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF/jboss-osgi-bootstrap.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2010-02-25 11:14:22 UTC (rev 101462) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2010-02-25 11:20:58 UTC (rev 101463) @@ -35,7 +35,6 @@ 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.osgi.testing;version=1.0 Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/jboss-osgi-bootstrap.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2010-02-25 11:14:22 UTC (rev 101462) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2010-02-25 11:20:58 UTC (rev 101463) @@ -35,7 +35,6 @@ 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.osgi.testing;version=1.0

15 years, 10 months

1
0
0 / 0

JBoss-OSGI SVN: r101461 - in projects/jboss-osgi: projects/bundles/hotdeploy/trunk/src/main/java/org/jboss/osgi/hotdeploy/internal and 22 other directories.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2010-02-25 06:04:39 -0500 (Thu, 25 Feb 2010) New Revision: 101461 Added: projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-api/src/main/java/org/jboss/osgi/jmx/MBeanProxy.java projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-api/src/main/java/org/jboss/osgi/jmx/ObjectNameFactory.java Removed: projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/management/ Modified: projects/jboss-osgi/projects/bundles/hotdeploy/trunk/.classpath projects/jboss-osgi/projects/bundles/hotdeploy/trunk/pom.xml projects/jboss-osgi/projects/bundles/hotdeploy/trunk/src/main/java/org/jboss/osgi/hotdeploy/internal/DeploymentScannerImpl.java projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-api/.classpath projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-api/.settings/org.eclipse.jdt.core.prefs projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/main/java/org/jboss/osgi/jmx/internal/AbstractState.java projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/main/java/org/jboss/osgi/jmx/internal/BundleStateExt.java projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/main/java/org/jboss/osgi/jmx/internal/FrameworkStateExt.java projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/main/java/org/jboss/osgi/jmx/internal/ServiceStateExt.java projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/test/java/org/jboss/test/osgi/jmx/AbstractTestCase.java projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/test/java/org/jboss/test/osgi/jmx/BundleStateTestCase.java projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/test/java/org/jboss/test/osgi/jmx/FrameworkTestCase.java projects/jboss-osgi/projects/runtime/deployment/trunk/.settings/org.eclipse.jdt.core.prefs projects/jboss-osgi/projects/runtime/deployment/trunk/src/main/java/org/jboss/osgi/deployment/DeploymentServicesActivator.java projects/jboss-osgi/projects/runtime/deployment/trunk/src/main/java/org/jboss/osgi/deployment/deployer/DeployerService.java projects/jboss-osgi/projects/runtime/deployment/trunk/src/main/java/org/jboss/osgi/deployment/internal/SystemDeployerService.java projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/service/internal/MicrocontainerServiceImpl.java projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/internal/MainDeployerClient.java projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/internal/OSGiRuntimeImpl.java projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/internal/RemoteBundle.java projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/internal/RemotePackageAdmin.java projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/internal/RemoteRuntime.java 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/jmx/JMXTestCase.java projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/jmx/bundle/FooMBean.java projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/microcontainer/MicrocontainerTestCase.java projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/microcontainer/bundleA/SomeBeanMBean.java projects/jboss-osgi/trunk/testsuite/example/src/test/resources/mcservice/example-mcservice-bundleA.bnd projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi108/OSGi108TestCase.java projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi108/bundleA/SomeBeanMBean.java 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/mbean/FooMBean.java Log: Migrate spi.management to jmx API Modified: projects/jboss-osgi/projects/bundles/hotdeploy/trunk/.classpath =================================================================== --- projects/jboss-osgi/projects/bundles/hotdeploy/trunk/.classpath 2010-02-25 10:16:44 UTC (rev 101460) +++ projects/jboss-osgi/projects/bundles/hotdeploy/trunk/.classpath 2010-02-25 11:04:39 UTC (rev 101461) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" output="target/classes" path="src/main/java"/> - <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/projects/bundles/hotdeploy/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/bundles/hotdeploy/trunk/pom.xml 2010-02-25 10:16:44 UTC (rev 101460) +++ projects/jboss-osgi/projects/bundles/hotdeploy/trunk/pom.xml 2010-02-25 11:04:39 UTC (rev 101461) @@ -39,7 +39,7 @@  <properties> - <version.jboss.osgi.common>1.0.3</version.jboss.osgi.common> + <version.jboss.osgi.common>1.0.4-SNAPSHOT</version.jboss.osgi.common> <version.jboss.osgi.deployment>1.0.2-SNAPSHOT</version.jboss.osgi.deployment> <version.jboss.osgi.spi>1.0.5-SNAPSHOT</version.jboss.osgi.spi> <version.osgi>4.2.0</version.osgi> Modified: projects/jboss-osgi/projects/bundles/hotdeploy/trunk/src/main/java/org/jboss/osgi/hotdeploy/internal/DeploymentScannerImpl.java =================================================================== --- projects/jboss-osgi/projects/bundles/hotdeploy/trunk/src/main/java/org/jboss/osgi/hotdeploy/internal/DeploymentScannerImpl.java 2010-02-25 10:16:44 UTC (rev 101460) +++ projects/jboss-osgi/projects/bundles/hotdeploy/trunk/src/main/java/org/jboss/osgi/hotdeploy/internal/DeploymentScannerImpl.java 2010-02-25 11:04:39 UTC (rev 101461) @@ -332,7 +332,7 @@ { try { - return file.toURL(); + return file.toURI().toURL(); } catch (MalformedURLException ex) { Modified: projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-api/.classpath =================================================================== --- projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-api/.classpath 2010-02-25 10:16:44 UTC (rev 101460) +++ projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-api/.classpath 2010-02-25 11:04:39 UTC (rev 101461) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" output="target/classes" path="src/main/java"/> - <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/projects/bundles/jmx/trunk/jmx-api/.settings/org.eclipse.jdt.core.prefs =================================================================== --- projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-api/.settings/org.eclipse.jdt.core.prefs 2010-02-25 10:16:44 UTC (rev 101460) +++ projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-api/.settings/org.eclipse.jdt.core.prefs 2010-02-25 11:04:39 UTC (rev 101461) @@ -1,6 +1,13 @@ -#Fri Feb 19 14:10:33 CET 2010 +#Thu Feb 25 11:17:38 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.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.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.source=1.6 Copied: projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-api/src/main/java/org/jboss/osgi/jmx/MBeanProxy.java (from rev 101458, projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/management/MBeanProxy.java) =================================================================== --- projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-api/src/main/java/org/jboss/osgi/jmx/MBeanProxy.java (rev 0) +++ projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-api/src/main/java/org/jboss/osgi/jmx/MBeanProxy.java 2010-02-25 11:04:39 UTC (rev 101461) @@ -0,0 +1,42 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.osgi.jmx; + +// $Id: MBeanProxy.java 101072 2010-02-17 13:55:15Z thomas.diesler(a)jboss.com $ + +import javax.management.MBeanServerConnection; +import javax.management.MBeanServerInvocationHandler; +import javax.management.ObjectName; + +/** + * A simple MBeanProxy + * + * @author Thomas.Diesler(a)jboss.com + * @since 24-Feb-2009 + */ +public class MBeanProxy +{ + public static <T> T get(MBeanServerConnection server, ObjectName name, Class<T> interf) + { + return (T)MBeanServerInvocationHandler.newProxyInstance(server, name, interf, false); + } +} Copied: projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-api/src/main/java/org/jboss/osgi/jmx/ObjectNameFactory.java (from rev 101458, projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/management/ObjectNameFactory.java) =================================================================== --- projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-api/src/main/java/org/jboss/osgi/jmx/ObjectNameFactory.java (rev 0) +++ projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-api/src/main/java/org/jboss/osgi/jmx/ObjectNameFactory.java 2010-02-25 11:04:39 UTC (rev 101461) @@ -0,0 +1,74 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.osgi.jmx; + +// $Id: ObjectNameFactory.java 101072 2010-02-17 13:55:15Z thomas.diesler(a)jboss.com $ + +import java.util.Hashtable; + +import javax.management.MalformedObjectNameException; +import javax.management.ObjectName; + +/** + * A simple factory for creating safe object names. + * + * @author Thomas.Diesler(a)jboss.org + * @since 08-May-2006 + */ +public class ObjectNameFactory +{ + public static ObjectName create(String name) + { + try + { + return new ObjectName(name); + } + catch (MalformedObjectNameException e) + { + throw new Error("Invalid ObjectName: " + name + "; " + e); + } + } + + public static ObjectName create(String domain, String key, String value) + { + try + { + return new ObjectName(domain, key, value); + } + catch (MalformedObjectNameException e) + { + throw new Error("Invalid ObjectName: " + domain + "," + key + "," + value + "; " + e); + } + } + + public static ObjectName create(String domain, Hashtable<String, String> table) + { + try + { + return new ObjectName(domain, table); + } + catch (MalformedObjectNameException e) + { + throw new Error("Invalid ObjectName: " + domain + "," + table + "; " + e); + } + } +} Modified: projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/main/java/org/jboss/osgi/jmx/internal/AbstractState.java =================================================================== --- projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/main/java/org/jboss/osgi/jmx/internal/AbstractState.java 2010-02-25 10:16:44 UTC (rev 101460) +++ projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/main/java/org/jboss/osgi/jmx/internal/AbstractState.java 2010-02-25 11:04:39 UTC (rev 101461) @@ -30,8 +30,8 @@ import javax.management.StandardMBean; import org.jboss.logging.Logger; -import org.jboss.osgi.spi.management.MBeanProxy; -import org.jboss.osgi.spi.management.ObjectNameFactory; +import org.jboss.osgi.jmx.MBeanProxy; +import org.jboss.osgi.jmx.ObjectNameFactory; import org.osgi.framework.BundleContext; import org.osgi.jmx.framework.BundleStateMBean; import org.osgi.jmx.framework.FrameworkMBean; Modified: projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/main/java/org/jboss/osgi/jmx/internal/BundleStateExt.java =================================================================== --- projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/main/java/org/jboss/osgi/jmx/internal/BundleStateExt.java 2010-02-25 10:16:44 UTC (rev 101460) +++ projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/main/java/org/jboss/osgi/jmx/internal/BundleStateExt.java 2010-02-25 11:04:39 UTC (rev 101461) @@ -45,7 +45,7 @@ import javax.management.openmbean.TabularDataSupport; import org.jboss.osgi.jmx.BundleStateMBeanExt; -import org.jboss.osgi.spi.management.ObjectNameFactory; +import org.jboss.osgi.jmx.ObjectNameFactory; import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceReference; Modified: projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/main/java/org/jboss/osgi/jmx/internal/FrameworkStateExt.java =================================================================== --- projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/main/java/org/jboss/osgi/jmx/internal/FrameworkStateExt.java 2010-02-25 10:16:44 UTC (rev 101460) +++ projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/main/java/org/jboss/osgi/jmx/internal/FrameworkStateExt.java 2010-02-25 11:04:39 UTC (rev 101461) @@ -32,7 +32,7 @@ import javax.management.openmbean.CompositeData; import org.jboss.osgi.jmx.FrameworkMBeanExt; -import org.jboss.osgi.spi.management.ObjectNameFactory; +import org.jboss.osgi.jmx.ObjectNameFactory; import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceReference; import org.osgi.jmx.framework.FrameworkMBean; Modified: projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/main/java/org/jboss/osgi/jmx/internal/ServiceStateExt.java =================================================================== --- projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/main/java/org/jboss/osgi/jmx/internal/ServiceStateExt.java 2010-02-25 10:16:44 UTC (rev 101460) +++ projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/main/java/org/jboss/osgi/jmx/internal/ServiceStateExt.java 2010-02-25 11:04:39 UTC (rev 101461) @@ -39,8 +39,8 @@ import javax.management.openmbean.TabularData; import javax.management.openmbean.TabularDataSupport; +import org.jboss.osgi.jmx.ObjectNameFactory; import org.jboss.osgi.jmx.ServiceStateMBeanExt; -import org.jboss.osgi.spi.management.ObjectNameFactory; import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; import org.osgi.framework.Constants; Modified: projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/test/java/org/jboss/test/osgi/jmx/AbstractTestCase.java =================================================================== --- projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/test/java/org/jboss/test/osgi/jmx/AbstractTestCase.java 2010-02-25 10:16:44 UTC (rev 101460) +++ projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/test/java/org/jboss/test/osgi/jmx/AbstractTestCase.java 2010-02-25 11:04:39 UTC (rev 101461) @@ -30,11 +30,11 @@ import javax.management.ObjectName; import org.jboss.osgi.jmx.FrameworkMBeanExt; +import org.jboss.osgi.jmx.MBeanProxy; +import org.jboss.osgi.jmx.ObjectNameFactory; import org.jboss.osgi.jmx.ServiceStateMBeanExt; import org.jboss.osgi.spi.framework.OSGiBootstrap; import org.jboss.osgi.spi.framework.OSGiBootstrapProvider; -import org.jboss.osgi.spi.management.MBeanProxy; -import org.jboss.osgi.spi.management.ObjectNameFactory; import org.junit.AfterClass; import org.junit.BeforeClass; import org.osgi.framework.BundleContext; Modified: projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/test/java/org/jboss/test/osgi/jmx/BundleStateTestCase.java =================================================================== --- projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/test/java/org/jboss/test/osgi/jmx/BundleStateTestCase.java 2010-02-25 10:16:44 UTC (rev 101460) +++ projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/test/java/org/jboss/test/osgi/jmx/BundleStateTestCase.java 2010-02-25 11:04:39 UTC (rev 101461) @@ -30,7 +30,7 @@ import javax.management.openmbean.TabularData; import org.jboss.osgi.jmx.BundleStateMBeanExt; -import org.jboss.osgi.spi.management.ObjectNameFactory; +import org.jboss.osgi.jmx.ObjectNameFactory; import org.junit.Test; import org.osgi.framework.Bundle; import org.osgi.jmx.framework.BundleStateMBean; Modified: projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/test/java/org/jboss/test/osgi/jmx/FrameworkTestCase.java =================================================================== --- projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/test/java/org/jboss/test/osgi/jmx/FrameworkTestCase.java 2010-02-25 10:16:44 UTC (rev 101460) +++ projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/test/java/org/jboss/test/osgi/jmx/FrameworkTestCase.java 2010-02-25 11:04:39 UTC (rev 101461) @@ -28,7 +28,7 @@ import javax.management.ObjectName; import org.jboss.osgi.jmx.FrameworkMBeanExt; -import org.jboss.osgi.spi.management.ObjectNameFactory; +import org.jboss.osgi.jmx.ObjectNameFactory; import org.junit.Test; import org.osgi.jmx.framework.FrameworkMBean; Modified: projects/jboss-osgi/projects/runtime/deployment/trunk/.settings/org.eclipse.jdt.core.prefs =================================================================== --- projects/jboss-osgi/projects/runtime/deployment/trunk/.settings/org.eclipse.jdt.core.prefs 2010-02-25 10:16:44 UTC (rev 101460) +++ projects/jboss-osgi/projects/runtime/deployment/trunk/.settings/org.eclipse.jdt.core.prefs 2010-02-25 11:04:39 UTC (rev 101461) @@ -1,13 +1,13 @@ -#Wed Feb 17 12:15:07 CET 2010 +#Thu Feb 25 11:21:35 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.targetPlatform=1.6 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.5 +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.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.source=1.6 Modified: projects/jboss-osgi/projects/runtime/deployment/trunk/src/main/java/org/jboss/osgi/deployment/DeploymentServicesActivator.java =================================================================== --- projects/jboss-osgi/projects/runtime/deployment/trunk/src/main/java/org/jboss/osgi/deployment/DeploymentServicesActivator.java 2010-02-25 10:16:44 UTC (rev 101460) +++ projects/jboss-osgi/projects/runtime/deployment/trunk/src/main/java/org/jboss/osgi/deployment/DeploymentServicesActivator.java 2010-02-25 11:04:39 UTC (rev 101461) @@ -25,15 +25,11 @@ import java.util.Properties; -import javax.management.MBeanServer; - import org.jboss.osgi.deployment.deployer.DeployerService; import org.jboss.osgi.deployment.deployer.DeploymentRegistryService; import org.jboss.osgi.deployment.internal.DeploymentRegistryServiceImpl; import org.jboss.osgi.deployment.internal.SystemDeployerService; import org.osgi.framework.BundleContext; -import org.osgi.framework.ServiceReference; -import org.osgi.util.tracker.ServiceTracker; /** * An activator for the deployment services. @@ -58,38 +54,8 @@ // Register the SystemDeployerService Properties props = new Properties(); props.put("provider", "system"); - final SystemDeployerService deployerService = new SystemDeployerService(context); + SystemDeployerService deployerService = new SystemDeployerService(context); context.registerService(DeployerService.class.getName(), deployerService, props); - - // Track other DeployerService implementations and register as MBean - ServiceTracker serviceTracker = new ServiceTracker(context, DeployerService.class.getName(), null) - { - @Override - public Object addingService(ServiceReference reference) - { - DeployerService service = (DeployerService)super.addingService(reference); - ServiceReference sref = context.getServiceReference(MBeanServer.class.getName()); - if (sref != null) - { - MBeanServer mbeanServer = (MBeanServer)context.getService(sref); - deployerService.registerDeployerServiceMBean(context, mbeanServer); - } - return service; - } - - @Override - public void removedService(ServiceReference reference, Object service) - { - ServiceReference sref = context.getServiceReference(MBeanServer.class.getName()); - if (sref != null) - { - MBeanServer mbeanServer = (MBeanServer)context.getService(sref); - deployerService.unregisterDeployerServiceMBean(mbeanServer); - } - super.removedService(reference, service); - } - }; - serviceTracker.open(); } public void stop(BundleContext context) Modified: projects/jboss-osgi/projects/runtime/deployment/trunk/src/main/java/org/jboss/osgi/deployment/deployer/DeployerService.java =================================================================== --- projects/jboss-osgi/projects/runtime/deployment/trunk/src/main/java/org/jboss/osgi/deployment/deployer/DeployerService.java 2010-02-25 10:16:44 UTC (rev 101460) +++ projects/jboss-osgi/projects/runtime/deployment/trunk/src/main/java/org/jboss/osgi/deployment/deployer/DeployerService.java 2010-02-25 11:04:39 UTC (rev 101461) @@ -25,9 +25,6 @@ import java.net.URL; -import javax.management.ObjectName; - -import org.jboss.osgi.spi.management.ObjectNameFactory; import org.jboss.osgi.spi.util.BundleInfo; import org.jboss.virtual.VirtualFile; import org.osgi.framework.BundleException; @@ -40,11 +37,6 @@ */ public interface DeployerService { - /** - * The object name under which this is registered: 'jboss.osgi:service=DeployerService' - */ - ObjectName MBEAN_DEPLOYER_SERVICE = ObjectNameFactory.create("jboss.osgi:service=DeployerService"); - /** * Create a deployment from the given location. */ @@ -69,14 +61,4 @@ * Undeploy an array of bundles */ void undeploy(Deployment[] bundleDeps) throws BundleException; - - /** - * Deploy bundle from URL - */ - void deploy(URL url) throws BundleException; - - /** - * Undeploy bundle from URL. - */ - void undeploy(URL url) throws BundleException; } \ No newline at end of file Modified: projects/jboss-osgi/projects/runtime/deployment/trunk/src/main/java/org/jboss/osgi/deployment/internal/SystemDeployerService.java =================================================================== --- projects/jboss-osgi/projects/runtime/deployment/trunk/src/main/java/org/jboss/osgi/deployment/internal/SystemDeployerService.java 2010-02-25 10:16:44 UTC (rev 101460) +++ projects/jboss-osgi/projects/runtime/deployment/trunk/src/main/java/org/jboss/osgi/deployment/internal/SystemDeployerService.java 2010-02-25 11:04:39 UTC (rev 101461) @@ -23,17 +23,12 @@ //$Id$ -import java.net.URL; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Map.Entry; -import javax.management.JMException; -import javax.management.MBeanServer; -import javax.management.StandardMBean; - import org.jboss.logging.Logger; import org.jboss.osgi.deployment.deployer.AbstractDeployerService; import org.jboss.osgi.deployment.deployer.DeployerService; @@ -66,29 +61,9 @@ public SystemDeployerService(BundleContext context) { this.context = context; - - // Track the MBeanServer and register the DeployerService - ServiceTracker jmxTracker = new ServiceTracker(context, MBeanServer.class.getName(), null) - { - @Override - public Object addingService(ServiceReference reference) - { - MBeanServer mbeanServer = (MBeanServer)super.addingService(reference); - registerDeployerServiceMBean(context, mbeanServer); - return mbeanServer; - } - - @Override - public void removedService(ServiceReference reference, Object service) - { - MBeanServer mbeanServer = (MBeanServer)service; - unregisterDeployerServiceMBean(mbeanServer); - super.removedService(reference, service); - } - }; - jmxTracker.open(); } + @Override public void deploy(Deployment[] depArr) throws BundleException { DeploymentRegistryService registry = getDeploymentRegistry(); @@ -159,6 +134,7 @@ } } + @Override public void undeploy(Deployment[] depArr) throws BundleException { DeploymentRegistryService registry = getDeploymentRegistry(); @@ -181,26 +157,6 @@ } } - public void deploy(URL url) throws BundleException - { - Deployment dep = createDeployment(url); - deploy(new Deployment[] { dep }); - } - - public void undeploy(URL url) throws BundleException - { - DeploymentRegistryService registry = getDeploymentRegistry(); - Deployment dep = registry.getDeployment(url); - if (dep != null) - { - undeploy(new Deployment[] { dep }); - } - else - { - log.warn("Cannot find deployment for: " + url); - } - } - private Bundle getBundle(Deployment dep) { String symbolicName = dep.getSymbolicName(); @@ -240,41 +196,4 @@ } return (StartLevel)startLevelTracker.getService(); } - - public void registerDeployerServiceMBean(BundleContext context, MBeanServer mbeanServer) - { - try - { - // Get the DeployerService with the highest ranking - ServiceReference sref = context.getServiceReference(DeployerService.class.getName()); - if (sref == null) - throw new IllegalStateException("Cannot obtain deployer service"); - - // Unregister the DeployerService with a potentialy lower ranking - if (mbeanServer.isRegistered(DeployerService.MBEAN_DEPLOYER_SERVICE)) - mbeanServer.unregisterMBean(DeployerService.MBEAN_DEPLOYER_SERVICE); - - // Register the DeployerService with the highest ranking - DeployerService service = (DeployerService)context.getService(sref); - StandardMBean mbean = new StandardMBean(service, DeployerService.class); - mbeanServer.registerMBean(mbean, DeployerService.MBEAN_DEPLOYER_SERVICE); - } - catch (JMException ex) - { - throw new IllegalStateException("Cannot register DeployerService MBean", ex); - } - } - - public void unregisterDeployerServiceMBean(MBeanServer mbeanServer) - { - try - { - if (mbeanServer.isRegistered(DeployerService.MBEAN_DEPLOYER_SERVICE)) - mbeanServer.unregisterMBean(DeployerService.MBEAN_DEPLOYER_SERVICE); - } - catch (JMException ex) - { - log.error("Cannot unregister DeployerService MBean", ex); - } - } } \ No newline at end of file Modified: projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/service/internal/MicrocontainerServiceImpl.java =================================================================== --- projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/service/internal/MicrocontainerServiceImpl.java 2010-02-25 10:16:44 UTC (rev 101460) +++ projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/service/internal/MicrocontainerServiceImpl.java 2010-02-25 11:04:39 UTC (rev 101461) @@ -28,7 +28,6 @@ import java.util.List; import javax.management.MBeanServer; -import javax.management.StandardMBean; import org.jboss.dependency.plugins.AbstractController; import org.jboss.dependency.plugins.AbstractControllerContext; @@ -40,11 +39,9 @@ import org.jboss.kernel.Kernel; import org.jboss.kernel.spi.dependency.KernelController; import org.jboss.kernel.spi.dependency.KernelControllerContext; -import org.jboss.logging.Logger; import org.jboss.osgi.framework.bundle.OSGiBundleManager; import org.jboss.osgi.framework.plugins.MicrocontainerServicePlugin; import org.jboss.osgi.framework.plugins.internal.AbstractServicePlugin; -import org.jboss.osgi.spi.management.MicrocontainerServiceMBean; import org.jboss.osgi.spi.service.MicrocontainerService; import org.osgi.framework.Constants; import org.osgi.framework.InvalidSyntaxException; @@ -59,11 +56,8 @@ * @author thomas.diesler(a)jboss.com * @since 31-Aug-2009 */ -public class MicrocontainerServiceImpl extends AbstractServicePlugin implements MicrocontainerServicePlugin, MicrocontainerServiceMBean +public class MicrocontainerServiceImpl extends AbstractServicePlugin implements MicrocontainerServicePlugin { - /** The log */ - private static final Logger log = Logger.getLogger(MicrocontainerServiceImpl.class); - private Kernel kernel; private ServiceRegistration registration; @@ -83,7 +77,7 @@ try { String filter = "(" + Constants.OBJECTCLASS + "=" + MBeanServer.class.getName() + ")"; - getSystemContext().addServiceListener(new JMXServiceListener(this), filter); + getSystemContext().addServiceListener(new JMXServiceListener(), filter); } catch (InvalidSyntaxException ex) { @@ -144,45 +138,21 @@ } } - private void registerMBeans(MBeanServer server, MicrocontainerServiceMBean mbeanImpl) + private void uninstallKernelBean(String beanName) { + KernelController controller = kernel.getController(); try { - if (server != null) - { - installKernelBean(BEAN_MBEAN_SERVER, server); - StandardMBean mbean = new StandardMBean(mbeanImpl, MicrocontainerServiceMBean.class); - server.registerMBean(mbean, MBEAN_MICROCONTAINER_SERVICE); - } + controller.uninstall(beanName); } - catch (Exception ex) + catch (Throwable th) { - throw new IllegalStateException("Cannot register MicrocontainerServiceMBean", ex); + throw new IllegalStateException("Cannot uninstall kernel bean: " + beanName, th); } } - private void unregisterMBeans(MBeanServer server) - { - try - { - if (server != null && server.isRegistered(MBEAN_MICROCONTAINER_SERVICE)) - server.unregisterMBean(MBEAN_MICROCONTAINER_SERVICE); - } - catch (Exception ex) - { - log.warn("Cannot unregister MicrocontainerServiceMBean", ex); - } - } - class JMXServiceListener implements ServiceListener { - private MicrocontainerServiceMBean mbean; - - public JMXServiceListener(MicrocontainerServiceMBean mbean) - { - this.mbean = mbean; - } - public void serviceChanged(ServiceEvent event) { ServiceReference sref = event.getServiceReference(); @@ -191,12 +161,23 @@ switch (type) { case ServiceEvent.REGISTERED: - registerMBeans(server, mbean); + registerMBeanServer(server); break; case ServiceEvent.UNREGISTERING: - unregisterMBeans(server); + unregisterMBeanServer(server); break; } } + + private void registerMBeanServer(MBeanServer server) + { + if (server != null) + installKernelBean(BEAN_MBEAN_SERVER, server); + } + + private void unregisterMBeanServer(MBeanServer server) + { + uninstallKernelBean(BEAN_MBEAN_SERVER); + } } } \ No newline at end of file Modified: projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/internal/MainDeployerClient.java =================================================================== --- projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/internal/MainDeployerClient.java 2010-02-25 10:16:44 UTC (rev 101460) +++ projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/internal/MainDeployerClient.java 2010-02-25 11:04:39 UTC (rev 101461) @@ -28,7 +28,7 @@ import javax.management.MBeanException; import javax.management.ObjectName; -import org.jboss.osgi.spi.management.ObjectNameFactory; +import org.jboss.osgi.jmx.ObjectNameFactory; import org.jboss.osgi.testing.OSGiRuntime; import org.osgi.framework.BundleException; Modified: projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/internal/OSGiRuntimeImpl.java =================================================================== --- projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/internal/OSGiRuntimeImpl.java 2010-02-25 10:16:44 UTC (rev 101460) +++ projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/internal/OSGiRuntimeImpl.java 2010-02-25 11:04:39 UTC (rev 101461) @@ -41,9 +41,9 @@ import javax.naming.NamingException; import org.jboss.logging.Logger; +import org.jboss.osgi.jmx.MBeanProxy; +import org.jboss.osgi.jmx.ObjectNameFactory; import org.jboss.osgi.spi.capability.Capability; -import org.jboss.osgi.spi.management.MBeanProxy; -import org.jboss.osgi.spi.management.ObjectNameFactory; import org.jboss.osgi.spi.util.BundleInfo; import org.jboss.osgi.testing.OSGiBundle; import org.jboss.osgi.testing.OSGiRuntime; Modified: projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/internal/RemoteBundle.java =================================================================== --- projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/internal/RemoteBundle.java 2010-02-25 10:16:44 UTC (rev 101460) +++ projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/internal/RemoteBundle.java 2010-02-25 11:04:39 UTC (rev 101461) @@ -40,8 +40,8 @@ import org.jboss.logging.Logger; import org.jboss.osgi.jmx.BundleStateMBeanExt; -import org.jboss.osgi.spi.management.MBeanProxy; -import org.jboss.osgi.spi.management.ObjectNameFactory; +import org.jboss.osgi.jmx.MBeanProxy; +import org.jboss.osgi.jmx.ObjectNameFactory; import org.jboss.osgi.spi.util.UnmodifiableDictionary; import org.jboss.osgi.testing.OSGiBundle; import org.jboss.osgi.testing.OSGiRuntime; Modified: projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/internal/RemotePackageAdmin.java =================================================================== --- projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/internal/RemotePackageAdmin.java 2010-02-25 10:16:44 UTC (rev 101460) +++ projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/internal/RemotePackageAdmin.java 2010-02-25 11:04:39 UTC (rev 101461) @@ -26,8 +26,8 @@ import javax.management.ObjectName; import org.jboss.osgi.jmx.FrameworkMBeanExt; -import org.jboss.osgi.spi.management.MBeanProxy; -import org.jboss.osgi.spi.management.ObjectNameFactory; +import org.jboss.osgi.jmx.MBeanProxy; +import org.jboss.osgi.jmx.ObjectNameFactory; import org.jboss.osgi.testing.OSGiBundle; import org.jboss.osgi.testing.OSGiPackageAdmin; import org.jboss.osgi.testing.OSGiRuntime; Modified: projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/internal/RemoteRuntime.java =================================================================== --- projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/internal/RemoteRuntime.java 2010-02-25 10:16:44 UTC (rev 101460) +++ projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/internal/RemoteRuntime.java 2010-02-25 11:04:39 UTC (rev 101461) @@ -39,9 +39,9 @@ import javax.naming.InitialContext; import javax.naming.NamingException; +import org.jboss.osgi.jmx.MBeanProxy; +import org.jboss.osgi.jmx.ObjectNameFactory; import org.jboss.osgi.jmx.ServiceStateMBeanExt; -import org.jboss.osgi.spi.management.MBeanProxy; -import org.jboss.osgi.spi.management.ObjectNameFactory; import org.jboss.osgi.spi.util.BundleInfo; import org.jboss.osgi.testing.OSGiBundle; import org.jboss.osgi.testing.OSGiPackageAdmin; 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-25 10:16:44 UTC (rev 101460) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/enterprise/jmx/JMXEnterpriseTestCase.java 2010-02-25 11:04:39 UTC (rev 101461) @@ -31,8 +31,8 @@ import javax.management.openmbean.TabularData; import org.jboss.osgi.jmx.JMXCapability; -import org.jboss.osgi.spi.management.MBeanProxy; -import org.jboss.osgi.spi.management.ObjectNameFactory; +import org.jboss.osgi.jmx.MBeanProxy; +import org.jboss.osgi.jmx.ObjectNameFactory; import org.jboss.osgi.testing.OSGiRuntime; import org.jboss.osgi.testing.OSGiTest; import org.jboss.osgi.testing.OSGiTestHelper; Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/jmx/JMXTestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/jmx/JMXTestCase.java 2010-02-25 10:16:44 UTC (rev 101460) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/jmx/JMXTestCase.java 2010-02-25 11:04:39 UTC (rev 101461) @@ -27,8 +27,8 @@ import static org.junit.Assert.assertEquals; import org.jboss.osgi.jmx.JMXCapability; +import org.jboss.osgi.jmx.MBeanProxy; import org.jboss.osgi.jndi.JNDICapability; -import org.jboss.osgi.spi.management.MBeanProxy; import org.jboss.osgi.testing.OSGiBundle; import org.jboss.osgi.testing.OSGiRuntime; import org.jboss.osgi.testing.OSGiTestHelper; Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/jmx/bundle/FooMBean.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/jmx/bundle/FooMBean.java 2010-02-25 10:16:44 UTC (rev 101460) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/jmx/bundle/FooMBean.java 2010-02-25 11:04:39 UTC (rev 101461) @@ -23,7 +23,7 @@ import javax.management.ObjectName; -import org.jboss.osgi.spi.management.ObjectNameFactory; +import org.jboss.osgi.jmx.ObjectNameFactory; //$Id$ Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/microcontainer/MicrocontainerTestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/microcontainer/MicrocontainerTestCase.java 2010-02-25 10:16:44 UTC (rev 101460) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/microcontainer/MicrocontainerTestCase.java 2010-02-25 11:04:39 UTC (rev 101461) @@ -27,7 +27,7 @@ import static org.junit.Assert.assertEquals; import org.jboss.osgi.jmx.JMXCapability; -import org.jboss.osgi.spi.management.MBeanProxy; +import org.jboss.osgi.jmx.MBeanProxy; import org.jboss.osgi.testing.OSGiBundle; import org.jboss.osgi.testing.OSGiRuntime; import org.jboss.osgi.testing.OSGiTestHelper; Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/microcontainer/bundleA/SomeBeanMBean.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/microcontainer/bundleA/SomeBeanMBean.java 2010-02-25 10:16:44 UTC (rev 101460) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/microcontainer/bundleA/SomeBeanMBean.java 2010-02-25 11:04:39 UTC (rev 101461) @@ -23,7 +23,7 @@ import javax.management.ObjectName; -import org.jboss.osgi.spi.management.ObjectNameFactory; +import org.jboss.osgi.jmx.ObjectNameFactory; //$Id$ Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/resources/mcservice/example-mcservice-bundleA.bnd =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/src/test/resources/mcservice/example-mcservice-bundleA.bnd 2010-02-25 10:16:44 UTC (rev 101460) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/resources/mcservice/example-mcservice-bundleA.bnd 2010-02-25 11:04:39 UTC (rev 101461) @@ -3,6 +3,6 @@ Bundle-SymbolicName: example-mcservice-bundleA Bundle-Activator: org.jboss.test.osgi.example.microcontainer.bundleA.SomeServiceActivator Export-Package: org.jboss.test.osgi.example.microcontainer.bundleA -Import-Package: javax.management, org.jboss.osgi.spi.management, org.jboss.osgi.spi.service, org.osgi.framework +Import-Package: javax.management, org.jboss.osgi.jmx, org.jboss.osgi.spi.service, org.osgi.framework Include-Resource: META-INF/mcservice-jboss-beans.xml=META-INF/mcservice-jboss-beans.xml -removeheaders: Include-Resource Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi108/OSGi108TestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi108/OSGi108TestCase.java 2010-02-25 10:16:44 UTC (rev 101460) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi108/OSGi108TestCase.java 2010-02-25 11:04:39 UTC (rev 101461) @@ -28,8 +28,8 @@ import java.util.List; import org.jboss.osgi.jmx.JMXCapability; +import org.jboss.osgi.jmx.MBeanProxy; import org.jboss.osgi.spi.capability.LogServiceCapability; -import org.jboss.osgi.spi.management.MBeanProxy; import org.jboss.osgi.testing.OSGiBundle; import org.jboss.osgi.testing.OSGiPackageAdmin; import org.jboss.osgi.testing.OSGiRuntime; Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi108/bundleA/SomeBeanMBean.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi108/bundleA/SomeBeanMBean.java 2010-02-25 10:16:44 UTC (rev 101460) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi108/bundleA/SomeBeanMBean.java 2010-02-25 11:04:39 UTC (rev 101461) @@ -25,7 +25,7 @@ import javax.management.ObjectName; -import org.jboss.osgi.spi.management.ObjectNameFactory; +import org.jboss.osgi.jmx.ObjectNameFactory; //$Id$ 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-25 10:16:44 UTC (rev 101460) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbossas/jbosgi36/OSGi36TestCase.java 2010-02-25 11:04:39 UTC (rev 101461) @@ -27,7 +27,7 @@ import static org.junit.Assert.fail; import org.jboss.osgi.jmx.JMXCapability; -import org.jboss.osgi.spi.management.MBeanProxy; +import org.jboss.osgi.jmx.MBeanProxy; import org.jboss.osgi.testing.OSGiTest; import org.jboss.osgi.testing.OSGiTestHelper; import org.jboss.osgi.testing.internal.RemoteRuntime; Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbossas/jbosgi36/mbean/FooMBean.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbossas/jbosgi36/mbean/FooMBean.java 2010-02-25 10:16:44 UTC (rev 101460) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbossas/jbosgi36/mbean/FooMBean.java 2010-02-25 11:04:39 UTC (rev 101461) @@ -25,7 +25,7 @@ import javax.management.ObjectName; -import org.jboss.osgi.spi.management.ObjectNameFactory; +import org.jboss.osgi.jmx.ObjectNameFactory; public interface FooMBean {

15 years, 10 months

1
0
0 / 0

JBoss-OSGI SVN: r101454 - projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/util.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2010-02-25 02:45:13 -0500 (Thu, 25 Feb 2010) New Revision: 101454 Modified: projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/util/ExportedPackageHelper.java Log: [JBOSGI-295] NullPointerException in ExportedPackageHelper constructor Modified: projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/util/ExportedPackageHelper.java =================================================================== --- projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/util/ExportedPackageHelper.java 2010-02-25 07:31:44 UTC (rev 101453) +++ projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/util/ExportedPackageHelper.java 2010-02-25 07:45:13 UTC (rev 101454) @@ -49,6 +49,9 @@ public ExportedPackageHelper(BundleContext context) { + if (context == null) + throw new IllegalArgumentException("Null context"); + ServiceReference sref = context.getServiceReference(PackageAdmin.class.getName()); if (sref != null) packageAdmin = (PackageAdmin)context.getService(sref);

15 years, 10 months

1
0
0 / 0

JBoss-OSGI SVN: r101453 - projects/jboss-osgi/trunk.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2010-02-25 02:31:44 -0500 (Thu, 25 Feb 2010) New Revision: 101453 Modified: projects/jboss-osgi/trunk/pom.xml Log: Use jboss-osgi-deployers 1.0.5-SNAPSHOT Modified: projects/jboss-osgi/trunk/pom.xml =================================================================== --- projects/jboss-osgi/trunk/pom.xml 2010-02-25 07:29:57 UTC (rev 101452) +++ projects/jboss-osgi/trunk/pom.xml 2010-02-25 07:31:44 UTC (rev 101453) @@ -68,7 +68,7 @@ <version.jboss.osgi.jndi>1.0.3-SNAPSHOT</version.jboss.osgi.jndi> <version.jboss.osgi.jta>1.0.1-SNAPSHOT</version.jboss.osgi.jta> <version.jboss.osgi.reflect>2.2.0</version.jboss.osgi.reflect> - <version.jboss.osgi.runtime.deployers>1.0.4</version.jboss.osgi.runtime.deployers> + <version.jboss.osgi.runtime.deployers>1.0.5-SNAPSHOT</version.jboss.osgi.runtime.deployers> <version.jboss.osgi.runtime.equinox>3.5.1.SP1-SNAPSHOT</version.jboss.osgi.runtime.equinox> <version.jboss.osgi.runtime.felix>2.0.2.SP1-SNAPSHOT</version.jboss.osgi.runtime.felix> <version.jboss.osgi.runtime.jbossas>1.0.2</version.jboss.osgi.runtime.jbossas>

15 years, 10 months

1
0
0 / 0

JBoss-OSGI SVN: r101452 - projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2010-02-25 02:29:57 -0500 (Thu, 25 Feb 2010) New Revision: 101452 Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-equinox.xml projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-felix.xml Log: Remove BundleManagementDeployer Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-equinox.xml =================================================================== --- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-equinox.xml 2010-02-25 07:29:27 UTC (rev 101451) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-equinox.xml 2010-02-25 07:29:57 UTC (rev 101452) @@ -126,10 +126,4 @@ <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="bundleContext" /></property> </bean> -  - <bean name="jboss.osgi:service=BundleManagementDeployer" class="org.jboss.osgi.deployer.BundleManagementDeployer"> - <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="bundleContext" /></property> - <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property> - </bean> - </deployment> \ No newline at end of file Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-felix.xml =================================================================== --- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-felix.xml 2010-02-25 07:29:27 UTC (rev 101451) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-felix.xml 2010-02-25 07:29:57 UTC (rev 101452) @@ -126,10 +126,4 @@ <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="bundleContext" /></property> </bean> -  - <bean name="jboss.osgi:service=BundleManagementDeployer" class="org.jboss.osgi.deployer.BundleManagementDeployer"> - <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="bundleContext" /></property> - <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property> - </bean> - </deployment> \ No newline at end of file

15 years, 10 months

1
0
0 / 0

JBoss-OSGI SVN: r101451 - projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/main/java/org/jboss/osgi/jmx/internal.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2010-02-25 02:29:27 -0500 (Thu, 25 Feb 2010) New Revision: 101451 Modified: projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/main/java/org/jboss/osgi/jmx/internal/BundleStateExt.java Log: Add property type item Modified: projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/main/java/org/jboss/osgi/jmx/internal/BundleStateExt.java =================================================================== --- projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/main/java/org/jboss/osgi/jmx/internal/BundleStateExt.java 2010-02-25 07:28:55 UTC (rev 101450) +++ projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/main/java/org/jboss/osgi/jmx/internal/BundleStateExt.java 2010-02-25 07:29:27 UTC (rev 101451) @@ -141,9 +141,12 @@ if (value == null) return null; + String type = value.getClass().getSimpleName(); + Map<String, Object> items = new HashMap<String, Object>(); - items.put(KEY, key); - items.put(VALUE, value); + items.put(JmxConstants.KEY, key); + items.put(JmxConstants.VALUE, value); + items.put(JmxConstants.TYPE, type); try { return new CompositeDataSupport(JmxConstants.PROPERTY_TYPE, items);

15 years, 10 months

1
0
0 / 0

JBoss-OSGI SVN: r101450 - in projects/jboss-osgi/projects/runtime/deployers/trunk: .settings and 2 other directories.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2010-02-25 02:28:55 -0500 (Thu, 25 Feb 2010) New Revision: 101450 Removed: projects/jboss-osgi/projects/runtime/deployers/trunk/src/main/java/org/jboss/osgi/deployer/BundleManagementDeployer.java Modified: projects/jboss-osgi/projects/runtime/deployers/trunk/.classpath projects/jboss-osgi/projects/runtime/deployers/trunk/.settings/org.eclipse.jdt.core.prefs projects/jboss-osgi/projects/runtime/deployers/trunk/pom.xml projects/jboss-osgi/projects/runtime/deployers/trunk/src/main/java/org/jboss/osgi/deployer/helpers/PackageAdminDependencyItem.java Log: Remove BundleManagementDeployer Modified: projects/jboss-osgi/projects/runtime/deployers/trunk/.classpath =================================================================== --- projects/jboss-osgi/projects/runtime/deployers/trunk/.classpath 2010-02-25 07:18:02 UTC (rev 101449) +++ projects/jboss-osgi/projects/runtime/deployers/trunk/.classpath 2010-02-25 07:28:55 UTC (rev 101450) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" output="target/classes" path="src/main/java"/> - <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/projects/runtime/deployers/trunk/.settings/org.eclipse.jdt.core.prefs =================================================================== --- projects/jboss-osgi/projects/runtime/deployers/trunk/.settings/org.eclipse.jdt.core.prefs 2010-02-25 07:18:02 UTC (rev 101449) +++ projects/jboss-osgi/projects/runtime/deployers/trunk/.settings/org.eclipse.jdt.core.prefs 2010-02-25 07:28:55 UTC (rev 101450) @@ -1,4 +1,4 @@ -#Wed Feb 04 09:36:33 CET 2009 +#Thu Feb 25 08:25:55 CET 2010 eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 Modified: projects/jboss-osgi/projects/runtime/deployers/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/runtime/deployers/trunk/pom.xml 2010-02-25 07:18:02 UTC (rev 101449) +++ projects/jboss-osgi/projects/runtime/deployers/trunk/pom.xml 2010-02-25 07:28:55 UTC (rev 101450) @@ -31,8 +31,8 @@ <properties> <version.jboss.deployers>2.2.0.Alpha1</version.jboss.deployers> - <version.jboss.osgi.deployment>1.0.1</version.jboss.osgi.deployment> - <version.jboss.osgi.spi>1.0.4</version.jboss.osgi.spi> + <version.jboss.osgi.deployment>1.0.2-SNAPSHOT</version.jboss.osgi.deployment> + <version.jboss.osgi.spi>1.0.5-SNAPSHOT</version.jboss.osgi.spi> <version.osgi>4.2.0</version.osgi> </properties> Deleted: projects/jboss-osgi/projects/runtime/deployers/trunk/src/main/java/org/jboss/osgi/deployer/BundleManagementDeployer.java =================================================================== --- projects/jboss-osgi/projects/runtime/deployers/trunk/src/main/java/org/jboss/osgi/deployer/BundleManagementDeployer.java 2010-02-25 07:18:02 UTC (rev 101449) +++ projects/jboss-osgi/projects/runtime/deployers/trunk/src/main/java/org/jboss/osgi/deployer/BundleManagementDeployer.java 2010-02-25 07:28:55 UTC (rev 101450) @@ -1,100 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.osgi.deployer; - -// $Id: $ - -import javax.management.MBeanServer; -import javax.management.ObjectName; - -import org.jboss.deployers.spi.DeploymentException; -import org.jboss.deployers.spi.deployer.helpers.AbstractSimpleRealDeployer; -import org.jboss.deployers.structure.spi.DeploymentUnit; -import org.jboss.osgi.spi.management.ManagedBundle; -import org.osgi.framework.Bundle; -import org.osgi.framework.BundleContext; - -/** - * Register the Bundle as MBean with JMX. - * - * @author Thomas.Diesler(a)jboss.com - * @since 04-Mar-2009 - */ -public class BundleManagementDeployer extends AbstractSimpleRealDeployer<Bundle> -{ - private BundleContext systemContext; - private MBeanServer mbeanServer; - - public BundleManagementDeployer() - { - super(Bundle.class); - } - - public void setSystemContext(BundleContext systemContext) - { - this.systemContext = systemContext; - } - - public void setMbeanServer(MBeanServer mbeanServer) - { - this.mbeanServer = mbeanServer; - } - - public void deploy(DeploymentUnit unit, Bundle bundle) throws DeploymentException - { - if (mbeanServer != null) - { - ManagedBundle mb = new ManagedBundle(systemContext, bundle); - ObjectName oname = mb.getObjectName(); - try - { - if (mbeanServer.isRegistered(mb.getObjectName()) == false) - { - mbeanServer.registerMBean(mb, oname); - unit.addAttachment(ManagedBundle.class, mb); - } - } - catch (Exception ex) - { - DeploymentException.rethrowAsDeploymentException(ex.getMessage(), ex); - } - } - } - - @Override - public void undeploy(DeploymentUnit unit, Bundle bundle) - { - if (mbeanServer != null) - { - try - { - ManagedBundle mb = unit.getAttachment(ManagedBundle.class); - if (mb != null && mbeanServer.isRegistered(mb.getObjectName())) - mbeanServer.unregisterMBean(mb.getObjectName()); - } - catch (Exception ex) - { - log.warn("Cannot unregister: " + bundle, ex); - } - } - } -} \ No newline at end of file Modified: projects/jboss-osgi/projects/runtime/deployers/trunk/src/main/java/org/jboss/osgi/deployer/helpers/PackageAdminDependencyItem.java =================================================================== --- projects/jboss-osgi/projects/runtime/deployers/trunk/src/main/java/org/jboss/osgi/deployer/helpers/PackageAdminDependencyItem.java 2010-02-25 07:18:02 UTC (rev 101449) +++ projects/jboss-osgi/projects/runtime/deployers/trunk/src/main/java/org/jboss/osgi/deployer/helpers/PackageAdminDependencyItem.java 2010-02-25 07:28:55 UTC (rev 101450) @@ -46,8 +46,6 @@ public PackageAdminDependencyItem(BundleContext systemContext, Bundle bundle) { super(bundle.getSymbolicName(), null, CTRL_STATE, null); - if (bundle == null) - throw new IllegalArgumentException("Null bundle"); this.bundle = bundle;

15 years, 10 months

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

jboss-osgi-commits February 2010