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 [1/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/...
Author: ldywicki
Date: Thu Aug 18 02:08:08 2011
New Revision: 1158994
URL: http://svn.apache.org/viewvc?rev=1158994&view=rev
Log:
Split osgi and karaf modules. Improved navigation. Sample blueprint module (lists BlueprintContainers, details page doesn't work) attached to osgi tab. Add configuration page for osgi. Restructured widgets. This commit brokes i18n stuff.
Added:
karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/
karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/pom.xml
karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/
karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/
karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/java/
karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/java/org/
karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/java/org/apache/
karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/java/org/apache/karaf/
karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/java/org/apache/karaf/webconsole/
karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/java/org/apache/karaf/webconsole/blueprint/
karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/java/org/apache/karaf/webconsole/blueprint/internal/
karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/java/org/apache/karaf/webconsole/blueprint/internal/BlueprintPage.java
karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/java/org/apache/karaf/webconsole/blueprint/internal/BlueprintProvider.java
karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/java/org/apache/karaf/webconsole/blueprint/internal/ConsoleBlueprintContainer.java
karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/java/org/apache/karaf/webconsole/blueprint/internal/DetailsPage.java
karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/java/org/apache/karaf/webconsole/blueprint/internal/SerializableComponentMetadata.java
karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/java/org/apache/karaf/webconsole/blueprint/internal/navigation/
karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/java/org/apache/karaf/webconsole/blueprint/internal/navigation/BlueprintNavigationProvider.java
karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/resources/
karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/resources/OSGI-INF/
karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/resources/OSGI-INF/blueprint/
karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/resources/OSGI-INF/blueprint/blueprint.xml
karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/resources/org/
karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/resources/org/apache/
karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/resources/org/apache/karaf/
karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/resources/org/apache/karaf/webconsole/
karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/resources/org/apache/karaf/webconsole/blueprint/
karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/resources/org/apache/karaf/webconsole/blueprint/internal/
karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/resources/org/apache/karaf/webconsole/blueprint/internal/BlueprintPage.html
karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/resources/org/apache/karaf/webconsole/blueprint/internal/DetailsPage.html
karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/dashboard/
karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/dashboard/DashboardPage.java
- copied, changed from r1158621, karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/internal/DashboardPage.java
karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/internal/WebConsoleApplication.java
- copied, changed from r1158621, karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/internal/WicketApplication.java
karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/navigation/
karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/navigation/ConsoleTab.java
karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/navigation/ExtendableConsoleTab.java
karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/navigation/NavigationProvider.java
karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/navigation/i18n/
karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/navigation/i18n/LocalizableConsoleTab.java
karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/navigation/i18n/LocalizableNavigationProvider.java
karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/navigation/markup/
karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/navigation/markup/NavigationPanel.java
- copied, changed from r1158621, karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/NavigationPanel.java
karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/widget/
karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/widget/WidgetProvider.java
karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/OSGI-INF/blueprint/core.xml
karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/dashboard/
karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/dashboard/DashboardPage.html
- copied, changed from r1158621, karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/internal/DashboardPage.html
karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/dashboard/dashboard.css
- copied, changed from r1158621, karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/internal/dashboard.css
karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/navigation/
karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/navigation/markup/
karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/navigation/markup/NavigationPanel.html
- copied, changed from r1158621, karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/NavigationPanel.html
karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/navigation/markup/NavigationPanel.properties
karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/navigation/markup/NavigationPanel_de.properties
karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/navigation/markup/NavigationPanel_fr.properties
karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/
karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/pom.xml
karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/
karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/
karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/java/
karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/java/org/
karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/java/org/apache/
karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/java/org/apache/karaf/
karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/java/org/apache/karaf/webconsole/
karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/java/org/apache/karaf/webconsole/karaf/
karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/java/org/apache/karaf/webconsole/karaf/internal/
karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/java/org/apache/karaf/webconsole/karaf/internal/feature/
karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/java/org/apache/karaf/webconsole/karaf/internal/feature/ExtendedFeature.java
- copied, changed from r1158621, karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/ExtendedFeature.java
karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/java/org/apache/karaf/webconsole/karaf/internal/feature/FeaturesPage.java
- copied, changed from r1158621, karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/FeaturesPage.java
karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/java/org/apache/karaf/webconsole/karaf/internal/navigation/
karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/java/org/apache/karaf/webconsole/karaf/internal/navigation/KarafConsoleTab.java
karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/java/org/apache/karaf/webconsole/karaf/internal/repository/
karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/java/org/apache/karaf/webconsole/karaf/internal/repository/RepositoriesPage.java
- copied, changed from r1158621, karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/RepositoriesPage.java
karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/java/org/apache/karaf/webconsole/karaf/internal/widget/
karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/java/org/apache/karaf/webconsole/karaf/internal/widget/FeaturesWidgetPanel.java
- copied, changed from r1158621, karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/widget/FeaturesWidgetPanel.java
karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/java/org/apache/karaf/webconsole/karaf/internal/widget/KarafFeaturesWidgetProvider.java
karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/resources/
karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/resources/OSGI-INF/
karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/resources/OSGI-INF/blueprint/
karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/resources/OSGI-INF/blueprint/karaf.xml
karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/resources/org/
karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/resources/org/apache/
karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/resources/org/apache/karaf/
karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/resources/org/apache/karaf/webconsole/
karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/resources/org/apache/karaf/webconsole/karaf/
karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/resources/org/apache/karaf/webconsole/karaf/internal/
karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/resources/org/apache/karaf/webconsole/karaf/internal/feature/
karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/resources/org/apache/karaf/webconsole/karaf/internal/feature/FeaturesPage.html
- copied, changed from r1158621, karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/FeaturesPage.html
karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/resources/org/apache/karaf/webconsole/karaf/internal/feature/FeaturesPage.properties
- copied, changed from r1158621, karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/FeaturesPage.properties
karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/resources/org/apache/karaf/webconsole/karaf/internal/feature/FeaturesPage_de.properties
- copied, changed from r1158621, karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/FeaturesPage_de.properties
karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/resources/org/apache/karaf/webconsole/karaf/internal/feature/FeaturesPage_fr.properties
- copied, changed from r1158621, karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/FeaturesPage_fr.properties
karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/resources/org/apache/karaf/webconsole/karaf/internal/repository/
karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/resources/org/apache/karaf/webconsole/karaf/internal/repository/RepositoriesPage.html
- copied, changed from r1158621, karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/RepositoriesPage.html
karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/resources/org/apache/karaf/webconsole/karaf/internal/widget/
karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/resources/org/apache/karaf/webconsole/karaf/internal/widget/FeaturesWidgetPanel.html
- copied, changed from r1158621, karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/widget/FeaturesWidgetPanel.html
karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/OsgiPage.java
karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/bundle/
karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/bundle/BundlesPage.java
karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/bundle/DetailsPage.java
- copied, changed from r1158621, karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/DetailsPage.java
karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/bundle/ItemClassModifier.java
karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/bundle/decorator/
karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/bundle/decorator/SystemBundleClassModifier.java
karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/configuration/
karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/configuration/ConfigurationProvider.java
karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/configuration/ConfigurationsPage.java
karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/event/
karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/event/EventsPage.java
karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/navigation/
karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/navigation/OsgiConsoleTab.java
karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/widget/OsgiWidgetProvider.java
- copied, changed from r1158621, karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/OsgiWidget.java
karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/resources/OSGI-INF/blueprint/osgi.xml
karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/bundle/
karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/bundle/BundlesPage.html
- copied, changed from r1158621, karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/HomePage.html
karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/bundle/DetailsPage.html
- copied, changed from r1158621, karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/DetailsPage.html
karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/configuration/
karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/configuration/ConfigurationsPage.html
- copied, changed from r1158621, karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/ConfigurationsPage.html
karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/event/
karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/event/EventsPage.html
- copied, changed from r1158621, karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/EventsPage.html
Removed:
karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/ApplicationReference.java
karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/ApplicationSetter.java
karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/ConsoleTab.java
karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/DashboardWidget.java
karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/NavigationPanel.java
karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/internal/DashboardPage.java
karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/internal/Initializer.java
karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/internal/WicketApplication.java
karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/OSGI-INF/blueprint/wicket.xml
karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/BasePage$TabPanel1.html
karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/NavigationPanel.html
karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/internal/DashboardPage.html
karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/internal/dashboard.css
karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/wicket.properties
karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/ConfigurationsPage.java
karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/DetailsPage.java
karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/EventsPage.java
karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/ExtendedFeature.java
karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/FeaturesConsoleTab.java
karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/FeaturesPage.java
karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/HomePage.java
karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/KarafFeaturesWidget.java
karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/OsgiConsoleTab.java
karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/OsgiWidget.java
karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/RepositoriesPage.java
karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/widget/FeaturesWidgetPanel.java
karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/resources/OSGI-INF/blueprint/wicket.xml
karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/ConfigurationsPage.html
karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/DetailsPage.html
karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/EventsPage.html
karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/FeaturesPage.html
karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/FeaturesPage.properties
karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/FeaturesPage_de.properties
karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/FeaturesPage_fr.properties
karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/HomePage.html
karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/RepositoriesPage.html
karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/widget/FeaturesWidgetPanel.html
Modified:
karaf/sandbox/pieber/karaf-webconsole/trunk/core/pom.xml
karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/BasePage.java
karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/BasePage2.java
karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/internal/SystemConsoleTab.java
karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/pom.xml
karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/widget/OsgiWidgetPanel.java
karaf/sandbox/pieber/karaf-webconsole/trunk/pom.xml
Added: karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/pom.xml
URL: http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/pom.xml?rev=1158994&view=auto
==============================================================================
--- karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/pom.xml (added)
+++ karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/pom.xml Thu Aug 18 02:08:08 2011
@@ -0,0 +1,54 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>webconsole</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.apache.karaf.webconsole</groupId>
+ <artifactId>org.apache.karaf.webconsole.blueprint.internal</artifactId>
+ <packaging>bundle</packaging>
+ <name>Apache Karaf :: Karaf Webconsole Prototype :: OSGi Blueprint</name>
+ <version>1.0.0-SNAPSHOT</version>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.karaf.webconsole</groupId>
+ <artifactId>org.apache.karaf.webconsole.osgi</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.aries.blueprint</groupId>
+ <artifactId>org.apache.aries.blueprint</artifactId>
+ <version>0.3.1</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>2.3.5</version>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+ <Import-Package>
+ !org.apache.karaf.webconsole.blueprint.internal*,
+ *,
+ <!-- transient dependencies -->
+ org.ops4j.pax.wicket.api,
+ org.ops4j.pax.wicket.util,
+ org.ops4j.pax.wicket.util.proxy
+ </Import-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Added: karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/java/org/apache/karaf/webconsole/blueprint/internal/BlueprintPage.java
URL: http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/java/org/apache/karaf/webconsole/blueprint/internal/BlueprintPage.java?rev=1158994&view=auto
==============================================================================
--- karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/java/org/apache/karaf/webconsole/blueprint/internal/BlueprintPage.java (added)
+++ karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/java/org/apache/karaf/webconsole/blueprint/internal/BlueprintPage.java Thu Aug 18 02:08:08 2011
@@ -0,0 +1,43 @@
+package org.apache.karaf.webconsole.blueprint.internal;
+
+import java.util.List;
+
+import org.apache.karaf.webconsole.core.BasePage;
+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.apache.wicket.model.util.ListModel;
+import org.ops4j.pax.wicket.api.PaxWicketBean;
+import org.osgi.framework.ServiceReference;
+import org.osgi.framework.Version;
+
+public class BlueprintPage extends BasePage {
+
+ @PaxWicketBean(name = "containers")
+ private List<ServiceReference> containers;
+
+ public BlueprintPage() {
+ add(new ListView<ServiceReference>("containers", new ListModel<ServiceReference>(containers)) {
+
+ @Override
+ protected void populateItem(ListItem<ServiceReference> item) {
+ ServiceReference reference = item.getModelObject();
+
+ String symbolicName = (String) reference.getProperty("osgi.blueprint.container.symbolicname");
+ Version version = (Version) reference.getProperty("osgi.blueprint.container.version");
+
+ item.add(new Label("symbolicName", symbolicName));
+ item.add(new Label("version", version.toString()));
+
+ PageParameters params = new PageParameters();
+ params.put("bundleId", reference.getBundle().getBundleId());
+ item.add(new BookmarkablePageLink<DetailsPage>("details", DetailsPage.class, params));
+ }
+
+ });
+
+ }
+
+}
Added: karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/java/org/apache/karaf/webconsole/blueprint/internal/BlueprintProvider.java
URL: http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/java/org/apache/karaf/webconsole/blueprint/internal/BlueprintProvider.java?rev=1158994&view=auto
==============================================================================
--- karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/java/org/apache/karaf/webconsole/blueprint/internal/BlueprintProvider.java (added)
+++ karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/java/org/apache/karaf/webconsole/blueprint/internal/BlueprintProvider.java Thu Aug 18 02:08:08 2011
@@ -0,0 +1,47 @@
+package org.apache.karaf.webconsole.blueprint.internal;
+
+import java.util.Iterator;
+import java.util.List;
+
+import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;
+import org.apache.wicket.model.IModel;
+import org.osgi.framework.ServiceReference;
+import org.osgi.service.blueprint.container.BlueprintContainer;
+
+public class BlueprintProvider extends SortableDataProvider<BlueprintContainer> {
+
+ private final List<ServiceReference> containers;
+
+ public BlueprintProvider(List<ServiceReference> containers) {
+ this.containers = containers;
+ }
+
+ public Iterator<? extends BlueprintContainer> iterator(int first, int count) {
+ containers.subList(first, count).iterator();
+ return new Iterator<BlueprintContainer>() {
+ public boolean hasNext() {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
+ public BlueprintContainer next() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public void remove() {
+ // TODO Auto-generated method stub
+
+ }
+ };
+ }
+
+ public IModel<BlueprintContainer> model(BlueprintContainer object) {
+ return null;
+ }
+
+ public int size() {
+ return containers.size();
+ }
+
+}
Added: karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/java/org/apache/karaf/webconsole/blueprint/internal/ConsoleBlueprintContainer.java
URL: http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/java/org/apache/karaf/webconsole/blueprint/internal/ConsoleBlueprintContainer.java?rev=1158994&view=auto
==============================================================================
--- karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/java/org/apache/karaf/webconsole/blueprint/internal/ConsoleBlueprintContainer.java (added)
+++ karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/java/org/apache/karaf/webconsole/blueprint/internal/ConsoleBlueprintContainer.java Thu Aug 18 02:08:08 2011
@@ -0,0 +1,47 @@
+package org.apache.karaf.webconsole.blueprint.internal;
+
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.Set;
+
+import org.osgi.service.blueprint.container.BlueprintContainer;
+import org.osgi.service.blueprint.reflect.ComponentMetadata;
+
+public class ConsoleBlueprintContainer implements BlueprintContainer, Serializable {
+
+ private BlueprintContainer container;
+ private final String symbolicName;
+ private final String version;
+
+ public ConsoleBlueprintContainer(BlueprintContainer container, String symbolicName, String version) {
+ this.container = container;
+ this.symbolicName = symbolicName;
+ this.version = version;
+
+ }
+
+ public Set getComponentIds() {
+ return container.getComponentIds();
+ }
+
+ public Object getComponentInstance(String id) {
+ return container.getComponentInstance(id);
+ }
+
+ public ComponentMetadata getComponentMetadata(String id) {
+ return container.getComponentMetadata(id);
+ }
+
+ public Collection getMetadata(Class type) {
+ return container.getMetadata(type);
+ }
+
+ public String getSymbolicName() {
+ return symbolicName;
+ }
+
+ public String getVersion() {
+ return version;
+ }
+
+}
Added: karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/java/org/apache/karaf/webconsole/blueprint/internal/DetailsPage.java
URL: http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/java/org/apache/karaf/webconsole/blueprint/internal/DetailsPage.java?rev=1158994&view=auto
==============================================================================
--- karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/java/org/apache/karaf/webconsole/blueprint/internal/DetailsPage.java (added)
+++ karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/java/org/apache/karaf/webconsole/blueprint/internal/DetailsPage.java Thu Aug 18 02:08:08 2011
@@ -0,0 +1,72 @@
+package org.apache.karaf.webconsole.blueprint.internal;
+
+import java.util.Collection;
+import java.util.LinkedList;
+import java.util.List;
+
+import org.apache.karaf.webconsole.core.BasePage;
+import org.apache.wicket.PageParameters;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.list.ListItem;
+import org.apache.wicket.markup.html.list.ListView;
+import org.apache.wicket.model.LoadableDetachableModel;
+import org.ops4j.pax.wicket.api.PaxWicketBean;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceReference;
+import org.osgi.service.blueprint.container.BlueprintContainer;
+import org.osgi.service.blueprint.reflect.ComponentMetadata;
+
+public class DetailsPage extends BasePage {
+
+ @PaxWicketBean(name = "blueprintBundleContext")
+ private BundleContext context;
+
+ public DetailsPage(PageParameters params) {
+ final Bundle bundle = context.getBundle(params.getLong("bundleId"));
+
+ ServiceReference[] references = bundle.getRegisteredServices();
+ ServiceReference reference = null;
+
+ for (ServiceReference ref : references) {
+ if ("org.osgi.service.blueprint.container.BlueprintContainer".equals(ref.getProperty("objectClass"))) {
+ reference = ref;
+ break;
+ }
+ }
+
+ if (reference == null) {
+ return;
+ }
+
+ final BlueprintContainer container = (BlueprintContainer) context.getService(reference);
+
+ LoadableDetachableModel<List<SerializableComponentMetadata>> model = new LoadableDetachableModel<List<SerializableComponentMetadata>>() {
+ @Override
+ protected List<SerializableComponentMetadata> load() {
+ @SuppressWarnings("unchecked")
+ Collection<ComponentMetadata> metadata = container.getMetadata(ComponentMetadata.class);
+
+ List<SerializableComponentMetadata> serializable = new LinkedList<SerializableComponentMetadata>();
+ for (ComponentMetadata componentMetadata : metadata) {
+ serializable.add(new SerializableComponentMetadata(componentMetadata));
+ }
+
+ return serializable;
+ }
+ };
+
+ add(new ListView<SerializableComponentMetadata>("components", model) {
+ @Override
+ protected void populateItem(ListItem<SerializableComponentMetadata> item) {
+ SerializableComponentMetadata metadata = item.getModelObject();
+
+ item.add(new Label("componentId", metadata.getId()));
+ item.add(new Label("type", metadata.getTypeName()));
+ }
+ });
+
+ context.ungetService(reference);
+ }
+
+}
Added: karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/java/org/apache/karaf/webconsole/blueprint/internal/SerializableComponentMetadata.java
URL: http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/java/org/apache/karaf/webconsole/blueprint/internal/SerializableComponentMetadata.java?rev=1158994&view=auto
==============================================================================
--- karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/java/org/apache/karaf/webconsole/blueprint/internal/SerializableComponentMetadata.java (added)
+++ karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/java/org/apache/karaf/webconsole/blueprint/internal/SerializableComponentMetadata.java Thu Aug 18 02:08:08 2011
@@ -0,0 +1,31 @@
+package org.apache.karaf.webconsole.blueprint.internal;
+
+import java.io.Serializable;
+import java.util.List;
+
+import org.osgi.service.blueprint.reflect.ComponentMetadata;
+
+public class SerializableComponentMetadata implements ComponentMetadata, Serializable {
+
+ private transient ComponentMetadata metadata;
+
+ public SerializableComponentMetadata(ComponentMetadata metadata) {
+ this.metadata = metadata;
+ }
+
+ public String getId() {
+ return metadata.getId();
+ }
+
+ public int getActivation() {
+ return metadata.getActivation();
+ }
+
+ public List<String> getDependsOn() {
+ return metadata.getDependsOn();
+ }
+
+ public String getTypeName() {
+ return metadata.getClass().getName();
+ }
+}
Added: karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/java/org/apache/karaf/webconsole/blueprint/internal/navigation/BlueprintNavigationProvider.java
URL: http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/java/org/apache/karaf/webconsole/blueprint/internal/navigation/BlueprintNavigationProvider.java?rev=1158994&view=auto
==============================================================================
--- karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/java/org/apache/karaf/webconsole/blueprint/internal/navigation/BlueprintNavigationProvider.java (added)
+++ karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/java/org/apache/karaf/webconsole/blueprint/internal/navigation/BlueprintNavigationProvider.java Thu Aug 18 02:08:08 2011
@@ -0,0 +1,18 @@
+package org.apache.karaf.webconsole.blueprint.internal.navigation;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.karaf.webconsole.blueprint.internal.BlueprintPage;
+import org.apache.karaf.webconsole.core.navigation.NavigationProvider;
+import org.apache.wicket.Page;
+
+public class BlueprintNavigationProvider implements NavigationProvider {
+
+ public Map<String, Class<? extends Page>> getItems() {
+ Map<String, Class<? extends Page>> items = new HashMap<String, Class<? extends Page>>();
+ items.put("blueprint", BlueprintPage.class);
+ return items;
+ }
+
+}
Added: karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/resources/OSGI-INF/blueprint/blueprint.xml
URL: http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/resources/OSGI-INF/blueprint/blueprint.xml?rev=1158994&view=auto
==============================================================================
--- karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/resources/OSGI-INF/blueprint/blueprint.xml (added)
+++ karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/resources/OSGI-INF/blueprint/blueprint.xml Thu Aug 18 02:08:08 2011
@@ -0,0 +1,18 @@
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
+ xmlns:wicket="http://www.ops4j.org/schema/wicket">
+
+ <reference-list id="containers" interface="org.osgi.service.blueprint.container.BlueprintContainer"
+ member-type="service-reference"
+ />
+
+ <service ref="provider" interface="org.apache.karaf.webconsole.core.navigation.NavigationProvider">
+ <service-properties>
+ <entry key="extends" value="osgi" />
+ </service-properties>
+
+ </service>
+
+
+ <bean id="provider" class="org.apache.karaf.webconsole.blueprint.internal.internal.navigation.BlueprintNavigationProvider" />
+
+</blueprint>
Added: karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/resources/org/apache/karaf/webconsole/blueprint/internal/BlueprintPage.html
URL: http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/resources/org/apache/karaf/webconsole/blueprint/internal/BlueprintPage.html?rev=1158994&view=auto
==============================================================================
--- karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/resources/org/apache/karaf/webconsole/blueprint/internal/BlueprintPage.html (added)
+++ karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/resources/org/apache/karaf/webconsole/blueprint/internal/BlueprintPage.html Thu Aug 18 02:08:08 2011
@@ -0,0 +1,30 @@
+<?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 - Blueprint page</title>
+ </wicket:head>
+
+ <body>
+ <wicket:extend>
+ <h1>Blueprint containers</h1>
+ <table>
+ <tr>
+ <th>Name</th>
+ <th>Version</th>
+ <th>Operations</th>
+ </tr>
+ <tr wicket:id="containers">
+ <td>
+ <span wicket:id="symbolicName">com.example</span>
+ </td>
+ <td>
+ <span wicket:id="version">0.0.0</span>
+ </td>
+ <td>
+ <a wicket:id="details">Details</a>
+ </td>
+ </tr>
+ </table>
+ </wicket:extend>
+ </body>
+</html>
Added: karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/resources/org/apache/karaf/webconsole/blueprint/internal/DetailsPage.html
URL: http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/resources/org/apache/karaf/webconsole/blueprint/internal/DetailsPage.html?rev=1158994&view=auto
==============================================================================
--- karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/resources/org/apache/karaf/webconsole/blueprint/internal/DetailsPage.html (added)
+++ karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/resources/org/apache/karaf/webconsole/blueprint/internal/DetailsPage.html Thu Aug 18 02:08:08 2011
@@ -0,0 +1,31 @@
+<?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 - Blueprint page</title>
+ </wicket:head>
+
+ <body>
+ <wicket:extend>
+ <h1>Blueprint container details</h1>
+
+ <table>
+ <tr>
+ <th>Id</th>
+ <th>Component type</th>
+ <th>Operations</th>
+ </tr>
+ <tr wicket:id="components">
+ <td>
+ <span wicket:id="componentId">component-id</span>
+ </td>
+ <td>
+ <span wicket:id="type">org.osgi.service.blueprint.reflect.ComponentMetadata</span>
+ </td>
+ <td>
+ <a wicket:id="details">Details</a>
+ </td>
+ </tr>
+ </table>
+ </wicket:extend>
+ </body>
+</html>
Modified: karaf/sandbox/pieber/karaf-webconsole/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/core/pom.xml?rev=1158994&r1=1158993&r2=1158994&view=diff
==============================================================================
--- karaf/sandbox/pieber/karaf-webconsole/trunk/core/pom.xml (original)
+++ karaf/sandbox/pieber/karaf-webconsole/trunk/core/pom.xml Thu Aug 18 02:08:08 2011
@@ -23,36 +23,22 @@
<!-- WICKET DEPENDENCIES -->
<dependency>
- <groupId>org.ops4j.pax.wicket</groupId>
- <artifactId>org.ops4j.pax.wicket.service</artifactId>
- <version>${ops4j.paxwicket.version}</version>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket</artifactId>
+ <version>1.4.17</version>
</dependency>
-
- <!-- JUNIT DEPENDENCY FOR TESTING -->
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.8.1</version>
- <scope>test</scope>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-extensions</artifactId>
+ <version>1.4.17</version>
</dependency>
- <!-- Karaf -->
<dependency>
- <groupId>org.apache.karaf.features</groupId>
- <artifactId>org.apache.karaf.features.core</artifactId>
- <version>${karaf.version}</version>
+ <groupId>org.ops4j.pax.wicket</groupId>
+ <artifactId>org.ops4j.pax.wicket.service</artifactId>
+ <version>${ops4j.paxwicket.version}</version>
</dependency>
- <!-- <dependency> -->
- <!-- <groupId>org.odlabs.wiquery</groupId> -->
- <!-- <artifactId>wiquery</artifactId> -->
- <!-- <version>1.2.4</version> -->
- <!-- </dependency> -->
- <!-- <dependency> -->
- <!-- <groupId>org.slf4j</groupId> -->
- <!-- <artifactId>slf4j-api</artifactId> -->
- <!-- <version>1.6</version> -->
- <!-- </dependency> -->
</dependencies>
<build>
@@ -68,6 +54,7 @@
<!-- The bundle activator is only required if we
do the things by hand. -->
<Import-Package>
+ !org.apache.karaf.webconsole.core*,
*,<!-- let bnd import direct dependencies -->
org.apache.wicket.settings,
org.apache.wicket.session,
@@ -90,9 +77,7 @@
net.sf.cglib.reflect;version="[2,3)",
<!-- and servlet api -->
javax.servlet,
- javax.servlet.http,
- <!-- Karaf -->
- org.apache.karaf.features
+ javax.servlet.http
</Import-Package>
</instructions>
</configuration>
Modified: karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/BasePage.java
URL: http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/BasePage.java?rev=1158994&r1=1158993&r2=1158994&view=diff
==============================================================================
--- karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/BasePage.java (original)
+++ karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/BasePage.java Thu Aug 18 02:08:08 2011
@@ -5,6 +5,8 @@ import java.util.List;
import java.util.Locale;
import org.apache.karaf.webconsole.core.internal.LanguagePanel;
+import org.apache.karaf.webconsole.core.navigation.ConsoleTab;
+import org.apache.karaf.webconsole.core.navigation.markup.NavigationPanel;
import org.apache.wicket.ResourceReference;
import org.apache.wicket.markup.html.CSSPackageResource;
import org.apache.wicket.markup.html.WebPage;
Modified: karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/BasePage2.java
URL: http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/BasePage2.java?rev=1158994&r1=1158993&r2=1158994&view=diff
==============================================================================
--- karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/BasePage2.java (original)
+++ karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/BasePage2.java Thu Aug 18 02:08:08 2011
@@ -1,5 +1,10 @@
package org.apache.karaf.webconsole.core;
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
+
+import org.apache.karaf.webconsole.core.navigation.ConsoleTab;
import org.apache.wicket.ResourceReference;
import org.apache.wicket.extensions.markup.html.tabs.AbstractTab;
import org.apache.wicket.extensions.markup.html.tabs.TabbedPanel;
@@ -14,10 +19,6 @@ import org.apache.wicket.markup.html.pan
import org.apache.wicket.model.Model;
import org.ops4j.pax.wicket.api.PaxWicketBean;
-import java.util.ArrayList;
-import java.util.LinkedList;
-import java.util.List;
-
public class BasePage2 extends WebPage {
@PaxWicketBean(name = "tabs")
Copied: karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/dashboard/DashboardPage.java (from r1158621, karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/internal/DashboardPage.java)
URL: http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/dashboard/DashboardPage.java?p2=karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/dashboard/DashboardPage.java&p1=karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/internal/DashboardPage.java&r1=1158621&r2=1158994&rev=1158994&view=diff
==============================================================================
--- karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/internal/DashboardPage.java (original)
+++ karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/dashboard/DashboardPage.java Thu Aug 18 02:08:08 2011
@@ -1,10 +1,11 @@
-package org.apache.karaf.webconsole.core.internal;
+package org.apache.karaf.webconsole.core.dashboard;
import java.util.List;
import org.apache.karaf.webconsole.core.BasePage;
-import org.apache.karaf.webconsole.core.DashboardWidget;
+import org.apache.karaf.webconsole.core.widget.WidgetProvider;
import org.apache.wicket.markup.html.CSSPackageResource;
+import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.list.ListItem;
import org.apache.wicket.markup.html.list.ListView;
import org.apache.wicket.model.util.ListModel;
@@ -13,14 +14,21 @@ import org.ops4j.pax.wicket.api.PaxWicke
public class DashboardPage extends BasePage {
@PaxWicketBean(name = "widgets")
- private List<DashboardWidget> widgets;
+ private List<WidgetProvider> widgets;
public DashboardPage() {
add(CSSPackageResource.getHeaderContribution(DashboardPage.class, "dashboard.css"));
- add(new ListView<DashboardWidget>("widgets", new ListModel<DashboardWidget>(widgets)) {
+ add(new Label("noWidgets", "So far there is no widgets to display") {
@Override
- protected void populateItem(ListItem<DashboardWidget> item) {
+ public boolean isVisible() {
+ return widgets.size() == 0;
+ }
+ });
+
+ add(new ListView<WidgetProvider>("widgets", new ListModel<WidgetProvider>(widgets)) {
+ @Override
+ protected void populateItem(ListItem<WidgetProvider> item) {
item.add(item.getModelObject().getWidgetPanel("widget"));
}
});
Modified: karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/internal/SystemConsoleTab.java
URL: http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/internal/SystemConsoleTab.java?rev=1158994&r1=1158993&r2=1158994&view=diff
==============================================================================
--- karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/internal/SystemConsoleTab.java (original)
+++ karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/internal/SystemConsoleTab.java Thu Aug 18 02:08:08 2011
@@ -1,27 +1,26 @@
package org.apache.karaf.webconsole.core.internal;
-import org.apache.karaf.webconsole.core.ConsoleTab;
-
import java.io.Serializable;
import java.util.HashMap;
import java.util.Map;
-public class SystemConsoleTab implements ConsoleTab, Serializable {
+import org.apache.karaf.webconsole.core.dashboard.DashboardPage;
+import org.apache.karaf.webconsole.core.navigation.ConsoleTab;
+import org.apache.wicket.Page;
- private static final long serialVersionUID = -7381914604367435106L;
- private static String dashBoard = "dashboard";
+public class SystemConsoleTab implements ConsoleTab, Serializable {
public String getLabel() {
- return "Dashboard";
+ return "dashboard";
}
- public Class getModuleHomePage() {
+ public Class<? extends Page> getModuleHomePage() {
return DashboardPage.class;
}
- public Map<String, Class> getItems() {
- Map<String, Class> map = new HashMap<String, Class>();
- map.put(dashBoard, DashboardPage.class);
+ public Map<String, Class<? extends Page>> getItems() {
+ Map<String, Class<? extends Page>> map = new HashMap<String, Class<? extends Page>>();
+ map.put("dashboard", DashboardPage.class);
return map;
}
Copied: karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/internal/WebConsoleApplication.java (from r1158621, karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/internal/WicketApplication.java)
URL: http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/internal/WebConsoleApplication.java?p2=karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/internal/WebConsoleApplication.java&p1=karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/internal/WicketApplication.java&r1=1158621&r2=1158994&rev=1158994&view=diff
==============================================================================
--- karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/internal/WicketApplication.java (original)
+++ karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/internal/WebConsoleApplication.java Thu Aug 18 02:08:08 2011
@@ -1,5 +1,6 @@
package org.apache.karaf.webconsole.core.internal;
+import org.apache.karaf.webconsole.core.dashboard.DashboardPage;
import org.apache.wicket.protocol.http.WebApplication;
/**
@@ -8,9 +9,9 @@ import org.apache.wicket.protocol.http.W
*
* @see org.code-house.Start#main(String[])
*/
-public class WicketApplication extends WebApplication {
+public class WebConsoleApplication extends WebApplication {
- public WicketApplication() {
+ public WebConsoleApplication() {
super();
}
Added: karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/navigation/ConsoleTab.java
URL: http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/navigation/ConsoleTab.java?rev=1158994&view=auto
==============================================================================
--- karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/navigation/ConsoleTab.java (added)
+++ karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/navigation/ConsoleTab.java Thu Aug 18 02:08:08 2011
@@ -0,0 +1,15 @@
+package org.apache.karaf.webconsole.core.navigation;
+
+import org.apache.wicket.Page;
+
+/**
+ * Console tab is top level extension of webconsole. It may provide new elements
+ * to navigation and should have label to be rendered in top menu.
+ */
+public interface ConsoleTab extends NavigationProvider {
+
+ String getLabel();
+
+ Class<? extends Page> getModuleHomePage();
+
+}
Added: karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/navigation/ExtendableConsoleTab.java
URL: http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/navigation/ExtendableConsoleTab.java?rev=1158994&view=auto
==============================================================================
--- karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/navigation/ExtendableConsoleTab.java (added)
+++ karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/navigation/ExtendableConsoleTab.java Thu Aug 18 02:08:08 2011
@@ -0,0 +1,42 @@
+package org.apache.karaf.webconsole.core.navigation;
+
+import java.util.Collection;
+import java.util.Map;
+
+import org.apache.wicket.Page;
+
+/**
+ * Implementation of console tab which allows external providers to put own
+ * items to it.
+ */
+public class ExtendableConsoleTab implements ConsoleTab {
+
+ private Collection<NavigationProvider> extensions;
+ private ConsoleTab base;
+
+ public ExtendableConsoleTab(ConsoleTab base) {
+ this.base = base;
+ }
+
+ public String getLabel() {
+ return base.getLabel();
+ }
+
+ public Class<? extends Page> getModuleHomePage() {
+ return base.getModuleHomePage();
+ }
+
+ public Map<String, Class<? extends Page>> getItems() {
+ Map<String, Class<? extends Page>> items = base.getItems();
+
+ for (NavigationProvider provider : extensions) {
+ items.putAll(provider.getItems());
+ }
+
+ return items;
+ }
+
+ public void setExtensions(Collection<NavigationProvider> extensions) {
+ this.extensions = extensions;
+ }
+}
Added: karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/navigation/NavigationProvider.java
URL: http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/navigation/NavigationProvider.java?rev=1158994&view=auto
==============================================================================
--- karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/navigation/NavigationProvider.java (added)
+++ karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/navigation/NavigationProvider.java Thu Aug 18 02:08:08 2011
@@ -0,0 +1,22 @@
+package org.apache.karaf.webconsole.core.navigation;
+
+import java.io.Serializable;
+import java.util.Map;
+
+import org.apache.wicket.Page;
+
+/**
+ * Base extension point in console. Allow suppliers to ship new navigation
+ * elements which points to new wicket pages.
+ */
+public interface NavigationProvider extends Serializable {
+
+ /**
+ * Return list of pages to add in navigation. Key in collection is element
+ * label.
+ *
+ * @return Pages to add in navigation.
+ */
+ Map<String, Class<? extends Page>> getItems();
+
+}
Added: karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/navigation/i18n/LocalizableConsoleTab.java
URL: http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/navigation/i18n/LocalizableConsoleTab.java?rev=1158994&view=auto
==============================================================================
--- karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/navigation/i18n/LocalizableConsoleTab.java (added)
+++ karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/navigation/i18n/LocalizableConsoleTab.java Thu Aug 18 02:08:08 2011
@@ -0,0 +1,24 @@
+package org.apache.karaf.webconsole.core.navigation.i18n;
+
+import org.apache.karaf.webconsole.core.navigation.ConsoleTab;
+import org.apache.wicket.Page;
+import org.apache.wicket.model.ResourceModel;
+
+public class LocalizableConsoleTab extends LocalizableNavigationProvider implements ConsoleTab {
+
+ private ConsoleTab provider;
+
+ public LocalizableConsoleTab(ConsoleTab provider) {
+ super(provider);
+ this.provider = provider;
+ }
+
+ public String getLabel() {
+ return new ResourceModel(provider.getLabel(), provider.getLabel()).getObject();
+ }
+
+ public Class<? extends Page> getModuleHomePage() {
+ return provider.getModuleHomePage();
+ }
+
+}
Added: karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/navigation/i18n/LocalizableNavigationProvider.java
URL: http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/navigation/i18n/LocalizableNavigationProvider.java?rev=1158994&view=auto
==============================================================================
--- karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/navigation/i18n/LocalizableNavigationProvider.java (added)
+++ karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/navigation/i18n/LocalizableNavigationProvider.java Thu Aug 18 02:08:08 2011
@@ -0,0 +1,31 @@
+package org.apache.karaf.webconsole.core.navigation.i18n;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import org.apache.karaf.webconsole.core.navigation.NavigationProvider;
+import org.apache.wicket.Page;
+import org.apache.wicket.model.ResourceModel;
+
+public class LocalizableNavigationProvider implements NavigationProvider {
+
+ private final NavigationProvider provider;
+
+
+ public LocalizableNavigationProvider(NavigationProvider provider) {
+ this.provider = provider;
+ }
+
+
+ public Map<String, Class<? extends Page>> getItems() {
+ Map<String, Class<? extends Page>> items = new HashMap<String, Class<? extends Page>>();
+
+ for (Entry<String, Class<? extends Page>> entry : provider.getItems().entrySet()) {
+ items.put(new ResourceModel(entry.getKey(), entry.getKey()).getObject(), entry.getValue());
+ }
+
+ return items;
+ }
+
+}
Copied: karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/navigation/markup/NavigationPanel.java (from r1158621, karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/NavigationPanel.java)
URL: http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/navigation/markup/NavigationPanel.java?p2=karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/navigation/markup/NavigationPanel.java&p1=karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/NavigationPanel.java&r1=1158621&r2=1158994&rev=1158994&view=diff
==============================================================================
--- karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/NavigationPanel.java (original)
+++ karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/navigation/markup/NavigationPanel.java Thu Aug 18 02:08:08 2011
@@ -1,16 +1,19 @@
-package org.apache.karaf.webconsole.core;
+package org.apache.karaf.webconsole.core.navigation.markup;
import java.util.LinkedList;
import java.util.List;
+import org.apache.karaf.webconsole.core.navigation.ConsoleTab;
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.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.ResourceModel;
+/**
+ * Component responsible for rendering top navigation in webconsole.
+ */
public class NavigationPanel extends Panel {
public NavigationPanel(String id, IModel<List<ConsoleTab>> model) {
@@ -20,6 +23,7 @@ public class NavigationPanel extends Pan
@Override
protected void populateItem(ListItem<ConsoleTab> item) {
final ConsoleTab tab = item.getModelObject();
+
item.add(new BookmarkablePageLink("moduleLink", tab.getModuleHomePage()).add(new Label("moduleLabel", tab.getLabel())));
List<String> subItems = new LinkedList<String>(tab.getItems().keySet());
@@ -27,7 +31,7 @@ public class NavigationPanel extends Pan
@Override
protected void populateItem(ListItem<String> item) {
String subItem = item.getModelObject();
- item.add(new BookmarkablePageLink("topLink", tab.getItems().get(subItem)).add(new Label("linkLabel", new ResourceModel(subItem))));
+ item.add(new BookmarkablePageLink("topLink", tab.getItems().get(subItem)).add(new Label("linkLabel", subItem)));
}
});
}
Added: karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/widget/WidgetProvider.java
URL: http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/widget/WidgetProvider.java?rev=1158994&view=auto
==============================================================================
--- karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/widget/WidgetProvider.java (added)
+++ karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/widget/WidgetProvider.java Thu Aug 18 02:08:08 2011
@@ -0,0 +1,21 @@
+package org.apache.karaf.webconsole.core.widget;
+
+import org.apache.wicket.markup.html.panel.Panel;
+
+/**
+ * Widget extension point which may be used in many places. Services registered
+ * in OSGi should provide information where it should be put using "intention"
+ * property.
+ */
+public interface WidgetProvider {
+
+ /**
+ * Create new panel with given id. This method will be called during page
+ * or parent component rendering - normally in container dispatching thread.
+ *
+ * @param id Panel id.
+ * @return Panel to be put as widget.
+ */
+ Panel getWidgetPanel(String id);
+
+}
Added: karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/OSGI-INF/blueprint/core.xml
URL: http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/OSGI-INF/blueprint/core.xml?rev=1158994&view=auto
==============================================================================
--- karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/OSGI-INF/blueprint/core.xml (added)
+++ karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/OSGI-INF/blueprint/core.xml Thu Aug 18 02:08:08 2011
@@ -0,0 +1,21 @@
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0" xmlns:wicket="http://www.ops4j.org/schema/wicket">
+
+ <wicket:application id="karafWebConsole"
+ class="org.apache.karaf.webconsole.core.internal.WebConsoleApplication"
+ applicationName="karafWebConsole" mountPoint="cns" />
+
+ <reference-list id="tabs" interface="org.apache.karaf.webconsole.core.navigation.ConsoleTab" availability="optional" />
+
+ <!-- He is not ready yet ... -->
+ <reference-list id="widgets" interface="org.apache.karaf.webconsole.core.widget.WidgetProvider" availability="optional"
+ filter="(intention=dashboard)" />
+
+ <service interface="org.apache.karaf.webconsole.core.navigation.ConsoleTab">
+ <bean class="org.apache.karaf.webconsole.core.navigation.i18n.LocalizableConsoleTab">
+ <argument>
+ <bean class="org.apache.karaf.webconsole.core.internal.SystemConsoleTab" />
+ </argument>
+ </bean>
+ </service>
+
+</blueprint>
Copied: karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/dashboard/DashboardPage.html (from r1158621, karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/internal/DashboardPage.html)
URL: http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/dashboard/DashboardPage.html?p2=karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/dashboard/DashboardPage.html&p1=karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/internal/DashboardPage.html&r1=1158621&r2=1158994&rev=1158994&view=diff
==============================================================================
--- karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/internal/DashboardPage.html (original)
+++ karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/dashboard/DashboardPage.html Thu Aug 18 02:08:08 2011
@@ -7,6 +7,11 @@
<body>
<wicket:extend>
+
+ <wicket:enclosure>
+ <span wicket:id="noWidgets">Info goes here</span>
+ </wicket:enclosure>
+
<ul id="widgets">
<li wicket:id="widgets">
<div wicket:id="widget">
Copied: karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/dashboard/dashboard.css (from r1158621, karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/internal/dashboard.css)
URL: http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/dashboard/dashboard.css?p2=karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/dashboard/dashboard.css&p1=karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/internal/dashboard.css&r1=1158621&r2=1158994&rev=1158994&view=diff
==============================================================================
(empty)
Copied: karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/navigation/markup/NavigationPanel.html (from r1158621, karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/NavigationPanel.html)
URL: http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/navigation/markup/NavigationPanel.html?p2=karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/navigation/markup/NavigationPanel.html&p1=karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/NavigationPanel.html&r1=1158621&r2=1158994&rev=1158994&view=diff
==============================================================================
(empty)
Added: karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/navigation/markup/NavigationPanel.properties
URL: http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/navigation/markup/NavigationPanel.properties?rev=1158994&view=auto
==============================================================================
--- karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/navigation/markup/NavigationPanel.properties (added)
+++ karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/navigation/markup/NavigationPanel.properties Thu Aug 18 02:08:08 2011
@@ -0,0 +1,6 @@
+# Features Console properties
+features.list = Features list
+features.repositories = Features repositories
+
+osgi = OSGi
+dashboard = Dashboard
\ No newline at end of file
Added: karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/navigation/markup/NavigationPanel_de.properties
URL: http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/navigation/markup/NavigationPanel_de.properties?rev=1158994&view=auto
==============================================================================
--- karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/navigation/markup/NavigationPanel_de.properties (added)
+++ karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/navigation/markup/NavigationPanel_de.properties Thu Aug 18 02:08:08 2011
@@ -0,0 +1,6 @@
+# Features Console properties
+features.list = Feature Liste
+features.repositories = Feature Repository
+
+osgi = OSGi
+dashboard = Dashboard
\ No newline at end of file
Added: karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/navigation/markup/NavigationPanel_fr.properties
URL: http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/navigation/markup/NavigationPanel_fr.properties?rev=1158994&view=auto
==============================================================================
--- karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/navigation/markup/NavigationPanel_fr.properties (added)
+++ karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/navigation/markup/NavigationPanel_fr.properties Thu Aug 18 02:08:08 2011
@@ -0,0 +1,6 @@
+# Features Console properties
+features.list = Liste de features
+features.repositories = R\u00E9pertoires de features
+
+osgi = OSGi
+dashboard = Dashboard
\ No newline at end of file
Added: karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/pom.xml
URL: http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/pom.xml?rev=1158994&view=auto
==============================================================================
--- karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/pom.xml (added)
+++ karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/pom.xml Thu Aug 18 02:08:08 2011
@@ -0,0 +1,54 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>webconsole</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.apache.karaf.webconsole</groupId>
+ <artifactId>org.apache.karaf.webconsole.karaf</artifactId>
+ <packaging>bundle</packaging>
+ <name>Apache Karaf :: Karaf Webconsole Prototype :: Karaf extension</name>
+ <version>1.0.0-SNAPSHOT</version>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.karaf.webconsole</groupId>
+ <artifactId>org.apache.karaf.webconsole.core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.karaf.features</groupId>
+ <artifactId>org.apache.karaf.features.core</artifactId>
+ <version>${karaf.version}</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>2.3.5</version>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+ <Import-Package>
+ !org.apache.karaf.webconsole.karaf*,
+ *,
+ <!-- transient dependencies -->
+ org.ops4j.pax.wicket.api,
+ org.ops4j.pax.wicket.util,
+ org.ops4j.pax.wicket.util.proxy
+ </Import-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Copied: karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/java/org/apache/karaf/webconsole/karaf/internal/feature/ExtendedFeature.java (from r1158621, karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/ExtendedFeature.java)
URL: http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/java/org/apache/karaf/webconsole/karaf/internal/feature/ExtendedFeature.java?p2=karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/java/org/apache/karaf/webconsole/karaf/internal/feature/ExtendedFeature.java&p1=karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/ExtendedFeature.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/ExtendedFeature.java (original)
+++ karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/java/org/apache/karaf/webconsole/karaf/internal/feature/ExtendedFeature.java Thu Aug 18 02:08:08 2011
@@ -1,4 +1,4 @@
-package org.apache.karaf.webconsole.osgi.internal;
+package org.apache.karaf.webconsole.karaf.internal.feature;
import org.apache.karaf.features.BundleInfo;
import org.apache.karaf.features.ConfigFileInfo;
Copied: karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/java/org/apache/karaf/webconsole/karaf/internal/feature/FeaturesPage.java (from r1158621, karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/FeaturesPage.java)
URL: http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/java/org/apache/karaf/webconsole/karaf/internal/feature/FeaturesPage.java?p2=karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/java/org/apache/karaf/webconsole/karaf/internal/feature/FeaturesPage.java&p1=karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/FeaturesPage.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/FeaturesPage.java (original)
+++ karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/java/org/apache/karaf/webconsole/karaf/internal/feature/FeaturesPage.java Thu Aug 18 02:08:08 2011
@@ -1,9 +1,16 @@
-package org.apache.karaf.webconsole.osgi.internal;
+package org.apache.karaf.webconsole.karaf.internal.feature;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.List;
import org.apache.karaf.features.Feature;
import org.apache.karaf.features.FeaturesService;
import org.apache.karaf.features.Repository;
import org.apache.karaf.webconsole.core.BasePage;
+import org.apache.karaf.webconsole.karaf.internal.feature.ExtendedFeature.State;
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;
@@ -13,8 +20,6 @@ import org.apache.wicket.model.Model;
import org.apache.wicket.model.StringResourceModel;
import org.ops4j.pax.wicket.api.PaxWicketBean;
-import java.util.*;
-
/**
* Features
*/
Added: karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/java/org/apache/karaf/webconsole/karaf/internal/navigation/KarafConsoleTab.java
URL: http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/java/org/apache/karaf/webconsole/karaf/internal/navigation/KarafConsoleTab.java?rev=1158994&view=auto
==============================================================================
--- karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/java/org/apache/karaf/webconsole/karaf/internal/navigation/KarafConsoleTab.java (added)
+++ karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/java/org/apache/karaf/webconsole/karaf/internal/navigation/KarafConsoleTab.java Thu Aug 18 02:08:08 2011
@@ -0,0 +1,27 @@
+package org.apache.karaf.webconsole.karaf.internal.navigation;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.karaf.webconsole.core.navigation.ConsoleTab;
+import org.apache.karaf.webconsole.karaf.internal.feature.FeaturesPage;
+import org.apache.karaf.webconsole.karaf.internal.repository.RepositoriesPage;
+import org.apache.wicket.Page;
+
+public class KarafConsoleTab implements ConsoleTab {
+
+ public String getLabel() {
+ return "karaf";
+ }
+
+ public Class<? extends Page> getModuleHomePage() {
+ return FeaturesPage.class;
+ }
+
+ public Map<String, Class<? extends Page>> getItems() {
+ Map<String, Class<? extends Page>> features = new HashMap<String, Class<? extends Page>>();
+ features.put("repositories", RepositoriesPage.class);
+ return features;
+ }
+
+}
Copied: karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/java/org/apache/karaf/webconsole/karaf/internal/repository/RepositoriesPage.java (from r1158621, karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/RepositoriesPage.java)
URL: http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/java/org/apache/karaf/webconsole/karaf/internal/repository/RepositoriesPage.java?p2=karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/java/org/apache/karaf/webconsole/karaf/internal/repository/RepositoriesPage.java&p1=karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/RepositoriesPage.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/RepositoriesPage.java (original)
+++ karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/java/org/apache/karaf/webconsole/karaf/internal/repository/RepositoriesPage.java Thu Aug 18 02:08:08 2011
@@ -1,4 +1,4 @@
-package org.apache.karaf.webconsole.osgi.internal;
+package org.apache.karaf.webconsole.karaf.internal.repository;
import org.apache.karaf.features.Feature;
import org.apache.karaf.features.FeaturesService;
Copied: karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/java/org/apache/karaf/webconsole/karaf/internal/widget/FeaturesWidgetPanel.java (from r1158621, karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/widget/FeaturesWidgetPanel.java)
URL: http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/java/org/apache/karaf/webconsole/karaf/internal/widget/FeaturesWidgetPanel.java?p2=karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/java/org/apache/karaf/webconsole/karaf/internal/widget/FeaturesWidgetPanel.java&p1=karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/widget/FeaturesWidgetPanel.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/widget/FeaturesWidgetPanel.java (original)
+++ karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/java/org/apache/karaf/webconsole/karaf/internal/widget/FeaturesWidgetPanel.java Thu Aug 18 02:08:08 2011
@@ -1,9 +1,9 @@
-package org.apache.karaf.webconsole.osgi.internal.widget;
+package org.apache.karaf.webconsole.karaf.internal.widget;
import org.apache.karaf.features.Feature;
import org.apache.karaf.features.FeaturesService;
-import org.apache.karaf.webconsole.osgi.internal.FeaturesPage;
-import org.apache.karaf.webconsole.osgi.internal.RepositoriesPage;
+import org.apache.karaf.webconsole.karaf.internal.feature.FeaturesPage;
+import org.apache.karaf.webconsole.karaf.internal.repository.RepositoriesPage;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
import org.apache.wicket.markup.html.panel.Panel;
Added: karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/java/org/apache/karaf/webconsole/karaf/internal/widget/KarafFeaturesWidgetProvider.java
URL: http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/java/org/apache/karaf/webconsole/karaf/internal/widget/KarafFeaturesWidgetProvider.java?rev=1158994&view=auto
==============================================================================
--- karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/java/org/apache/karaf/webconsole/karaf/internal/widget/KarafFeaturesWidgetProvider.java (added)
+++ karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/java/org/apache/karaf/webconsole/karaf/internal/widget/KarafFeaturesWidgetProvider.java Thu Aug 18 02:08:08 2011
@@ -0,0 +1,19 @@
+package org.apache.karaf.webconsole.karaf.internal.widget;
+
+import org.apache.karaf.features.FeaturesService;
+import org.apache.karaf.webconsole.core.widget.WidgetProvider;
+import org.apache.wicket.markup.html.panel.Panel;
+
+public class KarafFeaturesWidgetProvider implements WidgetProvider {
+
+ private final FeaturesService service;
+
+ public KarafFeaturesWidgetProvider(FeaturesService service) {
+ this.service = service;
+ }
+
+ public Panel getWidgetPanel(String id) {
+ return new FeaturesWidgetPanel(id, service);
+ }
+
+}
Added: karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/resources/OSGI-INF/blueprint/karaf.xml
URL: http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/resources/OSGI-INF/blueprint/karaf.xml?rev=1158994&view=auto
==============================================================================
--- karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/resources/OSGI-INF/blueprint/karaf.xml (added)
+++ karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/resources/OSGI-INF/blueprint/karaf.xml Thu Aug 18 02:08:08 2011
@@ -0,0 +1,19 @@
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
+
+ <service interface="org.apache.karaf.webconsole.core.navigation.ConsoleTab">
+ <bean class="org.apache.karaf.webconsole.karaf.internal.navigation.KarafConsoleTab" />
+ </service>
+
+ <reference id="featuresService" interface="org.apache.karaf.features.FeaturesService"/>
+
+ <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.karaf.internal.widget.KarafFeaturesWidgetProvider">
+ <argument ref="featuresService" />
+ </bean>
+
+</blueprint>
Copied: karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/resources/org/apache/karaf/webconsole/karaf/internal/feature/FeaturesPage.html (from r1158621, karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/FeaturesPage.html)
URL: http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/resources/org/apache/karaf/webconsole/karaf/internal/feature/FeaturesPage.html?p2=karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/resources/org/apache/karaf/webconsole/karaf/internal/feature/FeaturesPage.html&p1=karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/FeaturesPage.html&r1=1158621&r2=1158994&rev=1158994&view=diff
==============================================================================
(empty)