[jboss-cvs] JBossAS SVN: r91058 - in projects/jboss-osgi/projects/bundles: hotdeploy/trunk/src/main/java/org/jboss/osgi and 11 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Jul 10 06:04:12 EDT 2009
Author: thomas.diesler at jboss.com
Date: 2009-07-10 06:04:11 -0400 (Fri, 10 Jul 2009)
New Revision: 91058
Added:
projects/jboss-osgi/projects/bundles/hotdeploy/trunk/src/main/java/org/jboss/osgi/hotdeploy/
projects/jboss-osgi/projects/bundles/hotdeploy/trunk/src/main/java/org/jboss/osgi/hotdeploy/internal/
projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/webconsole/
projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/webconsole/internal/
projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/webconsole/internal/WebConsole.java
projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/webconsole/internal/WebConsoleActivator.java
projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/webconsole/internal/plugins/
Removed:
projects/jboss-osgi/projects/bundles/hotdeploy/trunk/src/main/java/org/jboss/osgi/service/hotdeploy/internal/
projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/service/webconsole/internal/WebConsole.java
projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/service/webconsole/internal/WebConsoleActivator.java
projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/service/webconsole/internal/plugins/
Modified:
projects/jboss-osgi/projects/bundles/hotdeploy/trunk/pom.xml
projects/jboss-osgi/projects/bundles/hotdeploy/trunk/src/main/java/org/jboss/osgi/hotdeploy/internal/DeploymentScannerActivator.java
projects/jboss-osgi/projects/bundles/hotdeploy/trunk/src/main/java/org/jboss/osgi/hotdeploy/internal/DeploymentScannerImpl.java
projects/jboss-osgi/projects/bundles/hotdeploy/trunk/src/main/java/org/jboss/osgi/hotdeploy/internal/ScannerThread.java
projects/jboss-osgi/projects/bundles/webconsole/trunk/pom.xml
projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/apache/felix/webconsole/internal/servlet/RenderBridge.java
projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/webconsole/internal/plugins/BundlesPlugin.java
projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/webconsole/internal/plugins/ConfigManagerPlugin.java
projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/webconsole/internal/plugins/EventAdminPlugin.java
projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/webconsole/internal/plugins/InstallActionExt.java
projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/webconsole/internal/plugins/LicensePlugin.java
projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/webconsole/internal/plugins/LogServicePlugin.java
projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/webconsole/internal/plugins/PluginHelper.java
projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/resources/OSGI-INF/metatype/metatype.xml
Log:
Remove 'service' from package name
Modified: projects/jboss-osgi/projects/bundles/hotdeploy/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/hotdeploy/trunk/pom.xml 2009-07-10 10:02:21 UTC (rev 91057)
+++ projects/jboss-osgi/projects/bundles/hotdeploy/trunk/pom.xml 2009-07-10 10:04:11 UTC (rev 91058)
@@ -63,8 +63,8 @@
<configuration>
<instructions>
<Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
- <Bundle-Activator>org.jboss.osgi.service.hotdeploy.internal.DeploymentScannerActivator</Bundle-Activator>
- <Private-Package>org.jboss.osgi.service.hotdeploy.internal</Private-Package>
+ <Bundle-Activator>org.jboss.osgi.hotdeploy.internal.DeploymentScannerActivator</Bundle-Activator>
+ <Private-Package>org.jboss.osgi.hotdeploy.internal</Private-Package>
<Import-Package>
javax.management,
org.jboss.osgi.common.log;version="1.0",
Copied: projects/jboss-osgi/projects/bundles/hotdeploy/trunk/src/main/java/org/jboss/osgi/hotdeploy/internal (from rev 91048, projects/jboss-osgi/projects/bundles/hotdeploy/trunk/src/main/java/org/jboss/osgi/service/hotdeploy/internal)
Modified: projects/jboss-osgi/projects/bundles/hotdeploy/trunk/src/main/java/org/jboss/osgi/hotdeploy/internal/DeploymentScannerActivator.java
===================================================================
--- projects/jboss-osgi/projects/bundles/hotdeploy/trunk/src/main/java/org/jboss/osgi/service/hotdeploy/internal/DeploymentScannerActivator.java 2009-07-10 05:26:35 UTC (rev 91048)
+++ projects/jboss-osgi/projects/bundles/hotdeploy/trunk/src/main/java/org/jboss/osgi/hotdeploy/internal/DeploymentScannerActivator.java 2009-07-10 10:04:11 UTC (rev 91058)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.osgi.service.hotdeploy.internal;
+package org.jboss.osgi.hotdeploy.internal;
//$Id$
Modified: projects/jboss-osgi/projects/bundles/hotdeploy/trunk/src/main/java/org/jboss/osgi/hotdeploy/internal/DeploymentScannerImpl.java
===================================================================
--- projects/jboss-osgi/projects/bundles/hotdeploy/trunk/src/main/java/org/jboss/osgi/service/hotdeploy/internal/DeploymentScannerImpl.java 2009-07-10 05:26:35 UTC (rev 91048)
+++ projects/jboss-osgi/projects/bundles/hotdeploy/trunk/src/main/java/org/jboss/osgi/hotdeploy/internal/DeploymentScannerImpl.java 2009-07-10 10:04:11 UTC (rev 91058)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.osgi.service.hotdeploy.internal;
+package org.jboss.osgi.hotdeploy.internal;
//$Id$
Modified: projects/jboss-osgi/projects/bundles/hotdeploy/trunk/src/main/java/org/jboss/osgi/hotdeploy/internal/ScannerThread.java
===================================================================
--- projects/jboss-osgi/projects/bundles/hotdeploy/trunk/src/main/java/org/jboss/osgi/service/hotdeploy/internal/ScannerThread.java 2009-07-10 05:26:35 UTC (rev 91048)
+++ projects/jboss-osgi/projects/bundles/hotdeploy/trunk/src/main/java/org/jboss/osgi/hotdeploy/internal/ScannerThread.java 2009-07-10 10:04:11 UTC (rev 91058)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.osgi.service.hotdeploy.internal;
+package org.jboss.osgi.hotdeploy.internal;
//$Id$
Modified: projects/jboss-osgi/projects/bundles/webconsole/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/webconsole/trunk/pom.xml 2009-07-10 10:02:21 UTC (rev 91057)
+++ projects/jboss-osgi/projects/bundles/webconsole/trunk/pom.xml 2009-07-10 10:04:11 UTC (rev 91058)
@@ -132,7 +132,7 @@
<configuration>
<instructions>
<Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
- <Bundle-Activator>org.jboss.osgi.service.webconsole.internal.WebConsoleActivator</Bundle-Activator>
+ <Bundle-Activator>org.jboss.osgi.webconsole.internal.WebConsoleActivator</Bundle-Activator>
<Export-Package>
org.apache.felix.webconsole;version=${version.felix.webconsole},
org.osgi.service.obr
@@ -140,8 +140,7 @@
<Private-Package>
!org.apache.felix.webconsole,
org.apache.felix.webconsole.*,
- org.jboss.osgi.service.webconsole.internal,
- org.jboss.osgi.service.webconsole.internal.*
+ org.jboss.osgi.webconsole.internal*
</Private-Package>
<Import-Package>
org.apache.felix.scr;
Modified: projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/apache/felix/webconsole/internal/servlet/RenderBridge.java
===================================================================
--- projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/apache/felix/webconsole/internal/servlet/RenderBridge.java 2009-07-10 10:02:21 UTC (rev 91057)
+++ projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/apache/felix/webconsole/internal/servlet/RenderBridge.java 2009-07-10 10:04:11 UTC (rev 91058)
@@ -27,7 +27,7 @@
import org.apache.felix.webconsole.AbstractWebConsolePlugin;
import org.apache.felix.webconsole.Render;
-import org.jboss.osgi.service.webconsole.internal.plugins.PluginHelper;
+import org.jboss.osgi.webconsole.internal.plugins.PluginHelper;
public class RenderBridge extends AbstractWebConsolePlugin
Deleted: projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/service/webconsole/internal/WebConsole.java
===================================================================
--- projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/service/webconsole/internal/WebConsole.java 2009-07-10 10:02:21 UTC (rev 91057)
+++ projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/service/webconsole/internal/WebConsole.java 2009-07-10 10:04:11 UTC (rev 91058)
@@ -1,115 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.osgi.service.webconsole.internal;
-
-//$Id$
-
-import org.apache.felix.webconsole.internal.compendium.ComponentConfigurationPrinter;
-import org.apache.felix.webconsole.internal.core.SetStartLevelAction;
-import org.apache.felix.webconsole.internal.misc.ConfigurationRender;
-import org.apache.felix.webconsole.internal.obr.BundleRepositoryRender;
-import org.apache.felix.webconsole.internal.obr.InstallFromRepoAction;
-import org.apache.felix.webconsole.internal.obr.RefreshRepoAction;
-import org.apache.felix.webconsole.internal.servlet.OsgiManager;
-import org.apache.felix.webconsole.internal.system.GCAction;
-import org.apache.felix.webconsole.internal.system.VMStatPlugin;
-import org.jboss.osgi.service.webconsole.internal.plugins.BundlesPlugin;
-import org.jboss.osgi.service.webconsole.internal.plugins.ConfigManagerPlugin;
-import org.jboss.osgi.service.webconsole.internal.plugins.EventAdminPlugin;
-import org.jboss.osgi.service.webconsole.internal.plugins.InstallActionExt;
-import org.jboss.osgi.service.webconsole.internal.plugins.LicensePlugin;
-import org.jboss.osgi.service.webconsole.internal.plugins.LogServicePlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * Web Console integration
- *
- * Improve console extensibility https://issues.apache.org/jira/browse/FELIX-1013
- *
- * @author thomas.diesler at jboss.com
- * @since 12-Mar-2009
- */
-public class WebConsole extends OsgiManager
-{
- private static final long serialVersionUID = 1L;
-
- private BundleContext bundleContext;
-
- public WebConsole(BundleContext bundleContext)
- {
- super(bundleContext);
- this.bundleContext = bundleContext;
- }
-
- @Override
- protected String getDefaultManagerRoot()
- {
- return "/jboss-osgi";
- }
-
- @Override
- protected String[] getPluginClasses()
- {
- /*
- PLUGIN_CLASSES =
- "org.apache.felix.webconsole.internal.compendium.ComponentConfigurationPrinter",
- "org.apache.felix.webconsole.internal.compendium.ComponentsServlet",
- "org.apache.felix.webconsole.internal.compendium.ConfigManager",
- "org.apache.felix.webconsole.internal.compendium.LogServlet",
- "org.apache.felix.webconsole.internal.core.BundlesServlet",
- "org.apache.felix.webconsole.internal.core.InstallAction",
- "org.apache.felix.webconsole.internal.core.SetStartLevelAction",
- "org.apache.felix.webconsole.internal.deppack.DepPackServlet",
- "org.apache.felix.webconsole.internal.misc.EventAdminServlet",
- "org.apache.felix.webconsole.internal.misc.LicenseServlet",
- "org.apache.felix.webconsole.internal.misc.ConfigurationRender",
- "org.apache.felix.webconsole.internal.misc.ShellServlet",
- "org.apache.felix.webconsole.internal.obr.BundleRepositoryRender",
- "org.apache.felix.webconsole.internal.obr.InstallFromRepoAction",
- "org.apache.felix.webconsole.internal.obr.RefreshRepoAction",
- "org.apache.felix.webconsole.internal.system.GCAction",
- "org.apache.felix.webconsole.internal.system.VMStatPlugin"
- */
-
- String[] PLUGIN_CLASSES = new String[] {
- ComponentConfigurationPrinter.class.getName(),
- //ComponentsServlet.class.getName(),
- ConfigManagerPlugin.class.getName(),
- LogServicePlugin.class.getName(),
- BundlesPlugin.class.getName(),
- InstallActionExt.class.getName(),
- SetStartLevelAction.class.getName(),
- // DepPackServlet.class.getName(),
- EventAdminPlugin.class.getName(),
- LicensePlugin.class.getName(),
- ConfigurationRender.class.getName(),
- // ShellServlet.class.getName(),
- BundleRepositoryRender.class.getName(),
- InstallFromRepoAction.class.getName(),
- RefreshRepoAction.class.getName(),
- GCAction.class.getName(),
- VMStatPlugin.class.getName()
- };
-
- return PLUGIN_CLASSES;
- }
-}
\ No newline at end of file
Deleted: projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/service/webconsole/internal/WebConsoleActivator.java
===================================================================
--- projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/service/webconsole/internal/WebConsoleActivator.java 2009-07-10 10:02:21 UTC (rev 91057)
+++ projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/service/webconsole/internal/WebConsoleActivator.java 2009-07-10 10:04:11 UTC (rev 91058)
@@ -1,51 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.osgi.service.webconsole.internal;
-
-//$Id$
-
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-
-/**
- * The web console Activator
- *
- * @author thomas.diesler at jboss.com
- * @since 12-Mar-2009
- */
-public class WebConsoleActivator implements BundleActivator
-{
- private WebConsole console;
-
- public void start(BundleContext context) throws Exception
- {
- console = new WebConsole(context);
- }
-
- public void stop(BundleContext context) throws Exception
- {
- if (console != null)
- {
- console.dispose();
- }
- }
-}
\ No newline at end of file
Copied: projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/webconsole/internal/WebConsole.java (from rev 91048, projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/service/webconsole/internal/WebConsole.java)
===================================================================
--- projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/webconsole/internal/WebConsole.java (rev 0)
+++ projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/webconsole/internal/WebConsole.java 2009-07-10 10:04:11 UTC (rev 91058)
@@ -0,0 +1,115 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.osgi.webconsole.internal;
+
+//$Id$
+
+import org.apache.felix.webconsole.internal.compendium.ComponentConfigurationPrinter;
+import org.apache.felix.webconsole.internal.core.SetStartLevelAction;
+import org.apache.felix.webconsole.internal.misc.ConfigurationRender;
+import org.apache.felix.webconsole.internal.obr.BundleRepositoryRender;
+import org.apache.felix.webconsole.internal.obr.InstallFromRepoAction;
+import org.apache.felix.webconsole.internal.obr.RefreshRepoAction;
+import org.apache.felix.webconsole.internal.servlet.OsgiManager;
+import org.apache.felix.webconsole.internal.system.GCAction;
+import org.apache.felix.webconsole.internal.system.VMStatPlugin;
+import org.jboss.osgi.webconsole.internal.plugins.BundlesPlugin;
+import org.jboss.osgi.webconsole.internal.plugins.ConfigManagerPlugin;
+import org.jboss.osgi.webconsole.internal.plugins.EventAdminPlugin;
+import org.jboss.osgi.webconsole.internal.plugins.InstallActionExt;
+import org.jboss.osgi.webconsole.internal.plugins.LicensePlugin;
+import org.jboss.osgi.webconsole.internal.plugins.LogServicePlugin;
+import org.osgi.framework.BundleContext;
+
+/**
+ * Web Console integration
+ *
+ * Improve console extensibility https://issues.apache.org/jira/browse/FELIX-1013
+ *
+ * @author thomas.diesler at jboss.com
+ * @since 12-Mar-2009
+ */
+public class WebConsole extends OsgiManager
+{
+ private static final long serialVersionUID = 1L;
+
+ private BundleContext bundleContext;
+
+ public WebConsole(BundleContext bundleContext)
+ {
+ super(bundleContext);
+ this.bundleContext = bundleContext;
+ }
+
+ @Override
+ protected String getDefaultManagerRoot()
+ {
+ return "/jboss-osgi";
+ }
+
+ @Override
+ protected String[] getPluginClasses()
+ {
+ /*
+ PLUGIN_CLASSES =
+ "org.apache.felix.webconsole.internal.compendium.ComponentConfigurationPrinter",
+ "org.apache.felix.webconsole.internal.compendium.ComponentsServlet",
+ "org.apache.felix.webconsole.internal.compendium.ConfigManager",
+ "org.apache.felix.webconsole.internal.compendium.LogServlet",
+ "org.apache.felix.webconsole.internal.core.BundlesServlet",
+ "org.apache.felix.webconsole.internal.core.InstallAction",
+ "org.apache.felix.webconsole.internal.core.SetStartLevelAction",
+ "org.apache.felix.webconsole.internal.deppack.DepPackServlet",
+ "org.apache.felix.webconsole.internal.misc.EventAdminServlet",
+ "org.apache.felix.webconsole.internal.misc.LicenseServlet",
+ "org.apache.felix.webconsole.internal.misc.ConfigurationRender",
+ "org.apache.felix.webconsole.internal.misc.ShellServlet",
+ "org.apache.felix.webconsole.internal.obr.BundleRepositoryRender",
+ "org.apache.felix.webconsole.internal.obr.InstallFromRepoAction",
+ "org.apache.felix.webconsole.internal.obr.RefreshRepoAction",
+ "org.apache.felix.webconsole.internal.system.GCAction",
+ "org.apache.felix.webconsole.internal.system.VMStatPlugin"
+ */
+
+ String[] PLUGIN_CLASSES = new String[] {
+ ComponentConfigurationPrinter.class.getName(),
+ //ComponentsServlet.class.getName(),
+ ConfigManagerPlugin.class.getName(),
+ LogServicePlugin.class.getName(),
+ BundlesPlugin.class.getName(),
+ InstallActionExt.class.getName(),
+ SetStartLevelAction.class.getName(),
+ // DepPackServlet.class.getName(),
+ EventAdminPlugin.class.getName(),
+ LicensePlugin.class.getName(),
+ ConfigurationRender.class.getName(),
+ // ShellServlet.class.getName(),
+ BundleRepositoryRender.class.getName(),
+ InstallFromRepoAction.class.getName(),
+ RefreshRepoAction.class.getName(),
+ GCAction.class.getName(),
+ VMStatPlugin.class.getName()
+ };
+
+ return PLUGIN_CLASSES;
+ }
+}
\ No newline at end of file
Copied: projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/webconsole/internal/WebConsoleActivator.java (from rev 91048, projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/service/webconsole/internal/WebConsoleActivator.java)
===================================================================
--- projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/webconsole/internal/WebConsoleActivator.java (rev 0)
+++ projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/webconsole/internal/WebConsoleActivator.java 2009-07-10 10:04:11 UTC (rev 91058)
@@ -0,0 +1,51 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.osgi.webconsole.internal;
+
+//$Id$
+
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The web console Activator
+ *
+ * @author thomas.diesler at jboss.com
+ * @since 12-Mar-2009
+ */
+public class WebConsoleActivator implements BundleActivator
+{
+ private WebConsole console;
+
+ public void start(BundleContext context) throws Exception
+ {
+ console = new WebConsole(context);
+ }
+
+ public void stop(BundleContext context) throws Exception
+ {
+ if (console != null)
+ {
+ console.dispose();
+ }
+ }
+}
\ No newline at end of file
Copied: projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/webconsole/internal/plugins (from rev 91048, projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/service/webconsole/internal/plugins)
Modified: projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/webconsole/internal/plugins/BundlesPlugin.java
===================================================================
--- projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/service/webconsole/internal/plugins/BundlesPlugin.java 2009-07-10 05:26:35 UTC (rev 91048)
+++ projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/webconsole/internal/plugins/BundlesPlugin.java 2009-07-10 10:04:11 UTC (rev 91058)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.osgi.service.webconsole.internal.plugins;
+package org.jboss.osgi.webconsole.internal.plugins;
//$Id$
Modified: projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/webconsole/internal/plugins/ConfigManagerPlugin.java
===================================================================
--- projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/service/webconsole/internal/plugins/ConfigManagerPlugin.java 2009-07-10 05:26:35 UTC (rev 91048)
+++ projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/webconsole/internal/plugins/ConfigManagerPlugin.java 2009-07-10 10:04:11 UTC (rev 91058)
@@ -19,9 +19,9 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.osgi.service.webconsole.internal.plugins;
+package org.jboss.osgi.webconsole.internal.plugins;
-//$Id$
+//$Id: ConfigManagerPlugin.java 90828 2009-07-06 09:12:53Z thomas.diesler at jboss.com $
import java.io.PrintWriter;
import java.text.MessageFormat;
Modified: projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/webconsole/internal/plugins/EventAdminPlugin.java
===================================================================
--- projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/service/webconsole/internal/plugins/EventAdminPlugin.java 2009-07-10 05:26:35 UTC (rev 91048)
+++ projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/webconsole/internal/plugins/EventAdminPlugin.java 2009-07-10 10:04:11 UTC (rev 91058)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.osgi.service.webconsole.internal.plugins;
+package org.jboss.osgi.webconsole.internal.plugins;
//$Id$
Modified: projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/webconsole/internal/plugins/InstallActionExt.java
===================================================================
--- projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/service/webconsole/internal/plugins/InstallActionExt.java 2009-07-10 05:26:35 UTC (rev 91048)
+++ projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/webconsole/internal/plugins/InstallActionExt.java 2009-07-10 10:04:11 UTC (rev 91058)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.osgi.service.webconsole.internal.plugins;
+package org.jboss.osgi.webconsole.internal.plugins;
//$Id: EventAdminPlugin.java 86577 2009-04-01 07:53:06Z thomas.diesler at jboss.com $
Modified: projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/webconsole/internal/plugins/LicensePlugin.java
===================================================================
--- projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/service/webconsole/internal/plugins/LicensePlugin.java 2009-07-10 05:26:35 UTC (rev 91048)
+++ projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/webconsole/internal/plugins/LicensePlugin.java 2009-07-10 10:04:11 UTC (rev 91058)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.osgi.service.webconsole.internal.plugins;
+package org.jboss.osgi.webconsole.internal.plugins;
//$Id$
Modified: projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/webconsole/internal/plugins/LogServicePlugin.java
===================================================================
--- projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/service/webconsole/internal/plugins/LogServicePlugin.java 2009-07-10 05:26:35 UTC (rev 91048)
+++ projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/webconsole/internal/plugins/LogServicePlugin.java 2009-07-10 10:04:11 UTC (rev 91058)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.osgi.service.webconsole.internal.plugins;
+package org.jboss.osgi.webconsole.internal.plugins;
//$Id: BundlesPlugin.java 86576 2009-04-01 07:17:02Z thomas.diesler at jboss.com $
Modified: projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/webconsole/internal/plugins/PluginHelper.java
===================================================================
--- projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/service/webconsole/internal/plugins/PluginHelper.java 2009-07-10 05:26:35 UTC (rev 91048)
+++ projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/webconsole/internal/plugins/PluginHelper.java 2009-07-10 10:04:11 UTC (rev 91058)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.osgi.service.webconsole.internal.plugins;
+package org.jboss.osgi.webconsole.internal.plugins;
//$Id$
Modified: projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/resources/OSGI-INF/metatype/metatype.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/resources/OSGI-INF/metatype/metatype.xml 2009-07-10 10:02:21 UTC (rev 91057)
+++ projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/resources/OSGI-INF/metatype/metatype.xml 2009-07-10 10:04:11 UTC (rev 91058)
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<metatype:MetaData xmlns:metatype="http://www.osgi.org/xmlns/metatype/v1.0.0" localization="OSGI-INF/metatype/metatype">
- <metatype:OCD id="org.jboss.osgi.service.webconsole.internal.WebConsole" name="%manager.name" description="%manager.description">
+ <metatype:OCD id="org.jboss.osgi.webconsole.internal.WebConsole" name="%manager.name" description="%manager.description">
<metatype:AD id="realm" type="String" default="OSGi Management Console" name="%realm.name" description="%realm.description"/>
<metatype:AD id="manager.root" type="String" default="/jboss-osgi" name="%manager.root.name" description="%manager.root.description"/>
<metatype:AD id="default.render" type="String" default="bundles" name="%default.render.name" description="%default.render.description"/>
<metatype:AD id="username" type="String" default="admin" name="%username.name" description="%username.description"/>
<metatype:AD id="password" type="String" default="admin" name="%password.name" description="%password.description"/>
</metatype:OCD>
- <metatype:Designate pid="org.jboss.osgi.service.webconsole.internal.WebConsole">
- <metatype:Object ocdref="org.jboss.osgi.service.webconsole.internal.WebConsole"/>
+ <metatype:Designate pid="org.jboss.osgi.webconsole.internal.WebConsole">
+ <metatype:Object ocdref="org.jboss.osgi.webconsole.internal.WebConsole"/>
</metatype:Designate>
</metatype:MetaData>
More information about the jboss-cvs-commits
mailing list