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

JBoss-OSGI SVN: r86385 - in projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/jboss/osgi/service/webconsole/internal: plugins and 1 other directory.

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

Author: thomas.diesler(a)jboss.com Date: 2009-03-26 11:30:24 -0400 (Thu, 26 Mar 2009) New Revision: 86385 Added: projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/jboss/osgi/service/webconsole/internal/plugins/JBossRenderBridge.java Removed: projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/jboss/osgi/service/webconsole/internal/plugins/RenderBridge.java Modified: projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/jboss/osgi/service/webconsole/internal/WebConsole.java Log: Add javadoc Modified: projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/jboss/osgi/service/webconsole/internal/WebConsole.java =================================================================== --- projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/jboss/osgi/service/webconsole/internal/WebConsole.java 2009-03-26 15:24:48 UTC (rev 86384) +++ projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/jboss/osgi/service/webconsole/internal/WebConsole.java 2009-03-26 15:30:24 UTC (rev 86385) @@ -25,7 +25,7 @@ import org.apache.felix.webconsole.Render; import org.apache.felix.webconsole.internal.servlet.OsgiManager; -import org.jboss.osgi.service.webconsole.internal.plugins.RenderBridge; +import org.jboss.osgi.service.webconsole.internal.plugins.JBossRenderBridge; import org.osgi.framework.BundleContext; /** @@ -81,7 +81,7 @@ @Override protected void bindRender(Render render) { - RenderBridge bridge = new RenderBridge(render); + JBossRenderBridge bridge = new JBossRenderBridge(render); bridge.activate(bundleContext); bindServlet(render.getName(), bridge); } Copied: projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/jboss/osgi/service/webconsole/internal/plugins/JBossRenderBridge.java (from rev 86384, projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/jboss/osgi/service/webconsole/internal/plugins/RenderBridge.java) =================================================================== --- projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/jboss/osgi/service/webconsole/internal/plugins/JBossRenderBridge.java (rev 0) +++ projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/jboss/osgi/service/webconsole/internal/plugins/JBossRenderBridge.java 2009-03-26 15:30:24 UTC (rev 86385) @@ -0,0 +1,90 @@ +/* + * 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.plugins; + +//$Id$ + +import java.io.IOException; +import java.io.PrintWriter; +import java.text.MessageFormat; + +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.felix.webconsole.AbstractWebConsolePlugin; +import org.apache.felix.webconsole.Render; +import org.apache.felix.webconsole.internal.servlet.OsgiManager; + +/** + * A copy of the org.apache.felix.webconsole.internal.servlet.RenderBridge + * which does not have a public ctor. + * + * We replace the header and footer. + * + * @author Thomas.Diesler(a)jboss.com + * @since 26-Mar-2009 + */ +@SuppressWarnings("serial") +public class JBossRenderBridge extends AbstractWebConsolePlugin +{ + private final Render render; + + public JBossRenderBridge(Render render) + { + this.render = render; + } + + @Override + protected String getHeader() + { + return PluginHelper.getHeader(); + } + + @Override + protected void endResponse(HttpServletRequest request, PrintWriter pw) + { + String appRoot = (String)request.getAttribute(OsgiManager.ATTR_APP_ROOT); + String footer = MessageFormat.format(PluginHelper.getFooter(), new Object[]{ appRoot }); + pw.println(footer); + } + + public Render getRender() + { + return render; + } + + public String getTitle() + { + return render.getLabel(); + } + + public String getLabel() + { + return render.getName(); + } + + protected void renderContent(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException + { + render.render(request, response); + } +} Property changes on: projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/jboss/osgi/service/webconsole/internal/plugins/JBossRenderBridge.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:mergeinfo + Name: svn:eol-style + LF Deleted: projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/jboss/osgi/service/webconsole/internal/plugins/RenderBridge.java =================================================================== --- projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/jboss/osgi/service/webconsole/internal/plugins/RenderBridge.java 2009-03-26 15:24:48 UTC (rev 86384) +++ projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/jboss/osgi/service/webconsole/internal/plugins/RenderBridge.java 2009-03-26 15:30:24 UTC (rev 86385) @@ -1,81 +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.plugins; - -//$Id$ - -import java.io.IOException; -import java.io.PrintWriter; -import java.text.MessageFormat; - -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.felix.webconsole.AbstractWebConsolePlugin; -import org.apache.felix.webconsole.Render; -import org.apache.felix.webconsole.internal.servlet.OsgiManager; - -@SuppressWarnings("serial") -public class RenderBridge extends AbstractWebConsolePlugin -{ - private final Render render; - - public RenderBridge(Render render) - { - this.render = render; - } - - public Render getRender() - { - return render; - } - - public String getTitle() - { - return render.getLabel(); - } - - public String getLabel() - { - return render.getName(); - } - - protected void renderContent(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException - { - render.render(request, response); - } - - @Override - protected String getHeader() - { - return PluginHelper.getHeader(); - } - - @Override - protected void endResponse(HttpServletRequest request, PrintWriter pw) - { - String appRoot = (String)request.getAttribute(OsgiManager.ATTR_APP_ROOT); - String footer = MessageFormat.format(PluginHelper.getFooter(), new Object[]{ appRoot }); - pw.println(footer); - } -}

16 years, 9 months

1
0
0 / 0

JBoss-OSGI SVN: r86384 - in projects/jboss-osgi/trunk: service/webconsole/src/main/java/org/jboss/osgi/service/webconsole/internal and 1 other directories.

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

Author: thomas.diesler(a)jboss.com Date: 2009-03-26 11:24:48 -0400 (Thu, 26 Mar 2009) New Revision: 86384 Added: projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/jboss/osgi/service/webconsole/internal/plugins/ConfigManagerPlugin.java projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/jboss/osgi/service/webconsole/internal/plugins/RenderBridge.java Removed: projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/jboss/osgi/service/webconsole/internal/plugins/ConfigPlugin.java projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/jboss/osgi/service/webconsole/internal/plugins/DepPackPlugin.java Modified: projects/jboss-osgi/trunk/build/docbook/en/master.xml projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/jboss/osgi/service/webconsole/internal/WebConsole.java projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/jboss/osgi/service/webconsole/internal/plugins/BundlesPlugin.java projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/jboss/osgi/service/webconsole/internal/plugins/EventAdminPlugin.java projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/jboss/osgi/service/webconsole/internal/plugins/LicensePlugin.java Log: Finish web console re-branding Modified: projects/jboss-osgi/trunk/build/docbook/en/master.xml =================================================================== --- projects/jboss-osgi/trunk/build/docbook/en/master.xml 2009-03-26 14:07:57 UTC (rev 86383) +++ projects/jboss-osgi/trunk/build/docbook/en/master.xml 2009-03-26 15:24:48 UTC (rev 86384) @@ -11,13 +11,16 @@ <!ENTITY ChapProvidedServices SYSTEM "modules/providedservices.xml"> <!ENTITY ChapReferences SYSTEM "modules/references.xml"> <!ENTITY ChapGettingSupport SYSTEM "modules/gettingsupport.xml"> + <!ENTITY version "1.0.0.Alpha3"> +<!ENTITY pubdate "26-Mar-2009"> ]> <book lang="en"> <bookinfo> <title>JBossOSGi - User Guide</title> <releaseinfo>Version: &version;</releaseinfo> + <pubdate>Date: &pubdate;</pubdate> <!-- <author> Modified: projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/jboss/osgi/service/webconsole/internal/WebConsole.java =================================================================== --- projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/jboss/osgi/service/webconsole/internal/WebConsole.java 2009-03-26 14:07:57 UTC (rev 86383) +++ projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/jboss/osgi/service/webconsole/internal/WebConsole.java 2009-03-26 15:24:48 UTC (rev 86384) @@ -23,7 +23,9 @@ //$Id$ +import org.apache.felix.webconsole.Render; import org.apache.felix.webconsole.internal.servlet.OsgiManager; +import org.jboss.osgi.service.webconsole.internal.plugins.RenderBridge; import org.osgi.framework.BundleContext; /** @@ -36,9 +38,12 @@ { private static final long serialVersionUID = 1L; + private BundleContext bundleContext; + public WebConsole(BundleContext bundleContext) { super(bundleContext); + this.bundleContext = bundleContext; } @Override @@ -50,25 +55,34 @@ @Override protected String[] getPluginClasses() { - return new String[] { + return new String[] { + "org.jboss.osgi.service.webconsole.internal.plugins.BundlesPlugin", + "org.jboss.osgi.service.webconsole.internal.plugins.ConfigManagerPlugin", + "org.jboss.osgi.service.webconsole.internal.plugins.EventAdminPlugin", + "org.jboss.osgi.service.webconsole.internal.plugins.LicensePlugin", + "org.apache.felix.webconsole.internal.compendium.ComponentConfigurationPrinter", - "org.apache.felix.webconsole.internal.compendium.ComponentsServlet", - "org.apache.felix.webconsole.internal.compendium.ConfigManager", - "org.jboss.osgi.service.webconsole.internal.plugins.BundlesPlugin", + //"org.apache.felix.webconsole.internal.compendium.ComponentsServlet", "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.deppack.DepPackServlet", "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.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.obr.RefreshRepoAction", "org.apache.felix.webconsole.internal.system.GCAction", - "org.apache.felix.webconsole.internal.system.ShutdownAction", + "org.apache.felix.webconsole.internal.system.ShutdownAction", "org.apache.felix.webconsole.internal.system.ShutdownRender", - "org.apache.felix.webconsole.internal.system.VMStatRender" + "org.apache.felix.webconsole.internal.system.VMStatRender" }; } + + @Override + protected void bindRender(Render render) + { + RenderBridge bridge = new RenderBridge(render); + bridge.activate(bundleContext); + bindServlet(render.getName(), bridge); + } } \ No newline at end of file Modified: projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/jboss/osgi/service/webconsole/internal/plugins/BundlesPlugin.java =================================================================== --- projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/jboss/osgi/service/webconsole/internal/plugins/BundlesPlugin.java 2009-03-26 14:07:57 UTC (rev 86383) +++ projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/jboss/osgi/service/webconsole/internal/plugins/BundlesPlugin.java 2009-03-26 15:24:48 UTC (rev 86384) @@ -47,6 +47,7 @@ return PluginHelper.getHeader(); } + @Override protected void endResponse(HttpServletRequest request, PrintWriter pw) { String appRoot = (String)request.getAttribute(OsgiManager.ATTR_APP_ROOT); Copied: projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/jboss/osgi/service/webconsole/internal/plugins/ConfigManagerPlugin.java (from rev 86375, projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/jboss/osgi/service/webconsole/internal/plugins/ConfigPlugin.java) =================================================================== --- projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/jboss/osgi/service/webconsole/internal/plugins/ConfigManagerPlugin.java (rev 0) +++ projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/jboss/osgi/service/webconsole/internal/plugins/ConfigManagerPlugin.java 2009-03-26 15:24:48 UTC (rev 86384) @@ -0,0 +1,57 @@ +/* + * 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.plugins; + +//$Id$ + +import java.io.PrintWriter; +import java.text.MessageFormat; + +import javax.servlet.http.HttpServletRequest; + +import org.apache.felix.webconsole.internal.compendium.ConfigManager; +import org.apache.felix.webconsole.internal.servlet.OsgiManager; + +/** + * A Console plugin + * + * @author thomas.diesler(a)jboss.com + * @since 12-Mar-2009 + */ +public class ConfigManagerPlugin extends ConfigManager +{ + private static final long serialVersionUID = 1L; + + @Override + protected String getHeader() + { + return PluginHelper.getHeader(); + } + + @Override + protected void endResponse(HttpServletRequest request, PrintWriter pw) + { + String appRoot = (String)request.getAttribute(OsgiManager.ATTR_APP_ROOT); + String footer = MessageFormat.format(PluginHelper.getFooter(), new Object[]{ appRoot }); + pw.println(footer); + } +} \ No newline at end of file Property changes on: projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/jboss/osgi/service/webconsole/internal/plugins/ConfigManagerPlugin.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:mergeinfo + Name: svn:eol-style + LF Deleted: projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/jboss/osgi/service/webconsole/internal/plugins/ConfigPlugin.java =================================================================== --- projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/jboss/osgi/service/webconsole/internal/plugins/ConfigPlugin.java 2009-03-26 14:07:57 UTC (rev 86383) +++ projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/jboss/osgi/service/webconsole/internal/plugins/ConfigPlugin.java 2009-03-26 15:24:48 UTC (rev 86384) @@ -1,56 +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.plugins; - -//$Id$ - -import java.io.PrintWriter; -import java.text.MessageFormat; - -import javax.servlet.http.HttpServletRequest; - -import org.apache.felix.webconsole.internal.core.BundlesServlet; -import org.apache.felix.webconsole.internal.servlet.OsgiManager; - -/** - * A Console plugin - * - * @author thomas.diesler(a)jboss.com - * @since 12-Mar-2009 - */ -public class ConfigPlugin extends BundlesServlet -{ - private static final long serialVersionUID = 1L; - - @Override - protected String getHeader() - { - return PluginHelper.getHeader(); - } - - protected void endResponse(HttpServletRequest request, PrintWriter pw) - { - String appRoot = (String)request.getAttribute(OsgiManager.ATTR_APP_ROOT); - String footer = MessageFormat.format(PluginHelper.getFooter(), new Object[]{ appRoot }); - pw.println(footer); - } -} \ No newline at end of file Deleted: projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/jboss/osgi/service/webconsole/internal/plugins/DepPackPlugin.java =================================================================== --- projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/jboss/osgi/service/webconsole/internal/plugins/DepPackPlugin.java 2009-03-26 14:07:57 UTC (rev 86383) +++ projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/jboss/osgi/service/webconsole/internal/plugins/DepPackPlugin.java 2009-03-26 15:24:48 UTC (rev 86384) @@ -1,56 +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.plugins; - -//$Id$ - -import java.io.PrintWriter; -import java.text.MessageFormat; - -import javax.servlet.http.HttpServletRequest; - -import org.apache.felix.webconsole.internal.core.BundlesServlet; -import org.apache.felix.webconsole.internal.servlet.OsgiManager; - -/** - * A Console plugin - * - * @author thomas.diesler(a)jboss.com - * @since 12-Mar-2009 - */ -public class DepPackPlugin extends BundlesServlet -{ - private static final long serialVersionUID = 1L; - - @Override - protected String getHeader() - { - return PluginHelper.getHeader(); - } - - protected void endResponse(HttpServletRequest request, PrintWriter pw) - { - String appRoot = (String)request.getAttribute(OsgiManager.ATTR_APP_ROOT); - String footer = MessageFormat.format(PluginHelper.getFooter(), new Object[]{ appRoot }); - pw.println(footer); - } -} \ No newline at end of file Modified: projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/jboss/osgi/service/webconsole/internal/plugins/EventAdminPlugin.java =================================================================== --- projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/jboss/osgi/service/webconsole/internal/plugins/EventAdminPlugin.java 2009-03-26 14:07:57 UTC (rev 86383) +++ projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/jboss/osgi/service/webconsole/internal/plugins/EventAdminPlugin.java 2009-03-26 15:24:48 UTC (rev 86384) @@ -28,7 +28,7 @@ import javax.servlet.http.HttpServletRequest; -import org.apache.felix.webconsole.internal.core.BundlesServlet; +import org.apache.felix.webconsole.internal.misc.EventAdminServlet; import org.apache.felix.webconsole.internal.servlet.OsgiManager; /** @@ -37,7 +37,7 @@ * @author thomas.diesler(a)jboss.com * @since 12-Mar-2009 */ -public class EventAdminPlugin extends BundlesServlet +public class EventAdminPlugin extends EventAdminServlet { private static final long serialVersionUID = 1L; @@ -47,6 +47,7 @@ return PluginHelper.getHeader(); } + @Override protected void endResponse(HttpServletRequest request, PrintWriter pw) { String appRoot = (String)request.getAttribute(OsgiManager.ATTR_APP_ROOT); Modified: projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/jboss/osgi/service/webconsole/internal/plugins/LicensePlugin.java =================================================================== --- projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/jboss/osgi/service/webconsole/internal/plugins/LicensePlugin.java 2009-03-26 14:07:57 UTC (rev 86383) +++ projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/jboss/osgi/service/webconsole/internal/plugins/LicensePlugin.java 2009-03-26 15:24:48 UTC (rev 86384) @@ -28,7 +28,7 @@ import javax.servlet.http.HttpServletRequest; -import org.apache.felix.webconsole.internal.core.BundlesServlet; +import org.apache.felix.webconsole.internal.misc.LicenseServlet; import org.apache.felix.webconsole.internal.servlet.OsgiManager; /** @@ -37,7 +37,7 @@ * @author thomas.diesler(a)jboss.com * @since 12-Mar-2009 */ -public class LicensePlugin extends BundlesServlet +public class LicensePlugin extends LicenseServlet { private static final long serialVersionUID = 1L; @@ -47,6 +47,7 @@ return PluginHelper.getHeader(); } + @Override protected void endResponse(HttpServletRequest request, PrintWriter pw) { String appRoot = (String)request.getAttribute(OsgiManager.ATTR_APP_ROOT); Added: projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/jboss/osgi/service/webconsole/internal/plugins/RenderBridge.java =================================================================== --- projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/jboss/osgi/service/webconsole/internal/plugins/RenderBridge.java (rev 0) +++ projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/jboss/osgi/service/webconsole/internal/plugins/RenderBridge.java 2009-03-26 15:24:48 UTC (rev 86384) @@ -0,0 +1,81 @@ +/* + * 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.plugins; + +//$Id$ + +import java.io.IOException; +import java.io.PrintWriter; +import java.text.MessageFormat; + +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.felix.webconsole.AbstractWebConsolePlugin; +import org.apache.felix.webconsole.Render; +import org.apache.felix.webconsole.internal.servlet.OsgiManager; + +@SuppressWarnings("serial") +public class RenderBridge extends AbstractWebConsolePlugin +{ + private final Render render; + + public RenderBridge(Render render) + { + this.render = render; + } + + public Render getRender() + { + return render; + } + + public String getTitle() + { + return render.getLabel(); + } + + public String getLabel() + { + return render.getName(); + } + + protected void renderContent(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException + { + render.render(request, response); + } + + @Override + protected String getHeader() + { + return PluginHelper.getHeader(); + } + + @Override + protected void endResponse(HttpServletRequest request, PrintWriter pw) + { + String appRoot = (String)request.getAttribute(OsgiManager.ATTR_APP_ROOT); + String footer = MessageFormat.format(PluginHelper.getFooter(), new Object[]{ appRoot }); + pw.println(footer); + } +} Property changes on: projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/jboss/osgi/service/webconsole/internal/plugins/RenderBridge.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF

