Markup clean up, remove unnecessary header parts.
authorŁukasz Dywicki <ldywicki@apache.org>
Fri, 10 Feb 2012 14:09:22 +0000 (14:09 +0000)
committerŁukasz Dywicki <ldywicki@apache.org>
Fri, 10 Feb 2012 14:09:22 +0000 (14:09 +0000)
git-svn-id: https://svn.apache.org/repos/asf/karaf/webconsole/trunk@1242776 13f79535-47bb-0310-9956-ffa450edef68

42 files changed:
camel/src/main/resources/org/apache/karaf/webconsole/camel/internal/context/CamelContextsPage.html
camel/src/main/resources/org/apache/karaf/webconsole/camel/internal/context/DumpPage.html
camel/src/main/resources/org/apache/karaf/webconsole/camel/internal/context/TracePage.html
camel/src/main/resources/org/apache/karaf/webconsole/camel/internal/widget/CamelWidget.html
core/src/main/resources/org/apache/karaf/webconsole/core/behavior/formalize/images/button.png [deleted file]
core/src/main/resources/org/apache/karaf/webconsole/core/behavior/formalize/images/select_arrow.gif [deleted file]
core/src/main/resources/org/apache/karaf/webconsole/core/dashboard/DashboardPage.html
core/src/main/resources/org/apache/karaf/webconsole/core/form/LabelBorder.html
core/src/main/resources/org/apache/karaf/webconsole/core/internal/LanguagePanel.html
core/src/main/resources/org/apache/karaf/webconsole/core/internal/SidebarPanel.html
core/src/main/resources/org/apache/karaf/webconsole/core/internal/preferences/SystemPreferencesPanel.html
core/src/main/resources/org/apache/karaf/webconsole/core/navigation/markup/NavigationPanel.html
core/src/main/resources/org/apache/karaf/webconsole/core/page/LoginPage.html
core/src/main/resources/org/apache/karaf/webconsole/core/page/SecuredPage.html
core/src/main/resources/org/apache/karaf/webconsole/core/page/SidebarPage.html
core/src/main/resources/org/apache/karaf/webconsole/core/page/SinglePage.html
core/src/main/resources/org/apache/karaf/webconsole/core/panel/AbstractImagePanel.html
core/src/main/resources/org/apache/karaf/webconsole/core/panel/CssImagePanel.html
core/src/main/resources/org/apache/karaf/webconsole/core/panel/StaticImagePanel.html
core/src/main/resources/org/apache/karaf/webconsole/core/preferences/PreferencesPage.html
core/src/main/resources/org/apache/karaf/webconsole/core/preferences/PreferencesPanel.html
core/src/main/resources/org/apache/karaf/webconsole/core/table/ActionsPanel.html
cxf/src/main/resources/org/apache/karaf/webconsole/cxf/internal/services/CxfServicesPage.html
cxf/src/main/resources/org/apache/karaf/webconsole/cxf/internal/services/DetailsPage.html
karaf/admin/src/main/java/org/apache/karaf/webconsole/karaf/admin/list/InstancesPage.java
karaf/admin/src/main/resources/OSGI-INF/blueprint/admin.xml
osgi/blueprint/src/main/resources/org/apache/karaf/webconsole/osgi/blueprint/BlueprintPage.html
osgi/blueprint/src/main/resources/org/apache/karaf/webconsole/osgi/blueprint/details/DetailsPage.html
osgi/bundle/src/main/resources/org/apache/karaf/webconsole/osgi/bundle/internal/BundlesPage.html
osgi/bundle/src/main/resources/org/apache/karaf/webconsole/osgi/bundle/internal/DetailsPage.html
osgi/bundle/src/main/resources/org/apache/karaf/webconsole/osgi/bundle/internal/view/DecorationPanel.html
osgi/config/src/main/resources/org/apache/karaf/webconsole/osgi/config/ConfigurationEditPage.html
osgi/config/src/main/resources/org/apache/karaf/webconsole/osgi/config/ConfigurationRemovePage.html
osgi/config/src/main/resources/org/apache/karaf/webconsole/osgi/config/ConfigurationsPage.html
osgi/event/src/main/resources/org/apache/karaf/webconsole/osgi/event/EventsPage.html
osgi/framework/src/main/resources/org/apache/karaf/webconsole/osgi/framework/internal/FrameworkPage.html
osgi/framework/src/main/resources/org/apache/karaf/webconsole/osgi/framework/internal/OsgiWidgetPanel.html
osgi/log/src/main/resources/org/apache/karaf/webconsole/osgi/log/LogsPage.html
osgi/scr/src/main/resources/org/apache/karaf/webconsole/osgi/scr/ScrColumnPanel.html
servicemix/src/main/resources/org/apache/karaf/webconsole/servicemix/internal/DetailsPage.html
servicemix/src/main/resources/org/apache/karaf/webconsole/servicemix/internal/ServiceMixPage.html
servicemix/src/main/resources/org/apache/karaf/webconsole/servicemix/internal/TrackNmrPage.html

