[jboss-osgi-commits] JBoss-OSGI SVN: r97294 - in projects/jboss-osgi/projects/runtime: equinox/trunk and 3 other directories.

Author: thomas.diesler(a)jboss.com Date: 2009-12-02 09:52:15 -0500 (Wed, 02 Dec 2009) New Revision: 97294 Added: projects/jboss-osgi/projects/runtime/deployment/trunk/src/main/java/org/jboss/osgi/deployment/DeploymentServicesActivator.java Removed: projects/jboss-osgi/projects/runtime/deployment/trunk/src/main/java/org/jboss/osgi/deployment/DeploymentActivator.java Modified: projects/jboss-osgi/projects/runtime/equinox/trunk/pom.xml projects/jboss-osgi/projects/runtime/equinox/trunk/src/main/java/org/jboss/osgi/equinox/EquinoxBootstrapProvider.java projects/jboss-osgi/projects/runtime/equinox/trunk/src/main/java/org/jboss/osgi/equinox/EquinoxIntegration.java projects/jboss-osgi/projects/runtime/felix/trunk/pom.xml projects/jboss-osgi/projects/runtime/felix/trunk/src/main/java/org/jboss/osgi/felix/FelixBootstrapProvider.java projects/jboss-osgi/projects/runtime/felix/trunk/src/main/java/org/jboss/osgi/felix/FelixIntegration.java Log: Use deployment-1.0.0-SNAPSHOT Deleted: projects/jboss-osgi/projects/runtime/deployment/trunk/src/main/java/org/jboss/osgi/deployment/DeploymentActivator.java =================================================================== --- projects/jboss-osgi/projects/runtime/deployment/trunk/src/main/java/org/jboss/osgi/deployment/DeploymentActivator.java 2009-12-02 14:49:42 UTC (rev 97293) +++ projects/jboss-osgi/projects/runtime/deployment/trunk/src/main/java/org/jboss/osgi/deployment/DeploymentActivator.java 2009-12-02 14:52:15 UTC (rev 97294) @@ -1,101 +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.deployment; - -//$Id$ - -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.interceptor.LifecycleInterceptorService; -import org.jboss.osgi.deployment.internal.DeploymentRegistryServiceImpl; -import org.jboss.osgi.deployment.internal.LifecycleInterceptorServiceImpl; -import org.jboss.osgi.deployment.internal.SystemDeployerService; -import org.osgi.framework.BundleContext; -import org.osgi.framework.ServiceReference; -import org.osgi.util.tracker.ServiceTracker; - -/** - * The deployers activator - * - * @author thomas.diesler(a)jboss.com - * @since 15-Oct-2009 - */ -public class DeploymentActivator -{ - public void start(BundleContext context) - { - if (context == null) - throw new IllegalArgumentException("Null BundleContext"); - - // Register the DeploymentRegistryService - DeploymentRegistryService registry = new DeploymentRegistryServiceImpl(context); - context.registerService(DeploymentRegistryService.class.getName(), registry, null); - - // Register the SystemDeployerService - Properties props = new Properties(); - props.put("provider", "system"); - final SystemDeployerService deployerService = new SystemDeployerService(context); - context.registerService(DeployerService.class.getName(), deployerService, props); - - // Register the lifecycle interceptor related services - LifecycleInterceptorService service = new LifecycleInterceptorServiceImpl(context); - context.registerService(LifecycleInterceptorService.class.getName(), service, null); - - // 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) - { - } -} \ No newline at end of file Copied: projects/jboss-osgi/projects/runtime/deployment/trunk/src/main/java/org/jboss/osgi/deployment/DeploymentServicesActivator.java (from rev 97211, projects/jboss-osgi/projects/runtime/deployment/trunk/src/main/java/org/jboss/osgi/deployment/DeploymentActivator.java) =================================================================== --- projects/jboss-osgi/projects/runtime/deployment/trunk/src/main/java/org/jboss/osgi/deployment/DeploymentServicesActivator.java (rev 0) +++ projects/jboss-osgi/projects/runtime/deployment/trunk/src/main/java/org/jboss/osgi/deployment/DeploymentServicesActivator.java 2009-12-02 14:52:15 UTC (rev 97294) @@ -0,0 +1,104 @@ +/* + * 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.deployment; + +//$Id$ + +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.interceptor.LifecycleInterceptorService; +import org.jboss.osgi.deployment.internal.DeploymentRegistryServiceImpl; +import org.jboss.osgi.deployment.internal.LifecycleInterceptorServiceImpl; +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. + * + * This can be used like a BundleActivator altough the deployment services + * are not installed as a bundle. + * + * @author thomas.diesler(a)jboss.com + * @since 15-Oct-2009 + */ +public class DeploymentServicesActivator +{ + public void start(BundleContext context) + { + if (context == null) + throw new IllegalArgumentException("Null BundleContext"); + + // Register the DeploymentRegistryService + DeploymentRegistryService registry = new DeploymentRegistryServiceImpl(context); + context.registerService(DeploymentRegistryService.class.getName(), registry, null); + + // Register the SystemDeployerService + Properties props = new Properties(); + props.put("provider", "system"); + final SystemDeployerService deployerService = new SystemDeployerService(context); + context.registerService(DeployerService.class.getName(), deployerService, props); + + // Register the lifecycle interceptor related services + LifecycleInterceptorService service = new LifecycleInterceptorServiceImpl(context); + context.registerService(LifecycleInterceptorService.class.getName(), service, null); + + // 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) + { + } +} \ No newline at end of file Modified: projects/jboss-osgi/projects/runtime/equinox/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/runtime/equinox/trunk/pom.xml 2009-12-02 14:49:42 UTC (rev 97293) +++ projects/jboss-osgi/projects/runtime/equinox/trunk/pom.xml 2009-12-02 14:52:15 UTC (rev 97294) @@ -39,7 +39,7 @@ <!-- Properties --> <properties> <version.eclipse.equinox>3.5.1</version.eclipse.equinox> - <version.jboss.osgi.deployment>1.0.0</version.jboss.osgi.deployment> + <version.jboss.osgi.deployment>1.0.0-SNAPSHOT</version.jboss.osgi.deployment> <version.jboss.osgi.husky>1.0.2-SNAPSHOT</version.jboss.osgi.husky> <version.jboss.osgi.spi>1.0.3-SNAPSHOT</version.jboss.osgi.spi> </properties> Modified: projects/jboss-osgi/projects/runtime/equinox/trunk/src/main/java/org/jboss/osgi/equinox/EquinoxBootstrapProvider.java =================================================================== --- projects/jboss-osgi/projects/runtime/equinox/trunk/src/main/java/org/jboss/osgi/equinox/EquinoxBootstrapProvider.java 2009-12-02 14:49:42 UTC (rev 97293) +++ projects/jboss-osgi/projects/runtime/equinox/trunk/src/main/java/org/jboss/osgi/equinox/EquinoxBootstrapProvider.java 2009-12-02 14:52:15 UTC (rev 97294) @@ -25,7 +25,7 @@ import java.util.Map; -import org.jboss.osgi.deployment.DeploymentActivator; +import org.jboss.osgi.deployment.DeploymentServicesActivator; import org.jboss.osgi.spi.framework.PropertiesBootstrapProvider; import org.jboss.osgi.spi.util.ServiceLoader; import org.osgi.framework.BundleContext; @@ -45,7 +45,7 @@ // Provide logging final Logger log = LoggerFactory.getLogger(EquinoxBootstrapProvider.class); - private DeploymentActivator deploymentActivator; + private DeploymentServicesActivator deploymentActivator; @Override protected Framework createFramework(Map<String, Object> properties) @@ -64,7 +64,7 @@ @Override protected void registerSystemServices(BundleContext context) { - deploymentActivator = new DeploymentActivator(); + deploymentActivator = new DeploymentServicesActivator(); deploymentActivator.start(context); } Modified: projects/jboss-osgi/projects/runtime/equinox/trunk/src/main/java/org/jboss/osgi/equinox/EquinoxIntegration.java =================================================================== --- projects/jboss-osgi/projects/runtime/equinox/trunk/src/main/java/org/jboss/osgi/equinox/EquinoxIntegration.java 2009-12-02 14:49:42 UTC (rev 97293) +++ projects/jboss-osgi/projects/runtime/equinox/trunk/src/main/java/org/jboss/osgi/equinox/EquinoxIntegration.java 2009-12-02 14:52:15 UTC (rev 97294) @@ -25,7 +25,7 @@ import java.util.Map; -import org.jboss.osgi.deployment.DeploymentActivator; +import org.jboss.osgi.deployment.DeploymentServicesActivator; import org.jboss.osgi.spi.framework.FrameworkIntegrationBean; import org.jboss.osgi.spi.util.ServiceLoader; import org.osgi.framework.BundleContext; @@ -45,7 +45,7 @@ // Provide logging final Logger log = LoggerFactory.getLogger(EquinoxIntegration.class); - private DeploymentActivator deploymentActivator; + private DeploymentServicesActivator deploymentActivator; @Override protected Framework createFramework(Map<String, Object> properties) @@ -63,7 +63,7 @@ @Override protected void registerSystemServices(BundleContext context) { - deploymentActivator = new DeploymentActivator(); + deploymentActivator = new DeploymentServicesActivator(); deploymentActivator.start(context); } Modified: projects/jboss-osgi/projects/runtime/felix/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/runtime/felix/trunk/pom.xml 2009-12-02 14:49:42 UTC (rev 97293) +++ projects/jboss-osgi/projects/runtime/felix/trunk/pom.xml 2009-12-02 14:52:15 UTC (rev 97294) @@ -38,7 +38,7 @@ <properties> <version.felix.framework>2.0.2</version.felix.framework> - <version.jboss.osgi.deployment>1.0.0</version.jboss.osgi.deployment> + <version.jboss.osgi.deployment>1.0.0-SNAPSHOT</version.jboss.osgi.deployment> <version.jboss.osgi.husky>1.0.2-SNAPSHOT</version.jboss.osgi.husky> <version.jboss.osgi.spi>1.0.3-SNAPSHOT</version.jboss.osgi.spi> <version.osgi>4.2.0</version.osgi> Modified: projects/jboss-osgi/projects/runtime/felix/trunk/src/main/java/org/jboss/osgi/felix/FelixBootstrapProvider.java =================================================================== --- projects/jboss-osgi/projects/runtime/felix/trunk/src/main/java/org/jboss/osgi/felix/FelixBootstrapProvider.java 2009-12-02 14:49:42 UTC (rev 97293) +++ projects/jboss-osgi/projects/runtime/felix/trunk/src/main/java/org/jboss/osgi/felix/FelixBootstrapProvider.java 2009-12-02 14:52:15 UTC (rev 97294) @@ -25,7 +25,7 @@ import java.util.Map; -import org.jboss.osgi.deployment.DeploymentActivator; +import org.jboss.osgi.deployment.DeploymentServicesActivator; import org.jboss.osgi.spi.framework.PropertiesBootstrapProvider; import org.jboss.osgi.spi.util.ServiceLoader; import org.osgi.framework.BundleContext; @@ -45,7 +45,7 @@ // Provide logging final Logger log = LoggerFactory.getLogger(FelixBootstrapProvider.class); - private DeploymentActivator deploymentActivator; + private DeploymentServicesActivator deploymentActivator; @Override protected Framework createFramework(Map<String, Object> properties) @@ -71,7 +71,7 @@ @Override protected void registerSystemServices(BundleContext context) { - deploymentActivator = new DeploymentActivator(); + deploymentActivator = new DeploymentServicesActivator(); deploymentActivator.start(context); } Modified: projects/jboss-osgi/projects/runtime/felix/trunk/src/main/java/org/jboss/osgi/felix/FelixIntegration.java =================================================================== --- projects/jboss-osgi/projects/runtime/felix/trunk/src/main/java/org/jboss/osgi/felix/FelixIntegration.java 2009-12-02 14:49:42 UTC (rev 97293) +++ projects/jboss-osgi/projects/runtime/felix/trunk/src/main/java/org/jboss/osgi/felix/FelixIntegration.java 2009-12-02 14:52:15 UTC (rev 97294) @@ -25,7 +25,7 @@ import java.util.Map; -import org.jboss.osgi.deployment.DeploymentActivator; +import org.jboss.osgi.deployment.DeploymentServicesActivator; import org.jboss.osgi.spi.framework.FrameworkIntegrationBean; import org.jboss.osgi.spi.util.ServiceLoader; import org.osgi.framework.BundleContext; @@ -46,7 +46,7 @@ // Provide logging final Logger log = LoggerFactory.getLogger(FelixIntegration.class); - private DeploymentActivator deploymentActivator; + private DeploymentServicesActivator deploymentActivator; @Override protected Framework createFramework(Map<String, Object> properties) @@ -71,7 +71,7 @@ @Override protected void registerSystemServices(BundleContext context) { - deploymentActivator = new DeploymentActivator(); + deploymentActivator = new DeploymentServicesActivator(); deploymentActivator.start(context); }