July 2009 - jboss-osgi-commits - Jboss List Archives

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

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

Author: thomas.diesler(a)jboss.com Date: 2009-07-10 06:04:11 -0400 (Fri, 10 Jul 2009) New Revision: 91058 Added: projects/jboss-osgi/projects/bundles/hotdeploy/trunk/src/main/java/org/jboss/osgi/hotdeploy/ projects/jboss-osgi/projects/bundles/hotdeploy/trunk/src/main/java/org/jboss/osgi/hotdeploy/internal/ projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/webconsole/ projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/webconsole/internal/ projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/webconsole/internal/WebConsole.java projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/webconsole/internal/WebConsoleActivator.java projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/webconsole/internal/plugins/ Removed: projects/jboss-osgi/projects/bundles/hotdeploy/trunk/src/main/java/org/jboss/osgi/service/hotdeploy/internal/ projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/service/webconsole/internal/WebConsole.java projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/service/webconsole/internal/WebConsoleActivator.java projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/service/webconsole/internal/plugins/ Modified: projects/jboss-osgi/projects/bundles/hotdeploy/trunk/pom.xml projects/jboss-osgi/projects/bundles/hotdeploy/trunk/src/main/java/org/jboss/osgi/hotdeploy/internal/DeploymentScannerActivator.java 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/ScannerThread.java projects/jboss-osgi/projects/bundles/webconsole/trunk/pom.xml projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/apache/felix/webconsole/internal/servlet/RenderBridge.java projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/webconsole/internal/plugins/BundlesPlugin.java projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/webconsole/internal/plugins/ConfigManagerPlugin.java projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/webconsole/internal/plugins/EventAdminPlugin.java projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/webconsole/internal/plugins/InstallActionExt.java projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/webconsole/internal/plugins/LicensePlugin.java projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/webconsole/internal/plugins/LogServicePlugin.java projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/webconsole/internal/plugins/PluginHelper.java projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/resources/OSGI-INF/metatype/metatype.xml Log: Remove 'service' from package name Modified: projects/jboss-osgi/projects/bundles/hotdeploy/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/bundles/hotdeploy/trunk/pom.xml 2009-07-10 10:02:21 UTC (rev 91057) +++ projects/jboss-osgi/projects/bundles/hotdeploy/trunk/pom.xml 2009-07-10 10:04:11 UTC (rev 91058) @@ -63,8 +63,8 @@ <configuration> <instructions> <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName> - <Bundle-Activator>org.jboss.osgi.service.hotdeploy.internal.DeploymentScannerActivator</Bundle-Activator> - <Private-Package>org.jboss.osgi.service.hotdeploy.internal</Private-Package> + <Bundle-Activator>org.jboss.osgi.hotdeploy.internal.DeploymentScannerActivator</Bundle-Activator> + <Private-Package>org.jboss.osgi.hotdeploy.internal</Private-Package> <Import-Package> javax.management, org.jboss.osgi.common.log;version="1.0", Copied: projects/jboss-osgi/projects/bundles/hotdeploy/trunk/src/main/java/org/jboss/osgi/hotdeploy/internal (from rev 91048, projects/jboss-osgi/projects/bundles/hotdeploy/trunk/src/main/java/org/jboss/osgi/service/hotdeploy/internal) Modified: projects/jboss-osgi/projects/bundles/hotdeploy/trunk/src/main/java/org/jboss/osgi/hotdeploy/internal/DeploymentScannerActivator.java =================================================================== --- projects/jboss-osgi/projects/bundles/hotdeploy/trunk/src/main/java/org/jboss/osgi/service/hotdeploy/internal/DeploymentScannerActivator.java 2009-07-10 05:26:35 UTC (rev 91048) +++ projects/jboss-osgi/projects/bundles/hotdeploy/trunk/src/main/java/org/jboss/osgi/hotdeploy/internal/DeploymentScannerActivator.java 2009-07-10 10:04:11 UTC (rev 91058) @@ -19,7 +19,7 @@ * 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.service.hotdeploy.internal; +package org.jboss.osgi.hotdeploy.internal; //$Id$ 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/service/hotdeploy/internal/DeploymentScannerImpl.java 2009-07-10 05:26:35 UTC (rev 91048) +++ projects/jboss-osgi/projects/bundles/hotdeploy/trunk/src/main/java/org/jboss/osgi/hotdeploy/internal/DeploymentScannerImpl.java 2009-07-10 10:04:11 UTC (rev 91058) @@ -19,7 +19,7 @@ * 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.service.hotdeploy.internal; +package org.jboss.osgi.hotdeploy.internal; //$Id$ Modified: projects/jboss-osgi/projects/bundles/hotdeploy/trunk/src/main/java/org/jboss/osgi/hotdeploy/internal/ScannerThread.java =================================================================== --- projects/jboss-osgi/projects/bundles/hotdeploy/trunk/src/main/java/org/jboss/osgi/service/hotdeploy/internal/ScannerThread.java 2009-07-10 05:26:35 UTC (rev 91048) +++ projects/jboss-osgi/projects/bundles/hotdeploy/trunk/src/main/java/org/jboss/osgi/hotdeploy/internal/ScannerThread.java 2009-07-10 10:04:11 UTC (rev 91058) @@ -19,7 +19,7 @@ * 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.service.hotdeploy.internal; +package org.jboss.osgi.hotdeploy.internal; //$Id$ Modified: projects/jboss-osgi/projects/bundles/webconsole/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/bundles/webconsole/trunk/pom.xml 2009-07-10 10:02:21 UTC (rev 91057) +++ projects/jboss-osgi/projects/bundles/webconsole/trunk/pom.xml 2009-07-10 10:04:11 UTC (rev 91058) @@ -132,7 +132,7 @@ <configuration> <instructions> <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName> - <Bundle-Activator>org.jboss.osgi.service.webconsole.internal.WebConsoleActivator</Bundle-Activator> + <Bundle-Activator>org.jboss.osgi.webconsole.internal.WebConsoleActivator</Bundle-Activator> <Export-Package> org.apache.felix.webconsole;version=${version.felix.webconsole}, org.osgi.service.obr @@ -140,8 +140,7 @@ <Private-Package> !org.apache.felix.webconsole, org.apache.felix.webconsole.*, - org.jboss.osgi.service.webconsole.internal, - org.jboss.osgi.service.webconsole.internal.* + org.jboss.osgi.webconsole.internal* </Private-Package> <Import-Package> org.apache.felix.scr; Modified: projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/apache/felix/webconsole/internal/servlet/RenderBridge.java =================================================================== --- projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/apache/felix/webconsole/internal/servlet/RenderBridge.java 2009-07-10 10:02:21 UTC (rev 91057) +++ projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/apache/felix/webconsole/internal/servlet/RenderBridge.java 2009-07-10 10:04:11 UTC (rev 91058) @@ -27,7 +27,7 @@ import org.apache.felix.webconsole.AbstractWebConsolePlugin; import org.apache.felix.webconsole.Render; -import org.jboss.osgi.service.webconsole.internal.plugins.PluginHelper; +import org.jboss.osgi.webconsole.internal.plugins.PluginHelper; public class RenderBridge extends AbstractWebConsolePlugin Deleted: projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/service/webconsole/internal/WebConsole.java =================================================================== --- projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/service/webconsole/internal/WebConsole.java 2009-07-10 10:02:21 UTC (rev 91057) +++ projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/service/webconsole/internal/WebConsole.java 2009-07-10 10:04:11 UTC (rev 91058) @@ -1,115 +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.service.webconsole.internal; - -//$Id$ - -import org.apache.felix.webconsole.internal.compendium.ComponentConfigurationPrinter; -import org.apache.felix.webconsole.internal.core.SetStartLevelAction; -import org.apache.felix.webconsole.internal.misc.ConfigurationRender; -import org.apache.felix.webconsole.internal.obr.BundleRepositoryRender; -import org.apache.felix.webconsole.internal.obr.InstallFromRepoAction; -import org.apache.felix.webconsole.internal.obr.RefreshRepoAction; -import org.apache.felix.webconsole.internal.servlet.OsgiManager; -import org.apache.felix.webconsole.internal.system.GCAction; -import org.apache.felix.webconsole.internal.system.VMStatPlugin; -import org.jboss.osgi.service.webconsole.internal.plugins.BundlesPlugin; -import org.jboss.osgi.service.webconsole.internal.plugins.ConfigManagerPlugin; -import org.jboss.osgi.service.webconsole.internal.plugins.EventAdminPlugin; -import org.jboss.osgi.service.webconsole.internal.plugins.InstallActionExt; -import org.jboss.osgi.service.webconsole.internal.plugins.LicensePlugin; -import org.jboss.osgi.service.webconsole.internal.plugins.LogServicePlugin; -import org.osgi.framework.BundleContext; - -/** - * Web Console integration - * - * Improve console extensibility https://issues.apache.org/jira/browse/FELIX-1013 - * - * @author thomas.diesler(a)jboss.com - * @since 12-Mar-2009 - */ -public class WebConsole extends OsgiManager -{ - private static final long serialVersionUID = 1L; - - private BundleContext bundleContext; - - public WebConsole(BundleContext bundleContext) - { - super(bundleContext); - this.bundleContext = bundleContext; - } - - @Override - protected String getDefaultManagerRoot() - { - return "/jboss-osgi"; - } - - @Override - protected String[] getPluginClasses() - { - /* - PLUGIN_CLASSES = - "org.apache.felix.webconsole.internal.compendium.ComponentConfigurationPrinter", - "org.apache.felix.webconsole.internal.compendium.ComponentsServlet", - "org.apache.felix.webconsole.internal.compendium.ConfigManager", - "org.apache.felix.webconsole.internal.compendium.LogServlet", - "org.apache.felix.webconsole.internal.core.BundlesServlet", - "org.apache.felix.webconsole.internal.core.InstallAction", - "org.apache.felix.webconsole.internal.core.SetStartLevelAction", - "org.apache.felix.webconsole.internal.deppack.DepPackServlet", - "org.apache.felix.webconsole.internal.misc.EventAdminServlet", - "org.apache.felix.webconsole.internal.misc.LicenseServlet", - "org.apache.felix.webconsole.internal.misc.ConfigurationRender", - "org.apache.felix.webconsole.internal.misc.ShellServlet", - "org.apache.felix.webconsole.internal.obr.BundleRepositoryRender", - "org.apache.felix.webconsole.internal.obr.InstallFromRepoAction", - "org.apache.felix.webconsole.internal.obr.RefreshRepoAction", - "org.apache.felix.webconsole.internal.system.GCAction", - "org.apache.felix.webconsole.internal.system.VMStatPlugin" - */ - - String[] PLUGIN_CLASSES = new String[] { - ComponentConfigurationPrinter.class.getName(), - //ComponentsServlet.class.getName(), - ConfigManagerPlugin.class.getName(), - LogServicePlugin.class.getName(), - BundlesPlugin.class.getName(), - InstallActionExt.class.getName(), - SetStartLevelAction.class.getName(), - // DepPackServlet.class.getName(), - EventAdminPlugin.class.getName(), - LicensePlugin.class.getName(), - ConfigurationRender.class.getName(), - // ShellServlet.class.getName(), - BundleRepositoryRender.class.getName(), - InstallFromRepoAction.class.getName(), - RefreshRepoAction.class.getName(), - GCAction.class.getName(), - VMStatPlugin.class.getName() - }; - - return PLUGIN_CLASSES; - } -} \ No newline at end of file Deleted: projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/service/webconsole/internal/WebConsoleActivator.java =================================================================== --- projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/service/webconsole/internal/WebConsoleActivator.java 2009-07-10 10:02:21 UTC (rev 91057) +++ projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/service/webconsole/internal/WebConsoleActivator.java 2009-07-10 10:04:11 UTC (rev 91058) @@ -1,51 +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.service.webconsole.internal; - -//$Id$ - -import org.osgi.framework.BundleActivator; -import org.osgi.framework.BundleContext; - -/** - * The web console Activator - * - * @author thomas.diesler(a)jboss.com - * @since 12-Mar-2009 - */ -public class WebConsoleActivator implements BundleActivator -{ - private WebConsole console; - - public void start(BundleContext context) throws Exception - { - console = new WebConsole(context); - } - - public void stop(BundleContext context) throws Exception - { - if (console != null) - { - console.dispose(); - } - } -} \ No newline at end of file Copied: projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/webconsole/internal/WebConsole.java (from rev 91048, projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/service/webconsole/internal/WebConsole.java) =================================================================== --- projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/webconsole/internal/WebConsole.java (rev 0) +++ projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/webconsole/internal/WebConsole.java 2009-07-10 10:04:11 UTC (rev 91058) @@ -0,0 +1,115 @@ +/* + * 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.webconsole.internal; + +//$Id$ + +import org.apache.felix.webconsole.internal.compendium.ComponentConfigurationPrinter; +import org.apache.felix.webconsole.internal.core.SetStartLevelAction; +import org.apache.felix.webconsole.internal.misc.ConfigurationRender; +import org.apache.felix.webconsole.internal.obr.BundleRepositoryRender; +import org.apache.felix.webconsole.internal.obr.InstallFromRepoAction; +import org.apache.felix.webconsole.internal.obr.RefreshRepoAction; +import org.apache.felix.webconsole.internal.servlet.OsgiManager; +import org.apache.felix.webconsole.internal.system.GCAction; +import org.apache.felix.webconsole.internal.system.VMStatPlugin; +import org.jboss.osgi.webconsole.internal.plugins.BundlesPlugin; +import org.jboss.osgi.webconsole.internal.plugins.ConfigManagerPlugin; +import org.jboss.osgi.webconsole.internal.plugins.EventAdminPlugin; +import org.jboss.osgi.webconsole.internal.plugins.InstallActionExt; +import org.jboss.osgi.webconsole.internal.plugins.LicensePlugin; +import org.jboss.osgi.webconsole.internal.plugins.LogServicePlugin; +import org.osgi.framework.BundleContext; + +/** + * Web Console integration + * + * Improve console extensibility https://issues.apache.org/jira/browse/FELIX-1013 + * + * @author thomas.diesler(a)jboss.com + * @since 12-Mar-2009 + */ +public class WebConsole extends OsgiManager +{ + private static final long serialVersionUID = 1L; + + private BundleContext bundleContext; + + public WebConsole(BundleContext bundleContext) + { + super(bundleContext); + this.bundleContext = bundleContext; + } + + @Override + protected String getDefaultManagerRoot() + { + return "/jboss-osgi"; + } + + @Override + protected String[] getPluginClasses() + { + /* + PLUGIN_CLASSES = + "org.apache.felix.webconsole.internal.compendium.ComponentConfigurationPrinter", + "org.apache.felix.webconsole.internal.compendium.ComponentsServlet", + "org.apache.felix.webconsole.internal.compendium.ConfigManager", + "org.apache.felix.webconsole.internal.compendium.LogServlet", + "org.apache.felix.webconsole.internal.core.BundlesServlet", + "org.apache.felix.webconsole.internal.core.InstallAction", + "org.apache.felix.webconsole.internal.core.SetStartLevelAction", + "org.apache.felix.webconsole.internal.deppack.DepPackServlet", + "org.apache.felix.webconsole.internal.misc.EventAdminServlet", + "org.apache.felix.webconsole.internal.misc.LicenseServlet", + "org.apache.felix.webconsole.internal.misc.ConfigurationRender", + "org.apache.felix.webconsole.internal.misc.ShellServlet", + "org.apache.felix.webconsole.internal.obr.BundleRepositoryRender", + "org.apache.felix.webconsole.internal.obr.InstallFromRepoAction", + "org.apache.felix.webconsole.internal.obr.RefreshRepoAction", + "org.apache.felix.webconsole.internal.system.GCAction", + "org.apache.felix.webconsole.internal.system.VMStatPlugin" + */ + + String[] PLUGIN_CLASSES = new String[] { + ComponentConfigurationPrinter.class.getName(), + //ComponentsServlet.class.getName(), + ConfigManagerPlugin.class.getName(), + LogServicePlugin.class.getName(), + BundlesPlugin.class.getName(), + InstallActionExt.class.getName(), + SetStartLevelAction.class.getName(), + // DepPackServlet.class.getName(), + EventAdminPlugin.class.getName(), + LicensePlugin.class.getName(), + ConfigurationRender.class.getName(), + // ShellServlet.class.getName(), + BundleRepositoryRender.class.getName(), + InstallFromRepoAction.class.getName(), + RefreshRepoAction.class.getName(), + GCAction.class.getName(), + VMStatPlugin.class.getName() + }; + + return PLUGIN_CLASSES; + } +} \ No newline at end of file Copied: projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/webconsole/internal/WebConsoleActivator.java (from rev 91048, projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/service/webconsole/internal/WebConsoleActivator.java) =================================================================== --- projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/webconsole/internal/WebConsoleActivator.java (rev 0) +++ projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/webconsole/internal/WebConsoleActivator.java 2009-07-10 10:04:11 UTC (rev 91058) @@ -0,0 +1,51 @@ +/* + * 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.webconsole.internal; + +//$Id$ + +import org.osgi.framework.BundleActivator; +import org.osgi.framework.BundleContext; + +/** + * The web console Activator + * + * @author thomas.diesler(a)jboss.com + * @since 12-Mar-2009 + */ +public class WebConsoleActivator implements BundleActivator +{ + private WebConsole console; + + public void start(BundleContext context) throws Exception + { + console = new WebConsole(context); + } + + public void stop(BundleContext context) throws Exception + { + if (console != null) + { + console.dispose(); + } + } +} \ No newline at end of file Copied: projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/webconsole/internal/plugins (from rev 91048, projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/service/webconsole/internal/plugins) Modified: projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/webconsole/internal/plugins/BundlesPlugin.java =================================================================== --- projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/service/webconsole/internal/plugins/BundlesPlugin.java 2009-07-10 05:26:35 UTC (rev 91048) +++ projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/webconsole/internal/plugins/BundlesPlugin.java 2009-07-10 10:04:11 UTC (rev 91058) @@ -19,7 +19,7 @@ * 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.service.webconsole.internal.plugins; +package org.jboss.osgi.webconsole.internal.plugins; //$Id$ Modified: projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/webconsole/internal/plugins/ConfigManagerPlugin.java =================================================================== --- projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/service/webconsole/internal/plugins/ConfigManagerPlugin.java 2009-07-10 05:26:35 UTC (rev 91048) +++ projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/webconsole/internal/plugins/ConfigManagerPlugin.java 2009-07-10 10:04:11 UTC (rev 91058) @@ -19,9 +19,9 @@ * 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.service.webconsole.internal.plugins; +package org.jboss.osgi.webconsole.internal.plugins; -//$Id$ +//$Id: ConfigManagerPlugin.java 90828 2009-07-06 09:12:53Z thomas.diesler(a)jboss.com $ import java.io.PrintWriter; import java.text.MessageFormat; Modified: projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/webconsole/internal/plugins/EventAdminPlugin.java =================================================================== --- projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/service/webconsole/internal/plugins/EventAdminPlugin.java 2009-07-10 05:26:35 UTC (rev 91048) +++ projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/webconsole/internal/plugins/EventAdminPlugin.java 2009-07-10 10:04:11 UTC (rev 91058) @@ -19,7 +19,7 @@ * 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.service.webconsole.internal.plugins; +package org.jboss.osgi.webconsole.internal.plugins; //$Id$ Modified: projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/webconsole/internal/plugins/InstallActionExt.java =================================================================== --- projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/service/webconsole/internal/plugins/InstallActionExt.java 2009-07-10 05:26:35 UTC (rev 91048) +++ projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/webconsole/internal/plugins/InstallActionExt.java 2009-07-10 10:04:11 UTC (rev 91058) @@ -19,7 +19,7 @@ * 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.service.webconsole.internal.plugins; +package org.jboss.osgi.webconsole.internal.plugins; //$Id: EventAdminPlugin.java 86577 2009-04-01 07:53:06Z thomas.diesler(a)jboss.com $ Modified: projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/webconsole/internal/plugins/LicensePlugin.java =================================================================== --- projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/service/webconsole/internal/plugins/LicensePlugin.java 2009-07-10 05:26:35 UTC (rev 91048) +++ projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/webconsole/internal/plugins/LicensePlugin.java 2009-07-10 10:04:11 UTC (rev 91058) @@ -19,7 +19,7 @@ * 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.service.webconsole.internal.plugins; +package org.jboss.osgi.webconsole.internal.plugins; //$Id$ Modified: projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/webconsole/internal/plugins/LogServicePlugin.java =================================================================== --- projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/service/webconsole/internal/plugins/LogServicePlugin.java 2009-07-10 05:26:35 UTC (rev 91048) +++ projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/webconsole/internal/plugins/LogServicePlugin.java 2009-07-10 10:04:11 UTC (rev 91058) @@ -19,7 +19,7 @@ * 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.service.webconsole.internal.plugins; +package org.jboss.osgi.webconsole.internal.plugins; //$Id: BundlesPlugin.java 86576 2009-04-01 07:17:02Z thomas.diesler(a)jboss.com $ Modified: projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/webconsole/internal/plugins/PluginHelper.java =================================================================== --- projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/service/webconsole/internal/plugins/PluginHelper.java 2009-07-10 05:26:35 UTC (rev 91048) +++ projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/webconsole/internal/plugins/PluginHelper.java 2009-07-10 10:04:11 UTC (rev 91058) @@ -19,7 +19,7 @@ * 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.service.webconsole.internal.plugins; +package org.jboss.osgi.webconsole.internal.plugins; //$Id$ Modified: projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/resources/OSGI-INF/metatype/metatype.xml =================================================================== --- projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/resources/OSGI-INF/metatype/metatype.xml 2009-07-10 10:02:21 UTC (rev 91057) +++ projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/resources/OSGI-INF/metatype/metatype.xml 2009-07-10 10:04:11 UTC (rev 91058) @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> <metatype:MetaData xmlns:metatype="http://www.osgi.org/xmlns/metatype/v1.0.0" localization="OSGI-INF/metatype/metatype"> - <metatype:OCD id="org.jboss.osgi.service.webconsole.internal.WebConsole" name="%manager.name" description="%manager.description"> + <metatype:OCD id="org.jboss.osgi.webconsole.internal.WebConsole" name="%manager.name" description="%manager.description"> <metatype:AD id="realm" type="String" default="OSGi Management Console" name="%realm.name" description="%realm.description"/> <metatype:AD id="manager.root" type="String" default="/jboss-osgi" name="%manager.root.name" description="%manager.root.description"/> <metatype:AD id="default.render" type="String" default="bundles" name="%default.render.name" description="%default.render.description"/> <metatype:AD id="username" type="String" default="admin" name="%username.name" description="%username.description"/> <metatype:AD id="password" type="String" default="admin" name="%password.name" description="%password.description"/> </metatype:OCD> - <metatype:Designate pid="org.jboss.osgi.service.webconsole.internal.WebConsole"> - <metatype:Object ocdref="org.jboss.osgi.service.webconsole.internal.WebConsole"/> + <metatype:Designate pid="org.jboss.osgi.webconsole.internal.WebConsole"> + <metatype:Object ocdref="org.jboss.osgi.webconsole.internal.WebConsole"/> </metatype:Designate> </metatype:MetaData>

