You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by ld...@apache.org on 2011/08/18 04:08:12 UTC
svn commit: r1158994 [2/2] - in
/karaf/sandbox/pieber/karaf-webconsole/trunk: ./ blueprint/ blueprint/src/
blueprint/src/main/ blueprint/src/main/java/ blueprint/src/main/java/org/
blueprint/src/main/java/org/apache/ blueprint/src/main/java/org/apache/...
Copied: karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/resources/org/apache/karaf/webconsole/karaf/internal/feature/FeaturesPage.properties (from r1158621, karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/FeaturesPage.properties)
URL: http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/resources/org/apache/karaf/webconsole/karaf/internal/feature/FeaturesPage.properties?p2=karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/resources/org/apache/karaf/webconsole/karaf/internal/feature/FeaturesPage.properties&p1=karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/FeaturesPage.properties&r1=1158621&r2=1158994&rev=1158994&view=diff
==============================================================================
(empty)
Copied: karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/resources/org/apache/karaf/webconsole/karaf/internal/feature/FeaturesPage_de.properties (from r1158621, karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/FeaturesPage_de.properties)
URL: http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/resources/org/apache/karaf/webconsole/karaf/internal/feature/FeaturesPage_de.properties?p2=karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/resources/org/apache/karaf/webconsole/karaf/internal/feature/FeaturesPage_de.properties&p1=karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/FeaturesPage_de.properties&r1=1158621&r2=1158994&rev=1158994&view=diff
==============================================================================
(empty)
Copied: karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/resources/org/apache/karaf/webconsole/karaf/internal/feature/FeaturesPage_fr.properties (from r1158621, karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/FeaturesPage_fr.properties)
URL: http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/resources/org/apache/karaf/webconsole/karaf/internal/feature/FeaturesPage_fr.properties?p2=karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/resources/org/apache/karaf/webconsole/karaf/internal/feature/FeaturesPage_fr.properties&p1=karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/FeaturesPage_fr.properties&r1=1158621&r2=1158994&rev=1158994&view=diff
==============================================================================
(empty)
Copied: karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/resources/org/apache/karaf/webconsole/karaf/internal/repository/RepositoriesPage.html (from r1158621, karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/RepositoriesPage.html)
URL: http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/resources/org/apache/karaf/webconsole/karaf/internal/repository/RepositoriesPage.html?p2=karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/resources/org/apache/karaf/webconsole/karaf/internal/repository/RepositoriesPage.html&p1=karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/RepositoriesPage.html&r1=1158621&r2=1158994&rev=1158994&view=diff
==============================================================================
--- karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/RepositoriesPage.html (original)
+++ karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/resources/org/apache/karaf/webconsole/karaf/internal/repository/RepositoriesPage.html Thu Aug 18 02:08:08 2011
@@ -10,4 +10,5 @@
<table wicket:id="repositories" class="dataview"/>
</wicket:extend>
</body>
+
</html>
Copied: karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/resources/org/apache/karaf/webconsole/karaf/internal/widget/FeaturesWidgetPanel.html (from r1158621, karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/widget/FeaturesWidgetPanel.html)
URL: http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/resources/org/apache/karaf/webconsole/karaf/internal/widget/FeaturesWidgetPanel.html?p2=karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/resources/org/apache/karaf/webconsole/karaf/internal/widget/FeaturesWidgetPanel.html&p1=karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/widget/FeaturesWidgetPanel.html&r1=1158621&r2=1158994&rev=1158994&view=diff
==============================================================================
(empty)
Modified: karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/pom.xml
URL: http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/pom.xml?rev=1158994&r1=1158993&r2=1158994&view=diff
==============================================================================
--- karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/pom.xml (original)
+++ karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/pom.xml Thu Aug 18 02:08:08 2011
@@ -21,6 +21,11 @@
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <version>4.2.0</version>
+ </dependency>
</dependencies>
<build>
Added: karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/OsgiPage.java
URL: http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/OsgiPage.java?rev=1158994&view=auto
==============================================================================
--- karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/OsgiPage.java (added)
+++ karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/OsgiPage.java Thu Aug 18 02:08:08 2011
@@ -0,0 +1,26 @@
+package org.apache.karaf.webconsole.osgi.internal;
+
+import java.util.LinkedList;
+import java.util.List;
+
+import org.apache.karaf.webconsole.core.SidebarPage;
+import org.apache.karaf.webconsole.osgi.internal.configuration.ConfigurationsPage;
+import org.apache.karaf.webconsole.osgi.internal.event.EventsPage;
+import org.apache.wicket.Page;
+import org.ops4j.pax.wicket.api.PaxWicketBean;
+import org.osgi.framework.BundleContext;
+
+public abstract class OsgiPage extends SidebarPage {
+
+ @PaxWicketBean(name = "blueprintBundleContext")
+ protected BundleContext context;
+
+ @Override
+ protected List<Class<? extends Page>> getSubPages() {
+ List<Class<? extends Page>> subpages = new LinkedList<Class<? extends Page>>();
+ subpages.add(ConfigurationsPage.class);
+ subpages.add(EventsPage.class);
+ return subpages;
+ }
+
+}
Added: karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/bundle/BundlesPage.java
URL: http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/bundle/BundlesPage.java?rev=1158994&view=auto
==============================================================================
--- karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/bundle/BundlesPage.java (added)
+++ karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/bundle/BundlesPage.java Thu Aug 18 02:08:08 2011
@@ -0,0 +1,55 @@
+package org.apache.karaf.webconsole.osgi.internal.bundle;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.apache.karaf.webconsole.osgi.internal.OsgiPage;
+import org.apache.wicket.PageParameters;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.link.BookmarkablePageLink;
+import org.apache.wicket.markup.html.list.ListItem;
+import org.apache.wicket.markup.html.list.ListView;
+import org.osgi.framework.Bundle;
+
+public class BundlesPage extends OsgiPage {
+
+ public BundlesPage() {
+
+ List<Bundle> model = Arrays.asList(context.getBundles());
+
+ add(new ListView<Bundle>("bundles", model) {
+ @Override
+ protected void populateItem(ListItem<Bundle> item) {
+ final Bundle bundle = item.getModelObject();
+ item.add(new Label("id", "" + bundle.getBundleId()));
+ item.add(new Label("symbolicName", bundle.getSymbolicName()));
+ item.add(new Label("version", bundle.getVersion().toString()));
+
+// List<String> classes = new ArrayList<String>() {
+// @Override
+// public String toString() {
+// String toString = "";
+// for (String item : this) {
+// toString += " " + item;
+// }
+// return toString;
+// }
+// };
+
+// for (ItemClassModifier modifier : modifiers) {
+// classes.addAll(modifier.getCssClasses(bundle));
+// }
+
+// item.add(new SimpleAttributeModifier("class", classes.toString()));
+
+
+ PageParameters params = new PageParameters();
+ params.put("bundleId", bundle.getBundleId());
+
+ item.add(new BookmarkablePageLink<DetailsPage>("link", DetailsPage.class, params));
+ }
+ });
+
+ }
+
+}
Copied: karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/bundle/DetailsPage.java (from r1158621, karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/DetailsPage.java)
URL: http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/bundle/DetailsPage.java?p2=karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/bundle/DetailsPage.java&p1=karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/DetailsPage.java&r1=1158621&r2=1158994&rev=1158994&view=diff
==============================================================================
--- karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/DetailsPage.java (original)
+++ karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/bundle/DetailsPage.java Thu Aug 18 02:08:08 2011
@@ -1,4 +1,4 @@
-package org.apache.karaf.webconsole.osgi.internal;
+package org.apache.karaf.webconsole.osgi.internal.bundle;
import java.util.Arrays;
Added: karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/bundle/ItemClassModifier.java
URL: http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/bundle/ItemClassModifier.java?rev=1158994&view=auto
==============================================================================
--- karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/bundle/ItemClassModifier.java (added)
+++ karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/bundle/ItemClassModifier.java Thu Aug 18 02:08:08 2011
@@ -0,0 +1,11 @@
+package org.apache.karaf.webconsole.osgi.internal.bundle;
+
+import java.util.List;
+
+import org.osgi.framework.Bundle;
+
+public interface ItemClassModifier {
+
+ List<String> getCssClasses(Bundle bundle);
+
+}
\ No newline at end of file
Added: karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/bundle/decorator/SystemBundleClassModifier.java
URL: http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/bundle/decorator/SystemBundleClassModifier.java?rev=1158994&view=auto
==============================================================================
--- karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/bundle/decorator/SystemBundleClassModifier.java (added)
+++ karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/bundle/decorator/SystemBundleClassModifier.java Thu Aug 18 02:08:08 2011
@@ -0,0 +1,36 @@
+package org.apache.karaf.webconsole.osgi.internal.bundle.decorator;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.karaf.webconsole.osgi.internal.bundle.ItemClassModifier;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceReference;
+import org.osgi.service.startlevel.StartLevel;
+
+class SystemBundleClassModifier implements ItemClassModifier {
+
+ public List<String> getCssClasses(Bundle bundle) {
+ BundleContext context = bundle.getBundleContext();
+ List<String> classes = new ArrayList<String>();
+
+ if (bundle.getBundleId() == 0) {
+ classes.add("framework");
+ }
+
+ ServiceReference startLevelReference = context.getServiceReference(StartLevel.class.getName());
+
+ if (startLevelReference != null) {
+ StartLevel startLevel = (StartLevel) context.getService(startLevelReference);
+
+ int bundleStartLevel = startLevel.getBundleStartLevel(bundle);
+ if (bundleStartLevel < startLevel.getInitialBundleStartLevel()) {
+ classes.add("system");
+ }
+ context.ungetService(startLevelReference);
+ }
+
+ return classes;
+ }
+}
\ No newline at end of file
Added: karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/configuration/ConfigurationProvider.java
URL: http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/configuration/ConfigurationProvider.java?rev=1158994&view=auto
==============================================================================
--- karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/configuration/ConfigurationProvider.java (added)
+++ karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/configuration/ConfigurationProvider.java Thu Aug 18 02:08:08 2011
@@ -0,0 +1,31 @@
+package org.apache.karaf.webconsole.osgi.internal.configuration;
+
+import java.util.Arrays;
+import java.util.Iterator;
+
+import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;
+import org.apache.wicket.model.CompoundPropertyModel;
+import org.apache.wicket.model.IModel;
+import org.osgi.service.cm.Configuration;
+
+public class ConfigurationProvider extends SortableDataProvider<Configuration> {
+
+ private final Configuration[] configurations;
+
+ public ConfigurationProvider(Configuration[] configurations) {
+ this.configurations = configurations;
+ }
+
+ public Iterator<? extends Configuration> iterator(int arg0, int arg1) {
+ return Arrays.asList(Arrays.copyOfRange(configurations, arg0, arg1)).iterator();
+ }
+
+ public IModel<Configuration> model(Configuration arg0) {
+ return new CompoundPropertyModel<Configuration>(arg0);
+ }
+
+ public int size() {
+ return configurations.length;
+ }
+
+}
Added: karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/configuration/ConfigurationsPage.java
URL: http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/configuration/ConfigurationsPage.java?rev=1158994&view=auto
==============================================================================
--- karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/configuration/ConfigurationsPage.java (added)
+++ karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/configuration/ConfigurationsPage.java Thu Aug 18 02:08:08 2011
@@ -0,0 +1,45 @@
+package org.apache.karaf.webconsole.osgi.internal.configuration;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.karaf.webconsole.osgi.internal.OsgiPage;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.DefaultDataTable;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.PropertyColumn;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
+import org.ops4j.pax.wicket.api.PaxWicketBean;
+import org.osgi.framework.InvalidSyntaxException;
+import org.osgi.service.cm.Configuration;
+import org.osgi.service.cm.ConfigurationAdmin;
+
+public class ConfigurationsPage extends OsgiPage {
+
+ @PaxWicketBean(name = "configurationAdmin")
+ private ConfigurationAdmin configurationAdmin;
+
+ public ConfigurationsPage() {
+
+ Configuration[] configurations = new Configuration[0];
+ try {
+ configurations = configurationAdmin.listConfigurations(null);
+ } catch (IOException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ } catch (InvalidSyntaxException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+
+ IModel<String> pid = Model.of("pid");
+
+ List<IColumn<Configuration>> columns = new ArrayList<IColumn<Configuration>>();
+ columns.add(new PropertyColumn<Configuration>(pid, "pid"));
+
+ add(new DefaultDataTable<Configuration>("configurations", columns, new ConfigurationProvider(configurations), 20));
+
+ }
+
+}
Added: karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/event/EventsPage.java
URL: http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/event/EventsPage.java?rev=1158994&view=auto
==============================================================================
--- karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/event/EventsPage.java (added)
+++ karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/event/EventsPage.java Thu Aug 18 02:08:08 2011
@@ -0,0 +1,7 @@
+package org.apache.karaf.webconsole.osgi.internal.event;
+
+import org.apache.karaf.webconsole.osgi.internal.OsgiPage;
+
+public class EventsPage extends OsgiPage {
+
+}
Added: karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/navigation/OsgiConsoleTab.java
URL: http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/navigation/OsgiConsoleTab.java?rev=1158994&view=auto
==============================================================================
--- karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/navigation/OsgiConsoleTab.java (added)
+++ karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/navigation/OsgiConsoleTab.java Thu Aug 18 02:08:08 2011
@@ -0,0 +1,24 @@
+package org.apache.karaf.webconsole.osgi.internal.navigation;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.karaf.webconsole.core.navigation.ConsoleTab;
+import org.apache.karaf.webconsole.osgi.internal.bundle.BundlesPage;
+import org.apache.wicket.Page;
+
+public class OsgiConsoleTab implements ConsoleTab {
+
+ public String getLabel() {
+ return "osgi";
+ }
+
+ public Class<? extends Page> getModuleHomePage() {
+ return BundlesPage.class;
+ }
+
+ public Map<String, Class<? extends Page>> getItems() {
+ return new HashMap<String, Class<? extends Page>>();
+ }
+
+}
Modified: karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/widget/OsgiWidgetPanel.java
URL: http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/widget/OsgiWidgetPanel.java?rev=1158994&r1=1158993&r2=1158994&view=diff
==============================================================================
--- karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/widget/OsgiWidgetPanel.java (original)
+++ karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/widget/OsgiWidgetPanel.java Thu Aug 18 02:08:08 2011
@@ -1,6 +1,7 @@
package org.apache.karaf.webconsole.osgi.internal.widget;
-import org.apache.karaf.webconsole.osgi.internal.HomePage;
+import org.apache.karaf.webconsole.osgi.internal.OsgiPage;
+import org.apache.karaf.webconsole.osgi.internal.bundle.BundlesPage;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
import org.apache.wicket.markup.html.panel.Panel;
@@ -16,7 +17,7 @@ public class OsgiWidgetPanel extends Pan
add(new Label("bundleCount", "" + context.getBundles().length));
- add(new BookmarkablePageLink<HomePage>("osgiLink", HomePage.class).add(new Label("osgiLinkLabel", "Manage")));
+ add(new BookmarkablePageLink<OsgiPage>("osgiLink", BundlesPage.class).add(new Label("osgiLinkLabel", "Manage")));
}
}
Copied: karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/widget/OsgiWidgetProvider.java (from r1158621, karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/OsgiWidget.java)
URL: http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/widget/OsgiWidgetProvider.java?p2=karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/widget/OsgiWidgetProvider.java&p1=karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/OsgiWidget.java&r1=1158621&r2=1158994&rev=1158994&view=diff
==============================================================================
--- karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/OsgiWidget.java (original)
+++ karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/widget/OsgiWidgetProvider.java Thu Aug 18 02:08:08 2011
@@ -1,15 +1,14 @@
-package org.apache.karaf.webconsole.osgi.internal;
+package org.apache.karaf.webconsole.osgi.internal.widget;
-import org.apache.karaf.webconsole.core.DashboardWidget;
-import org.apache.karaf.webconsole.osgi.internal.widget.OsgiWidgetPanel;
+import org.apache.karaf.webconsole.core.widget.WidgetProvider;
import org.apache.wicket.markup.html.panel.Panel;
import org.osgi.framework.BundleContext;
-public class OsgiWidget implements DashboardWidget {
+public class OsgiWidgetProvider implements WidgetProvider {
private final BundleContext context;
- public OsgiWidget(BundleContext context) {
+ public OsgiWidgetProvider(BundleContext context) {
this.context = context;
}
Added: karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/resources/OSGI-INF/blueprint/osgi.xml
URL: http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/resources/OSGI-INF/blueprint/osgi.xml?rev=1158994&view=auto
==============================================================================
--- karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/resources/OSGI-INF/blueprint/osgi.xml (added)
+++ karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/resources/OSGI-INF/blueprint/osgi.xml Thu Aug 18 02:08:08 2011
@@ -0,0 +1,36 @@
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="
+ http://www.osgi.org/xmlns/blueprint/v1.0.0
+ http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd
+ ">
+
+ <service interface="org.apache.karaf.webconsole.core.navigation.ConsoleTab">
+ <bean class="org.apache.karaf.webconsole.core.navigation.ExtendableConsoleTab">
+ <argument>
+ <bean class="org.apache.karaf.webconsole.core.navigation.i18n.LocalizableConsoleTab">
+ <argument>
+ <bean class="org.apache.karaf.webconsole.osgi.internal.navigation.OsgiConsoleTab" />
+ </argument>
+ </bean>
+ </argument>
+ <property name="extensions">
+ <reference-list interface="org.apache.karaf.webconsole.core.navigation.NavigationProvider"
+ availability="optional" filter="(extends=osgi)" />
+ </property>
+ </bean>
+ </service>
+
+ <service ref="widgetProvider" interface="org.apache.karaf.webconsole.core.widget.WidgetProvider">
+ <service-properties>
+ <entry key="intention" value="dashboard" />
+ </service-properties>
+ </service>
+
+ <bean id="widgetProvider" class="org.apache.karaf.webconsole.osgi.internal.widget.OsgiWidgetProvider">
+ <argument ref="blueprintBundleContext" />
+ </bean>
+
+ <reference id="configurationAdmin" interface="org.osgi.service.cm.ConfigurationAdmin" availability="optional" />
+
+</blueprint>
Copied: karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/bundle/BundlesPage.html (from r1158621, karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/HomePage.html)
URL: http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/bundle/BundlesPage.html?p2=karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/bundle/BundlesPage.html&p1=karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/HomePage.html&r1=1158621&r2=1158994&rev=1158994&view=diff
==============================================================================
(empty)
Copied: karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/bundle/DetailsPage.html (from r1158621, karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/DetailsPage.html)
URL: http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/bundle/DetailsPage.html?p2=karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/bundle/DetailsPage.html&p1=karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/DetailsPage.html&r1=1158621&r2=1158994&rev=1158994&view=diff
==============================================================================
(empty)
Copied: karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/configuration/ConfigurationsPage.html (from r1158621, karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/ConfigurationsPage.html)
URL: http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/configuration/ConfigurationsPage.html?p2=karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/configuration/ConfigurationsPage.html&p1=karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/ConfigurationsPage.html&r1=1158621&r2=1158994&rev=1158994&view=diff
==============================================================================
--- karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/ConfigurationsPage.html (original)
+++ karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/configuration/ConfigurationsPage.html Thu Aug 18 02:08:08 2011
@@ -7,11 +7,9 @@
<body>
<wicket:extend>
- <h1>Confgiration</h1>
+ <h1>Configurations</h1>
- <p>
- In this place you will be able to manage configurations.
- </p>
+ <table wicket:id="configurations" class="dataview" />
</wicket:extend>
</body>
</html>
Copied: karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/event/EventsPage.html (from r1158621, karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/EventsPage.html)
URL: http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/event/EventsPage.html?p2=karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/event/EventsPage.html&p1=karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/EventsPage.html&r1=1158621&r2=1158994&rev=1158994&view=diff
==============================================================================
--- karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/EventsPage.html (original)
+++ karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/event/EventsPage.html Thu Aug 18 02:08:08 2011
@@ -1,16 +1,18 @@
<?xml version="1.0" encoding="UTF-8" ?>
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd" >
<wicket:head>
- <title>Karaf Wicket console - Features page</title>
+ <title>Karaf Wicket console - Events page</title>
</wicket:head>
<body>
<wicket:extend>
- <h1>Configuration</h1>
+ <h1>Events</h1>
+
<p>
- In this place you will be able to manage configurations.
+ Not supported yet.
</p>
+
</wicket:extend>
</body>
</html>
Modified: karaf/sandbox/pieber/karaf-webconsole/trunk/pom.xml
URL: http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/pom.xml?rev=1158994&r1=1158993&r2=1158994&view=diff
==============================================================================
--- karaf/sandbox/pieber/karaf-webconsole/trunk/pom.xml (original)
+++ karaf/sandbox/pieber/karaf-webconsole/trunk/pom.xml Thu Aug 18 02:08:08 2011
@@ -21,6 +21,8 @@
<modules>
<module>core</module>
<module>osgi</module>
+ <module>blueprint</module>
+ <module>karaf</module>
<module>features</module>
</modules>