16 years, 9 months

1
0
0 / 0

JBoss-OSGI SVN: r86383 - in projects/jboss-osgi/trunk/runtime/felix/src/test/resources: microcontainer and 1 other directory.

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

Author: thomas.diesler(a)jboss.com Date: 2009-03-26 10:07:57 -0400 (Thu, 26 Mar 2009) New Revision: 86383 Modified: projects/jboss-osgi/trunk/runtime/felix/src/test/resources/jboss-osgi-beans.xml projects/jboss-osgi/trunk/runtime/felix/src/test/resources/microcontainer/configured-service-test.xml projects/jboss-osgi/trunk/runtime/felix/src/test/resources/microcontainer/explicit-service-test.xml Log: Fix systemContext in MCService Modified: projects/jboss-osgi/trunk/runtime/felix/src/test/resources/jboss-osgi-beans.xml =================================================================== --- projects/jboss-osgi/trunk/runtime/felix/src/test/resources/jboss-osgi-beans.xml 2009-03-26 14:05:12 UTC (rev 86382) +++ projects/jboss-osgi/trunk/runtime/felix/src/test/resources/jboss-osgi-beans.xml 2009-03-26 14:07:57 UTC (rev 86383) @@ -13,7 +13,7 @@ </bean> <bean name="jboss.osgi:service=Microcontainer" class="org.jboss.osgi.service.MicrocontainerService"> - <property name="bundleContext"><inject bean="jboss.osgi:service=Framework" property="systemBundleContext"/></property> + <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="systemBundleContext"/></property> <property name="kernel"><inject bean="jboss.kernel:service=Kernel" /></property> </bean> Modified: projects/jboss-osgi/trunk/runtime/felix/src/test/resources/microcontainer/configured-service-test.xml =================================================================== --- projects/jboss-osgi/trunk/runtime/felix/src/test/resources/microcontainer/configured-service-test.xml 2009-03-26 14:05:12 UTC (rev 86382) +++ projects/jboss-osgi/trunk/runtime/felix/src/test/resources/microcontainer/configured-service-test.xml 2009-03-26 14:07:57 UTC (rev 86383) @@ -7,7 +7,7 @@ </bean> <bean name="jboss.osgi:service=Microcontainer" class="org.jboss.osgi.service.MicrocontainerService"> - <property name="bundleContext"><inject bean="jboss.osgi:service=Framework" property="systemBundleContext"/></property> + <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="systemBundleContext"/></property> <property name="kernel"><inject bean="jboss.kernel:service=Kernel" /></property> </bean> Modified: projects/jboss-osgi/trunk/runtime/felix/src/test/resources/microcontainer/explicit-service-test.xml =================================================================== --- projects/jboss-osgi/trunk/runtime/felix/src/test/resources/microcontainer/explicit-service-test.xml 2009-03-26 14:05:12 UTC (rev 86382) +++ projects/jboss-osgi/trunk/runtime/felix/src/test/resources/microcontainer/explicit-service-test.xml 2009-03-26 14:07:57 UTC (rev 86383) @@ -7,7 +7,7 @@ </bean> <bean name="jboss.osgi:service=Microcontainer" class="org.jboss.osgi.service.MicrocontainerService"> - <property name="bundleContext"><inject bean="jboss.osgi:service=Framework" property="systemBundleContext"/></property> + <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="systemBundleContext"/></property> <property name="kernel"><inject bean="jboss.kernel:service=Kernel" /></property> </bean>

16 years, 9 months

1
0
0 / 0

JBoss-OSGI SVN: r86382 - in projects/jboss-osgi/trunk/build/docbook/en: modules and 1 other directory.

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

Author: thomas.diesler(a)jboss.com Date: 2009-03-26 10:05:12 -0400 (Thu, 26 Mar 2009) New Revision: 86382 Added: projects/jboss-osgi/trunk/build/docbook/en/modules/gettingsupport.xml Modified: projects/jboss-osgi/trunk/build/docbook/en/master.xml Log: Add getting support Modified: projects/jboss-osgi/trunk/build/docbook/en/master.xml =================================================================== --- projects/jboss-osgi/trunk/build/docbook/en/master.xml 2009-03-26 13:40:34 UTC (rev 86381) +++ projects/jboss-osgi/trunk/build/docbook/en/master.xml 2009-03-26 14:05:12 UTC (rev 86382) @@ -10,6 +10,7 @@ <!ENTITY ChapDeveloperGuide SYSTEM "modules/devguide.xml"> <!ENTITY ChapProvidedServices SYSTEM "modules/providedservices.xml"> <!ENTITY ChapReferences SYSTEM "modules/references.xml"> +<!ENTITY ChapGettingSupport SYSTEM "modules/gettingsupport.xml"> <!ENTITY version "1.0.0.Alpha3"> ]> @@ -37,6 +38,7 @@ &ChapFrameworkIntegration; &ChapDeveloperGuide; &ChapProvidedServices; + &ChapGettingSupport; &ChapReferences; </book> \ No newline at end of file Added: projects/jboss-osgi/trunk/build/docbook/en/modules/gettingsupport.xml =================================================================== --- projects/jboss-osgi/trunk/build/docbook/en/modules/gettingsupport.xml (rev 0) +++ projects/jboss-osgi/trunk/build/docbook/en/modules/gettingsupport.xml 2009-03-26 14:05:12 UTC (rev 86382) @@ -0,0 +1,16 @@ + +<chapter xml:id="ChapGettingSupport"> + + <title>Getting Support</title> + + <para>We offer free support through the <ulink url="http://www.jboss.org/index.html?module=bb&op=viewforum&f=257">JBossOSGi User Forum</ulink>.</para> + + <para>Please note, that posts to this forum will be dealt with at the community's leisure. + If your business is such that you need to rely on qualified answers within a known time frame, + this forum might not be your preferred support channel.</para> + + <para>For professional support please go to <ulink url="http://www.jboss.com/services">JBoss Support Services</ulink>.</para> + +</chapter> Property changes on: projects/jboss-osgi/trunk/build/docbook/en/modules/gettingsupport.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF

