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 2012/02/10 15:10:46 UTC
svn commit: r1242777 - in
/karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core:
brand/ dashboard/ form/ internal/ internal/preferences/ navigation/
navigation/markup/ page/ panel/ preferences/ security/ table/ table/map/
Author: ldywicki
Date: Fri Feb 10 14:10:45 2012
New Revision: 1242777
URL: http://svn.apache.org/viewvc?rev=1242777&view=rev
Log:
Clean up javadoc.
Modified:
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/brand/BrandProvider.java
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/brand/DefaultBrandProvider.java
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/dashboard/DashboardPage.java
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/form/LabelBorder.java
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/form/MapEditForm.java
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/internal/LanguagePanel.java
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/internal/SidebarPanel.java
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/internal/SystemConsoleTabProvider.java
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/internal/preferences/SystemPreferencesForm.java
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/internal/preferences/SystemPreferencesPanel.java
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/navigation/ExtendableConsoleTabProvider.java
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/navigation/ExtendableSidebarProvider.java
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/navigation/markup/NavigationPanel.java
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/page/AvatarImage.java
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/page/SecuredPage.java
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/panel/AbstractImagePanel.java
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/panel/CssImagePanel.java
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/panel/StaticImagePanel.java
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/preferences/PreferencesModel.java
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/preferences/PreferencesPanel.java
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/security/JaasWebSession.java
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/security/KarafJaasWebSession.java
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/security/SecuredPageLink.java
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/security/WebConsoleSession.java
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/table/ActionsPanel.java
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/table/OrdinalColumn.java
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/table/PropertyColumnExt.java
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/table/SortablePropertyColumnExt.java
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/table/map/EntryModel.java
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/table/map/MapDataProvider.java
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/table/map/MapDataTable.java
Modified: karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/brand/BrandProvider.java
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/brand/BrandProvider.java?rev=1242777&r1=1242776&r2=1242777&view=diff
==============================================================================
--- karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/brand/BrandProvider.java (original)
+++ karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/brand/BrandProvider.java Fri Feb 10 14:10:45 2012
@@ -22,11 +22,31 @@ import org.apache.wicket.Page;
import org.apache.wicket.behavior.IBehavior;
import org.apache.wicket.markup.html.image.Image;
+/**
+ * Interface which allows to customize look and feel.
+ */
public interface BrandProvider {
+ /**
+ * Header image customization.
+ *
+ * @param imageId Identifier of image element.
+ * @return
+ */
Image getHeaderImage(String imageId);
+ /**
+ * List of generic behaviours to apply on every page.
+ *
+ * @return Brand specific behaviors, like CSS or JavaScript references.
+ */
List<IBehavior> getBehaviors();
+ /**
+ * Page specific hook which allows to modify or replace elements on singular
+ * page.
+ *
+ * @param page Page to modify.
+ */
void modify(Page page);
}
Modified: karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/brand/DefaultBrandProvider.java
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/brand/DefaultBrandProvider.java?rev=1242777&r1=1242776&r2=1242777&view=diff
==============================================================================
--- karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/brand/DefaultBrandProvider.java (original)
+++ karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/brand/DefaultBrandProvider.java Fri Feb 10 14:10:45 2012
@@ -16,6 +16,8 @@
*/
package org.apache.karaf.webconsole.core.brand;
+import static org.apache.wicket.markup.html.CSSPackageResource.getHeaderContribution;
+
import java.io.Serializable;
import java.util.Collections;
import java.util.List;
@@ -25,11 +27,15 @@ import org.apache.wicket.Page;
import org.apache.wicket.ResourceReference;
import org.apache.wicket.behavior.IBehavior;
import org.apache.wicket.behavior.SimpleAttributeModifier;
-import org.apache.wicket.markup.html.CSSPackageResource;
import org.apache.wicket.markup.html.image.Image;
+/**
+ * Default brand customization.
+ */
public class DefaultBrandProvider implements BrandProvider, Serializable /* for tests mainly */ {
+ private static final long serialVersionUID = 1L;
+
public Image getHeaderImage(String imageId) {
Image image = new Image(imageId, new ResourceReference(BasePage.class, "images/karaf-logo.png"));
image.add(new SimpleAttributeModifier("width", "150"));
@@ -44,8 +50,8 @@ public class DefaultBrandProvider implem
}
public void modify(Page page) {
- page.add(CSSPackageResource.getHeaderContribution(BasePage.class, "style.css"));
- page.add(CSSPackageResource.getHeaderContribution(BasePage.class, "grid.css"));
+ page.add(getHeaderContribution(BasePage.class, "style.css"));
+ page.add(getHeaderContribution(BasePage.class, "grid.css"));
}
}
Modified: karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/dashboard/DashboardPage.java
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/dashboard/DashboardPage.java?rev=1242777&r1=1242776&r2=1242777&view=diff
==============================================================================
--- karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/dashboard/DashboardPage.java (original)
+++ karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/dashboard/DashboardPage.java Fri Feb 10 14:10:45 2012
@@ -42,6 +42,8 @@ public class DashboardPage extends Singl
add(CSSPackageResource.getHeaderContribution(DashboardPage.class, "dashboard.css"));
add(new Label("noWidgets", "So far there is no widgets to display") {
+ private static final long serialVersionUID = 1L;
+
@Override
public boolean isVisible() {
return widgets.size() == 0;
@@ -49,6 +51,8 @@ public class DashboardPage extends Singl
});
add(new ListView<WidgetProvider>("widgets", new ListModel<WidgetProvider>(widgets)) {
+ private static final long serialVersionUID = 1L;
+
@Override
protected void populateItem(ListItem<WidgetProvider> item) {
item.add(item.getModelObject().createPanel("widget"));
Modified: karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/form/LabelBorder.java
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/form/LabelBorder.java?rev=1242777&r1=1242776&r2=1242777&view=diff
==============================================================================
--- karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/form/LabelBorder.java (original)
+++ karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/form/LabelBorder.java Fri Feb 10 14:10:45 2012
@@ -21,6 +21,8 @@ import org.apache.wicket.model.IModel;
public class LabelBorder extends Border {
+ private static final long serialVersionUID = 1L;
+
public LabelBorder(String id, IModel<?> model) {
super(id, model);
}
Modified: karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/form/MapEditForm.java
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/form/MapEditForm.java?rev=1242777&r1=1242776&r2=1242777&view=diff
==============================================================================
--- karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/form/MapEditForm.java (original)
+++ karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/form/MapEditForm.java Fri Feb 10 14:10:45 2012
@@ -26,8 +26,16 @@ import org.apache.wicket.markup.repeater
import org.apache.wicket.model.CompoundPropertyModel;
import org.apache.wicket.model.IModel;
+/**
+ * Generic map editing form.
+ *
+ * @param <K> Key type.
+ * @param <V> Value type.
+ */
public abstract class MapEditForm<K, V> extends Form<Map<K, V>> {
+ private static final long serialVersionUID = 1L;
+
public MapEditForm(String id, CompoundPropertyModel<Map<K, V>> model) {
super(id, model);
Modified: karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/internal/LanguagePanel.java
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/internal/LanguagePanel.java?rev=1242777&r1=1242776&r2=1242777&view=diff
==============================================================================
--- karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/internal/LanguagePanel.java (original)
+++ karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/internal/LanguagePanel.java Fri Feb 10 14:10:45 2012
@@ -32,17 +32,25 @@ import java.util.Locale;
public class LanguagePanel extends Panel {
+ private static final long serialVersionUID = 1L;
+
public LanguagePanel(String id, IModel<List<Locale>> locales) {
super(id);
add(new Label("languagesTitle",new StringResourceModel("languages.available",this.getDefaultModel())));
add(new ListView<Locale>("languages", locales) {
+
+ private static final long serialVersionUID = 1L;
+
@Override
protected void populateItem(final ListItem<Locale> item) {
final Locale model = item.getModelObject();
Image flagImage = new Image("flag", new ResourceReference(BasePage.class, "images/" + model.getDisplayName(Locale.ENGLISH).toLowerCase() + "-flag.png"));
Link<Void> link = new Link<Void>("languageLink") {
+
+ private static final long serialVersionUID = 1L;
+
@Override
public void onClick() {
getSession().setLocale(model);
Modified: karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/internal/SidebarPanel.java
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/internal/SidebarPanel.java?rev=1242777&r1=1242776&r2=1242777&view=diff
==============================================================================
--- karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/internal/SidebarPanel.java (original)
+++ karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/internal/SidebarPanel.java Fri Feb 10 14:10:45 2012
@@ -26,12 +26,17 @@ import org.apache.wicket.markup.html.pan
public class SidebarPanel extends Panel {
+ private static final long serialVersionUID = 1L;
+
public SidebarPanel(String id, SidebarProvider provider) {
super(id);
add(provider.getMasterPageLink("masterPageLink", "masterPageLabel"));
add(new ListView<Link<Page>>("subPageLinks", provider.getItems("subPageLink", "subPageLabel")) {
+
+ private static final long serialVersionUID = 1L;
+
@Override
protected void populateItem(ListItem<Link<Page>> item) {
item.add(item.getModelObject());
@@ -39,6 +44,9 @@ public class SidebarPanel extends Panel
});
add(new ListView<WidgetProvider>("widgets", provider.getWidgetProviders()) {
+
+ private static final long serialVersionUID = 1L;
+
@Override
protected void populateItem(ListItem<WidgetProvider> item) {
item.add(item.getModelObject().createPanel("widget"));
Modified: karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/internal/SystemConsoleTabProvider.java
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/internal/SystemConsoleTabProvider.java?rev=1242777&r1=1242776&r2=1242777&view=diff
==============================================================================
--- karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/internal/SystemConsoleTabProvider.java (original)
+++ karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/internal/SystemConsoleTabProvider.java Fri Feb 10 14:10:45 2012
@@ -29,6 +29,8 @@ import org.apache.wicket.markup.html.lin
public class SystemConsoleTabProvider implements ConsoleTabProvider, Serializable {
+ private static final long serialVersionUID = 1L;
+
public Link<Page> getModuleLink(String componentId, String labelId) {
Link<Page> link = new BookmarkablePageLink<Page>(componentId, DashboardPage.class);
link.add(new Label(labelId, "Dashboard"));
Modified: karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/internal/preferences/SystemPreferencesForm.java
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/internal/preferences/SystemPreferencesForm.java?rev=1242777&r1=1242776&r2=1242777&view=diff
==============================================================================
--- karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/internal/preferences/SystemPreferencesForm.java (original)
+++ karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/internal/preferences/SystemPreferencesForm.java Fri Feb 10 14:10:45 2012
@@ -34,6 +34,8 @@ import org.slf4j.LoggerFactory;
*/
public class SystemPreferencesForm extends Form<Preferences> {
+ private static final long serialVersionUID = 1L;
+
private transient Logger logger = LoggerFactory.getLogger(SystemPreferencesForm.class);
private FileUploadField upload;
Modified: karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/internal/preferences/SystemPreferencesPanel.java
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/internal/preferences/SystemPreferencesPanel.java?rev=1242777&r1=1242776&r2=1242777&view=diff
==============================================================================
--- karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/internal/preferences/SystemPreferencesPanel.java (original)
+++ karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/internal/preferences/SystemPreferencesPanel.java Fri Feb 10 14:10:45 2012
@@ -29,6 +29,8 @@ import org.osgi.service.prefs.Preference
*/
public class SystemPreferencesPanel extends Panel {
+ private static final long serialVersionUID = 1L;
+
@PaxWicketBean(name = "preferencesService")
private PreferencesService preferences;
Modified: karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/navigation/ExtendableConsoleTabProvider.java
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/navigation/ExtendableConsoleTabProvider.java?rev=1242777&r1=1242776&r2=1242777&view=diff
==============================================================================
--- karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/navigation/ExtendableConsoleTabProvider.java (original)
+++ karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/navigation/ExtendableConsoleTabProvider.java Fri Feb 10 14:10:45 2012
@@ -29,6 +29,8 @@ import org.apache.wicket.markup.html.lin
*/
public class ExtendableConsoleTabProvider implements ConsoleTabProvider {
+ private static final long serialVersionUID = 1L;
+
private Collection<NavigationProvider> extensions;
private ConsoleTabProvider base;
Modified: karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/navigation/ExtendableSidebarProvider.java
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/navigation/ExtendableSidebarProvider.java?rev=1242777&r1=1242776&r2=1242777&view=diff
==============================================================================
--- karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/navigation/ExtendableSidebarProvider.java (original)
+++ karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/navigation/ExtendableSidebarProvider.java Fri Feb 10 14:10:45 2012
@@ -29,6 +29,8 @@ import org.apache.wicket.markup.html.lin
*/
public class ExtendableSidebarProvider implements SidebarProvider {
+ private static final long serialVersionUID = 1L;
+
private Collection<NavigationProvider> navigationProviders;
private Collection<WidgetProvider> widgetProviders;
private SidebarProvider base;
Modified: karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/navigation/markup/NavigationPanel.java
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/navigation/markup/NavigationPanel.java?rev=1242777&r1=1242776&r2=1242777&view=diff
==============================================================================
--- karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/navigation/markup/NavigationPanel.java (original)
+++ karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/navigation/markup/NavigationPanel.java Fri Feb 10 14:10:45 2012
@@ -31,10 +31,15 @@ import org.apache.wicket.model.IModel;
*/
public class NavigationPanel extends Panel {
+ private static final long serialVersionUID = 1L;
+
public NavigationPanel(String id, IModel<List<ConsoleTabProvider>> model) {
super(id);
add(new ListView<ConsoleTabProvider>("tabs", model) {
+
+ private static final long serialVersionUID = 1L;
+
@Override
protected void populateItem(ListItem<ConsoleTabProvider> item) {
ConsoleTabProvider tab = item.getModelObject();
@@ -42,6 +47,9 @@ public class NavigationPanel extends Pan
item.add(tab.getModuleLink("moduleLink", "moduleLabel"));
item.add(new ListView<Link<Page>>("moduleLinks", tab.getItems("link", "label")) {
+
+ private static final long serialVersionUID = 1L;
+
@Override
protected void populateItem(ListItem<Link<Page>> item) {
item.add(item.getModelObject());
Modified: karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/page/AvatarImage.java
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/page/AvatarImage.java?rev=1242777&r1=1242776&r2=1242777&view=diff
==============================================================================
--- karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/page/AvatarImage.java (original)
+++ karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/page/AvatarImage.java Fri Feb 10 14:10:45 2012
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.karaf.webconsole.core.page;
import org.apache.wicket.ResourceReference;
@@ -5,8 +21,13 @@ import org.apache.wicket.markup.html.ima
import org.apache.wicket.resource.ByteArrayResource;
import org.osgi.service.prefs.Preferences;
+/**
+ * Avatar image which displays picture from preference store.
+ */
public class AvatarImage extends Image {
+ private static final long serialVersionUID = 1L;
+
public AvatarImage(String id, Preferences preferences) {
super(id);
Modified: karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/page/SecuredPage.java
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/page/SecuredPage.java?rev=1242777&r1=1242776&r2=1242777&view=diff
==============================================================================
--- karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/page/SecuredPage.java (original)
+++ karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/page/SecuredPage.java Fri Feb 10 14:10:45 2012
@@ -46,6 +46,9 @@ public class SecuredPage extends BasePag
public SecuredPage() {
add(new NavigationPanel("navigationPanel", new LoadableDetachableModel<List<ConsoleTabProvider>>() {
+
+ private static final long serialVersionUID = 1L;
+
@Override
protected List<ConsoleTabProvider> load() {
return tabs;
@@ -59,6 +62,9 @@ public class SecuredPage extends BasePag
add(new SecuredPageLink<PreferencesPage>("preferencesLink", PreferencesPage.class));
Link<Void> aLink = new Link<Void>("logoutLink") {
+
+ private static final long serialVersionUID = 1L;
+
@Override
public void onClick() {
WebConsoleSession.get().invalidateNow();
@@ -66,8 +72,8 @@ public class SecuredPage extends BasePag
setResponsePage(LoginPage.class);
}
};
- aLink.add(new Label("logoutTranslatedLink",new StringResourceModel("logout.link", this.getDefaultModel())));
- add(aLink);
+ aLink.add(new Label("logoutTranslatedLink", new StringResourceModel("logout.link", this.getDefaultModel())));
+ add(aLink);
}
}
Modified: karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/panel/AbstractImagePanel.java
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/panel/AbstractImagePanel.java?rev=1242777&r1=1242776&r2=1242777&view=diff
==============================================================================
--- karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/panel/AbstractImagePanel.java (original)
+++ karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/panel/AbstractImagePanel.java Fri Feb 10 14:10:45 2012
@@ -23,6 +23,8 @@ import org.apache.wicket.markup.html.pan
*/
public class AbstractImagePanel extends Panel {
+ private static final long serialVersionUID = 1L;
+
public AbstractImagePanel(String id) {
super(id);
}
Modified: karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/panel/CssImagePanel.java
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/panel/CssImagePanel.java?rev=1242777&r1=1242776&r2=1242777&view=diff
==============================================================================
--- karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/panel/CssImagePanel.java (original)
+++ karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/panel/CssImagePanel.java Fri Feb 10 14:10:45 2012
@@ -26,6 +26,8 @@ import org.apache.wicket.markup.html.bas
*/
public class CssImagePanel extends AbstractImagePanel {
+ private static final long serialVersionUID = 1L;
+
public CssImagePanel(String id, String cssClass) {
super(id);
Modified: karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/panel/StaticImagePanel.java
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/panel/StaticImagePanel.java?rev=1242777&r1=1242776&r2=1242777&view=diff
==============================================================================
--- karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/panel/StaticImagePanel.java (original)
+++ karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/panel/StaticImagePanel.java Fri Feb 10 14:10:45 2012
@@ -24,6 +24,8 @@ import org.apache.wicket.markup.html.ima
*/
public class StaticImagePanel extends AbstractImagePanel {
+ private static final long serialVersionUID = 1L;
+
public StaticImagePanel(String id, ResourceReference resource) {
super(id);
Modified: karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/preferences/PreferencesModel.java
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/preferences/PreferencesModel.java?rev=1242777&r1=1242776&r2=1242777&view=diff
==============================================================================
--- karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/preferences/PreferencesModel.java (original)
+++ karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/preferences/PreferencesModel.java Fri Feb 10 14:10:45 2012
@@ -26,6 +26,8 @@ import org.osgi.service.prefs.Preference
*/
public class PreferencesModel extends LoadableDetachableModel<Preferences> {
+ private static final long serialVersionUID = 1L;
+
/**
* Service to load preferences.
*/
Modified: karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/preferences/PreferencesPanel.java
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/preferences/PreferencesPanel.java?rev=1242777&r1=1242776&r2=1242777&view=diff
==============================================================================
--- karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/preferences/PreferencesPanel.java (original)
+++ karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/preferences/PreferencesPanel.java Fri Feb 10 14:10:45 2012
@@ -30,6 +30,8 @@ import org.osgi.service.prefs.Preference
*/
public class PreferencesPanel extends Panel {
+ private static final long serialVersionUID = 1L;
+
public PreferencesPanel(String id, String user, PreferencesService service, IModel<Preferences> model) throws BackingStoreException {
super(id, model);
Modified: karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/security/JaasWebSession.java
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/security/JaasWebSession.java?rev=1242777&r1=1242776&r2=1242777&view=diff
==============================================================================
--- karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/security/JaasWebSession.java (original)
+++ karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/security/JaasWebSession.java Fri Feb 10 14:10:45 2012
@@ -31,6 +31,8 @@ import org.slf4j.LoggerFactory;
*/
public abstract class JaasWebSession extends WebConsoleSession {
+ private static final long serialVersionUID = 1L;
+
/**
* Logger.
*/
Modified: karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/security/KarafJaasWebSession.java
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/security/KarafJaasWebSession.java?rev=1242777&r1=1242776&r2=1242777&view=diff
==============================================================================
--- karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/security/KarafJaasWebSession.java (original)
+++ karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/security/KarafJaasWebSession.java Fri Feb 10 14:10:45 2012
@@ -26,6 +26,8 @@ import org.apache.wicket.Request;
*/
public class KarafJaasWebSession extends JaasWebSession {
+ private static final long serialVersionUID = 1L;
+
private static final String KARAF_REALM = "karaf";
public KarafJaasWebSession(Request request) {
Modified: karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/security/SecuredPageLink.java
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/security/SecuredPageLink.java?rev=1242777&r1=1242776&r2=1242777&view=diff
==============================================================================
--- karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/security/SecuredPageLink.java (original)
+++ karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/security/SecuredPageLink.java Fri Feb 10 14:10:45 2012
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.karaf.webconsole.core.security;
import org.apache.karaf.webconsole.core.page.SecuredPage;
@@ -5,8 +21,16 @@ import org.apache.wicket.PageParameters;
import org.apache.wicket.authentication.AuthenticatedWebSession;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
+/**
+ * Bookmarkable secured link which hides link if destination page is not
+ * accessible by curent user/session.
+ *
+ * @param <T>
+ */
public class SecuredPageLink<T extends SecuredPage> extends BookmarkablePageLink<T> {
+ private static final long serialVersionUID = 1L;
+
public SecuredPageLink(String id, Class<T> pageClass) {
this(id, pageClass, null);
}
Modified: karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/security/WebConsoleSession.java
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/security/WebConsoleSession.java?rev=1242777&r1=1242776&r2=1242777&view=diff
==============================================================================
--- karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/security/WebConsoleSession.java (original)
+++ karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/security/WebConsoleSession.java Fri Feb 10 14:10:45 2012
@@ -24,6 +24,8 @@ import org.apache.wicket.authentication.
*/
public abstract class WebConsoleSession extends AuthenticatedWebSession {
+ private static final long serialVersionUID = 1L;
+
public WebConsoleSession(Request request) {
super(request);
}
Modified: karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/table/ActionsPanel.java
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/table/ActionsPanel.java?rev=1242777&r1=1242776&r2=1242777&view=diff
==============================================================================
--- karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/table/ActionsPanel.java (original)
+++ karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/table/ActionsPanel.java Fri Feb 10 14:10:45 2012
@@ -34,6 +34,8 @@ import org.apache.wicket.model.util.List
@SuppressWarnings("rawtypes")
public class ActionsPanel<T> extends Panel {
+ private static final long serialVersionUID = 1L;
+
public ActionsPanel(String componentId, IModel<T> model) {
super(componentId, model);
@@ -41,6 +43,8 @@ public class ActionsPanel<T> extends Pan
final List<Link> links = getLinks(model.getObject(), "action", "label");
add(new ListView<Link>("actions", new ListModel<Link>(links)) {
+ private static final long serialVersionUID = 1L;
+
@Override
protected void populateItem(ListItem<Link> item) {
item.addOrReplace(item.getModelObject());
@@ -60,5 +64,4 @@ public class ActionsPanel<T> extends Pan
return Collections.emptyList();
}
-
}
Modified: karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/table/OrdinalColumn.java
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/table/OrdinalColumn.java?rev=1242777&r1=1242776&r2=1242777&view=diff
==============================================================================
--- karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/table/OrdinalColumn.java (original)
+++ karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/table/OrdinalColumn.java Fri Feb 10 14:10:45 2012
@@ -28,7 +28,9 @@ import org.apache.wicket.model.Model;
*/
public class OrdinalColumn<T> extends AbstractColumn<T> {
- transient int counter = 1;
+ private static final long serialVersionUID = 1L;
+
+ private transient int counter = 1;
public OrdinalColumn(String displayModel, String sortProperty) {
super(Model.of(displayModel), sortProperty);
Modified: karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/table/PropertyColumnExt.java
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/table/PropertyColumnExt.java?rev=1242777&r1=1242776&r2=1242777&view=diff
==============================================================================
--- karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/table/PropertyColumnExt.java (original)
+++ karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/table/PropertyColumnExt.java Fri Feb 10 14:10:45 2012
@@ -19,8 +19,15 @@ package org.apache.karaf.webconsole.core
import org.apache.wicket.extensions.markup.html.repeater.data.table.PropertyColumn;
import org.apache.wicket.model.Model;
+/**
+ * Column which given label in serializable model.
+ *
+ * @param <T> Type of displayed data.
+ */
public class PropertyColumnExt<T> extends PropertyColumn<T> {
+ private static final long serialVersionUID = 1L;
+
public PropertyColumnExt(String label, String property) {
super(Model.of(label), property);
}
Modified: karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/table/SortablePropertyColumnExt.java
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/table/SortablePropertyColumnExt.java?rev=1242777&r1=1242776&r2=1242777&view=diff
==============================================================================
--- karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/table/SortablePropertyColumnExt.java (original)
+++ karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/table/SortablePropertyColumnExt.java Fri Feb 10 14:10:45 2012
@@ -19,8 +19,15 @@ package org.apache.karaf.webconsole.core
import org.apache.wicket.extensions.markup.html.repeater.data.table.PropertyColumn;
import org.apache.wicket.model.Model;
+/**
+ * Sortable column which wraps given label in serializable model.
+ *
+ * @param <T> Type of displayed data.
+ */
public class SortablePropertyColumnExt<T> extends PropertyColumn<T> {
+ private static final long serialVersionUID = 1L;
+
public SortablePropertyColumnExt(String label, String property) {
super(Model.of(label), property, property);
}
Modified: karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/table/map/EntryModel.java
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/table/map/EntryModel.java?rev=1242777&r1=1242776&r2=1242777&view=diff
==============================================================================
--- karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/table/map/EntryModel.java (original)
+++ karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/table/map/EntryModel.java Fri Feb 10 14:10:45 2012
@@ -20,8 +20,16 @@ import java.util.Map.Entry;
import org.apache.wicket.model.IModel;
+/**
+ * Entry model for table row.
+ *
+ * @param <K> Key type.
+ * @param <V> Value type.
+ */
public class EntryModel<K, V> implements IModel<Entry<K, V>> {
+ private static final long serialVersionUID = 1L;
+
private Entry<K, V> object;
public EntryModel(Entry<K, V> object) {
Modified: karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/table/map/MapDataProvider.java
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/table/map/MapDataProvider.java?rev=1242777&r1=1242776&r2=1242777&view=diff
==============================================================================
--- karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/table/map/MapDataProvider.java (original)
+++ karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/table/map/MapDataProvider.java Fri Feb 10 14:10:45 2012
@@ -24,8 +24,16 @@ import java.util.Map.Entry;
import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;
import org.apache.wicket.model.IModel;
+/**
+ * Generic data provider for map table.
+ *
+ * @param <K> Key type.
+ * @param <V> Value type.
+ */
public class MapDataProvider<K, V> extends SortableDataProvider<Entry<K, V>> {
+ private static final long serialVersionUID = 1L;
+
private final Map<K, V> map;
public MapDataProvider(Map<K, V> map) {
Modified: karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/table/map/MapDataTable.java
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/table/map/MapDataTable.java?rev=1242777&r1=1242776&r2=1242777&view=diff
==============================================================================
--- karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/table/map/MapDataTable.java (original)
+++ karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/table/map/MapDataTable.java Fri Feb 10 14:10:45 2012
@@ -26,8 +26,16 @@ import org.apache.wicket.extensions.mark
import org.apache.wicket.extensions.markup.html.repeater.data.table.ISortableDataProvider;
import org.apache.wicket.markup.repeater.data.IDataProvider;
+/**
+ * Generic map table.
+ *
+ * @param <K> Key type.
+ * @param <V> Value type.
+ */
public class MapDataTable<K, V> extends DefaultDataTable<Entry<K, V>> {
+ private static final long serialVersionUID = 1L;
+
public MapDataTable(String id, IColumn<Entry<K, V>>[] columns, ISortableDataProvider<Entry<K, V>> dataProvider, int rowsPerPage) {
super(id, Arrays.asList(columns), dataProvider, rowsPerPage);
}