16 years, 6 months

1
0
0 / 0

JBoss-OSGI SVN: r91057 - in projects/jboss-osgi/projects: bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer and 3 other directories.

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

Author: thomas.diesler(a)jboss.com Date: 2009-07-10 06:02:21 -0400 (Fri, 10 Jul 2009) New Revision: 91057 Added: projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/MicrocontainerService.java projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/integration/ projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/integration/AbstractMicrocontainerService.java projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/integration/MicrocontainerServiceBean.java Removed: projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/service/MicrocontainerService.java Modified: projects/jboss-osgi/projects/bundles/microcontainer/trunk/pom.xml projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/MicrocontainerCapability.java projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/internal/MicrocontainerServiceActivator.java projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/internal/MicrocontainerServiceImpl.java Log: Move MicrocontainerService to mc bundle Modified: projects/jboss-osgi/projects/bundles/microcontainer/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/bundles/microcontainer/trunk/pom.xml 2009-07-10 09:56:10 UTC (rev 91056) +++ projects/jboss-osgi/projects/bundles/microcontainer/trunk/pom.xml 2009-07-10 10:02:21 UTC (rev 91057) @@ -22,7 +22,6 @@ <version.jboss.deployers>2.0.5.SP1</version.jboss.deployers> <version.jboss.microcontainer>2.0.5.GA</version.jboss.microcontainer> <version.jboss.osgi.deployers>1.0.0-SNAPSHOT</version.jboss.osgi.deployers> - <version.jboss.osgi.jbossas>1.0.0-SNAPSHOT</version.jboss.osgi.jbossas> <version.jboss.osgi.jmx>1.0.0-SNAPSHOT</version.jboss.osgi.jmx> <version.jboss.osgi.xml.binding>2.0.1-SNAPSHOT</version.jboss.osgi.xml.binding> <version.osgi>r4v41</version.osgi> @@ -56,11 +55,6 @@ <artifactId>jboss-osgi-deployers</artifactId> <version>${version.jboss.osgi.deployers}</version> </dependency> - <dependency> - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-integration-jbossas</artifactId> - <version>${version.jboss.osgi.jbossas}</version> - </dependency>  <dependency> @@ -91,6 +85,7 @@ org.jboss.osgi.microcontainer;version=${version} </Export-Package> <Private-Package> + org.jboss.osgi.microcontainer.integration, org.jboss.osgi.microcontainer.internal </Private-Package> <Import-Package> @@ -151,7 +146,6 @@ jboss-metatype;inline=false, jboss-mdr;inline=false, jboss-osgi-deployers;inline=false, - jboss-osgi-integration-jbossas;inline=false, jboss-kernel;inline=false, </Embed-Dependency> <_exportcontents> Modified: projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/MicrocontainerCapability.java =================================================================== --- projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/MicrocontainerCapability.java 2009-07-10 09:56:10 UTC (rev 91056) +++ projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/MicrocontainerCapability.java 2009-07-10 10:02:21 UTC (rev 91057) @@ -26,7 +26,6 @@ import org.jboss.osgi.jbossxb.XMLBindingCapability; import org.jboss.osgi.jmx.JMXCapability; import org.jboss.osgi.spi.capability.Capability; -import org.jboss.osgi.spi.service.MicrocontainerService; import org.jboss.osgi.spi.testing.OSGiRuntime; /** Copied: projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/MicrocontainerService.java (from rev 91048, projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/service/MicrocontainerService.java) =================================================================== --- projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/MicrocontainerService.java (rev 0) +++ projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/MicrocontainerService.java 2009-07-10 10:02:21 UTC (rev 91057) @@ -0,0 +1,72 @@ +/* + * 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.microcontainer; + +//$Id$ + +import java.util.List; + +/** + * An OSGi Service the gives access to the Kernel and MBeanServer. + * + * @author thomas.diesler(a)jboss.com + * @since 23-Jan-2009 + */ +public interface MicrocontainerService +{ + /* + * The name under which the system bundle context is registered: 'jboss.osgi:service=BundleContext' + */ + String BEAN_SYSTEM_BUNDLE_CONTEXT = "jboss.osgi:service=BundleContext"; + + /* + * The name under which the MBeanServer is registered: 'jboss.osgi:service=MBeanServer' + */ + String BEAN_MBEAN_SERVER = "jboss.osgi:service=MBeanServer"; + + /* + * The name under which the KernelController is registered: 'jboss.kernel:service=KernelController' + */ + String BEAN_KERNEL_CONTROLLER = "jboss.kernel:service=KernelController"; + + /* + * The name under which the Kernel is registered: 'jboss.kernel:service=Kernel' + */ + String BEAN_KERNEL = "jboss.kernel:service=Kernel"; + + /* + * Get the list of registered beans. + */ + List<String> getRegisteredBeans(); + + /* + * Get a registered bean from the Kernel. + * @return null if there is no bean registered under this name + */ + Object getRegisteredBean(String beanName); + + /* + * Get a registered bean from the Kernel. + * @return null if there is no bean registered under this name + */ + <T> T getRegisteredBean(Class<T> clazz, String beanName); +} \ No newline at end of file Copied: projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/integration/AbstractMicrocontainerService.java (from rev 91048, projects/jboss-osgi/projects/integration/jbossas/trunk/src/main/java/org/jboss/osgi/integration/jbossas/AbstractMicrocontainerService.java) =================================================================== --- projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/integration/AbstractMicrocontainerService.java (rev 0) +++ projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/integration/AbstractMicrocontainerService.java 2009-07-10 10:02:21 UTC (rev 91057) @@ -0,0 +1,277 @@ +/* + * 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.microcontainer.integration; + +//$Id$ + +import static org.jboss.osgi.spi.management.MicrocontainerServiceMBean.MBEAN_MICROCONTAINER_SERVICE; + +import java.net.URL; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; + +import javax.management.MBeanServer; +import javax.management.StandardMBean; + +import org.jboss.dependency.plugins.AbstractController; +import org.jboss.dependency.plugins.AbstractControllerContext; +import org.jboss.dependency.plugins.AbstractControllerContextActions; +import org.jboss.dependency.plugins.action.ControllerContextAction; +import org.jboss.dependency.spi.ControllerContext; +import org.jboss.dependency.spi.ControllerContextActions; +import org.jboss.dependency.spi.ControllerState; +import org.jboss.deployers.client.spi.Deployment; +import org.jboss.deployers.client.spi.main.MainDeployer; +import org.jboss.deployers.spi.attachments.MutableAttachments; +import org.jboss.deployers.vfs.spi.client.VFSDeployment; +import org.jboss.deployers.vfs.spi.client.VFSDeploymentFactory; +import org.jboss.kernel.Kernel; +import org.jboss.kernel.spi.dependency.KernelController; +import org.jboss.kernel.spi.dependency.KernelControllerContext; +import org.jboss.osgi.microcontainer.MicrocontainerService; +import org.jboss.osgi.spi.Constants; +import org.jboss.osgi.spi.management.MicrocontainerServiceMBean; +import org.jboss.osgi.spi.service.DeployerService; +import org.jboss.osgi.spi.service.DeploymentRegistryService; +import org.jboss.osgi.spi.util.BundleDeployment; +import org.jboss.osgi.spi.util.BundleDeploymentFactory; +import org.jboss.virtual.VFS; +import org.jboss.virtual.VirtualFile; +import org.osgi.framework.BundleContext; +import org.osgi.framework.BundleException; +import org.osgi.util.tracker.ServiceTracker; + +/** + * An OSGi Service the gives access to the Kernel. + * + * @author thomas.diesler(a)jboss.com + * @since 23-Jan-2009 + */ +public abstract class AbstractMicrocontainerService implements DeployerService, MicrocontainerService +{ + private VFSDeploymentFactory deploymentFactory = VFSDeploymentFactory.getInstance(); + private ServiceTracker registryTracker; + + public abstract Kernel getKernel(); + + public abstract void logDebug(String message); + + public abstract void logWarning(String message, Exception ex); + + public void logWarning(String message) + { + logWarning(message, null); + } + + public List<String> getRegisteredBeans() + { + List<String> names = new ArrayList<String>(); + + AbstractController controller = (AbstractController)getKernel().getController(); + for (ControllerContext ctx : controller.getAllContexts()) + { + if (ctx instanceof KernelControllerContext || ctx instanceof PreInstalledControllerContext) + names.add(ctx.getName().toString()); + } + + return names; + } + + public Object getRegisteredBean(String beanName) + { + ControllerContext context = getKernel().getController().getInstalledContext(beanName); + return context != null ? context.getTarget() : null; + } + + @SuppressWarnings("unchecked") + public <T> T getRegisteredBean(Class<T> clazz, String beanName) + { + return (T)getRegisteredBean(beanName); + } + + public void deploy(URL url) throws BundleException + { + BundleDeployment dep = BundleDeploymentFactory.createBundleDeployment(url); + deploy(new BundleDeployment[] { dep }); + } + + public boolean undeploy(URL url) throws BundleException + { + DeploymentRegistryService registry = getDeploymentRegistry(); + BundleDeployment dep = registry.getBundleDeployment(url); + if (dep == null) + { + logWarning("Package not deployed: " + url); + return false; + } + + try + { + MainDeployer mainDeployer = (MainDeployer)getRegisteredBean("MainDeployer"); + mainDeployer.removeDeployment((String)dep.getMetadata()); + mainDeployer.process(); + return true; + } + catch (Exception ex) + { + logWarning("Cannot undeploy bundle", ex); + return false; + } + } + + public void deploy(BundleDeployment[] depArr) throws BundleException + { + ClassLoader ctxLoader = Thread.currentThread().getContextClassLoader(); + try + { + Thread.currentThread().setContextClassLoader(getClass().getClassLoader()); + + List<Deployment> depList = new ArrayList<Deployment>(); + MainDeployer mainDeployer = (MainDeployer)getRegisteredBean("MainDeployer"); + DeploymentRegistryService registry = getDeploymentRegistry(); + + for (BundleDeployment dep : depArr) + { + VirtualFile file = VFS.createNewRoot(dep.getLocation()); + VFSDeployment deployment = deploymentFactory.createVFSDeployment(file); + dep.setMetadata(deployment.getName()); + registry.registerBundleDeployment(dep); + depList.add(deployment); + + MutableAttachments att = (MutableAttachments)deployment.getPredeterminedManagedObjects(); + att.addAttachment(Constants.PROPERTY_START_LEVEL, new Integer(dep.getStartLevel())); + att.addAttachment(Constants.PROPERTY_AUTO_START, new Boolean(dep.isAutoStart())); + + mainDeployer.addDeployment(deployment); + } + + // Process the deployments + mainDeployer.process(); + + // Check for completeness + Deployment[] deploymentArr = depList.toArray(new Deployment[depList.size()]); + mainDeployer.checkComplete(deploymentArr); + } + catch (RuntimeException rte) + { + throw rte; + } + catch (Exception ex) + { + throw new BundleException("Cannot deploy bundles", ex); + } + finally + { + Thread.currentThread().setContextClassLoader(ctxLoader); + } + } + + public void undeploy(BundleDeployment[] depArr) throws BundleException + { + try + { + MainDeployer mainDeployer = (MainDeployer)getRegisteredBean("MainDeployer"); + DeploymentRegistryService registry = getDeploymentRegistry(); + + for (BundleDeployment dep : depArr) + { + registry.unregisterBundleDeployment(dep); + mainDeployer.removeDeployment((String)dep.getMetadata()); + } + mainDeployer.process(); + } + catch (RuntimeException rte) + { + throw rte; + } + catch (Exception ex) + { + logWarning("Cannot undeploy bundles", ex); + } + } + + protected void installBean(KernelController controller, String beanName, Object beanImpl) + { + try + { + ControllerContextActions actions = new AbstractControllerContextActions(new HashMap<ControllerState, ControllerContextAction>()); + controller.install(new PreInstalledControllerContext(beanName, actions, beanImpl)); + } + catch (RuntimeException rte) + { + throw rte; + } + catch (Throwable ex) + { + throw new IllegalStateException("Cannot register bean: " + beanName, ex); + } + } + + protected void registerMicrocontainerServiceMBean(MBeanServer mbeanServer) + { + try + { + StandardMBean mbean = new StandardMBean((MicrocontainerServiceMBean)this, MicrocontainerServiceMBean.class); + mbeanServer.registerMBean(mbean, MBEAN_MICROCONTAINER_SERVICE); + } + catch (Exception ex) + { + throw new IllegalStateException("Cannot register MicrocontainerServiceMBean", ex); + } + } + + protected void unregisterMicrocontainerServiceMBean(MBeanServer mbeanServer) + { + if (mbeanServer.isRegistered(MBEAN_MICROCONTAINER_SERVICE)) + { + try + { + logDebug("Unregister MicrocontainerServiceMBean"); + mbeanServer.unregisterMBean(MBEAN_MICROCONTAINER_SERVICE); + } + catch (Exception ex) + { + logWarning("Cannot unregister MicrocontainerServiceMBean", ex); + } + } + } + + private DeploymentRegistryService getDeploymentRegistry() + { + if (registryTracker == null) + { + BundleContext context = getRegisteredBean(BundleContext.class, BEAN_SYSTEM_BUNDLE_CONTEXT); + registryTracker = new ServiceTracker(context, DeploymentRegistryService.class.getName(), null); + registryTracker.open(); + } + return (DeploymentRegistryService)registryTracker.getService(); + } + + static class PreInstalledControllerContext extends AbstractControllerContext + { + public PreInstalledControllerContext(Object name, ControllerContextActions actions, Object target) + { + super(name, actions, null, target); + } + } +} \ No newline at end of file Copied: projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/integration/MicrocontainerServiceBean.java (from rev 91048, projects/jboss-osgi/projects/integration/jbossas/trunk/src/main/java/org/jboss/osgi/integration/jbossas/MicrocontainerServiceBean.java) =================================================================== --- projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/integration/MicrocontainerServiceBean.java (rev 0) +++ projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/integration/MicrocontainerServiceBean.java 2009-07-10 10:02:21 UTC (rev 91057) @@ -0,0 +1,139 @@ +/* + * 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.microcontainer.integration; + +//$Id$ + +import java.util.Properties; + +import javax.management.MBeanServer; +import javax.naming.InitialContext; +import javax.naming.NamingException; + +import org.jboss.kernel.Kernel; +import org.jboss.kernel.spi.dependency.KernelController; +import org.jboss.logging.Logger; +import org.jboss.osgi.microcontainer.MicrocontainerService; +import org.jboss.osgi.spi.management.MicrocontainerServiceMBean; +import org.jboss.osgi.spi.service.DeployerService; +import org.osgi.framework.BundleContext; + +/** + * An implementation of the {@link DeployerService} and {@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 +{ + private static Logger log = Logger.getLogger(MicrocontainerServiceBean.class); + + private BundleContext context; + private MBeanServer mbeanServer; + private Kernel kernel; + + public void setSystemContext(BundleContext context) + { + this.context = context; + } + + public void setMbeanServer(MBeanServer mbeanServer) + { + this.mbeanServer = mbeanServer; + } + + public void setKernel(Kernel kernel) + { + this.kernel = kernel; + } + + public Kernel getKernel() + { + return kernel; + } + + @Override + public void logDebug(String message) + { + log.debug(message); + } + + @Override + public void logWarning(String message, Exception ex) + { + log.warn(message, ex); + } + + public void start() + { + Kernel kernel = getKernel(); + KernelController controller = kernel.getController(); + + // Register the MBeanServer + context.registerService(MBeanServer.class.getName(), mbeanServer, null); + log.debug("MBeanServer registered"); + + // Register the InitialContext service + registerInitialContext(); + log.debug("InitialContext registered"); + + // Preregister some beans + installBean(controller, BEAN_SYSTEM_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 DeployerService + Properties props = new Properties(); + props.setProperty("provider", "microcontainer"); + context.registerService(DeployerService.class.getName(), this, props); + log.debug("DeployerService registered"); + + // Register the MicrocontainerServiceMBean + registerMicrocontainerServiceMBean(mbeanServer); + log.debug("MicrocontainerServiceMBean registered"); + } + + void stop() + { + unregisterMicrocontainerServiceMBean(mbeanServer); + } + + public void registerInitialContext() + { + try + { + InitialContext initialContext = new InitialContext(); + context.registerService(InitialContext.class.getName(), initialContext, null); + } + catch (NamingException ex) + { + throw new IllegalStateException("Cannot register InitialContext", ex); + } + } +} \ No newline at end of file Modified: projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/internal/MicrocontainerServiceActivator.java =================================================================== --- projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/internal/MicrocontainerServiceActivator.java 2009-07-10 09:56:10 UTC (rev 91056) +++ projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/internal/MicrocontainerServiceActivator.java 2009-07-10 10:02:21 UTC (rev 91057) @@ -23,7 +23,7 @@ //$Id$ -import org.jboss.osgi.spi.service.MicrocontainerService; +import org.jboss.osgi.microcontainer.MicrocontainerService; import org.osgi.framework.BundleActivator; import org.osgi.framework.BundleContext; Modified: projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/internal/MicrocontainerServiceImpl.java =================================================================== --- projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/internal/MicrocontainerServiceImpl.java 2009-07-10 09:56:10 UTC (rev 91056) +++ projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/internal/MicrocontainerServiceImpl.java 2009-07-10 10:02:21 UTC (rev 91057) @@ -35,11 +35,11 @@ import org.jboss.kernel.Kernel; import org.jboss.kernel.spi.dependency.KernelController; import org.jboss.osgi.common.log.LogServiceTracker; -import org.jboss.osgi.integration.jbossas.AbstractMicrocontainerService; import org.jboss.osgi.jbossxb.XMLBindingService; +import org.jboss.osgi.microcontainer.MicrocontainerService; +import org.jboss.osgi.microcontainer.integration.AbstractMicrocontainerService; import org.jboss.osgi.spi.management.MicrocontainerServiceMBean; import org.jboss.osgi.spi.service.DeployerService; -import org.jboss.osgi.spi.service.MicrocontainerService; import org.jboss.virtual.VFS; import org.osgi.framework.BundleContext; import org.osgi.framework.Filter; Deleted: projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/service/MicrocontainerService.java =================================================================== --- projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/service/MicrocontainerService.java 2009-07-10 09:56:10 UTC (rev 91056) +++ projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/service/MicrocontainerService.java 2009-07-10 10:02:21 UTC (rev 91057) @@ -1,72 +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.spi.service; - -//$Id$ - -import java.util.List; - -/** - * An OSGi Service the gives access to the Kernel and MBeanServer. - * - * @author thomas.diesler(a)jboss.com - * @since 23-Jan-2009 - */ -public interface MicrocontainerService -{ - /* - * The name under which the system bundle context is registered: 'jboss.osgi:service=BundleContext' - */ - String BEAN_SYSTEM_BUNDLE_CONTEXT = "jboss.osgi:service=BundleContext"; - - /* - * The name under which the MBeanServer is registered: 'jboss.osgi:service=MBeanServer' - */ - String BEAN_MBEAN_SERVER = "jboss.osgi:service=MBeanServer"; - - /* - * The name under which the KernelController is registered: 'jboss.kernel:service=KernelController' - */ - String BEAN_KERNEL_CONTROLLER = "jboss.kernel:service=KernelController"; - - /* - * The name under which the Kernel is registered: 'jboss.kernel:service=Kernel' - */ - String BEAN_KERNEL = "jboss.kernel:service=Kernel"; - - /* - * Get the list of registered beans. - */ - List<String> getRegisteredBeans(); - - /* - * Get a registered bean from the Kernel. - * @return null if there is no bean registered under this name - */ - Object getRegisteredBean(String beanName); - - /* - * Get a registered bean from the Kernel. - * @return null if there is no bean registered under this name - */ - <T> T getRegisteredBean(Class<T> clazz, String beanName); -} \ No newline at end of file

16 years, 6 months

1
0
0 / 0

JBoss-OSGI SVN: r91056 - projects/jboss-osgi/projects/integration/jbossas/trunk.

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

Author: thomas.diesler(a)jboss.com Date: 2009-07-10 05:56:10 -0400 (Fri, 10 Jul 2009) New Revision: 91056 Modified: projects/jboss-osgi/projects/integration/jbossas/trunk/pom.xml Log: Fix typo Modified: projects/jboss-osgi/projects/integration/jbossas/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/integration/jbossas/trunk/pom.xml 2009-07-10 09:55:33 UTC (rev 91055) +++ projects/jboss-osgi/projects/integration/jbossas/trunk/pom.xml 2009-07-10 09:56:10 UTC (rev 91056) @@ -17,22 +17,13 @@ </parent> <properties> - <version.jboss.osgi.jmx>1.0.0-SNAPSHOT</version.jboss.osgi.jmx> <version.jboss.osgi.microcontainer>1.0.0-SNAPSHOT</version.jboss.osgi.microcontainer> - <version.osgi>r4v41</version.osgi> </properties>  <dependencies> -  - <dependency> - <groupId>org.jboss.osgi.bundles</groupId> <artifactId>jboss-osgi-microcontainer</artifactId> <version>${version.jboss.osgi.microcontainer}</version> </dependency>

16 years, 6 months

1
0
0 / 0

JBoss-OSGI SVN: r91055 - in projects/jboss-osgi/projects/integration/jbossas/trunk: src/main/java/org/jboss/osgi and 1 other directories.

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

Author: thomas.diesler(a)jboss.com Date: 2009-07-10 05:55:33 -0400 (Fri, 10 Jul 2009) New Revision: 91055 Removed: projects/jboss-osgi/projects/integration/jbossas/trunk/src/main/java/org/jboss/osgi/integration/jbossas/ projects/jboss-osgi/projects/integration/jbossas/trunk/src/main/java/org/jboss/osgi/jaxb/ projects/jboss-osgi/projects/integration/jbossas/trunk/src/main/java/org/jboss/osgi/jbossxb/ projects/jboss-osgi/projects/integration/jbossas/trunk/src/main/java/org/jboss/osgi/jmx/ projects/jboss-osgi/projects/integration/jbossas/trunk/src/main/java/org/jboss/osgi/jndi/ projects/jboss-osgi/projects/integration/jbossas/trunk/src/main/java/org/jboss/osgi/microcontainer/ projects/jboss-osgi/projects/integration/jbossas/trunk/src/main/java/org/jboss/osgi/xml/ Modified: projects/jboss-osgi/projects/integration/jbossas/trunk/pom.xml Log: Use dependency plugin to collect classes Modified: projects/jboss-osgi/projects/integration/jbossas/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/integration/jbossas/trunk/pom.xml 2009-07-10 09:41:44 UTC (rev 91054) +++ projects/jboss-osgi/projects/integration/jbossas/trunk/pom.xml 2009-07-10 09:55:33 UTC (rev 91055) @@ -17,36 +17,61 @@ </parent> <properties> - <version.jboss.osgi.spi>1.0.0-SNAPSHOT</version.jboss.osgi.spi> + <version.jboss.osgi.jmx>1.0.0-SNAPSHOT</version.jboss.osgi.jmx> + <version.jboss.osgi.microcontainer>1.0.0-SNAPSHOT</version.jboss.osgi.microcontainer> <version.osgi>r4v41</version.osgi> </properties>  <dependencies> +  + --> <dependency> - <groupId>org.osgi</groupId> - <artifactId>org.osgi.core</artifactId> - <version>${version.osgi}</version> - <scope>provided</scope> + <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.compendium</artifactId> - <version>${version.osgi}</version> - <scope>provided</scope> - </dependency> </dependencies>  <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-apache-xerces,jboss-osgi-jaxb,jboss-osgi-jmx,jboss-osgi-jndi,jboss-osgi-microcontainer,jboss-osgi-xml-binding + </includeArtifactIds> + <includes> + org/jboss/osgi/jaxb/*.class, + org/jboss/osgi/jbossxb/*.class, + org/jboss/osgi/jmx/*.class, + org/jboss/osgi/jndi/*.class, + org/jboss/osgi/microcontainer/*.class, + org/jboss/osgi/microcontainer/integration/*.class, + org/jboss/osgi/xml/*.class + </includes> + </configuration> + </plugin> </plugins> </build>

16 years, 6 months

1
0
0 / 0

JBoss-OSGI SVN: r91021 - projects/jboss-osgi/projects/runtime/felix/trunk/src/main/resources.

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

Author: thomas.diesler(a)jboss.com Date: 2009-07-09 16:07:06 -0400 (Thu, 09 Jul 2009) New Revision: 91021 Modified: projects/jboss-osgi/projects/runtime/felix/trunk/src/main/resources/osgi-deployers-jboss-beans.xml Log: Add org.jboss.beans;version=2.0 Modified: projects/jboss-osgi/projects/runtime/felix/trunk/src/main/resources/osgi-deployers-jboss-beans.xml =================================================================== --- projects/jboss-osgi/projects/runtime/felix/trunk/src/main/resources/osgi-deployers-jboss-beans.xml 2009-07-09 19:56:29 UTC (rev 91020) +++ projects/jboss-osgi/projects/runtime/felix/trunk/src/main/resources/osgi-deployers-jboss-beans.xml 2009-07-09 20:07:06 UTC (rev 91021) @@ -41,12 +41,12 @@ org.jboss.osgi.spi.util;version=1.0,  - org.jboss.beans.metadata.plugins, - org.jboss.beans.metadata.plugins.builder, - org.jboss.beans.metadata.spi.builder, - org.jboss.beans.metadata.spi, - org.jboss.dependency.spi, - org.jboss.kernel.spi.dependency, + org.jboss.beans.metadata.plugins;version=2.0, + org.jboss.beans.metadata.plugins.builder;version=2.0, + org.jboss.beans.metadata.spi.builder;version=2.0, + org.jboss.beans.metadata.spi;version=2.0, + org.jboss.dependency.spi;version=2.0, + org.jboss.kernel.spi.dependency;version=2.0, org.jboss.logging, org.jboss.virtual, org.jboss.virtual.plugins.registry,

16 years, 6 months

1
0
0 / 0

JBoss-OSGI SVN: r91020 - in projects/jboss-osgi: projects/integration/jbossas/trunk/src/main/java/org/jboss/osgi/jaxb and 10 other directories.

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

Author: thomas.diesler(a)jboss.com Date: 2009-07-09 15:56:29 -0400 (Thu, 09 Jul 2009) New Revision: 91020 Added: projects/jboss-osgi/projects/integration/jbossas/trunk/src/main/java/org/jboss/osgi/jaxb/ projects/jboss-osgi/projects/integration/jbossas/trunk/src/main/java/org/jboss/osgi/jaxb/JAXBCapability.java projects/jboss-osgi/projects/integration/jbossas/trunk/src/main/java/org/jboss/osgi/jaxb/JAXBService.java projects/jboss-osgi/projects/integration/jbossas/trunk/src/main/java/org/jboss/osgi/jbossxb/ projects/jboss-osgi/projects/integration/jbossas/trunk/src/main/java/org/jboss/osgi/jbossxb/XMLBindingCapability.java projects/jboss-osgi/projects/integration/jbossas/trunk/src/main/java/org/jboss/osgi/jbossxb/XMLBindingService.java projects/jboss-osgi/projects/integration/jbossas/trunk/src/main/java/org/jboss/osgi/jmx/ projects/jboss-osgi/projects/integration/jbossas/trunk/src/main/java/org/jboss/osgi/jmx/JMXCapability.java projects/jboss-osgi/projects/integration/jbossas/trunk/src/main/java/org/jboss/osgi/jndi/ projects/jboss-osgi/projects/integration/jbossas/trunk/src/main/java/org/jboss/osgi/jndi/JNDICapability.java projects/jboss-osgi/projects/integration/jbossas/trunk/src/main/java/org/jboss/osgi/microcontainer/ projects/jboss-osgi/projects/integration/jbossas/trunk/src/main/java/org/jboss/osgi/microcontainer/MicrocontainerCapability.java projects/jboss-osgi/projects/integration/jbossas/trunk/src/main/java/org/jboss/osgi/xml/ projects/jboss-osgi/projects/integration/jbossas/trunk/src/main/java/org/jboss/osgi/xml/XMLParserCapability.java Modified: projects/jboss-osgi/projects/runtime/felix/trunk/src/main/resources/osgi-deployers-jboss-beans.xml projects/jboss-osgi/trunk/blueprint/impl/pom.xml projects/jboss-osgi/trunk/blueprint/pom.xml projects/jboss-osgi/trunk/blueprint/testsuite/pom.xml projects/jboss-osgi/trunk/pom.xml Log: Fix JBossAS integration Added: projects/jboss-osgi/projects/integration/jbossas/trunk/src/main/java/org/jboss/osgi/jaxb/JAXBCapability.java =================================================================== --- projects/jboss-osgi/projects/integration/jbossas/trunk/src/main/java/org/jboss/osgi/jaxb/JAXBCapability.java (rev 0) +++ projects/jboss-osgi/projects/integration/jbossas/trunk/src/main/java/org/jboss/osgi/jaxb/JAXBCapability.java 2009-07-09 19:56:29 UTC (rev 91020) @@ -0,0 +1,52 @@ +/* + * 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.jaxb; + +//$Id$ + +import org.jboss.osgi.spi.capability.Capability; +import org.jboss.osgi.spi.testing.OSGiRuntime; +import org.jboss.osgi.xml.XMLParserCapability; + +/** + * Adds the JAXB capability to the {@link OSGiRuntime} + * under test. + * + * It is ignored if the {@link JAXBService} is already registered. + * + * Dependent capabilities: {@link XMLParserCapability}. + * + * Installed bundles: jboss-osgi-jaxb.jar + * + * @author thomas.diesler(a)jboss.com + * @since 05-May-2009 + */ +public class JAXBCapability extends Capability +{ + public JAXBCapability() + { + super(JAXBService.class.getName()); + + addDependency(new XMLParserCapability()); + addBundle("bundles/jboss-osgi-jaxb.jar"); + } +} \ No newline at end of file Property changes on: projects/jboss-osgi/projects/integration/jbossas/trunk/src/main/java/org/jboss/osgi/jaxb/JAXBCapability.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/jboss-osgi/projects/integration/jbossas/trunk/src/main/java/org/jboss/osgi/jaxb/JAXBService.java =================================================================== --- projects/jboss-osgi/projects/integration/jbossas/trunk/src/main/java/org/jboss/osgi/jaxb/JAXBService.java (rev 0) +++ projects/jboss-osgi/projects/integration/jbossas/trunk/src/main/java/org/jboss/osgi/jaxb/JAXBService.java 2009-07-09 19:56:29 UTC (rev 91020) @@ -0,0 +1,34 @@ +/* + * 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.jaxb; + +//$Id$ + +/** + * A marker service that is registered by jboss-osgi-jaxb + * + * @author thomas.diesler(a)jboss.com + * @since 29-May-2009 + */ +public interface JAXBService +{ +} \ No newline at end of file Property changes on: projects/jboss-osgi/projects/integration/jbossas/trunk/src/main/java/org/jboss/osgi/jaxb/JAXBService.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/jboss-osgi/projects/integration/jbossas/trunk/src/main/java/org/jboss/osgi/jbossxb/XMLBindingCapability.java =================================================================== --- projects/jboss-osgi/projects/integration/jbossas/trunk/src/main/java/org/jboss/osgi/jbossxb/XMLBindingCapability.java (rev 0) +++ projects/jboss-osgi/projects/integration/jbossas/trunk/src/main/java/org/jboss/osgi/jbossxb/XMLBindingCapability.java 2009-07-09 19:56:29 UTC (rev 91020) @@ -0,0 +1,53 @@ +/* + * 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.jbossxb; + +//$Id$ + +import org.jboss.osgi.jaxb.JAXBCapability; +import org.jboss.osgi.spi.capability.Capability; +import org.jboss.osgi.spi.testing.OSGiRuntime; + +/** + * Adds the JBossXB capability to the {@link OSGiRuntime} + * under test. + * + * It is ignored if the {@link XMLBindingService} is already registered. + * + * Dependent capabilities: {@link JAXBCapability}. + * + * Installed bundles: jboss-osgi-common-core.jar, jboss-osgi-xml-binding.jar + * + * @author thomas.diesler(a)jboss.com + * @since 05-May-2009 + */ +public class XMLBindingCapability extends Capability +{ + public XMLBindingCapability() + { + super (XMLBindingService.class.getName()); + + addDependency(new JAXBCapability()); + addBundle("bundles/jboss-osgi-common-core.jar"); + addBundle("bundles/jboss-osgi-xml-binding.jar"); + } +} \ No newline at end of file Property changes on: projects/jboss-osgi/projects/integration/jbossas/trunk/src/main/java/org/jboss/osgi/jbossxb/XMLBindingCapability.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/jboss-osgi/projects/integration/jbossas/trunk/src/main/java/org/jboss/osgi/jbossxb/XMLBindingService.java =================================================================== --- projects/jboss-osgi/projects/integration/jbossas/trunk/src/main/java/org/jboss/osgi/jbossxb/XMLBindingService.java (rev 0) +++ projects/jboss-osgi/projects/integration/jbossas/trunk/src/main/java/org/jboss/osgi/jbossxb/XMLBindingService.java 2009-07-09 19:56:29 UTC (rev 91020) @@ -0,0 +1,34 @@ +/* + * 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.jbossxb; + +//$Id$ + +/** + * A marker service that is registered by jboss-osgi-xml-binding + * + * @author thomas.diesler(a)jboss.com + * @since 29-May-2009 + */ +public interface XMLBindingService +{ +} \ No newline at end of file Property changes on: projects/jboss-osgi/projects/integration/jbossas/trunk/src/main/java/org/jboss/osgi/jbossxb/XMLBindingService.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/jboss-osgi/projects/integration/jbossas/trunk/src/main/java/org/jboss/osgi/jmx/JMXCapability.java =================================================================== --- projects/jboss-osgi/projects/integration/jbossas/trunk/src/main/java/org/jboss/osgi/jmx/JMXCapability.java (rev 0) +++ projects/jboss-osgi/projects/integration/jbossas/trunk/src/main/java/org/jboss/osgi/jmx/JMXCapability.java 2009-07-09 19:56:29 UTC (rev 91020) @@ -0,0 +1,64 @@ +/* + * 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$ + +import java.util.Properties; + +import javax.management.MBeanServer; + +import org.jboss.osgi.spi.capability.Capability; +import org.jboss.osgi.spi.testing.OSGiRuntime; + +/** + * Adds the JMX capability to the {@link OSGiRuntime} + * under test. + * + * It is ignored if the {@link MBeanServer} is already registered. + * + * Installed bundles: jboss-osgi-jmx.jar + * + * Default properties set by this capability + * + * <table> + * <tr><th>Property</th><th>Value</th></tr> + * <tr><td>org.jboss.osgi.jmx.host</td><td>${jboss.bind.address}</td></tr> + * <tr><td>org.jboss.osgi.jmx.rmi.port</td><td>1198</td></tr> + * </table> + * + * @author thomas.diesler(a)jboss.com + * @since 05-May-2009 + */ +public class JMXCapability extends Capability +{ + public JMXCapability() + { + super(MBeanServer.class.getName()); + + Properties props = getProperties(); + props.setProperty("org.jboss.osgi.jmx.host", System.getProperty("jboss.bind.address", "localhost")); + props.setProperty("org.jboss.osgi.jmx.rmi.port", "1198"); + + addBundle("bundles/jboss-osgi-jmx.jar"); + } +} \ No newline at end of file Property changes on: projects/jboss-osgi/projects/integration/jbossas/trunk/src/main/java/org/jboss/osgi/jmx/JMXCapability.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/jboss-osgi/projects/integration/jbossas/trunk/src/main/java/org/jboss/osgi/jndi/JNDICapability.java =================================================================== --- projects/jboss-osgi/projects/integration/jbossas/trunk/src/main/java/org/jboss/osgi/jndi/JNDICapability.java (rev 0) +++ projects/jboss-osgi/projects/integration/jbossas/trunk/src/main/java/org/jboss/osgi/jndi/JNDICapability.java 2009-07-09 19:56:29 UTC (rev 91020) @@ -0,0 +1,67 @@ +/* + * 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.jndi; + +//$Id$ + +import java.util.Properties; + +import javax.naming.InitialContext; + +import org.jboss.osgi.spi.capability.Capability; +import org.jboss.osgi.spi.testing.OSGiRuntime; + +/** + * Adds the JNDI capability to the {@link OSGiRuntime} + * under test. + * + * It is ignored if the {@link InitialContext} is already registered. + * + * Installed bundles: jboss-osgi-common-core.jar, jboss-osgi-jndi.jar + * + * Default properties set by this capability + * + * <table> + * <tr><th>Property</th><th>Value</th></tr> + * <tr><td>org.jboss.osgi.jndi.host</td><td>${jboss.bind.address}</td></tr> + * <tr><td>org.jboss.osgi.jndi.rmi.port</td><td>1198</td></tr> + * <tr><td>org.jboss.osgi.jndi.port</td><td>1199</td></tr> + * </table> + * + * @author thomas.diesler(a)jboss.com + * @since 05-May-2009 + */ +public class JNDICapability extends Capability +{ + public JNDICapability() + { + super(InitialContext.class.getName()); + + Properties props = getProperties(); + props.setProperty("org.jboss.osgi.jndi.host", System.getProperty("jboss.bind.address", "localhost")); + props.setProperty("org.jboss.osgi.jndi.rmi.port", "1198"); + props.setProperty("org.jboss.osgi.jndi.port", "1199"); + + addBundle("bundles/jboss-osgi-common-core.jar"); + addBundle("bundles/jboss-osgi-jndi.jar"); + } +} \ No newline at end of file Property changes on: projects/jboss-osgi/projects/integration/jbossas/trunk/src/main/java/org/jboss/osgi/jndi/JNDICapability.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/jboss-osgi/projects/integration/jbossas/trunk/src/main/java/org/jboss/osgi/microcontainer/MicrocontainerCapability.java =================================================================== --- projects/jboss-osgi/projects/integration/jbossas/trunk/src/main/java/org/jboss/osgi/microcontainer/MicrocontainerCapability.java (rev 0) +++ projects/jboss-osgi/projects/integration/jbossas/trunk/src/main/java/org/jboss/osgi/microcontainer/MicrocontainerCapability.java 2009-07-09 19:56:29 UTC (rev 91020) @@ -0,0 +1,55 @@ +/* + * 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.microcontainer; + +//$Id$ + +import org.jboss.osgi.jbossxb.XMLBindingCapability; +import org.jboss.osgi.jmx.JMXCapability; +import org.jboss.osgi.spi.capability.Capability; +import org.jboss.osgi.spi.service.MicrocontainerService; +import org.jboss.osgi.spi.testing.OSGiRuntime; + +/** + * Adds the Microcontainer capability to the {@link OSGiRuntime} + * under test. + * + * It is ignored if the {@link MicrocontainerService} is already registered. + * + * Dependent capabilities: {@link JMXCapability}, {@link XMLBindingCapability}. + * + * Installed bundles: jboss-osgi-microcontainer.jar + * + * @author thomas.diesler(a)jboss.com + * @since 05-May-2009 + */ +public class MicrocontainerCapability extends Capability +{ + public MicrocontainerCapability() + { + super(MicrocontainerService.class.getName()); + + addDependency(new JMXCapability()); + addDependency(new XMLBindingCapability()); + addBundle("bundles/jboss-osgi-microcontainer.jar"); + } +} \ No newline at end of file Property changes on: projects/jboss-osgi/projects/integration/jbossas/trunk/src/main/java/org/jboss/osgi/microcontainer/MicrocontainerCapability.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/jboss-osgi/projects/integration/jbossas/trunk/src/main/java/org/jboss/osgi/xml/XMLParserCapability.java =================================================================== --- projects/jboss-osgi/projects/integration/jbossas/trunk/src/main/java/org/jboss/osgi/xml/XMLParserCapability.java (rev 0) +++ projects/jboss-osgi/projects/integration/jbossas/trunk/src/main/java/org/jboss/osgi/xml/XMLParserCapability.java 2009-07-09 19:56:29 UTC (rev 91020) @@ -0,0 +1,50 @@ +/* + * 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.xml; + +//$Id$ + +import javax.xml.parsers.SAXParserFactory; + +import org.jboss.osgi.spi.capability.Capability; +import org.jboss.osgi.spi.testing.OSGiRuntime; + +/** + * Adds the XML parser capability to the {@link OSGiRuntime} + * under test. + * + * It is ignored if the {@link SAXParserFactory} is already registered. + * + * Installed bundles: jboss-osgi-apache-xerces.jar + * + * @author thomas.diesler(a)jboss.com + * @since 05-May-2009 + */ +public class XMLParserCapability extends Capability +{ + public XMLParserCapability() + { + super(SAXParserFactory.class.getName()); + + addBundle("bundles/jboss-osgi-apache-xerces.jar"); + } +} \ No newline at end of file Property changes on: projects/jboss-osgi/projects/integration/jbossas/trunk/src/main/java/org/jboss/osgi/xml/XMLParserCapability.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: projects/jboss-osgi/projects/runtime/felix/trunk/src/main/resources/osgi-deployers-jboss-beans.xml =================================================================== --- projects/jboss-osgi/projects/runtime/felix/trunk/src/main/resources/osgi-deployers-jboss-beans.xml 2009-07-09 19:51:27 UTC (rev 91019) +++ projects/jboss-osgi/projects/runtime/felix/trunk/src/main/resources/osgi-deployers-jboss-beans.xml 2009-07-09 19:56:29 UTC (rev 91020) @@ -29,13 +29,16 @@ org.apache.xerces.dom,  + org.jboss.osgi.jmx;version=1.0, + org.jboss.osgi.jndi;version=1.0, + org.jboss.osgi.microcontainer;version=1.0, org.jboss.osgi.spi;version=1.0, org.jboss.osgi.spi.capability;version=1.0, org.jboss.osgi.spi.logging;version=1.0, org.jboss.osgi.spi.management;version=1.0, org.jboss.osgi.spi.service;version=1.0, org.jboss.osgi.spi.testing;version=1.0, - org.jboss.osgi.spi.util;version=1.0, + org.jboss.osgi.spi.util;version=1.0,  org.jboss.beans.metadata.plugins, Modified: projects/jboss-osgi/trunk/blueprint/impl/pom.xml =================================================================== --- projects/jboss-osgi/trunk/blueprint/impl/pom.xml 2009-07-09 19:51:27 UTC (rev 91019) +++ projects/jboss-osgi/trunk/blueprint/impl/pom.xml 2009-07-09 19:56:29 UTC (rev 91020) @@ -11,7 +11,7 @@ <parent> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-blueprint-parent</artifactId> - <version>1.0.0.Beta3</version> + <version>1.0.0-SNAPSHOT</version> </parent>  Modified: projects/jboss-osgi/trunk/blueprint/pom.xml =================================================================== --- projects/jboss-osgi/trunk/blueprint/pom.xml 2009-07-09 19:51:27 UTC (rev 91019) +++ projects/jboss-osgi/trunk/blueprint/pom.xml 2009-07-09 19:56:29 UTC (rev 91020) @@ -7,6 +7,8 @@ <artifactId>jboss-osgi-blueprint-parent</artifactId> <packaging>pom</packaging> + <version>1.0.0-SNAPSHOT</version> + <parent> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi</artifactId> Modified: projects/jboss-osgi/trunk/blueprint/testsuite/pom.xml =================================================================== --- projects/jboss-osgi/trunk/blueprint/testsuite/pom.xml 2009-07-09 19:51:27 UTC (rev 91019) +++ projects/jboss-osgi/trunk/blueprint/testsuite/pom.xml 2009-07-09 19:56:29 UTC (rev 91020) @@ -10,7 +10,7 @@ <parent> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-blueprint-parent</artifactId> - <version>1.0.0.Beta3</version> + <version>1.0.0-SNAPSHOT</version> </parent>  @@ -18,9 +18,13 @@ <dependency> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-blueprint</artifactId> - <version>${version}</version> <scope>provided</scope> </dependency> + <dependency> + <groupId>org.jboss.osgi</groupId> + <artifactId>jboss-osgi-husky-harness</artifactId> + <scope>provided</scope> + </dependency> <dependency> <groupId>biz.aQute</groupId> Modified: projects/jboss-osgi/trunk/pom.xml =================================================================== --- projects/jboss-osgi/trunk/pom.xml 2009-07-09 19:51:27 UTC (rev 91019) +++ projects/jboss-osgi/trunk/pom.xml 2009-07-09 19:56:29 UTC (rev 91020) @@ -40,6 +40,7 @@ <version.jboss.microcontainer>2.0.5.GA</version.jboss.microcontainer> <version.jboss.naming>5.0.1.GA</version.jboss.naming> <version.jboss.osgi.apache.xerces>2.9.1-SNAPSHOT</version.jboss.osgi.apache.xerces> + <version.jboss.osgi.blueprint>1.0.0-SNAPSHOT</version.jboss.osgi.blueprint> <version.jboss.osgi.common>1.0.0-SNAPSHOT</version.jboss.osgi.common> <version.jboss.osgi.common.core>2.2.11</version.jboss.osgi.common.core> <version.jboss.osgi.deployers>1.0.0-SNAPSHOT</version.jboss.osgi.deployers> @@ -136,6 +137,11 @@ <version>${version.jboss.naming}</version> </dependency> <dependency> + <groupId>org.jboss.osgi</groupId> + <artifactId>jboss-osgi-blueprint</artifactId> + <version>${version.jboss.osgi.blueprint}</version> + </dependency> + <dependency> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-deployers</artifactId> <version>${version.jboss.osgi.deployers}</version>

16 years, 6 months

1
0
0 / 0

JBoss-OSGI SVN: r91015 - projects/jboss-osgi/projects/parent/tags/jboss-osgi-parent-1.0.0.

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

Author: thomas.diesler(a)jboss.com Date: 2009-07-09 15:01:38 -0400 (Thu, 09 Jul 2009) New Revision: 91015 Modified: projects/jboss-osgi/projects/parent/tags/jboss-osgi-parent-1.0.0/.project Log: Add Eclipse stuff Modified: projects/jboss-osgi/projects/parent/tags/jboss-osgi-parent-1.0.0/.project =================================================================== --- projects/jboss-osgi/projects/parent/tags/jboss-osgi-parent-1.0.0/.project 2009-07-09 19:00:30 UTC (rev 91014) +++ projects/jboss-osgi/projects/parent/tags/jboss-osgi-parent-1.0.0/.project 2009-07-09 19:01:38 UTC (rev 91015) @@ -6,23 +6,12 @@ </projects> <buildSpec> <buildCommand> - <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name> - <triggers>full,incremental,</triggers> - <arguments> - <dictionary> - <key>LaunchConfigHandle</key> - <value><project>/.externalToolBuilders/org.eclipse.jdt.core.javabuilder.launch</value> - </dictionary> - </arguments> - </buildCommand> - <buildCommand> <name>org.maven.ide.eclipse.maven2Builder</name> <arguments> </arguments> </buildCommand> </buildSpec> <natures> - <nature>org.eclipse.jdt.core.javanature</nature> <nature>org.maven.ide.eclipse.maven2Nature</nature> </natures> </projectDescription>

16 years, 6 months

1
0
0 / 0

JBoss-OSGI SVN: r91014 - projects/jboss-osgi/projects/parent/tags/jboss-osgi-parent-1.0.0.

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

Author: thomas.diesler(a)jboss.com Date: 2009-07-09 15:00:30 -0400 (Thu, 09 Jul 2009) New Revision: 91014 Added: projects/jboss-osgi/projects/parent/tags/jboss-osgi-parent-1.0.0/.project Modified: projects/jboss-osgi/projects/parent/tags/jboss-osgi-parent-1.0.0/ Log: Add Eclipse stuff Property changes on: projects/jboss-osgi/projects/parent/tags/jboss-osgi-parent-1.0.0 ___________________________________________________________________ Name: svn:ignore + target Added: projects/jboss-osgi/projects/parent/tags/jboss-osgi-parent-1.0.0/.project =================================================================== --- projects/jboss-osgi/projects/parent/tags/jboss-osgi-parent-1.0.0/.project (rev 0) +++ projects/jboss-osgi/projects/parent/tags/jboss-osgi-parent-1.0.0/.project 2009-07-09 19:00:30 UTC (rev 91014) @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>jboss-osgi-parent</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name> + <triggers>full,incremental,</triggers> + <arguments> + <dictionary> + <key>LaunchConfigHandle</key> + <value><project>/.externalToolBuilders/org.eclipse.jdt.core.javabuilder.launch</value> + </dictionary> + </arguments> + </buildCommand> + <buildCommand> + <name>org.maven.ide.eclipse.maven2Builder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.maven.ide.eclipse.maven2Nature</nature> + </natures> +</projectDescription>

16 years, 6 months

1
0
0 / 0

JBoss-OSGI SVN: r91003 - in projects/jboss-osgi: trunk/testsuite/functional/src/test/resources and 1 other directory.

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

Author: thomas.diesler(a)jboss.com Date: 2009-07-09 10:07:07 -0400 (Thu, 09 Jul 2009) New Revision: 91003 Modified: projects/jboss-osgi/projects/bundles/jmx/trunk/pom.xml projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jboss-osgi-felix.properties Log: Fix missing capability package from sys classpath Modified: projects/jboss-osgi/projects/bundles/jmx/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/bundles/jmx/trunk/pom.xml 2009-07-09 13:58:40 UTC (rev 91002) +++ projects/jboss-osgi/projects/bundles/jmx/trunk/pom.xml 2009-07-09 14:07:07 UTC (rev 91003) @@ -67,9 +67,9 @@ javax.naming.spi,  - org.jboss.osgi.common.log;version="1.0", + org.jboss.osgi.common.log;version=1.0, org.jboss.osgi.spi.capability;version=1.0, - org.jboss.osgi.spi.management;version="1.0", + org.jboss.osgi.spi.management;version=1.0,  org.osgi.framework;version=1.4, Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jboss-osgi-felix.properties =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jboss-osgi-felix.properties 2009-07-09 13:58:40 UTC (rev 91002) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jboss-osgi-felix.properties 2009-07-09 14:07:07 UTC (rev 91003) @@ -19,6 +19,7 @@ org.jboss.logging, \ org.jboss.net.protocol, \ org.jboss.osgi.spi;version=1.0, \ + org.jboss.osgi.spi.capability;version=1.0, \ org.jboss.osgi.spi.logging;version=1.0, \ org.jboss.osgi.spi.management;version=1.0, \ org.jboss.osgi.spi.service;version=1.0, \

16 years, 6 months

1
0
0 / 0

JBoss-OSGI SVN: r91002 - in projects/jboss-osgi: projects/bundles/microcontainer/trunk and 3 other directories.

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

Author: thomas.diesler(a)jboss.com Date: 2009-07-09 09:58:40 -0400 (Thu, 09 Jul 2009) New Revision: 91002 Modified: projects/jboss-osgi/projects/3rdparty/jboss-xml-binding/trunk/pom.xml projects/jboss-osgi/projects/bundles/microcontainer/trunk/pom.xml projects/jboss-osgi/trunk/blueprint/impl/pom.xml projects/jboss-osgi/trunk/blueprint/testsuite/pom.xml projects/jboss-osgi/trunk/blueprint/testsuite/src/test/resources/container/container-basic.bnd Log: Fix bundle exports and wiring for BP Modified: projects/jboss-osgi/projects/3rdparty/jboss-xml-binding/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/3rdparty/jboss-xml-binding/trunk/pom.xml 2009-07-09 13:34:57 UTC (rev 91001) +++ projects/jboss-osgi/projects/3rdparty/jboss-xml-binding/trunk/pom.xml 2009-07-09 13:58:40 UTC (rev 91002) @@ -68,6 +68,9 @@ <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName> <Bundle-Activator>org.jboss.osgi.jbossxb.internal.XMLBindingActivator</Bundle-Activator> <Embed-Transitive>true</Embed-Transitive> + <Export-Package> + org.jboss.osgi.jbossxb;version=${version} + </Export-Package> <Import-Package>  javax.activation, Modified: projects/jboss-osgi/projects/bundles/microcontainer/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/bundles/microcontainer/trunk/pom.xml 2009-07-09 13:34:57 UTC (rev 91001) +++ projects/jboss-osgi/projects/bundles/microcontainer/trunk/pom.xml 2009-07-09 13:58:40 UTC (rev 91002) @@ -115,6 +115,7 @@ org.jboss.joinpoint.*, org.jboss.logging, org.jboss.osgi.common.log;version="1.0", + org.jboss.osgi.jbossxb;version="2.0", org.jboss.osgi.spi;version="1.0", org.jboss.osgi.spi.management;version="1.0", org.jboss.osgi.spi.util;version="1.0", Modified: projects/jboss-osgi/trunk/blueprint/impl/pom.xml =================================================================== --- projects/jboss-osgi/trunk/blueprint/impl/pom.xml 2009-07-09 13:34:57 UTC (rev 91001) +++ projects/jboss-osgi/trunk/blueprint/impl/pom.xml 2009-07-09 13:58:40 UTC (rev 91002) @@ -49,6 +49,7 @@ org.jboss.osgi.blueprint.* </Private-Package> <Export-Package> + org.jboss.osgi.blueprint;version=${version}, org.osgi.service.blueprint.*;version=1.0 </Export-Package> <Import-Package> Modified: projects/jboss-osgi/trunk/blueprint/testsuite/pom.xml =================================================================== --- projects/jboss-osgi/trunk/blueprint/testsuite/pom.xml 2009-07-09 13:34:57 UTC (rev 91001) +++ projects/jboss-osgi/trunk/blueprint/testsuite/pom.xml 2009-07-09 13:58:40 UTC (rev 91002) @@ -46,7 +46,7 @@ <artifactId>org.osgi.compendium</artifactId> </dependency> -  +  <dependency> <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.log</artifactId> @@ -54,16 +54,6 @@ </dependency> <dependency> <groupId>org.jboss.osgi.bundles</groupId> - <artifactId>jboss-osgi-apache-xerces</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.osgi.bundles</groupId> - <artifactId>jboss-osgi-common</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.osgi.bundles</groupId> <artifactId>jboss-osgi-common-core</artifactId> <scope>provided</scope> </dependency> @@ -72,26 +62,6 @@ <artifactId>jboss-osgi-husky-harness</artifactId> <scope>provided</scope> </dependency> - <dependency> - <groupId>org.jboss.osgi.bundles</groupId> - <artifactId>jboss-osgi-jaxb</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.osgi.bundles</groupId> - <artifactId>jboss-osgi-jmx</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.osgi.bundles</groupId> - <artifactId>jboss-osgi-microcontainer</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.osgi.bundles</groupId> - <artifactId>jboss-osgi-xml-binding</artifactId> - <scope>provided</scope> - </dependency> </dependencies> Modified: projects/jboss-osgi/trunk/blueprint/testsuite/src/test/resources/container/container-basic.bnd =================================================================== --- projects/jboss-osgi/trunk/blueprint/testsuite/src/test/resources/container/container-basic.bnd 2009-07-09 13:34:57 UTC (rev 91001) +++ projects/jboss-osgi/trunk/blueprint/testsuite/src/test/resources/container/container-basic.bnd 2009-07-09 13:58:40 UTC (rev 91002) @@ -8,7 +8,7 @@ Import-Package: \ javax.management, \ - org.jboss.osgi.blueprint, \ + org.jboss.osgi.blueprint, \ org.jboss.osgi.husky, \ org.jboss.osgi.husky.annotation, \ org.jboss.osgi.spi.capability, \

16 years, 6 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

jboss-osgi-commits July 2009