16 years, 9 months

1
0
0 / 0

JBoss-OSGI SVN: r86381 - in projects/jboss-osgi/trunk: build/docbook/en/modules and 3 other directories.

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

Author: thomas.diesler(a)jboss.com Date: 2009-03-26 09:40:34 -0400 (Thu, 26 Mar 2009) New Revision: 86381 Added: projects/jboss-osgi/trunk/build/docbook/en/modules/providedservices.xml Modified: projects/jboss-osgi/trunk/build/docbook/en/master.xml projects/jboss-osgi/trunk/build/docbook/en/modules/devguide.xml projects/jboss-osgi/trunk/runtime/deployer/src/main/resources/osgi-deployers-jboss-beans.xml projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/service/MicrocontainerService.java projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/service/microcontainer/MBeanTestService.java Log: docbook mc service Modified: projects/jboss-osgi/trunk/build/docbook/en/master.xml =================================================================== --- projects/jboss-osgi/trunk/build/docbook/en/master.xml 2009-03-26 12:50:09 UTC (rev 86380) +++ projects/jboss-osgi/trunk/build/docbook/en/master.xml 2009-03-26 13:40:34 UTC (rev 86381) @@ -8,6 +8,7 @@ <!ENTITY ChapGettingStarted SYSTEM "modules/gettingstarted.xml"> <!ENTITY ChapFrameworkIntegration SYSTEM "modules/frameworkintegration.xml"> <!ENTITY ChapDeveloperGuide SYSTEM "modules/devguide.xml"> +<!ENTITY ChapProvidedServices SYSTEM "modules/providedservices.xml"> <!ENTITY ChapReferences SYSTEM "modules/references.xml"> <!ENTITY version "1.0.0.Alpha3"> ]> @@ -35,6 +36,7 @@ &ChapGettingStarted; &ChapFrameworkIntegration; &ChapDeveloperGuide; + &ChapProvidedServices; &ChapReferences; </book> \ No newline at end of file Modified: projects/jboss-osgi/trunk/build/docbook/en/modules/devguide.xml =================================================================== --- projects/jboss-osgi/trunk/build/docbook/en/modules/devguide.xml 2009-03-26 12:50:09 UTC (rev 86380) +++ projects/jboss-osgi/trunk/build/docbook/en/modules/devguide.xml 2009-03-26 13:40:34 UTC (rev 86381) @@ -14,7 +14,7 @@ <mediaobject> <imageobject> - <imagedata fileref="images/jboss-osgi.png"/> + <imagedata fileref="images/jboss-osgi.png" contentwidth="450"/> </imageobject> </mediaobject> @@ -244,7 +244,7 @@ <mediaobject> <imageobject> - <imagedata fileref="images/jmx-agent-view.png"/> + <imagedata fileref="images/jmx-agent-view.png" contentwidth="450"/> </imageobject> </mediaobject> @@ -253,59 +253,4 @@ </note> </sect1> - <sect1 xml:id="SecLoggingBridge"> - <title>Logging Bridge</title> - - <para>The JBossOSGi <emphasis role="bold">jboss-osgi-service-logging.jar</emphasis> Bundle contains a simple Logging Bridge Service to - <ulink url="http://www.jboss.org/community/docs/DOC-11280">JBoss Logging</ulink>. It registers a trivial - <ulink url="http://www.osgi.org/javadoc/r4v41/org/osgi/service/log/LogListener.html">LogListener</ulink> with the - <ulink url="http://www.osgi.org/javadoc/r4v41/org/osgi/service/log/LogReaderService.html">LogReaderService</ulink> in case that service - is registered with the Framework.</para> - - <para>The <ulink url="http://www.osgi.org/javadoc/r4v41/org/osgi/service/log/LogReaderService.html">LogReaderService</ulink> is part of the - standard <ulink url="http://www.osgi.org/Download/File?url=/download/r4v41/r4.cmpn.pdf">OSGi Compendium Services</ulink>. JBossOSGi currently - uses the (not yet released) LogService from <ulink url="http://felix.apache.org">Apache Felix</ulink>, which gets deployed as Bundle - <emphasis role="bold">org.apache.felix.log.jar</emphasis></para> - - <para>The <ulink url="http://www.osgi.org/javadoc/r4v41/org/osgi/service/log/LogListener.html">LogListener</ulink> itself logs messages - under the Bundle's symbolic name.</para> - - <programlisting role="JAVA"> - public class JBossLoggingLogListener implements LogListener - { - public void logged(LogEntry entry) - { - Bundle bundle = entry.getBundle(); - int level = entry.getLevel(); - Throwable throwable = entry.getException(); - - String loggerName = bundle.getSymbolicName(); - Logger log = Logger.getLogger(loggerName); - - if (level == LogService.LOG_DEBUG) - log.debug(entry.getMessage(), throwable); - - else if (level == LogService.LOG_INFO) - log.info(entry.getMessage(), throwable); - - else if (level == LogService.LOG_WARNING) - log.warn(entry.getMessage(), throwable); - - else if (level == LogService.LOG_ERROR) - log.error(entry.getMessage(), throwable); - } - } - </programlisting> - - <para>You can therefore change the logging for specific Bundles by <ulink url="http://www.jboss.org/community/docs/DOC-12490">setting the respective logging level</ulink>.</para>. - </sect1> - - <sect1 xml:id="SecMicrocontainerService"> - <title>Microcontainer Service</title> - - <note> - <title>TODO: Document the Microcontainer Service</title> - </note> - </sect1> - </chapter> Added: projects/jboss-osgi/trunk/build/docbook/en/modules/providedservices.xml =================================================================== --- projects/jboss-osgi/trunk/build/docbook/en/modules/providedservices.xml (rev 0) +++ projects/jboss-osgi/trunk/build/docbook/en/modules/providedservices.xml 2009-03-26 13:40:34 UTC (rev 86381) @@ -0,0 +1,82 @@ + +<chapter xml:id="ChapProvidedServices"> + + <title>Provided Services</title> + + <sect1 xml:id="SecLoggingService"> + <title>JBoss Logging Service</title> + + <para>The JBossOSGi <emphasis role="bold">jboss-osgi-service-logging.jar</emphasis> Bundle contains a simple Logging Bridge Service to + <ulink url="http://www.jboss.org/community/docs/DOC-11280">JBoss Logging</ulink>. It registers a trivial LogListener with the + LogReaderService in case that service is registered with the Framework.</para> + + <itemizedlist> + <listitem><ulink url="http://www.osgi.org/javadoc/r4v41/org/osgi/service/log/LogListener.html">LogListener</ulink> - Subscribes to LogEntry objects from the LogReaderService</listitem> + <listitem><ulink url="http://www.osgi.org/javadoc/r4v41/org/osgi/service/log/LogReaderService.html">LogReaderService</ulink> - Provides methods to retrieve LogEntry objects from the log</listitem> + </itemizedlist> + + <para>The LogReaderService is part of the standard <ulink url="http://www.osgi.org/Download/File?url=/download/r4v41/r4.cmpn.pdf">OSGi + Compendium Services</ulink>. JBossOSGi currently uses the (not yet released) LogService from <ulink url="http://felix.apache.org">Apache Felix</ulink>, + which gets deployed as Bundle <emphasis role="bold">org.apache.felix.log.jar</emphasis></para> + + <para>The LogListener itself logs messages under the Bundle's symbolic name.</para> + + <programlisting role="JAVA"> + public class JBossLoggingLogListener implements LogListener + { + public void logged(LogEntry entry) + { + Bundle bundle = entry.getBundle(); + int level = entry.getLevel(); + Throwable throwable = entry.getException(); + + String loggerName = bundle.getSymbolicName(); + Logger log = Logger.getLogger(loggerName); + + if (level == LogService.LOG_DEBUG) + log.debug(entry.getMessage(), throwable); + + else if (level == LogService.LOG_INFO) + log.info(entry.getMessage(), throwable); + + else if (level == LogService.LOG_WARNING) + log.warn(entry.getMessage(), throwable); + + else if (level == LogService.LOG_ERROR) + log.error(entry.getMessage(), throwable); + } + } + </programlisting> + + <para>You can therefore change the logging for specific Bundles by + <ulink url="http://www.jboss.org/community/docs/DOC-12490">setting the respective logging level</ulink>.</para> + </sect1> + + <sect1 xml:id="SecMicrocontainerService"> + <title>Microcontainer Service</title> + + <para>JBossOSGi SPI comes with a service that give access to the <ulink url="http://www.jboss.org/jbossmc">JBoss Microcontainer</ulink> Kernel + and the JMX <ulink url="http://java.sun.com/j2se/1.5.0/docs/api/javax/management/MBeanServer.html">MBeanServer</ulink>. The service is + registered with the Framework under the name</para> + + <itemizedlist> + <listitem><emphasis role="bold">org.jboss.osgi.service.MicrocontainerService</emphasis></listitem> + </itemizedlist> + + <para>Here is an example of how an OSGi component can register an arbitrary MBean with the + <ulink url="http://java.sun.com/j2se/1.5.0/docs/api/javax/management/MBeanServer.html">MBeanServer</ulink>.</para> + + <programlisting role="JAVA"> + ServiceReference sref = context.getServiceReference(MicrocontainerService.class.getName()); + if (sref == null) + throw new IllegalStateException("MicrocontainerService not registered"); + + MicrocontainerService mcService = (MicrocontainerService)context.getService(sref); + MBeanServer mbeanServer = mcService.getMbeanServer(); + mbeanServer.registerMBean(new Foo(), OBJECT_NAME); + </programlisting> + </sect1> + +</chapter> Property changes on: projects/jboss-osgi/trunk/build/docbook/en/modules/providedservices.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: projects/jboss-osgi/trunk/runtime/deployer/src/main/resources/osgi-deployers-jboss-beans.xml =================================================================== --- projects/jboss-osgi/trunk/runtime/deployer/src/main/resources/osgi-deployers-jboss-beans.xml 2009-03-26 12:50:09 UTC (rev 86380) +++ projects/jboss-osgi/trunk/runtime/deployer/src/main/resources/osgi-deployers-jboss-beans.xml 2009-03-26 13:40:34 UTC (rev 86381) @@ -46,7 +46,7 @@  <bean name="jboss.osgi:service=Microcontainer" class="org.jboss.osgi.service.MicrocontainerService"> - <property name="bundleContext"><inject bean="jboss.osgi:service=Framework" property="systemBundleContext"/></property> + <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="systemBundleContext"/></property> <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property> <property name="kernel"><inject bean="jboss.kernel:service=Kernel" /></property> </bean> Modified: projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/service/MicrocontainerService.java =================================================================== --- projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/service/MicrocontainerService.java 2009-03-26 12:50:09 UTC (rev 86380) +++ projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/service/MicrocontainerService.java 2009-03-26 13:40:34 UTC (rev 86381) @@ -30,14 +30,14 @@ import org.osgi.framework.BundleContext; /** - * An OSGi Service the gives access to the Microcontainer + * An OSGi Service the gives access to the Kernel and MBeanServer. * * @author thomas.diesler(a)jboss.com * @since 23-Jan-2009 */ public class MicrocontainerService { - private BundleContext bundleContext; + private BundleContext systemContext; private MBeanServer mbeanServer; private Kernel kernel; @@ -46,12 +46,12 @@ */ public void create() { - bundleContext.registerService(MicrocontainerService.class.getName(), this, null); + systemContext.registerService(MicrocontainerService.class.getName(), this, null); } - public void setBundleContext(BundleContext bundleContext) + public void setSystemContext(BundleContext bundleContext) { - this.bundleContext = bundleContext; + this.systemContext = bundleContext; } public void setKernel(Kernel kernel) Modified: projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/service/microcontainer/MBeanTestService.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/service/microcontainer/MBeanTestService.java 2009-03-26 12:50:09 UTC (rev 86380) +++ projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/service/microcontainer/MBeanTestService.java 2009-03-26 13:40:34 UTC (rev 86381) @@ -83,7 +83,7 @@ { ServiceReference sref = context.getServiceReference(MicrocontainerService.class.getName()); if (sref == null) - throw new IllegalStateException("HttpService not registered"); + throw new IllegalStateException("MicrocontainerService not registered"); return (MicrocontainerService)context.getService(sref); }

16 years, 9 months

1
0
0 / 0

JBoss-OSGI SVN: r86379 - projects/jboss-osgi/trunk/build/docbook/en/modules.

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

Author: thomas.diesler(a)jboss.com Date: 2009-03-26 08:31:59 -0400 (Thu, 26 Mar 2009) New Revision: 86379 Modified: projects/jboss-osgi/trunk/build/docbook/en/modules/devguide.xml Log: docbook logging Modified: projects/jboss-osgi/trunk/build/docbook/en/modules/devguide.xml =================================================================== --- projects/jboss-osgi/trunk/build/docbook/en/modules/devguide.xml 2009-03-26 12:02:32 UTC (rev 86378) +++ projects/jboss-osgi/trunk/build/docbook/en/modules/devguide.xml 2009-03-26 12:31:59 UTC (rev 86379) @@ -251,15 +251,53 @@ <note> <para>The JMX Console is <emphasis role="bold">not part</emphasis> of the <link linkend="SecRuntime">JBossOSGi Runtime</link>.</para> </note> - </sect1> <sect1 xml:id="SecLoggingBridge"> <title>Logging Bridge</title> - <note> - <title>TODO: Document the Logging Bridge</title> - </note> + <para>The JBossOSGi <emphasis role="bold">jboss-osgi-service-logging.jar</emphasis> Bundle contains a simple Logging Bridge Service to + <ulink url="http://www.jboss.org/community/docs/DOC-11280">JBoss Logging</ulink>. It registers a trivial + <ulink url="http://www.osgi.org/javadoc/r4v41/org/osgi/service/log/LogListener.html">LogListener</ulink> with the + <ulink url="http://www.osgi.org/javadoc/r4v41/org/osgi/service/log/LogReaderService.html">LogReaderService</ulink> in case that service + is registered with the Framework.</para> + + <para>The <ulink url="http://www.osgi.org/javadoc/r4v41/org/osgi/service/log/LogReaderService.html">LogReaderService</ulink> is part of the + standard <ulink url="http://www.osgi.org/Download/File?url=/download/r4v41/r4.cmpn.pdf">OSGi Compendium Services</ulink>. JBossOSGi currently + uses the (not yet released) LogService from <ulink url="http://felix.apache.org">Apache Felix</ulink>, which gets deployed as Bundle + <emphasis role="bold">org.apache.felix.log.jar</emphasis></para> + + <para>The <ulink url="http://www.osgi.org/javadoc/r4v41/org/osgi/service/log/LogListener.html">LogListener</ulink> itself logs messages + under the Bundle's symbolic name.</para> + + <programlisting role="JAVA"> + public class JBossLoggingLogListener implements LogListener + { + public void logged(LogEntry entry) + { + Bundle bundle = entry.getBundle(); + int level = entry.getLevel(); + Throwable throwable = entry.getException(); + + String loggerName = bundle.getSymbolicName(); + Logger log = Logger.getLogger(loggerName); + + if (level == LogService.LOG_DEBUG) + log.debug(entry.getMessage(), throwable); + + else if (level == LogService.LOG_INFO) + log.info(entry.getMessage(), throwable); + + else if (level == LogService.LOG_WARNING) + log.warn(entry.getMessage(), throwable); + + else if (level == LogService.LOG_ERROR) + log.error(entry.getMessage(), throwable); + } + } + </programlisting> + + <para>You can therefore change the logging for specific Bundles by <ulink url="http://www.jboss.org/community/docs/DOC-12490">setting the respective logging level</ulink>.</para>. </sect1> <sect1 xml:id="SecMicrocontainerService">

16 years, 9 months

1
0
0 / 0

JBoss-OSGI SVN: r86378 - in projects/jboss-osgi/trunk: build/docbook/en/modules and 2 other directories.

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

Author: thomas.diesler(a)jboss.com Date: 2009-03-26 08:02:32 -0400 (Thu, 26 Mar 2009) New Revision: 86378 Added: projects/jboss-osgi/trunk/build/docbook/en/images/jmx-agent-view.png Modified: projects/jboss-osgi/trunk/build/docbook/en/modules/devguide.xml projects/jboss-osgi/trunk/runtime/deployer/src/main/resources/osgi-deployers-jboss-beans.xml projects/jboss-osgi/trunk/testsuite/src/test/resources/jboss-osgi-beans.xml projects/jboss-osgi/trunk/testsuite/src/test/resources/jboss-osgi-bootstrap-beans.xml Log: docbook management Added: projects/jboss-osgi/trunk/build/docbook/en/images/jmx-agent-view.png =================================================================== (Binary files differ) Property changes on: projects/jboss-osgi/trunk/build/docbook/en/images/jmx-agent-view.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: projects/jboss-osgi/trunk/build/docbook/en/modules/devguide.xml =================================================================== --- projects/jboss-osgi/trunk/build/docbook/en/modules/devguide.xml 2009-03-26 11:17:31 UTC (rev 86377) +++ projects/jboss-osgi/trunk/build/docbook/en/modules/devguide.xml 2009-03-26 12:02:32 UTC (rev 86378) @@ -150,24 +150,108 @@ <emphasis role="bold">BundleManagementDeployer</emphasis> <para>The BundleManagementDeployer registers the Bundle as <ulink url="http://java.sun.com/j2se/1.5.0/docs/api/javax/management/StandardMBean.html">StandardMBean</ulink> with JMX. - Please see the section on <ulink url="#SecJMXView">Management View</ulink> for details.</para> + Please see the section on <link linkend="SecJMXView">Management View</link> for details.</para> </sect1> <sect1 xml:id="SecJMXView"> <title>Management View</title> + <para>JBossOSGi registers the Framework and every deployed Bundle with the JMX <ulink url="http://java.sun.com/j2se/1.5.0/docs/api/javax/management/MBeanServer.html">MBeanServer</ulink>.</para> + + <emphasis role="bold">The ManagementFramework</emphasis> + + <para>The <code>ManagedFramework</code> gives you access to the MBean views of the deployed Bundles. It is registerd under the name:</para> + + <itemizedlist> + <listitem><emphasis role="bold">jboss.osgi:service=ManagedFramework</emphasis></listitem> + </itemizedlist> + + <programlisting role="JAVA"> + public interface ManagedFrameworkMBean + { + /** + * Get the list of all installed bundles + */ + Set<ObjectName> getBundles(); + + /** + * Get the installed bundle + */ + ObjectName getBundle(String symbolicName); + } + </programlisting> + + <emphasis role="bold">The ManagementBundle</emphasis> + + <para>The <code>ManagementBundle</code> gives you access to the MBean views of a deployed Bundle. It is registerd under the name:</para> + + <itemizedlist> + <listitem><emphasis role="bold">jboss.osgi:bundle=[SymbolicName],id=[BundleId]</emphasis></listitem> + </itemizedlist> + + <programlisting role="JAVA"> + public interface ManagedBundleMBean + { + /** + * Returns this bundle's current state. + * A bundle can be in only one state at any time. + * + * @return An element of UNINSTALLED,INSTALLED, RESOLVED,STARTING, STOPPING,ACTIVE. + */ + int getState(); + + /** + * Get the bundles object name. + */ + ObjectName getObjectName(); + + /** + * Returns this bundle's unique identifier. + */ + long getBundleId(); + + /** + * Returns the symbolic name of this bundle as specified by its Bundle-SymbolicName manifest header + */ + String getSymbolicName(); + + /** + * Returns the value of the specified property from the BundleContext. + */ + String getProperty(String key); + + /** + * Starts this bundle with no options + */ + void start() throws BundleException; + + /** + * Stops this bundle with no options. + */ + void stop() throws BundleException; + } + </programlisting> + + <emphasis role="bold">Accessing the Management Objects</emphasis> + + <para>If you work with the JBossOSGi Testsuite you get access to the Managed Objects through the JBossOSGi SPI provided + <ulink url="http://junit.sourceforge.net/">JUnit</ulink> support package <ulink url="http://jbmuc.dyndns.org:8280/hudson/job/Container-JDK1.6/javadoc/org/jbos...">org.jboss.osgi.spi.junit</ulink>. + </para> + + <para>If you install JBossOSGi in an already existing JBossAS instance you also get access to the Managed Objects through the JBoss provided + JMX Console (<ulink url="http://localhost:8080/jmx-console">http://localhost:8080/jmx-console</ulink>).</para> + + <mediaobject> + <imageobject> + <imagedata fileref="images/jmx-agent-view.png"/> + </imageobject> + </mediaobject> + <note> - <title>TODO: Document the JMX View</title> - </note> - </sect1> - - <sect1 xml:id="SecClassLoading"> - <title>Class Loading</title> + <para>The JMX Console is <emphasis role="bold">not part</emphasis> of the <link linkend="SecRuntime">JBossOSGi Runtime</link>.</para> + </note> - <note> - <title>TODO: Document the Class Loading</title> - </note> </sect1> <sect1 xml:id="SecLoggingBridge"> Modified: projects/jboss-osgi/trunk/runtime/deployer/src/main/resources/osgi-deployers-jboss-beans.xml =================================================================== --- projects/jboss-osgi/trunk/runtime/deployer/src/main/resources/osgi-deployers-jboss-beans.xml 2009-03-26 11:17:31 UTC (rev 86377) +++ projects/jboss-osgi/trunk/runtime/deployer/src/main/resources/osgi-deployers-jboss-beans.xml 2009-03-26 12:02:32 UTC (rev 86378) @@ -51,7 +51,7 @@ <property name="kernel"><inject bean="jboss.kernel:service=Kernel" /></property> </bean> -  +  <bean name="jboss.osgi:service=BundleMetaDataDeployer" class="org.jboss.osgi.deployer.BundleMetaDataDeployer" />  @@ -60,7 +60,7 @@ <property name="skipBundles"><inject bean="jboss.osgi:service=Framework" property="autoInstall" /></property> </bean> -  +  <bean name="jboss.osgi:service=BundleClassLoaderDeployer" class="org.jboss.osgi.deployer.BundleClassLoaderDeployer"> <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="systemBundleContext" /></property> </bean> Modified: projects/jboss-osgi/trunk/testsuite/src/test/resources/jboss-osgi-beans.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/src/test/resources/jboss-osgi-beans.xml 2009-03-26 11:17:31 UTC (rev 86377) +++ projects/jboss-osgi/trunk/testsuite/src/test/resources/jboss-osgi-beans.xml 2009-03-26 12:02:32 UTC (rev 86378) @@ -19,16 +19,16 @@ </property> </bean> -  - <bean name="jboss.osgi:service=MetaDataDeployer" class="org.jboss.osgi.deployer.OSGiMetaDataDeployer" /> +  + <bean name="jboss.osgi:service=BundleMetaDataDeployer" class="org.jboss.osgi.deployer.BundleMetaDataDeployer" /> -  - <bean name="jboss.osgi:service=Deployer" class="org.jboss.osgi.deployer.OSGiDeployer"> +  + <bean name="jboss.osgi:service=BundleRealDeployer" class="org.jboss.osgi.deployer.BundleRealDeployer"> <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="systemBundleContext" /></property> <property name="skipBundles"><inject bean="jboss.osgi:service=Framework" property="autoInstall" /></property> </bean> -  +  <bean name="jboss.osgi:service=BundleClassLoaderDeployer" class="org.jboss.osgi.deployer.BundleClassLoaderDeployer"> <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="systemBundleContext" /></property> </bean> Modified: projects/jboss-osgi/trunk/testsuite/src/test/resources/jboss-osgi-bootstrap-beans.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/src/test/resources/jboss-osgi-bootstrap-beans.xml 2009-03-26 11:17:31 UTC (rev 86377) +++ projects/jboss-osgi/trunk/testsuite/src/test/resources/jboss-osgi-bootstrap-beans.xml 2009-03-26 12:02:32 UTC (rev 86378) @@ -108,22 +108,4 @@ <property name="system"><inject bean="ClassLoaderSystem"/></property> </bean> -  - -  - </deployment>

16 years, 9 months

1
0
0 / 0

JBoss-OSGI SVN: r86377 - in projects/jboss-osgi/trunk: build/docbook/en/images and 4 other directories.

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

Author: thomas.diesler(a)jboss.com Date: 2009-03-26 07:17:31 -0400 (Thu, 26 Mar 2009) New Revision: 86377 Added: projects/jboss-osgi/trunk/build/docbook/en/images/hudson-home.png projects/jboss-osgi/trunk/build/docbook/en/images/webconsole.png projects/jboss-osgi/trunk/runtime/deployer/src/main/java/org/jboss/osgi/deployer/BundleMetaData.java projects/jboss-osgi/trunk/runtime/deployer/src/main/java/org/jboss/osgi/deployer/BundleMetaDataDeployer.java projects/jboss-osgi/trunk/runtime/deployer/src/main/java/org/jboss/osgi/deployer/BundleRealDeployer.java Removed: projects/jboss-osgi/trunk/build/docbook/en/images/hudson_home.png projects/jboss-osgi/trunk/build/docbook/en/images/webconsole.jpg projects/jboss-osgi/trunk/runtime/deployer/src/main/java/org/jboss/osgi/deployer/OSGiClassLoadingMetaDataDeployer.java projects/jboss-osgi/trunk/runtime/deployer/src/main/java/org/jboss/osgi/deployer/OSGiDeployer.java projects/jboss-osgi/trunk/runtime/deployer/src/main/java/org/jboss/osgi/deployer/OSGiMetaData.java projects/jboss-osgi/trunk/runtime/deployer/src/main/java/org/jboss/osgi/deployer/OSGiMetaDataDeployer.java Modified: projects/jboss-osgi/trunk/build/distribution/src/main/resources/installer/install-definition.xml projects/jboss-osgi/trunk/build/docbook/en/modules/devguide.xml projects/jboss-osgi/trunk/build/docbook/en/modules/frameworkintegration.xml projects/jboss-osgi/trunk/build/docbook/en/modules/gettingstarted.xml projects/jboss-osgi/trunk/build/docbook/en/modules/introduction.xml projects/jboss-osgi/trunk/build/docbook/en/modules/references.xml projects/jboss-osgi/trunk/runtime/deployer/src/main/java/org/jboss/osgi/deployer/BundleClassLoaderDeployer.java projects/jboss-osgi/trunk/runtime/deployer/src/main/java/org/jboss/osgi/deployer/BundleManagementDeployer.java projects/jboss-osgi/trunk/runtime/deployer/src/main/java/org/jboss/osgi/deployer/helpers/BundleClassLoader.java projects/jboss-osgi/trunk/runtime/deployer/src/main/resources/osgi-deployers-jboss-beans.xml Log: docbook deployers Modified: projects/jboss-osgi/trunk/build/distribution/src/main/resources/installer/install-definition.xml =================================================================== --- projects/jboss-osgi/trunk/build/distribution/src/main/resources/installer/install-definition.xml 2009-03-26 08:38:07 UTC (rev 86376) +++ projects/jboss-osgi/trunk/build/distribution/src/main/resources/installer/install-definition.xml 2009-03-26 11:17:31 UTC (rev 86377) @@ -139,6 +139,7 @@  <fileset dir="@{jboss.runtime.dir}" targetdir="$INSTALL_PATH/runtime" override="true"/> + <executable targetfile="$INSTALL_PATH/runtime/bin/run.sh" stage="never" keep="true"/>  <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/runtime/server/default/deployers/osgi.deployer" override="true"> Copied: projects/jboss-osgi/trunk/build/docbook/en/images/hudson-home.png (from rev 86375, projects/jboss-osgi/trunk/build/docbook/en/images/hudson_home.png) =================================================================== (Binary files differ) Property changes on: projects/jboss-osgi/trunk/build/docbook/en/images/hudson-home.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Name: svn:mergeinfo + Deleted: projects/jboss-osgi/trunk/build/docbook/en/images/hudson_home.png =================================================================== (Binary files differ) Deleted: projects/jboss-osgi/trunk/build/docbook/en/images/webconsole.jpg =================================================================== (Binary files differ) Added: projects/jboss-osgi/trunk/build/docbook/en/images/webconsole.png =================================================================== (Binary files differ) Property changes on: projects/jboss-osgi/trunk/build/docbook/en/images/webconsole.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: projects/jboss-osgi/trunk/build/docbook/en/modules/devguide.xml =================================================================== --- projects/jboss-osgi/trunk/build/docbook/en/modules/devguide.xml 2009-03-26 08:38:07 UTC (rev 86376) +++ projects/jboss-osgi/trunk/build/docbook/en/modules/devguide.xml 2009-03-26 11:17:31 UTC (rev 86377) @@ -1,11 +1,11 @@  -<chapter id="ChapDeveloperGuide"> +<chapter xml:id="ChapDeveloperGuide"> <title>Developer Documentation</title> - <sect1 id="SecSPI"> + <sect1 xml:id="SecSPI"> <title>Service Provider Interface</title> <para>The JBossOSGi Service Provider Interface (SPI) is the integration point between the supported OSGi Frameworks and @@ -79,22 +79,82 @@ part of the JBossOSGi SPI.</para> <tip> - <title>Using the SPI from within an JBossAS deployed components</title> + <title>Using the SPI from within JBossAS deployed components</title> <para>If you need access to the OSGi Framework from within an JBossAS deployed component (e.g. servlet, ejb, mbean) you <emphasis role="bold">would not</emphasis> bootstrap JBossOSGi through the SPI. Instead, you would inject the already bootstrapped - OSGi Framework instance in your component.</para> + OSGi Framework instance into your component.</para> </tip> </sect1> - <sect1 id="SecDeployers"> + <sect1 xml:id="SecDeployers"> <title>Bundle Deployers</title> - <note> - <title>TODO: Document the Deployers</title> - </note> + <para>JBossOSGi comes with a number of <ulink url="http://www.jboss.org/jbossmc">JBoss Microcontainer</ulink> based deployers. Each deployer + takes care of a specific aspect of bundle deployment.</para> + + <itemizedlist> + <listitem><emphasis role="bold">BundleMetaDataDeployer</emphasis> - Create BundleMetaData from Manifest Headers</listitem> + <listitem><emphasis role="bold">BundleRealDeployer</emphasis> - Installs the Bundle into the Framework's SystemContext</listitem> + <listitem><emphasis role="bold">BundleClassLoaderDeployer</emphasis> - Creates a BundleClassLoader for the deployed Bundle</listitem> + <listitem><emphasis role="bold">BundleStartStopDeployer</emphasis> - Starts the Bundle when dependencies are resolved</listitem> + <listitem><emphasis role="bold">BundleManagementDeployer</emphasis> - Register the Bundle as MBean with JMX</listitem> + </itemizedlist> + + <emphasis role="bold">BundleMetaDataDeployer</emphasis> + + <para>The BundleMetaDataDeployer creates the BundleMetaData from Manifest Headers. If the manifest does not contain + a header named <emphasis role="bold">Bundle-SymbolicName</emphasis> this deployer does nothing. </para> + + <emphasis role="bold">BundleRealDeployer</emphasis> + + <para>The BundleRealDeployer installs the Bundle into the Framework's SystemContext. Optionally you can configure a list of + bundle locations that should be skipped and hence not installed. Typically, these bundles are already installed during + Framework startup.</para> + + <para>On undeploy the Bundle gets uninstalled from the Framework's SystemContext.</para> + + <emphasis role="bold">BundleClassLoaderDeployer</emphasis> + + <para>The BundleClassLoaderDeployer attaches a ClassLoaderFactory that creates a BundleClassLoader for the deployed Bundle. + A BundleClassLoader delegates all classloading concerns to the underlying Bundle.</para> + + <emphasis role="bold">BundleStartStopDeployer</emphasis> + + <para>The BundleStartStopDeployer currently works in two modes:</para> + + <itemizedlist> + <listitem>deferredStart (default)</listitem> + <listitem>simpleStart</listitem> + </itemizedlist> + + <para>In mode <emphasis role="bold">deferredStart</emphasis> the Bundle is added to a list of unresolved Bundles, which then get passed + on to <ulink url="http://www.osgi.org/javadoc/r4v41/org/osgi/service/packageadmin/PackageAd..."><code>PackageAdmin.resolveBundles(Bundle[])</code></ulink>. + The deployer then iterates over the unresolved Bundles and only starts those Bundles that are in state + <ulink url="http://www.osgi.org/javadoc/r4v41/org/osgi/framework/Bundle.html#RESOLVED"><code>RESOLVED</code></ulink>. + In this mode Bundles can be deployed in any order and only get started when all their respective dependencies can be resolved.</para> + + <para>In mode <emphasis role="bold">simpleStart</emphasis> the deployer attempts to start the Bundle regardless of whether its + dependencies can get resolved. In case the Bundle has a dependency oin a package that is not yet available, deployment will fail. + In this mode Bundles must be deployed in the order required to start them.</para> + + <para>The start mode is a configurable property on the Framework's SystemContext.</para> + + <programlisting role="XML"><![CDATA[ +  + <entry><key>org.jboss.osgi.deferred.start</key><value>true</value></entry> + ]]></programlisting> + + <emphasis role="bold">BundleManagementDeployer</emphasis> + + <para>The BundleManagementDeployer registers the Bundle as <ulink url="http://java.sun.com/j2se/1.5.0/docs/api/javax/management/StandardMBean.html">StandardMBean</ulink> with JMX. + Please see the section on <ulink url="#SecJMXView">Management View</ulink> for details.</para> + </sect1> - <sect1 id="SecJMXView"> + <sect1 xml:id="SecJMXView"> <title>Management View</title> <note> @@ -102,7 +162,7 @@ </note> </sect1> - <sect1 id="SecClassLoading"> + <sect1 xml:id="SecClassLoading"> <title>Class Loading</title> <note> @@ -110,7 +170,7 @@ </note> </sect1> - <sect1 id="SecLoggingBridge"> + <sect1 xml:id="SecLoggingBridge"> <title>Logging Bridge</title> <note> @@ -118,7 +178,7 @@ </note> </sect1> - <sect1 id="SecMicrocontainerService"> + <sect1 xml:id="SecMicrocontainerService"> <title>Microcontainer Service</title> <note> Modified: projects/jboss-osgi/trunk/build/docbook/en/modules/frameworkintegration.xml =================================================================== --- projects/jboss-osgi/trunk/build/docbook/en/modules/frameworkintegration.xml 2009-03-26 08:38:07 UTC (rev 86376) +++ projects/jboss-osgi/trunk/build/docbook/en/modules/frameworkintegration.xml 2009-03-26 11:17:31 UTC (rev 86377) @@ -1,11 +1,11 @@  -<chapter id="ChapFrameworkIntegration"> +<chapter xml:id="ChapFrameworkIntegration"> <title>Framework Integration</title> - <sect1 id="SecIntFelix"> + <sect1 xml:id="SecIntFelix"> <title>Apache Felix Integration</title> <para>JBossOSGi provides integration for the <ulink url="http://felix.apache.org">Apache Felix</ulink> OSGi Framework and some @@ -77,7 +77,7 @@ </table> </sect1> - <sect1 id="SecIntEquinox"> + <sect1 xml:id="SecIntEquinox"> <title>Equinox Integration</title> <note> @@ -85,7 +85,7 @@ </note> </sect1> - <sect1 id="SecIntKnopflerfish"> + <sect1 xml:id="SecIntKnopflerfish"> <title>Knopflerfish Integration</title> <note> Modified: projects/jboss-osgi/trunk/build/docbook/en/modules/gettingstarted.xml =================================================================== --- projects/jboss-osgi/trunk/build/docbook/en/modules/gettingstarted.xml 2009-03-26 08:38:07 UTC (rev 86376) +++ projects/jboss-osgi/trunk/build/docbook/en/modules/gettingstarted.xml 2009-03-26 11:17:31 UTC (rev 86377) @@ -1,14 +1,14 @@  -<chapter id="ChapGettingStarted"> +<chapter xml:id="ChapGettingStarted"> <title>Getting Started</title> <para>This chapter takes you through the first steps of getting JBossOSGi and provides the initial pointers to get up and running.</para> - <sect1 id="SecInstall"> + <sect1 xml:id="SecInstall"> <title>Installing JBossOSGi</title> <para>JBossOSGi is distributed as an <ulink url="http://izpack.org">IzPack</ulink> installer archive. @@ -89,7 +89,7 @@ </mediaobject> </sect1> - <sect1 id="SecRuntime"> + <sect1 xml:id="SecRuntime"> <title>JBossOSGi Runtime</title> <para>If you selected 'JBossOSGi Runtime' during installation you should see a <emphasis role="bold">runtime</emphasis> folder, which contains @@ -160,11 +160,12 @@ <para>JBossOSGi comes with a simple Web Console, which is currently based on the <ulink url="http://felix.apache.org/site/apache-felix-web-console.html">Apache Felix Web Console</ulink> project. - By default the JBossOSGi Web Console is available at <ulink url="http://localhost:8090/jboss-osgi">http://localhost:8090/jboss-osgi</ulink></para> + By default the JBossOSGi Web Console is available at <ulink url="http://localhost:8090/jboss-osgi">http://localhost:8090/jboss-osgi</ulink>. + </para> <mediaobject> <imageobject> - <imagedata fileref="images/webconsole.jpg" contentwidth="120%"/> + <imagedata fileref="images/webconsole.png" contentwidth="450"/> </imageobject> </mediaobject> @@ -173,7 +174,7 @@ </note> </sect1> - <sect1 id="SecHudson"> + <sect1 xml:id="SecHudson"> <title>Hudson QA Environment</title> <emphasis role="bold">Setup the Hudson QA Environment</emphasis> @@ -191,7 +192,7 @@ <mediaobject> <imageobject> - <imagedata fileref="images/hudson_home.png" contentwidth="120%"/> + <imagedata fileref="images/hudson-home.png" contentwidth="450"/> </imageobject> </mediaobject> Modified: projects/jboss-osgi/trunk/build/docbook/en/modules/introduction.xml =================================================================== --- projects/jboss-osgi/trunk/build/docbook/en/modules/introduction.xml 2009-03-26 08:38:07 UTC (rev 86376) +++ projects/jboss-osgi/trunk/build/docbook/en/modules/introduction.xml 2009-03-26 11:17:31 UTC (rev 86377) @@ -1,11 +1,11 @@  -<chapter id="ChapIntroduction"> +<chapter xml:id="ChapIntroduction"> <title>Introduction</title> - <sect1 id="SecWhatIsOsgi"> + <sect1 xml:id="SecWhatIsOsgi"> <title>What is OSGi</title> <para>The <ulink url="http://www2.osgi.org/Release4/HomePage">Open Services Gateway Initiative (OSGi)</ulink>, @@ -51,7 +51,7 @@ </sect1> - <sect1 id="SecFramworkOverview"> + <sect1 xml:id="SecFramworkOverview"> <title>OSGi Framework Overview</title> <para>The functionality of the Framework is divided in the following layers:</para> @@ -197,7 +197,7 @@ </mediaobject> </sect1> - <sect1 id="SecServiceCompendium"> + <sect1 xml:id="SecServiceCompendium"> <title>OSGi Service Compendium</title> <para>The OSGi Service Compendium specifies a number of services that may be available in an OSGi runtime environment. Modified: projects/jboss-osgi/trunk/build/docbook/en/modules/references.xml =================================================================== --- projects/jboss-osgi/trunk/build/docbook/en/modules/references.xml 2009-03-26 08:38:07 UTC (rev 86376) +++ projects/jboss-osgi/trunk/build/docbook/en/modules/references.xml 2009-03-26 11:17:31 UTC (rev 86377) @@ -1,7 +1,7 @@  -<chapter id="ChapReferences"> +<chapter xml:id="ChapReferences"> <title>References</title> Modified: projects/jboss-osgi/trunk/runtime/deployer/src/main/java/org/jboss/osgi/deployer/BundleClassLoaderDeployer.java =================================================================== --- projects/jboss-osgi/trunk/runtime/deployer/src/main/java/org/jboss/osgi/deployer/BundleClassLoaderDeployer.java 2009-03-26 08:38:07 UTC (rev 86376) +++ projects/jboss-osgi/trunk/runtime/deployer/src/main/java/org/jboss/osgi/deployer/BundleClassLoaderDeployer.java 2009-03-26 11:17:31 UTC (rev 86377) @@ -21,6 +21,8 @@ */ package org.jboss.osgi.deployer; +// $Id$ + import org.jboss.deployers.spi.DeploymentException; import org.jboss.deployers.spi.deployer.DeploymentStages; import org.jboss.deployers.spi.deployer.helpers.AbstractSimpleRealDeployer; @@ -35,13 +37,15 @@ import org.osgi.framework.BundleContext; /** - * This is the Bundle Deployer + * A deployer that attaches a {@link ClassLoaderFactory} that creates a + * {@link BundleClassLoader} for the deployed Bundle. * * @author Ales.Justin(a)jboss.org + * @author Thomas.Diesler(a)jboss.org + * @since 03-Feb-2009 */ public class BundleClassLoaderDeployer extends AbstractSimpleRealDeployer<Bundle> { - /** Deployment filter */ private DeploymentUnitFilter filter = new BundleDeploymentUnitFilter(); private BundleContext systemContext; @@ -85,7 +89,7 @@ { public ClassLoader createClassLoader(DeploymentUnit unit) throws Exception { - return BundleClassLoader.createBundleClassLoaderFor(bundle); + return BundleClassLoader.createBundleClassLoader(bundle); } public void removeClassLoader(DeploymentUnit unit) throws Exception Modified: projects/jboss-osgi/trunk/runtime/deployer/src/main/java/org/jboss/osgi/deployer/BundleManagementDeployer.java =================================================================== --- projects/jboss-osgi/trunk/runtime/deployer/src/main/java/org/jboss/osgi/deployer/BundleManagementDeployer.java 2009-03-26 08:38:07 UTC (rev 86376) +++ projects/jboss-osgi/trunk/runtime/deployer/src/main/java/org/jboss/osgi/deployer/BundleManagementDeployer.java 2009-03-26 11:17:31 UTC (rev 86377) @@ -33,7 +33,7 @@ import org.osgi.framework.Bundle; /** - * Register the bundle for management + * Register the Bundle as MBean with JMX. * * @author Thomas.Diesler(a)jboss.com * @since 04-Mar-2009 Copied: projects/jboss-osgi/trunk/runtime/deployer/src/main/java/org/jboss/osgi/deployer/BundleMetaData.java (from rev 86375, projects/jboss-osgi/trunk/runtime/deployer/src/main/java/org/jboss/osgi/deployer/OSGiMetaData.java) =================================================================== --- projects/jboss-osgi/trunk/runtime/deployer/src/main/java/org/jboss/osgi/deployer/BundleMetaData.java (rev 0) +++ projects/jboss-osgi/trunk/runtime/deployer/src/main/java/org/jboss/osgi/deployer/BundleMetaData.java 2009-03-26 11:17:31 UTC (rev 86377) @@ -0,0 +1,71 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.osgi.deployer; + +//$Id$ + +import java.net.URI; + +import org.jboss.deployers.vfs.spi.deployer.helpers.AbstractManifestMetaData; + + +/** + * The Bundle metadata. + * + * @author Thomas.Diesler(a)jboss.org + * @since 03-Feb-2009 + */ +public class BundleMetaData extends AbstractManifestMetaData +{ + private String symbolicName; + private URI bundleLocation; + + // exteralizable usage + public BundleMetaData() + { + } + + public BundleMetaData(String symbolicName) + { + this.symbolicName = symbolicName; + } + + public String getSymbolicName() + { + return symbolicName; + } + + public URI getBundleLocation() + { + return bundleLocation; + } + + public void setBundleLocation(URI bundleLocation) + { + this.bundleLocation = bundleLocation; + } + + public String toString() + { + return "Bundle[name=" + symbolicName + "]"; + } +} Property changes on: projects/jboss-osgi/trunk/runtime/deployer/src/main/java/org/jboss/osgi/deployer/BundleMetaData.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:mergeinfo + Name: svn:eol-style + LF Copied: projects/jboss-osgi/trunk/runtime/deployer/src/main/java/org/jboss/osgi/deployer/BundleMetaDataDeployer.java (from rev 86375, projects/jboss-osgi/trunk/runtime/deployer/src/main/java/org/jboss/osgi/deployer/OSGiMetaDataDeployer.java) =================================================================== --- projects/jboss-osgi/trunk/runtime/deployer/src/main/java/org/jboss/osgi/deployer/BundleMetaDataDeployer.java (rev 0) +++ projects/jboss-osgi/trunk/runtime/deployer/src/main/java/org/jboss/osgi/deployer/BundleMetaDataDeployer.java 2009-03-26 11:17:31 UTC (rev 86377) @@ -0,0 +1,71 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.osgi.deployer; + +//$Id$ + +import java.util.jar.Attributes; +import java.util.jar.Manifest; + +import org.jboss.deployers.vfs.spi.deployer.ManifestDeployer; +import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit; +import org.jboss.virtual.VirtualFile; +import org.osgi.framework.Constants; + +/** + * Create {@link BundleMetaData} from Manifest Headers. + * + * If the manifest does not contain a header (named "Bundle-SymbolicName") this deployer does nothing. + * + * @author Thomas.Diesler(a)jboss.org + * @since 03-Feb-2009 + */ +public class BundleMetaDataDeployer extends ManifestDeployer<BundleMetaData> +{ + public BundleMetaDataDeployer() + { + super(BundleMetaData.class); + } + + @Override + protected BundleMetaData parse(VFSDeploymentUnit unit, VirtualFile file, BundleMetaData root) throws Exception + { + BundleMetaData metaData = super.parse(unit, file, root); + if (metaData != null) + { + metaData.setBundleLocation(unit.getRoot().toURI()); + log.debug("Bundle-SymbolicName: " + metaData.getSymbolicName() + " in " + file); + } + return metaData; + } + + @Override + protected BundleMetaData createMetaData(Manifest manifest) throws Exception + { + Attributes attribs = manifest.getMainAttributes(); + String symbolicName = attribs.getValue(Constants.BUNDLE_SYMBOLICNAME); + if (symbolicName != null) + return new BundleMetaData(symbolicName); + + return null; + } +} Property changes on: projects/jboss-osgi/trunk/runtime/deployer/src/main/java/org/jboss/osgi/deployer/BundleMetaDataDeployer.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:mergeinfo + Name: svn:eol-style + LF Copied: projects/jboss-osgi/trunk/runtime/deployer/src/main/java/org/jboss/osgi/deployer/BundleRealDeployer.java (from rev 86375, projects/jboss-osgi/trunk/runtime/deployer/src/main/java/org/jboss/osgi/deployer/OSGiDeployer.java) =================================================================== --- projects/jboss-osgi/trunk/runtime/deployer/src/main/java/org/jboss/osgi/deployer/BundleRealDeployer.java (rev 0) +++ projects/jboss-osgi/trunk/runtime/deployer/src/main/java/org/jboss/osgi/deployer/BundleRealDeployer.java 2009-03-26 11:17:31 UTC (rev 86377) @@ -0,0 +1,128 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.osgi.deployer; + +//$Id$ + +import java.net.URI; +import java.util.List; + +import org.jboss.deployers.spi.DeploymentException; +import org.jboss.deployers.spi.deployer.DeploymentStages; +import org.jboss.deployers.spi.deployer.helpers.AbstractSimpleRealDeployer; +import org.jboss.deployers.structure.spi.DeploymentUnit; +import org.jboss.osgi.spi.framework.OSGiStateFormat; +import org.osgi.framework.Bundle; +import org.osgi.framework.BundleContext; +import org.osgi.framework.BundleException; + +/** + * Installs the Bundle into the Framework's SystemContext. + * + * This deployer does not start the bundle. It leaves it in state INSTALLED. + * On undeploy the Bundle gets uninstalled from the Framework's SystemContext. + * + * @author Thomas.Diesler(a)jboss.org + * @author Ales.Justin(a)jboss.org + * @since 03-Feb-2009 + */ +public class BundleRealDeployer extends AbstractSimpleRealDeployer<BundleMetaData> +{ + private BundleContext systemContext; + private List<URI> skipBundles; + + public BundleRealDeployer() + { + super(BundleMetaData.class); + addOutput(Bundle.class); + setStage(DeploymentStages.POST_PARSE); + } + + public void setSystemContext(BundleContext bundleContext) + { + this.systemContext = bundleContext; + } + + public void setSkipBundles(List<URI> skipBundles) + { + this.skipBundles = skipBundles; + } + + public void deploy(DeploymentUnit unit, BundleMetaData metadata) throws DeploymentException + { + URI bundleUri = metadata.getBundleLocation(); + if (bundleUri == null) + throw new IllegalStateException("Cannot obtain bundle location for: " + metadata); + + String bundlePath = bundleUri.getPath(); + if (bundlePath.endsWith("/")) + bundlePath = bundlePath.substring(0, bundlePath.length() - 1); + + try + { + if (skipBundles != null) + { + boolean skipBundle = false; + for (URI skip : skipBundles) + { + String skipPath = skip.getPath(); + if (skipPath.equals(bundlePath)) + { + skipBundle = true; + break; + } + } + if (skipBundle == false) + { + Bundle bundle = systemContext.installBundle(bundleUri.toString()); + unit.addAttachment(Bundle.class, bundle); + + String state = OSGiStateFormat.formatBundleState(bundle.getState()); + log.info("Installed: " + bundle + state); + } + } + } + catch (BundleException ex) + { + throw DeploymentException.rethrowAsDeploymentException("Cannot install bundle: " + metadata, ex); + } + } + + @Override + public void undeploy(DeploymentUnit unit, BundleMetaData osGiMetaData) + { + Bundle bundle = unit.getAttachment(Bundle.class); + if (bundle != null) + { + try + { + bundle.uninstall(); + String state = OSGiStateFormat.formatBundleState(bundle.getState()); + log.info("Uninstalled: " + bundle + state); + } + catch (BundleException ex) + { + log.warn(ex); + } + } + } +} Property changes on: projects/jboss-osgi/trunk/runtime/deployer/src/main/java/org/jboss/osgi/deployer/BundleRealDeployer.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:mergeinfo + Name: svn:eol-style + LF Deleted: projects/jboss-osgi/trunk/runtime/deployer/src/main/java/org/jboss/osgi/deployer/OSGiClassLoadingMetaDataDeployer.java =================================================================== --- projects/jboss-osgi/trunk/runtime/deployer/src/main/java/org/jboss/osgi/deployer/OSGiClassLoadingMetaDataDeployer.java 2009-03-26 08:38:07 UTC (rev 86376) +++ projects/jboss-osgi/trunk/runtime/deployer/src/main/java/org/jboss/osgi/deployer/OSGiClassLoadingMetaDataDeployer.java 2009-03-26 11:17:31 UTC (rev 86377) @@ -1,57 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.osgi.deployer; - -import org.jboss.classloading.spi.metadata.ClassLoadingMetaData; -import org.jboss.deployers.spi.DeploymentException; -import org.jboss.deployers.spi.deployer.DeploymentStages; -import org.jboss.deployers.spi.deployer.helpers.AbstractSimpleRealDeployer; -import org.jboss.deployers.structure.spi.DeploymentUnit; -import org.osgi.framework.Bundle; - -/** - * This creates limited CLMD. - * - * @author Ales.Justin(a)jboss.org - */ -public class OSGiClassLoadingMetaDataDeployer extends AbstractSimpleRealDeployer<Bundle> -{ - private ClassLoadingMetaData metaData; - - public OSGiClassLoadingMetaDataDeployer(ClassLoadingMetaData metaData) - { - super(Bundle.class); - if (metaData == null) - throw new IllegalArgumentException("Null metadata"); - - addOutput(ClassLoadingMetaData.class); - setStage(DeploymentStages.POST_PARSE); - this.metaData = metaData; - } - - public void deploy(DeploymentUnit unit, Bundle bundle) throws DeploymentException - { - // override in any case - ClassLoadingMetaData cloned = metaData.clone(); - unit.addAttachment(ClassLoadingMetaData.class, cloned); - } -} \ No newline at end of file Deleted: projects/jboss-osgi/trunk/runtime/deployer/src/main/java/org/jboss/osgi/deployer/OSGiDeployer.java =================================================================== --- projects/jboss-osgi/trunk/runtime/deployer/src/main/java/org/jboss/osgi/deployer/OSGiDeployer.java 2009-03-26 08:38:07 UTC (rev 86376) +++ projects/jboss-osgi/trunk/runtime/deployer/src/main/java/org/jboss/osgi/deployer/OSGiDeployer.java 2009-03-26 11:17:31 UTC (rev 86377) @@ -1,125 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.osgi.deployer; - -//$Id$ - -import java.net.URI; -import java.util.List; - -import org.jboss.deployers.spi.DeploymentException; -import org.jboss.deployers.spi.deployer.DeploymentStages; -import org.jboss.deployers.spi.deployer.helpers.AbstractSimpleRealDeployer; -import org.jboss.deployers.structure.spi.DeploymentUnit; -import org.jboss.osgi.spi.framework.OSGiStateFormat; -import org.osgi.framework.Bundle; -import org.osgi.framework.BundleContext; -import org.osgi.framework.BundleException; - -/** - * This is the OSGi Deployer - * - * @author Thomas.Diesler(a)jboss.org - * @author Ales.Justin(a)jboss.org - * @since 03-Feb-2009 - */ -public class OSGiDeployer extends AbstractSimpleRealDeployer<OSGiMetaData> -{ - private BundleContext systemContext; - private List<URI> skipBundles; - - public OSGiDeployer() - { - super(OSGiMetaData.class); - addOutput(Bundle.class); - setStage(DeploymentStages.POST_PARSE); - } - - public void setSystemContext(BundleContext bundleContext) - { - this.systemContext = bundleContext; - } - - public void setSkipBundles(List<URI> skipBundles) - { - this.skipBundles = skipBundles; - } - - public void deploy(DeploymentUnit unit, OSGiMetaData metadata) throws DeploymentException - { - URI bundleUri = metadata.getBundleLocation(); - if (bundleUri == null) - throw new IllegalStateException("Cannot obtain bundle location for: " + metadata); - - String bundlePath = bundleUri.getPath(); - if (bundlePath.endsWith("/")) - bundlePath = bundlePath.substring(0, bundlePath.length() - 1); - - try - { - if (skipBundles != null) - { - boolean skipBundle = false; - for (URI skip : skipBundles) - { - String skipPath = skip.getPath(); - if (skipPath.equals(bundlePath)) - { - skipBundle = true; - break; - } - } - if (skipBundle == false) - { - Bundle bundle = systemContext.installBundle(bundleUri.toString()); - unit.addAttachment(Bundle.class, bundle); - - String state = OSGiStateFormat.formatBundleState(bundle.getState()); - log.info("Installed: " + bundle + state); - } - } - } - catch (BundleException ex) - { - throw DeploymentException.rethrowAsDeploymentException("Cannot install bundle: " + metadata, ex); - } - } - - @Override - public void undeploy(DeploymentUnit unit, OSGiMetaData osGiMetaData) - { - Bundle bundle = unit.getAttachment(Bundle.class); - if (bundle != null) - { - try - { - bundle.uninstall(); - String state = OSGiStateFormat.formatBundleState(bundle.getState()); - log.info("Uninstalled: " + bundle + state); - } - catch (BundleException ex) - { - log.warn(ex); - } - } - } -} Deleted: projects/jboss-osgi/trunk/runtime/deployer/src/main/java/org/jboss/osgi/deployer/OSGiMetaData.java =================================================================== --- projects/jboss-osgi/trunk/runtime/deployer/src/main/java/org/jboss/osgi/deployer/OSGiMetaData.java 2009-03-26 08:38:07 UTC (rev 86376) +++ projects/jboss-osgi/trunk/runtime/deployer/src/main/java/org/jboss/osgi/deployer/OSGiMetaData.java 2009-03-26 11:17:31 UTC (rev 86377) @@ -1,71 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.osgi.deployer; - -//$Id$ - -import java.net.URI; - -import org.jboss.deployers.vfs.spi.deployer.helpers.AbstractManifestMetaData; - - -/** - * This are the OSGi Meta Data - * - * @author Thomas.Diesler(a)jboss.org - * @since 03-Feb-2009 - */ -public class OSGiMetaData extends AbstractManifestMetaData -{ - private String symbolicName; - private URI bundleLocation; - - // exteralizable usage - public OSGiMetaData() - { - } - - public OSGiMetaData(String symbolicName) - { - this.symbolicName = symbolicName; - } - - public String getSymbolicName() - { - return symbolicName; - } - - public URI getBundleLocation() - { - return bundleLocation; - } - - public void setBundleLocation(URI bundleLocation) - { - this.bundleLocation = bundleLocation; - } - - public String toString() - { - return "Bundle[name=" + symbolicName + "]"; - } -} Deleted: projects/jboss-osgi/trunk/runtime/deployer/src/main/java/org/jboss/osgi/deployer/OSGiMetaDataDeployer.java =================================================================== --- projects/jboss-osgi/trunk/runtime/deployer/src/main/java/org/jboss/osgi/deployer/OSGiMetaDataDeployer.java 2009-03-26 08:38:07 UTC (rev 86376) +++ projects/jboss-osgi/trunk/runtime/deployer/src/main/java/org/jboss/osgi/deployer/OSGiMetaDataDeployer.java 2009-03-26 11:17:31 UTC (rev 86377) @@ -1,69 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.osgi.deployer; - -//$Id$ - -import java.util.jar.Attributes; -import java.util.jar.Manifest; - -import org.jboss.deployers.vfs.spi.deployer.ManifestDeployer; -import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit; -import org.jboss.virtual.VirtualFile; -import org.osgi.framework.Constants; - -/** - * This is the OSGi Deployer - * - * @author Thomas.Diesler(a)jboss.org - * @since 03-Feb-2009 - */ -public class OSGiMetaDataDeployer extends ManifestDeployer<OSGiMetaData> -{ - public OSGiMetaDataDeployer() - { - super(OSGiMetaData.class); - } - - @Override - protected OSGiMetaData parse(VFSDeploymentUnit unit, VirtualFile file, OSGiMetaData root) throws Exception - { - OSGiMetaData metaData = super.parse(unit, file, root); - if (metaData != null) - { - metaData.setBundleLocation(unit.getRoot().toURI()); - log.debug("Bundle-SymbolicName: " + metaData.getSymbolicName() + " in " + file); - } - return metaData; - } - - @Override - protected OSGiMetaData createMetaData(Manifest manifest) throws Exception - { - Attributes attribs = manifest.getMainAttributes(); - String symbolicName = attribs.getValue(Constants.BUNDLE_SYMBOLICNAME); - if (symbolicName != null) - return new OSGiMetaData(symbolicName); - - return null; - } -} Modified: projects/jboss-osgi/trunk/runtime/deployer/src/main/java/org/jboss/osgi/deployer/helpers/BundleClassLoader.java =================================================================== --- projects/jboss-osgi/trunk/runtime/deployer/src/main/java/org/jboss/osgi/deployer/helpers/BundleClassLoader.java 2009-03-26 08:38:07 UTC (rev 86376) +++ projects/jboss-osgi/trunk/runtime/deployer/src/main/java/org/jboss/osgi/deployer/helpers/BundleClassLoader.java 2009-03-26 11:17:31 UTC (rev 86377) @@ -21,6 +21,8 @@ */ package org.jboss.osgi.deployer.helpers; +// $Id: $ + import java.io.IOException; import java.net.URL; import java.security.AccessController; @@ -32,15 +34,17 @@ import org.osgi.framework.Constants; /** - * Bundle backed classloader. + * A BundleClassLoader delegates all classloading concerns to the underlying Bundle. * - * @author <a href="mailto:ales.justin@jboss.org">Ales Justin</a> + * @author Ales.Justin(a)jboss.org + * @author thomas.Diesler(a)jboss.org + * @since 03-Feb-2009 */ public class BundleClassLoader extends ClassLoader { private final Bundle bundle; - public static BundleClassLoader createBundleClassLoaderFor(final Bundle bundle) + public static BundleClassLoader createBundleClassLoader(final Bundle bundle) { if (bundle == null) throw new IllegalArgumentException("Null bundle"); Modified: projects/jboss-osgi/trunk/runtime/deployer/src/main/resources/osgi-deployers-jboss-beans.xml =================================================================== --- projects/jboss-osgi/trunk/runtime/deployer/src/main/resources/osgi-deployers-jboss-beans.xml 2009-03-26 08:38:07 UTC (rev 86376) +++ projects/jboss-osgi/trunk/runtime/deployer/src/main/resources/osgi-deployers-jboss-beans.xml 2009-03-26 11:17:31 UTC (rev 86377) @@ -52,10 +52,10 @@ </bean>  - <bean name="jboss.osgi:service=MetaDataDeployer" class="org.jboss.osgi.deployer.OSGiMetaDataDeployer" /> + <bean name="jboss.osgi:service=BundleMetaDataDeployer" class="org.jboss.osgi.deployer.BundleMetaDataDeployer" /> -  - <bean name="jboss.osgi:service=Deployer" class="org.jboss.osgi.deployer.OSGiDeployer"> +  + <bean name="jboss.osgi:service=BundleRealDeployer" class="org.jboss.osgi.deployer.BundleRealDeployer"> <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="systemBundleContext" /></property> <property name="skipBundles"><inject bean="jboss.osgi:service=Framework" property="autoInstall" /></property> </bean> @@ -65,14 +65,14 @@ <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="systemBundleContext" /></property> </bean> +  + <bean name="jboss.osgi:service=BundleStartStopDeployer" class="org.jboss.osgi.deployer.BundleStartStopDeployer"> + <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="systemBundleContext" /></property> + </bean> +  <bean name="jboss.osgi:service=BundleManagementDeployer" class="org.jboss.osgi.deployer.BundleManagementDeployer"> <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property> </bean> -  - <bean name="jboss.osgi:service=BundleStartStopDeployer" class="org.jboss.osgi.deployer.BundleStartStopDeployer"> - <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="systemBundleContext" /></property> - </bean> - </deployment> \ No newline at end of file

16 years, 9 months

1
0
0 / 0

JBoss-OSGI SVN: r86370 - projects/jboss-osgi/trunk/build/docbook/en/modules.

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

Author: thomas.diesler(a)jboss.com Date: 2009-03-25 12:46:46 -0400 (Wed, 25 Mar 2009) New Revision: 86370 Modified: projects/jboss-osgi/trunk/build/docbook/en/modules/devguide.xml projects/jboss-osgi/trunk/build/docbook/en/modules/frameworkintegration.xml projects/jboss-osgi/trunk/build/docbook/en/modules/gettingstarted.xml Log: Promote TODO to title Modified: projects/jboss-osgi/trunk/build/docbook/en/modules/devguide.xml =================================================================== --- projects/jboss-osgi/trunk/build/docbook/en/modules/devguide.xml 2009-03-25 16:39:14 UTC (rev 86369) +++ projects/jboss-osgi/trunk/build/docbook/en/modules/devguide.xml 2009-03-25 16:46:46 UTC (rev 86370) @@ -90,7 +90,7 @@ <title>Bundle Deployers</title> <note> - <para>TODO: Document the Deployers</para> + <title>TODO: Document the Deployers</title> </note> </sect1> @@ -98,7 +98,7 @@ <title>Management View</title> <note> - <para>TODO: Document the JMX View</para> + <title>TODO: Document the JMX View</title> </note> </sect1> @@ -106,7 +106,7 @@ <title>Class Loading</title> <note> - <para>TODO: Document the Class Loading</para> + <title>TODO: Document the Class Loading</title> </note> </sect1> @@ -114,7 +114,7 @@ <title>Logging Bridge</title> <note> - <para>TODO: Document the Logging Bridge</para> + <title>TODO: Document the Logging Bridge</title> </note> </sect1> @@ -122,7 +122,7 @@ <title>Microcontainer Service</title> <note> - <para>TODO: Document the Microcontainer Service</para> + <title>TODO: Document the Microcontainer Service</title> </note> </sect1> Modified: projects/jboss-osgi/trunk/build/docbook/en/modules/frameworkintegration.xml =================================================================== --- projects/jboss-osgi/trunk/build/docbook/en/modules/frameworkintegration.xml 2009-03-25 16:39:14 UTC (rev 86369) +++ projects/jboss-osgi/trunk/build/docbook/en/modules/frameworkintegration.xml 2009-03-25 16:46:46 UTC (rev 86370) @@ -81,7 +81,7 @@ <title>Equinox Integration</title> <note> - <para>TODO: Provide and document Equinox Integration</para> + <title>TODO: Provide and document Equinox Integration</title> </note> </sect1> @@ -89,7 +89,7 @@ <title>Knopflerfish Integration</title> <note> - <para>TODO: Provide and document Knopflerfish Integration</para> + <title>TODO: Provide and document Knopflerfish Integration</title> </note> </sect1> Modified: projects/jboss-osgi/trunk/build/docbook/en/modules/gettingstarted.xml =================================================================== --- projects/jboss-osgi/trunk/build/docbook/en/modules/gettingstarted.xml 2009-03-25 16:39:14 UTC (rev 86369) +++ projects/jboss-osgi/trunk/build/docbook/en/modules/gettingstarted.xml 2009-03-25 16:46:46 UTC (rev 86370) @@ -17,7 +17,7 @@ To run the installer execute the following command:</para> <note> - <para>TODO: Provide better download support</para> + <title>TODO: Provide better download support</title> </note> <programlisting> @@ -152,7 +152,7 @@ </programlisting> <note> - <para>TODO: Provide example bundles and use them here</para> + <title>TODO: Provide example bundles and use them here</title> </note> @@ -169,7 +169,7 @@ </mediaobject> <note> - <para>TODO: Cleanup and document console provided functionality</para> + <title>TODO: Cleanup and document console provided functionality</title> </note> </sect1>

16 years, 9 months

1
0
0 / 0

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

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

Author: thomas.diesler(a)jboss.com Date: 2009-03-25 12:39:14 -0400 (Wed, 25 Mar 2009) New Revision: 86369 Modified: projects/jboss-osgi/trunk/build/distribution/pom.xml projects/jboss-osgi/trunk/build/distribution/scripts/antrun-installer.xml projects/jboss-osgi/trunk/build/distribution/scripts/assembly-deploy-artifacts.xml projects/jboss-osgi/trunk/build/distribution/src/main/resources/installer/install-definition.xml projects/jboss-osgi/trunk/build/docbook/pom.xml Log: Fix dependency on jdocbook output Modified: projects/jboss-osgi/trunk/build/distribution/pom.xml =================================================================== --- projects/jboss-osgi/trunk/build/distribution/pom.xml 2009-03-25 16:36:19 UTC (rev 86368) +++ projects/jboss-osgi/trunk/build/distribution/pom.xml 2009-03-25 16:39:14 UTC (rev 86369) @@ -104,24 +104,9 @@ <dependency> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-userguide</artifactId> - <classifier>html</classifier> <version>${version}</version> - <type>war</type> + <type>jdocbook</type> </dependency> - <dependency> - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-userguide</artifactId> - <classifier>html_single</classifier> - <version>${version}</version> - <type>war</type> - </dependency> - <dependency> - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-userguide</artifactId> - <classifier>pdf</classifier> - <version>${version}</version> - <type>war</type> - </dependency>  <dependency> Modified: projects/jboss-osgi/trunk/build/distribution/scripts/antrun-installer.xml =================================================================== --- projects/jboss-osgi/trunk/build/distribution/scripts/antrun-installer.xml 2009-03-25 16:36:19 UTC (rev 86368) +++ projects/jboss-osgi/trunk/build/distribution/scripts/antrun-installer.xml 2009-03-25 16:39:14 UTC (rev 86369) @@ -62,6 +62,13 @@ <property name="izpack.temp.dir" value="${output.dir}/izpack-temp" /> <mkdir dir="${izpack.temp.dir}" /> +  + <unzip src="${deploy.artifacts.dir}/docs/jboss-osgi-userguide-${product.version}.jdocbook" dest="${deploy.artifacts.dir}/docs/userguide"> + <patternset> + <exclude name="META-INF/**"/> + </patternset> + </unzip> +  <echo message="Running IzPack to build the installer..." /> <izpack input="${resources.dir}/installer/install-definition.xml" output="${output.dir}/jboss-osgi-installer-${product.version}.jar" Modified: projects/jboss-osgi/trunk/build/distribution/scripts/assembly-deploy-artifacts.xml =================================================================== --- projects/jboss-osgi/trunk/build/distribution/scripts/assembly-deploy-artifacts.xml 2009-03-25 16:36:19 UTC (rev 86368) +++ projects/jboss-osgi/trunk/build/distribution/scripts/assembly-deploy-artifacts.xml 2009-03-25 16:39:14 UTC (rev 86369) @@ -15,7 +15,7 @@ <outputDirectory>docs</outputDirectory> <useStrictFiltering>true</useStrictFiltering> <includes> - <include>*:jboss-osgi-runtime-spi:jar:javadoc</include> + <include>*:jboss-osgi-userguide:jdocbook</include> </includes> </dependencySet> Modified: projects/jboss-osgi/trunk/build/distribution/src/main/resources/installer/install-definition.xml =================================================================== --- projects/jboss-osgi/trunk/build/distribution/src/main/resources/installer/install-definition.xml 2009-03-25 16:36:19 UTC (rev 86368) +++ projects/jboss-osgi/trunk/build/distribution/src/main/resources/installer/install-definition.xml 2009-03-25 16:39:14 UTC (rev 86369) @@ -95,14 +95,8 @@ </fileset>  - <file src="@{deploy.artifacts.dir}/lib/jboss-osgi-runtime-spi-javadoc.jar" targetdir="$INSTALL_PATH/docs/apidocs" - unpack="true" override="true" /> - <file src="@{deploy.artifacts.dir}/lib/jboss-osgi-userguide-html.war" targetdir="$INSTALL_PATH/docs/userguide/html" - unpack="true" override="true" /> - <file src="@{deploy.artifacts.dir}/lib/jboss-osgi-userguide-html_single.war" targetdir="$INSTALL_PATH/docs/userguide/html_single" - unpack="true" override="true" /> - <file src="@{deploy.artifacts.dir}/lib/jboss-osgi-userguide-pdf.war" targetdir="$INSTALL_PATH/docs/userguide/pdf" - unpack="true" override="true" /> + <file src="@{deploy.artifacts.dir}/lib/jboss-osgi-runtime-spi-javadoc.jar" targetdir="$INSTALL_PATH/docs/apidocs" unpack="true" override="true" /> + <fileset dir="@{deploy.artifacts.dir}/docs/userguide" targetdir="$INSTALL_PATH/docs/userguide" override="true"/>  <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/lib" override="true"> Modified: projects/jboss-osgi/trunk/build/docbook/pom.xml =================================================================== --- projects/jboss-osgi/trunk/build/docbook/pom.xml 2009-03-25 16:36:19 UTC (rev 86368) +++ projects/jboss-osgi/trunk/build/docbook/pom.xml 2009-03-25 16:39:14 UTC (rev 86369) @@ -89,9 +89,6 @@ <options> <xincludeSupported>true</xincludeSupported> <xmlTransformerType>saxon</xmlTransformerType> -  -  - <docbookVersion>1.72.0</docbookVersion> </options> </configuration> </plugin>

16 years, 9 months

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

jboss-osgi-commits March 2009