index bccb76c..9ec2596 100644 (file)
@@ -7,7 +7,7 @@
    (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
+        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,
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd">
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>Karaf WebConsole</title>
-</head>
-<body>
+<wicket:extend xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd">
+    <h1>Deployed camel contexts</h1>
 
-    <wicket:extend>
-        <h1>Deployed camel contexts</h1>
+    <table wicket:id="contexts" class="dataview" />
 
-        <table wicket:id="contexts" class="dataview" />
-
-    </wicket:extend>
-
-</body>
-</html>
\ No newline at end of file
+</wicket:extend>
\ No newline at end of file
index 9f6d109..f6d994d 100644 (file)
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd">
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>Karaf WebConsole</title>
-</head>
-<body>
+<wicket:extend xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd">
+    <h1>Traced context details</h1>
 
-    <wicket:extend>
-        <h1>Traced context details</h1>
+    <h2>Info from trace</h2>
 
-        <h2>Info from trace</h2>
+    <ul>
+        <li wicket:id="properties">
+            <table wicket:id="propertyMap" class="dataview" />
+        </li>
+    </ul>
 
-        <ul>
-            <li wicket:id="properties">
-                <table wicket:id="propertyMap" class="dataview" />
-            </li>
-        </ul>
-
-    </wicket:extend>
-
-</body>
-</html>
\ No newline at end of file
+</wicket:extend>
\ No newline at end of file
index 11618b1..0095943 100644 (file)
@@ -7,7 +7,7 @@
    (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
+        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,
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd">
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>Karaf WebConsole</title>
-</head>
-<body>
+<wicket:extend xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd">
+    <h1>Deployed camel contexts</h1>
 
-    <wicket:extend>
-        <h1>Deployed camel contexts</h1>
+    <p>
+        A tracer has been found: <label wicket:id="tracer"></label>.
+    </p>
 
-        <p>
-            A tracer has been found: <label wicket:id="tracer"></label>.
-        </p>
+    <h2>Attached tracers</h2>
+    <ul>
+        <li wicket:id="tracers">ctx-1</li>
+    </ul>
 
-        <h2>Attached tracers</h2>
-        <ul>
-            <li wicket:id="tracers">ctx-1</li>
-        </ul>
-
-    </wicket:extend>
-
-</body>
-</html>
\ No newline at end of file
+</wicket:extend>
\ No newline at end of file
index 1923a18..4e283ab 100644 (file)
@@ -7,7 +7,7 @@
    (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
+        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,
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd">
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>Karaf WebConsole</title>
-</head>
-<body>
+<wicket:panel xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd">
+    <div class="grid_6 widget">
+        <h1>Deployed camel contexts</h1>
 
-    <wicket:panel>
-        <div class="grid_6 widget">
-            <h1>Deployed camel contexts</h1>
+        <p>You have <span wicket:id="count">13</span> camel contexts deployed. First four are:</p>
 
-            <p>You have <span wicket:id="count">13</span> camel contexts deployed. First four are:</p>
+        <table class="dataview">
+            <tr>
+                <th>Name</th>
+            </tr>
+            <tr wicket:id="contexts">
+                <td><span wicket:id="name">.test-context</span></td>
+            </tr>
+        </table>
 
-            <table class="dataview">
-                <tr>
-                    <th>Name</th>
-                </tr>
-                <tr wicket:id="contexts">
-                    <td><span wicket:id="name">.test-context</span></td>
-                </tr>
-            </table>
-
-            <a href="#" wicket:id="management">Go to context management</a>
-        </div>
-    </wicket:panel>
-
-</body>
-</html>
\ No newline at end of file
+        <a href="#" wicket:id="management">Go to context management</a>
+    </div>
+</wicket:panel>
\ No newline at end of file
diff --git a/core/src/main/resources/org/apache/karaf/webconsole/core/behavior/formalize/images/button.png b/core/src/main/resources/org/apache/karaf/webconsole/core/behavior/formalize/images/button.png
deleted file mode 100644 (file)
index c465162..0000000
Binary files a/core/src/main/resources/org/apache/karaf/webconsole/core/behavior/formalize/images/button.png and /dev/null differ
diff --git a/core/src/main/resources/org/apache/karaf/webconsole/core/behavior/formalize/images/select_arrow.gif b/core/src/main/resources/org/apache/karaf/webconsole/core/behavior/formalize/images/select_arrow.gif
deleted file mode 100644 (file)
index 004c3bf..0000000
Binary files a/core/src/main/resources/org/apache/karaf/webconsole/core/behavior/formalize/images/select_arrow.gif and /dev/null differ
index 0f3dad7..260a317 100644 (file)
@@ -7,7 +7,7 @@
    (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
+        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,
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd">
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>Karaf WebConsole</title>
-</head>
-<body>
+<wicket:extend xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd">
+    <wicket:enclosure>
+        <span wicket:id="noWidgets">Info goes here</span>
+    </wicket:enclosure>
 
-    <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">
-                    Widget content.
-                </div>
-            </li>
-        </ul>
-    </wicket:extend>
-
-</body>
-</html>
\ No newline at end of file
+    <ul id="widgets">
+        <li wicket:id="widgets">
+            <div wicket:id="widget">
+                Widget content.
+            </div>
+        </li>
+    </ul>
+</wicket:extend>
\ No newline at end of file
index 7875948..7acb1e5 100644 (file)
@@ -7,7 +7,7 @@
    (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
+        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,
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd">
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>Karaf WebConsole</title>
-</head>
-<body>
-
-    <wicket:border>
-        <label class="form-item">
-            <span wicket:id="label">Label</span>
-            <wicket:body />
-        </label>
-    </wicket:border>
-
-</body>
-</html>
\ No newline at end of file
+<wicket:border xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd">
+    <label class="form-item">
+        <span wicket:id="label">Label</span>
+        <wicket:body />
+    </label>
+</wicket:border>
\ No newline at end of file
index 82e90a6..e8aa91b 100644 (file)
@@ -7,7 +7,7 @@
    (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
+        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,
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd">
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>Karaf WebConsole</title>
-</head>
-<body>
-
-    <wicket:panel>
-        <div wicket:id="languagesTitle">Available languages</div>
-        <ul>
-            <li wicket:id="languages">
-                <a href="#" wicket:id="languageLink">
-                    <img wicket:id="flag" alt="flag" height="14" width="20" />
-                </a>
-            </li>
-        </ul>
-    </wicket:panel>
-
-</body>
-</html>
\ No newline at end of file
+<wicket:panel xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd">
+    <div wicket:id="languagesTitle">Available languages</div>
+    <ul>
+        <li wicket:id="languages">
+            <a href="#" wicket:id="languageLink">
+                <img wicket:id="flag" alt="flag" height="14" width="20" />
+            </a>
+        </li>
+    </ul>
+</wicket:panel>
\ No newline at end of file
index 7199ea8..e2fbdcf 100644 (file)
@@ -7,7 +7,7 @@
    (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
+        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,
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd">
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>Karaf WebConsole</title>
-</head>
-<body>
-
-    <wicket:panel>
-        <ul>
-            <li>
-                <h3>
-                    <a wicket:id="masterPageLink">
-                        <span wicket:id="masterPageLabel">OSGi</span>
+<wicket:panel xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd">
+    <ul>
+        <li>
+            <h3>
+                <a wicket:id="masterPageLink">
+                    <span wicket:id="masterPageLabel">OSGi</span>
+                </a>
+            </h3>
+            <ul>
+                <li wicket:id="subPageLinks">
+                    <a wicket:id="subPageLink">
+                        <span wicket:id="subPageLabel">Label</span>
                     </a>
-                </h3>
-                <ul>
-                    <li wicket:id="subPageLinks">
-                        <a wicket:id="subPageLink">
-                            <span wicket:id="subPageLabel">Label</span>
-                        </a>
-                    </li>
-                </ul>
-            </li>
-        </ul>
-
-        <ul>
-            <li wicket:id="widgets">
-                <div wicket:id="widget">
-                    Widget...
-                </div>
-            </li>
-        </ul>
-    </wicket:panel>
+                </li>
+            </ul>
+        </li>
+    </ul>
 
-</body>
-</html>
\ No newline at end of file
+    <ul>
+        <li wicket:id="widgets">
+            <div wicket:id="widget">
+                Widget...
+            </div>
+        </li>
+    </ul>
+</wicket:panel>
\ No newline at end of file
index a810be3..09052e9 100644 (file)
@@ -7,7 +7,7 @@
    (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
+        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,
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd">
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>Karaf WebConsole</title>
-</head>
-<body>
+<wicket:panel xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd">
+    <h1>System preferences</h1>
 
-    <wicket:panel>
-        <h1>System preferences</h1>
+    Current avatar
+    <img wicket:id="currentAvatar" />
 
-        Current avatar
-        <img wicket:id="currentAvatar" />
+    <form wicket:id="systemPreferences">
+        Select image to be used as your avatar:
+        <input wicket:id="avatar" type="file" />
 
-        <form wicket:id="systemPreferences">
-            Select image to be used as your avatar:
-            <input wicket:id="avatar" type="file" />
-
-            <input wicket:id="submit" type="submit" value="Save" />
-        </form>
-    </wicket:panel>
-
-</body>
-</html>
\ No newline at end of file
+        <input wicket:id="submit" type="submit" value="Save" />
+    </form>
+</wicket:panel>
\ No newline at end of file
index 18d33c2..a22af24 100644 (file)
@@ -7,7 +7,7 @@
    (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
+        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,
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd">
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>Karaf WebConsole</title>
-</head>
-<body>
+<wicket:panel xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd">
+    <div id="topmenu">
+        <ul>
+            <li wicket:id="tabs">
+                <a wicket:id="moduleLink">
+                    <span wicket:id="moduleLabel">Category</span>
+                </a>
 
-    <wicket:panel>
-        <div id="topmenu">
-            <ul>
-                <li wicket:id="tabs">
-                    <a wicket:id="moduleLink">
-                        <span wicket:id="moduleLabel">Category</span>
-                    </a>
-
-                    <ul>
-                        <li wicket:id="moduleLinks">
-                            <a wicket:id="link">
-                                <span wicket:id="label">Label</span>
-                            </a>
-                        </li>
-                    </ul>
-                </li>
-            </ul>
-        </div>
-    </wicket:panel>
-
-</body>
-</html>
\ No newline at end of file
+                <ul>
+                    <li wicket:id="moduleLinks">
+                        <a wicket:id="link">
+                            <span wicket:id="label">Label</span>
+                        </a>
+                    </li>
+                </ul>
+            </li>
+        </ul>
+    </div>
+</wicket:panel>
\ No newline at end of file
index 1b2dd28..a46ca85 100644 (file)
@@ -7,7 +7,7 @@
    (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
+        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,
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd">
-
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>Karaf WebConsole</title>
-</head>
-
-<body>
-    <wicket:extend>
-        <br /><br /><br /><br /><br /><br />
-        <div class="grid_4 prefix_4 suffix_4">
-            <div wicket:id="signIn">
-                Here will be sign in form.
-            </div>
+<wicket:extend xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd">
+    <br /><br /><br /><br /><br /><br />
+    <div class="grid_4 prefix_4 suffix_4">
+        <div wicket:id="signIn">
+            Here will be sign in form.
         </div>
-        <br /><br /><br /><br /><br /><br />
-    </wicket:extend>
-</body>
-</html>
\ No newline at end of file
+    </div>
+    <br /><br /><br /><br /><br /><br />
+</wicket:extend>
\ No newline at end of file
index 39a1f85..abbcc4b 100644 (file)
@@ -7,7 +7,7 @@
    (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
+        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,
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd">
+<wicket:extend xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd">
+    <div id="userbox" class="grid_2">
+        <img wicket:id="avatar" class="avatar" alt="User avatar" />
+        <span id="details">
+            Welcome <span wicket:id="username">admin</span>
 
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>Karaf WebConsole</title>
-</head>
+            <a href="#" wicket:id="logoutLink"><span wicket:id="logoutTranslatedLink"/></a>
+            <a href="#" wicket:id="preferencesLink">Preferences</a>
+        </span>
+    </div>
 
-<body>
+    <div class="grid_12">
+        <div wicket:id="navigationPanel">Navigation goes here</div>
+    </div>
+    <div class="clear"></div>
 
-    <wicket:extend>
-        <div id="userbox" class="grid_2">
-            <img wicket:id="avatar" class="avatar" alt="User avatar" />
-            <span id="details">
-                Welcome <span wicket:id="username">admin</span>
+    <wicket:child />
 
-                <a href="#" wicket:id="logoutLink"><span wicket:id="logoutTranslatedLink"/></a>
-                <a href="#" wicket:id="preferencesLink">Preferences</a>
-            </span>
-        </div>
-
-        <div class="grid_12">
-            <div wicket:id="navigationPanel">Navigation goes here</div>
-        </div>
-        <div class="clear"></div>
-
-        <wicket:child />
-    </wicket:extend>
-
-</body>
-</html>
\ No newline at end of file
+</wicket:extend>
\ No newline at end of file
index b2eabe7..e532812 100644 (file)
@@ -7,7 +7,7 @@
    (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
+        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,
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd">
-
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>Karaf WebConsole</title>
-</head>
-
-<body>
-
-    <wicket:extend>
-        <div class="grid_3 sidebar-wrapper">
-            <div class="sidebar" wicket:id="sidebar">Sidebar goes here</div>
-        </div>
-        <div class="grid_9 sidebar-content content">
-            <span wicket:id="feedback">Feedback stuff</span>
-            <wicket:child />
-        </div>
-        <div class="clear"></div>
-    </wicket:extend>
-
-</body>
-</html>
\ No newline at end of file
+<wicket:extend xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd">
+    <div class="grid_3 sidebar-wrapper">
+        <div class="sidebar" wicket:id="sidebar">Sidebar goes here</div>
+    </div>
+    <div class="grid_9 sidebar-content content">
+        <span wicket:id="feedback">Feedback stuff</span>
+        <wicket:child />
+    </div>
+    <div class="clear"></div>
+</wicket:extend>
\ No newline at end of file
index 670531e..efff411 100644 (file)
@@ -7,7 +7,7 @@
    (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
+        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,
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd">
-
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>Karaf WebConsole</title>
-</head>
-
-<body>
-
-    <wicket:extend>
-        <div class="grid_12 single-content content">
-            <span wicket:id="feedback">Feedback stuff</span>
-            <wicket:child />
-        </div>
-        <div class="clear"></div>
-    </wicket:extend>
-
-</body>
-</html>
\ No newline at end of file
+<wicket:extend xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd">
+    <div class="grid_12 single-content content">
+        <span wicket:id="feedback">Feedback stuff</span>
+        <wicket:child />
+    </div>
+    <div class="clear"></div>
+</wicket:extend>
\ No newline at end of file
index a38a16b..962777b 100644 (file)
@@ -7,7 +7,7 @@
    (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
+        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,
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd">
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>Karaf WebConsole</title>
-</head>
-<body>
-
-    <wicket:panel>
-        <div class="decoration image-decoration">
-            <wicket:child />
-        </div>
-    </wicket:panel>
-
-</body>
-</html>
\ No newline at end of file
+<wicket:panel xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd">
+    <div class="decoration image-decoration">
+        <wicket:child />
+    </div>
+</wicket:panel>
\ No newline at end of file
index 011c1cc..10710fb 100644 (file)
@@ -7,7 +7,7 @@
    (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
+        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,
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd">
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>Karaf WebConsole</title>
-</head>
-<body>
-
-    <wicket:extend>
-        <span wicket:id="decorationLabel"></span>
-    </wicket:extend>
-
-</body>
-</html>
\ No newline at end of file
+<wicket:extend xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd">
+    <span wicket:id="decorationLabel"></span>
+</wicket:extend>
\ No newline at end of file
index 8679a91..2532310 100644 (file)
@@ -7,7 +7,7 @@
    (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
+        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,
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd">
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>Karaf WebConsole</title>
-</head>
-<body>
-
-    <wicket:extend>
-        <img wicket:id="decorationImage" />
-    </wicket:extend>
-
-</body>
-</html>
\ No newline at end of file
+<wicket:extend xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd">
+    <img wicket:id="decorationImage" />
+</wicket:extend>
\ No newline at end of file
index dc18f41..04774b8 100644 (file)
@@ -7,7 +7,7 @@
    (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
+        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,
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd">
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>Karaf WebConsole</title>
-</head>
-<body>
-
-    <wicket:extend>
-
-        <ul>
-            <li wicket:id="preferences">
-                <div wicket:id="preferencesPanel">
-                    Preference Panel
-                </div>
-            </li>
-        </ul>
-    </wicket:extend>
-
-</body>
-</html>
\ No newline at end of file
+<wicket:extend xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd">
+    <ul>
+        <li wicket:id="preferences">
+            <div wicket:id="preferencesPanel">
+                Preference Panel
+            </div>
+        </li>
+    </ul>
+</wicket:extend>
\ No newline at end of file
index e559184..3083c82 100644 (file)
@@ -7,7 +7,7 @@
    (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
+        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,
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd">
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>Karaf WebConsole</title>
-</head>
-<body>
+<wicket:panel xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd">
+    <span wicket:id="path">some/path</span>
 
-    <wicket:panel>
-        <span wicket:id="path">some/path</span>
+    <ul>
+        <li wicket:id="preferences">
+            <span wicket:id="key">key</span>
+            <span wicket:id="value">value</span>
+        </li>
+    </ul>
 
-        <ul>
-            <li wicket:id="preferences">
-                <span wicket:id="key">key</span>
-                <span wicket:id="value">value</span>
-            </li>
-        </ul>
-
-        <ul>
-            <li wicket:id="children">
-                <div wicket:id="child">child details</div>
-            </li>
-        </ul>
-    </wicket:panel>
-
-</body>
-</html>
\ No newline at end of file
+    <ul>
+        <li wicket:id="children">
+            <div wicket:id="child">child details</div>
+        </li>
+    </ul>
+</wicket:panel>
\ No newline at end of file
index 1ae5ebe..238ad93 100644 (file)
@@ -7,7 +7,7 @@
    (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
+        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,
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd">
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>Karaf WebConsole</title>
-</head>
-<body>
+<wicket:panel xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd">
+    <div class="actions">
+        <ul>
+            <li wicket:id="actions">
+                <a wicket:id="action">
+                    <span wicket:id="label">label</span>
+                </a>
+            </li>
+        </ul>
+    </div>
 
-    <wicket:panel>
-        <div class="actions">
-            <ul>
-                <li wicket:id="actions">
-                    <a wicket:id="action">
-                        <span wicket:id="label">label</span>
-                    </a>
-                </li>
-            </ul>
-        </div>
-
-        <wicket:child />
-    </wicket:panel>
-
-</body>
-</html>
\ No newline at end of file
+    <wicket:child />
+</wicket:panel>
\ No newline at end of file
index 8ddf724..7c0a33d 100644 (file)
@@ -7,7 +7,7 @@
    (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
+        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,
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd">
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>Karaf WebConsole</title>
-</head>
-<body>
+<wicket:extend xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd">
+    <h1>Deployed CXF services</h1>
 
-    <wicket:extend>
-        <h1>Deployed CXF services</h1>
+    <table wicket:id="buses" class="dataview" />
 
-        <table wicket:id="buses" class="dataview" />
-
-    </wicket:extend>
-
-</body>
-</html>
\ No newline at end of file
+</wicket:extend>
\ No newline at end of file
index 2c4af46..741a03c 100644 (file)
@@ -7,7 +7,7 @@
    (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
+        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,
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd">
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>Karaf WebConsole</title>
-</head>
-<body>
+<wicket:extend xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd">
+    <h1>Bus details</h1>
 
-    <wicket:extend>
-        <h1>Bus details</h1>
+    <a wicket:id="traceOn">Enable tracing</a>
+    <a wicket:id="traceOff">Disable tracing</a>
 
-        <a wicket:id="traceOn">Enable tracing</a>
-        <a wicket:id="traceOff">Disable tracing</a>
+    <table class="dataview">
+        <tr>
+            <th colspan="2">Server</th>
+            <th>Operations</th>
+        </tr>
+        <wicket:container wicket:id="servers">
+            <tr>
+                <td colspan="2">
+                    <span wicket:id="class">org.apache.cxf.rt.SomeClass</span>
+                </td>
+                <td>
+                    <a wicket:id="stop">stop</a>
+                    <a wicket:id="start">start</a>
+                </td>
+            </tr>
+            <tr>
+                <td colspan="3"><hr /></td>
+            </tr>
 
-        <table class="dataview">
             <tr>
-                <th colspan="2">Server</th>
-                <th>Operations</th>
+                <th colspan="3">
+                    <h2>Endpoints</h2>
+                </th>
+            </tr>
+            <tr>
+                <th>Namespace</th>
+                <th>Element</th>
+                <th>Transport Id</th>
             </tr>
-            <wicket:container wicket:id="servers">
+            <wicket:container wicket:id="endpoints">
                 <tr>
-                    <td colspan="2">
-                        <span wicket:id="class">org.apache.cxf.rt.SomeClass</span>
+                    <td>
+                        <span wicket:id="namespace">http://someuri</span>
                     </td>
                     <td>
-                        <a wicket:id="stop">stop</a>
-                        <a wicket:id="start">start</a>
+                        <span wicket:id="element">someelem</span>
+                    </td>
+                    <td>
+                        <span wicket:id="transport">soap</span>
                     </td>
                 </tr>
                 <tr>
-                    <td colspan="3"><hr /></td>
-                </tr>
-
-                <tr>
-                    <th colspan="3">
-                        <h2>Endpoints</h2>
-                    </th>
+                    <th colspan="3">Operations</th>
                 </tr>
                 <tr>
-                    <th>Namespace</th>
-                    <th>Element</th>
-                    <th>Transport Id</th>
+                    <th>Name</th>
+                    <th>Input</th>
+                    <th>Output</th>
                 </tr>
-                <wicket:container wicket:id="endpoints">
+                <wicket:container wicket:id="operations">
                     <tr>
                         <td>
-                            <span wicket:id="namespace">http://someuri</span>
+                            <span wicket:id="input">aaa</span>
                         </td>
                         <td>
-                            <span wicket:id="element">someelem</span>
+                            <span wicket:id="output">aaa</span>
                         </td>
                         <td>
-                            <span wicket:id="transport">soap</span>
+                            <span wicket:id="faults">aaa</span>
                         </td>
                     </tr>
-                    <tr>
-                        <th colspan="3">Operations</th>
-                    </tr>
-                    <tr>
-                        <th>Name</th>
-                        <th>Input</th>
-                        <th>Output</th>
-                    </tr>
-                    <wicket:container wicket:id="operations">
-                        <tr>
-                            <td>
-                                <span wicket:id="input">aaa</span>
-                            </td>
-                            <td>
-                                <span wicket:id="output">aaa</span>
-                            </td>
-                            <td>
-                                <span wicket:id="faults">aaa</span>
-                            </td>
-                        </tr>
-                    </wicket:container>
                 </wicket:container>
-                <tr>
-                    <td colspan="3"><hr /></td>
-                </tr>
+            </wicket:container>
+            <tr>
+                <td colspan="3"><hr /></td>
+            </tr>
 
+            <tr>
+                <th colspan="3">
+                    <h3>In interceptors</h3>
+                </th>
+            </tr>
+            <tr>
+                <th width="150px">Id</th>
+                <th>Class</th>
+                <th>Phase</th>
+            </tr>
+            <wicket:container wicket:id="in-interceptors">
                 <tr>
-                    <th colspan="3">
-                        <h3>In interceptors</h3>
-                    </th>
-                </tr>
-                <tr>
-                    <th width="150px">Id</th>
-                    <th>Class</th>
-                    <th>Phase</th>
-                </tr>
-                <wicket:container wicket:id="in-interceptors">
-                    <tr>
-                        <td>
-                            <span wicket:id="id">some-class</span>
-                        </td>
-                        <td>
-                            <span wicket:id="class">some-class</span>
-                        </td>
-                        <td>
-                            <span wicket:id="phase">some-class</span>
-                        </td>
-                    </tr>
-                </wicket:container>
-                <tr>
-                    <td colspan="3"><hr /></td>
+                    <td>
+                        <span wicket:id="id">some-class</span>
+                    </td>
+                    <td>
+                        <span wicket:id="class">some-class</span>
+                    </td>
+                    <td>
+                        <span wicket:id="phase">some-class</span>
+                    </td>
                 </tr>
+            </wicket:container>
+            <tr>
+                <td colspan="3"><hr /></td>
+            </tr>
 
+            <tr>
+                <th colspan="3">
+                    <h3>Out interceptors</h3>
+                </th>
+            </tr>
+            <tr>
+                <th width="150px">Id</th>
+                <th>Class</th>
+                <th>Phase</th>
+            </tr>
+            <wicket:container wicket:id="out-interceptors">
                 <tr>
-                    <th colspan="3">
-                        <h3>Out interceptors</h3>
-                    </th>
-                </tr>
-                <tr>
-                    <th width="150px">Id</th>
-                    <th>Class</th>
-                    <th>Phase</th>
-                </tr>
-                <wicket:container wicket:id="out-interceptors">
-                    <tr>
-                        <td>
-                            <span wicket:id="id">some-class</span>
-                        </td>
-                        <td>
-                            <span wicket:id="class">some-class</span>
-                        </td>
-                        <td>
-                            <span wicket:id="phase">some-class</span>
-                        </td>
-                    </tr>
-                </wicket:container>
-                <tr>
-                    <td colspan="3"><hr /></td>
+                    <td>
+                        <span wicket:id="id">some-class</span>
+                    </td>
+                    <td>
+                        <span wicket:id="class">some-class</span>
+                    </td>
+                    <td>
+                        <span wicket:id="phase">some-class</span>
+                    </td>
                 </tr>
+            </wicket:container>
+            <tr>
+                <td colspan="3"><hr /></td>
+            </tr>
 
+            <tr>
+                <th colspan="3">
+                    <h3>Fault interceptors</h3>
+                </th>
+            </tr>
+            <tr>
+                <th width="150px">Id</th>
+                <th>Class</th>
+                <th>Phase</th>
+            </tr>
+            <wicket:container wicket:id="fault-interceptors">
                 <tr>
-                    <th colspan="3">
-                        <h3>Fault interceptors</h3>
-                    </th>
-                </tr>
-                <tr>
-                    <th width="150px">Id</th>
-                    <th>Class</th>
-                    <th>Phase</th>
+                    <td>
+                        <span wicket:id="id">some-class</span>
+                    </td>
+                    <td>
+                        <span wicket:id="class">some-class</span>
+                    </td>
+                    <td>
+                        <span wicket:id="phase">some-class</span>
+                    </td>
                 </tr>
-                <wicket:container wicket:id="fault-interceptors">
-                    <tr>
-                        <td>
-                            <span wicket:id="id">some-class</span>
-                        </td>
-                        <td>
-                            <span wicket:id="class">some-class</span>
-                        </td>
-                        <td>
-                            <span wicket:id="phase">some-class</span>
-                        </td>
-                    </tr>
-                </wicket:container>
             </wicket:container>
-        </table>
-
-    </wicket:extend>
+        </wicket:container>
+    </table>
 
-</body>
-</html>
\ No newline at end of file
+</wicket:extend>
\ No newline at end of file
index ac36785..d09829c 100644 (file)
@@ -2,38 +2,41 @@ package org.apache.karaf.webconsole.karaf.admin.list;
 
 import static org.apache.wicket.model.Model.of;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import org.apache.karaf.admin.Instance;
 import org.apache.karaf.webconsole.core.table.OrdinalColumn;
 import org.apache.karaf.webconsole.core.table.PropertyColumnExt;
+import org.apache.karaf.webconsole.core.table.advanced.AdvancedDataTable;
+import org.apache.karaf.webconsole.core.table.advanced.ColumnList;
 import org.apache.karaf.webconsole.karaf.admin.AdminPage;
 import org.apache.karaf.webconsole.karaf.admin.model.InstancesDataProvider;
 import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
 import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;
-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.markup.repeater.Item;
 import org.apache.wicket.model.IModel;
+import org.ops4j.pax.wicket.api.PaxWicketBean;
+import org.osgi.service.prefs.PreferencesService;
 
 public class InstancesPage extends AdminPage {
 
+       @PaxWicketBean(name = "preferencesService")
+       private PreferencesService preferences;
+
     public InstancesPage() {
-        List<IColumn<Instance>> columns = new ArrayList<IColumn<Instance>>();
-        columns.add(new OrdinalColumn<Instance>());
-        columns.add(new PropertyColumnExt<Instance>("PID", "pid"));
-        columns.add(new PropertyColumnExt<Instance>("Name", "name"));
-        columns.add(new PropertyColumnExt<Instance>("Root", "root"));
-        columns.add(new PropertyColumnExt<Instance>("State", "state"));
-        columns.add(new PropertyColumnExt<Instance>("Location", "location"));
-        columns.add(new AbstractColumn<Instance>(of("Actions")) {
+        ColumnList<Instance> columns = new ColumnList<Instance>(preferences.getUserPreferences("karaf"));
+
+        columns.addColumn(new OrdinalColumn<Instance>());
+        columns.addColumn(new PropertyColumnExt<Instance>("PID", "pid"));
+        columns.addColumn(new PropertyColumnExt<Instance>("Name", "name"));
+        columns.addColumn(new PropertyColumnExt<Instance>("Root", "root"));
+        columns.addColumn(new PropertyColumnExt<Instance>("State", "state"));
+        columns.addColumn(new PropertyColumnExt<Instance>("Location", "location"));
+        columns.addColumn(new AbstractColumn<Instance>(of("Actions")) {
             public void populateItem(Item<ICellPopulator<Instance>> cellItem, String componentId, IModel<Instance> rowModel) {
                 cellItem.add(new InstanceActionsPanel(componentId, rowModel));
             }
         });
 
-        add(new DefaultDataTable<Instance>("instances", columns, new InstancesDataProvider(admin), 20));
+        add(new AdvancedDataTable<Instance>("instances", columns, new InstancesDataProvider(admin), 20));
     }
 
 }
index 80f9b58..311bf13 100644 (file)
@@ -26,4 +26,6 @@
 
     <reference id="adminService" interface="org.apache.karaf.admin.AdminService"/>
 
-</blueprint>
+    <reference id="preferencesService" interface="org.osgi.service.prefs.PreferencesService" />
+
+</blueprint>
\ No newline at end of file
index d87fcea..3aa867f 100644 (file)
@@ -7,7 +7,7 @@
    (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
+        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,
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<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 WebConsole</title>
-    </wicket:head>
+<wicket:extend xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd">
+    <h1>Blueprint containers</h1>
 
-    <body>
-       <wicket:extend>
-            <h1>Blueprint containers</h1>
-
-            <table wicket:id="containers" class="dataview" />
-        </wicket:extend>
-    </body>
-</html>
+    <table wicket:id="containers" class="dataview" />
+</wicket:extend>
\ No newline at end of file
index 3edc274..57f5c2a 100644 (file)
@@ -7,7 +7,7 @@
    (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
+        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,
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<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 WebConsole</title>
-    </wicket:head>
+<wicket:extend xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd">
+    <h1>Blueprint container details</h1>
 
-    <body>
-       <wicket:extend>
-            <h1>Blueprint container details</h1>
+    <table class="dataview grid_12">
+        <tr wicket:id="components" class="component">
+            <td>
+                <span wicket:id="componentId">.component-1</span>
+            </td>
+            <td>
+                <span wicket:id="type">org.osgi.service.blueprint.reflect.ComponentMetadata</span>
+            </td>
+            <td>
+                <ul>
+                    <li wicket:id="dependencies">
+                        <span wicket:id="dependency">.component-12</span>
+                    </li>
+                </ul>
+            </td>
+        </tr>
+    </table>
 
-            <table class="dataview grid_12">
-                <tr wicket:id="components" class="component">
-                    <td>
-                        <span wicket:id="componentId">.component-1</span>
-                    </td>
-                    <td>
-                        <span wicket:id="type">org.osgi.service.blueprint.reflect.ComponentMetadata</span>
-                    </td>
-                    <td>
-                        <ul>
-                            <li wicket:id="dependencies">
-                                <span wicket:id="dependency">.component-12</span>
-                            </li>
-                        </ul>
-                    </td>
-                </tr>
-            </table>
-
-            <div id="graph" class="grid_12" style="height: 550px"></div>
-        </wicket:extend>
-    </body>
-</html>
+    <div id="graph" class="grid_12" style="height: 550px"></div>
+</wicket:extend>
\ No newline at end of file
index 2003a8a..28a4979 100644 (file)
@@ -7,7 +7,7 @@
    (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
+        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,
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<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 WebConsole</title>
-    </wicket:head>
+<wicket:extend xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd">
+    <h1>Bundles</h1>
 
-    <body>
-        <wicket:extend>
-            <h1>Bundles</h1>
+    <table wicket:id="bundles" class="dataview" />
 
-            <table wicket:id="bundles" class="dataview" />
-
-        </wicket:extend>
-    </body>
-</html>
+</wicket:extend>
index 5ff2924..dd9d9fb 100644 (file)
@@ -7,7 +7,7 @@
    (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
+        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,
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<html xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd" >
-    <body>
-        <h1>Bundle details</h1>
+<wicket:extend xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd">
+    <h1>Bundle details</h1>
+    Details of <span wicket:id="name">symbolic name</span>
 
-        <wicket:extend>
-            Details of <span wicket:id="name">symbolic name</span>
+    <h3>Imports</h3>
+    <ul>
+        <li wicket:id="imports">
+            <span wicket:id="importPackage">org.osgi.framework</span>
+        </li>
+    </ul>
 
-            <h3>Imports</h3>
-            <ul>
-                <li wicket:id="imports">
-                    <span wicket:id="importPackage">org.osgi.framework</span>
-                </li>
-            </ul>
+    <h3>Exports</h3>
+    <ul>
+        <li wicket:id="exports">
+            <span wicket:id="exportPackage">org.osgi.framework</span>
+        </li>
+    </ul>
 
-            <h3>Exports</h3>
-            <ul>
-                <li wicket:id="exports">
-                    <span wicket:id="exportPackage">org.osgi.framework</span>
-                </li>
-            </ul>
+    <h3>Services in use</h3>
+    <ul>
+        <li wicket:id="servicesInUse">
+            <span wicket:id="serviceInUse">org.osgi.framework</span>
+            <!--
+            <table>
+                <tr>
+                    <th>Property Name</th>
+                    <th>Property Value</th>
+                </tr>
+                <tr wicket:id="serviceInUseProperty">
+                    <td wicket:id="propertyName">Property Name</td>
+                    <td wicket:id="propertyValue">Property Value</td>
+                </tr>
+            </table>
+            -->
+        </li>
+    </ul>
 
-            <h3>Services in use</h3>
-            <ul>
-                <li wicket:id="servicesInUse">
-                    <span wicket:id="serviceInUse">org.osgi.framework</span>
-                    <!--
-                    <table>
-                        <tr>
-                            <th>Property Name</th>
-                            <th>Property Value</th>
-                        </tr>
-                        <tr wicket:id="serviceInUseProperty">
-                            <td wicket:id="propertyName">Property Name</td>
-                            <td wicket:id="propertyValue">Property Value</td>
-                        </tr>
-                    </table>
-                    -->
-                </li>
-            </ul>
-
-            <h3>Services provided by bundle</h3>
-            <ul>
-                <li wicket:id="servicesExported">
-                    <span wicket:id="serviceExported">org.osgi.framework</span>
-                </li>
-            </ul>
-        </wicket:extend>
-    </body>
-</html>
+    <h3>Services provided by bundle</h3>
+    <ul>
+        <li wicket:id="servicesExported">
+            <span wicket:id="serviceExported">org.osgi.framework</span>
+        </li>
+    </ul>
+</wicket:extend>
\ No newline at end of file
index 3464743..c1bc97a 100644 (file)
@@ -7,7 +7,7 @@
    (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
+        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,
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd">
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>Karaf WebConsole</title>
-</head>
-<body>
-
-    <wicket:panel>
-        <div class="decorations">
-            <ul>
-                <li wicket:id="extensions">
-                    <div wicket:id="extension" class="decoration" />
-                </li>
-            </ul>
-        </div>
-    </wicket:panel>
-
-</body>
-</html>
\ No newline at end of file
+<wicket:panel xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd">
+    <div class="decorations">
+        <ul>
+            <li wicket:id="extensions">
+                <div wicket:id="extension" class="decoration" />
+            </li>
+        </ul>
+    </div>
+</wicket:panel>
\ No newline at end of file
index b99ae0a..4587b81 100644 (file)
@@ -7,7 +7,7 @@
    (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
+        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,
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<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 WebConsole</title>
-    </wicket:head>
+<wicket:extend xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd">
+    <h1>Edit <span wicket:id="pid">org.apache.felix.filemount</span></h1>
 
-    <body>
+    <form wicket:id="edit">
+        <ul>
+            <li wicket:id="entries">
+                <input type="text" wicket:id="value" />
+            </li>
+        </ul>
+        <input type="submit" wicket:id="submit" value="Confirm" />
+    </form>
 
-        <wicket:extend>
-            <h1>Edit <span wicket:id="pid">org.apache.felix.filemount</span></h1>
+    <p>
+        System properties (not editable)
+    </p>
+    <table wicket:id="system" class="dataview" />
 
-            <form wicket:id="edit">
-                <ul>
-                    <li wicket:id="entries">
-                        <input type="text" wicket:id="value" />
-                    </li>
-                </ul>
-                <input type="submit" wicket:id="submit" value="Confirm" />
-            </form>
-
-            <p>
-                System properties (not editable)
-            </p>
-            <table wicket:id="system" class="dataview" />
-
-        </wicket:extend>
-    </body>
-</html>
+</wicket:extend>
index 238afd1..42c5358 100644 (file)
@@ -7,7 +7,7 @@
    (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
+        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,
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<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 WebConsole</title>
-    </wicket:head>
+<wicket:extend xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd">
+     <h1>Confirm removal of <span wicket:id="pid">org.apache.felix.filemount</span> configuration</h1>
 
-    <body>
-
-        <wicket:extend>
-            <h1>Confirm removal of <span wicket:id="pid">org.apache.felix.filemount</span> configuration</h1>
-
-            <form wicket:id="remove">
-                Are you sure want to delete this configuration?
-                <input type="submit" wicket:id="submit" value="Confirm" />
-            </form>
-        </wicket:extend>
-    </body>
-</html>
+     <form wicket:id="remove">
+         Are you sure want to delete this configuration?
+         <input type="submit" wicket:id="submit" value="Confirm" />
+     </form>
+ </wicket:extend>
index a7f3a0c..e221573 100644 (file)
@@ -7,7 +7,7 @@
    (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
+        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,
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<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 WebConsole</title>
-    </wicket:head>
+<wicket:extend xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd">
+    <h1>Configurations</h1>
 
-    <body>
+    <table wicket:id="configurations" class="dataview" />
 
-        <wicket:extend>
-            <h1>Configurations</h1>
-
-            <table wicket:id="configurations" class="dataview" />
-
-        </wicket:extend>
-    </body>
-</html>
+</wicket:extend>
\ No newline at end of file
index 8ae2151..9bccda2 100644 (file)
@@ -7,7 +7,7 @@
    (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
+        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,
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<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 WebConsole</title>
-    </wicket:head>
+<wicket:extend xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd">
+    <h1>Events</h1>
 
-    <body>
-
-        <wicket:extend>
-            <h1>Events</h1>
-
-            <table wicket:id="topics" />
-        </wicket:extend>
-    </body>
-</html>
+    <table wicket:id="topics" />
+</wicket:extend>
\ No newline at end of file
index 29a7be5..7f404a9 100644 (file)
@@ -7,7 +7,7 @@
    (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
+        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,
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<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 WebConsole</title>
-    </wicket:head>
+<wicket:extend xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd">
+    <h1>OSGi framework</h1>
 
-    <body>
-        <wicket:extend>
-            <h1>OSGi framework</h1>
-
-            <p>
-                You run on <span wicket:id="symbolicName">org.eclipse.equinox</span>
-                in version <span wicket:id="version">3.6.4.20110412</span>
-            </p>
-        </wicket:extend>
-    </body>
-</html>
\ No newline at end of file
+    <p>
+        You run on <span wicket:id="symbolicName">org.eclipse.equinox</span>
+        in version <span wicket:id="version">3.6.4.20110412</span>
+    </p>
+</wicket:extend>
\ No newline at end of file
index 25f8433..d0f25ca 100644 (file)
@@ -7,7 +7,7 @@
    (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
+        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,
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd">
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>Karaf WebConsole</title>
-</head>
-<body>
+<wicket:panel xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd">
+    <div class="grid_3 widget">
+        <h3>OSGi</h3>
+        <p>
+            Running framework <span wicket:id="symbolicName">framework</span> in version 
+            <span wicket:id="version">1.0</span>.
+        </p>
 
-    <wicket:panel>
-        <div class="grid_3 widget">
-            <h3>OSGi</h3>
-            <p>
-                Running framework <span wicket:id="symbolicName">framework</span> in version 
-                <span wicket:id="version">1.0</span>.
-            </p>
-
-            <p>
-                You have <span wicket:id="bundleCount">130</span> bundles installed.
-            </p>
-        </div>
-    </wicket:panel>
-
-</body>
-</html>
\ No newline at end of file
+        <p>
+            You have <span wicket:id="bundleCount">130</span> bundles installed.
+        </p>
+    </div>
+</wicket:panel>
\ No newline at end of file
index eef6050..706b093 100644 (file)
@@ -7,7 +7,7 @@
    (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
+        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,
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<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 WebConsole</title>
-    </wicket:head>
-
-    <body>
-        <wicket:extend>
-            <h1>Log entries</h1>
-
-            <div class="grid_9">
-                <form wicket:id="filters">
-
-                    <label for="priority">
-                        Priority
-                        <select wicket:id="priority" id="priority">
-                            <wicket:container wicket:id="options">
-                                <option wicket:id="option">label</option>
-                            </wicket:container>
-                        </select>
-                    </label>
-
-                    <label for="dateFrom">
-                        Date from
-                        <input type="text" id="dateFrom" wicket:id="dateFrom" />
-                    </label>
-
-                    <label for="dateTo">
-                        Date to
-                        <input type="text" id="dateTo" wicket:id="dateTo" />
-                    </label>
-
-                    <label for="messageFragment">
-                        Message
-                        <input type="text" id="messageFragment" wicket:id="messageFragment" />
-                    </label>
-
-                    <label for="bundleNameFragment">
-                        Bundle
-                        <input type="text" id="bundleNameFragment" wicket:id="bundleNameFragment" />
-                    </label>
-
-                    <input wicket:id="submit" type="submit" value="Filter" />
-                </form>
-            </div>
-
-            <table wicket:id="logs" class="dataview" />
-
-        </wicket:extend>
-    </body>
-</html>
+<wicket:extend xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd">
+    <h1>Log entries</h1>
+
+    <div class="grid_9">
+        <form wicket:id="filters">
+
+            <label for="priority">
+                Priority
+                <select wicket:id="priority" id="priority">
+                    <wicket:container wicket:id="options">
+                        <option wicket:id="option">label</option>
+                    </wicket:container>
+                </select>
+            </label>
+
+            <label for="dateFrom">
+                Date from
+                <input type="text" id="dateFrom" wicket:id="dateFrom" />
+            </label>
+
+            <label for="dateTo">
+                Date to
+                <input type="text" id="dateTo" wicket:id="dateTo" />
+            </label>
+
+            <label for="messageFragment">
+                Message
+                <input type="text" id="messageFragment" wicket:id="messageFragment" />
+            </label>
+
+            <label for="bundleNameFragment">
+                Bundle
+                <input type="text" id="bundleNameFragment" wicket:id="bundleNameFragment" />
+            </label>
+
+            <input wicket:id="submit" type="submit" value="Filter" />
+        </form>
+    </div>
+
+    <table wicket:id="logs" class="dataview" />
+
+</wicket:extend>
\ No newline at end of file
index c407880..75ce4e6 100644 (file)
@@ -7,7 +7,7 @@
    (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
+        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,
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd">
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>Karaf WebConsole</title>
-</head>
-<body>
-
-    <wicket:panel>
-        <ul>
-            <li wicket:id="components">
-                <span wicket:id="name">component-name</span>
-                <span wicket:id="state">ACTIVE</span>
-            </li>
-        </ul>
-    </wicket:panel>
-
-</body>
-</html>
\ No newline at end of file
+<wicket:panel xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd">
+    <ul>
+        <li wicket:id="components">
+            <span wicket:id="name">component-name</span>
+            <span wicket:id="state">ACTIVE</span>
+        </li>
+    </ul>
+</wicket:panel>
\ No newline at end of file
index 2ad516b..d3b1b2b 100644 (file)
@@ -7,7 +7,7 @@
    (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
+        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,
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd">
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>Karaf WebConsole</title>
-</head>
-<body>
+<wicket:extend xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd">
+    <h1>Exchange <span wicket:id="id">24319433961</span></h1>
 
-    <wicket:extend>
-        <h1>Exchange <span wicket:id="id">24319433961</span></h1>
+    <h2>Properties</h2>
+    <table wicket:id="properties" class="dataview" />
 
-        <h2>Properties</h2>
-        <table wicket:id="properties" class="dataview" />
+    <h2>Input</h2>
 
-        <h2>Input</h2>
+    <h3>Message headers</h3>
+    <table wicket:id="inHeaders" class="dataview" />
 
-        <h3>Message headers</h3>
-        <table wicket:id="inHeaders" class="dataview" />
+    <h3>Message body</h3>
+    <pre class="message" wicket:id="inBody">
+        message body
+    </pre>
 
-        <h3>Message body</h3>
-        <pre class="message" wicket:id="inBody">
-            message body
-        </pre>
+    <h2>Output</h2>
 
-        <h2>Output</h2>
+    <h3>Message headers</h3>
+    <table wicket:id="outHeaders" class="dataview" />
 
-        <h3>Message headers</h3>
-        <table wicket:id="outHeaders" class="dataview" />
+    <h3>Message body</h3>
+    <pre class="message" wicket:id="outBody">
+        message body
+    </pre>
 
-        <h3>Message body</h3>
-        <pre class="message" wicket:id="outBody">
-            message body
-        </pre>
+    <h2>Fault</h2>
 
-        <h2>Fault</h2>
+    <h3>Fault headers</h3>
+    <table wicket:id="faultHeaders" class="dataview" />
 
-        <h3>Fault headers</h3>
-        <table wicket:id="faultHeaders" class="dataview" />
+    <h3>Fault body</h3>
+    <pre class="message" wicket:id="faultBody">
+        message body
+    </pre>
 
-        <h3>Fault body</h3>
-        <pre class="message" wicket:id="faultBody">
-            message body
-        </pre>
-
-        <h2>Exception</h2>
-        <pre class="message" wicket:id="exception">
-            Some stack trace
-        </pre>
-    </wicket:extend>
-
-</body>
-</html>
\ No newline at end of file
+    <h2>Exception</h2>
+    <pre class="message" wicket:id="exception">
+        Some stack trace
+    </pre>
+</wicket:extend>
\ No newline at end of file
index 6ee3119..5db4538 100644 (file)
@@ -7,7 +7,7 @@
    (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
+        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,
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd">
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>Karaf WebConsole</title>
-</head>
-<body>
+<wicket:extend xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd">
+    <h1>ServiceMix page</h1>
 
-    <wicket:extend>
-        <h1>ServiceMix page</h1>
-
-        <table wicket:id="endpoints" class="dataview" />
-    </wicket:extend>
-
-</body>
-</html>
\ No newline at end of file
+    <table wicket:id="endpoints" class="dataview" />
+</wicket:extend>
\ No newline at end of file
index 9f1d4ee..2a081bc 100644 (file)
@@ -7,7 +7,7 @@
    (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
+        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,
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd">
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>Karaf WebConsole</title>
-</head>
-<body>
+<wicket:extend xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd">
+    <h1>Nmr events</h1>
 
-    <wicket:extend>
-        <h1>Nmr events</h1>
-
-        <table wicket:id="exchanges" class="dataview" />
-    </wicket:extend>
-
-</body>
-</html>
\ No newline at end of file
+    <table wicket:id="exchanges" class="dataview" />
+</wicket:extend>