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:09:24 UTC
svn commit: r1242776 [1/2] - in /karaf/webconsole/trunk:
camel/src/main/resources/org/apache/karaf/webconsole/camel/internal/context/
camel/src/main/resources/org/apache/karaf/webconsole/camel/internal/widget/
core/src/main/resources/org/apache/karaf/w...
Author: ldywicki
Date: Fri Feb 10 14:09:22 2012
New Revision: 1242776
URL: http://svn.apache.org/viewvc?rev=1242776&view=rev
Log:
Markup clean up, remove unnecessary header parts.
Removed:
karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/behavior/formalize/images/button.png
karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/behavior/formalize/images/select_arrow.gif
Modified:
karaf/webconsole/trunk/camel/src/main/resources/org/apache/karaf/webconsole/camel/internal/context/CamelContextsPage.html
karaf/webconsole/trunk/camel/src/main/resources/org/apache/karaf/webconsole/camel/internal/context/DumpPage.html
karaf/webconsole/trunk/camel/src/main/resources/org/apache/karaf/webconsole/camel/internal/context/TracePage.html
karaf/webconsole/trunk/camel/src/main/resources/org/apache/karaf/webconsole/camel/internal/widget/CamelWidget.html
karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/dashboard/DashboardPage.html
karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/form/LabelBorder.html
karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/internal/LanguagePanel.html
karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/internal/SidebarPanel.html
karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/internal/preferences/SystemPreferencesPanel.html
karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/navigation/markup/NavigationPanel.html
karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/page/LoginPage.html
karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/page/SecuredPage.html
karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/page/SidebarPage.html
karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/page/SinglePage.html
karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/panel/AbstractImagePanel.html
karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/panel/CssImagePanel.html
karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/panel/StaticImagePanel.html
karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/preferences/PreferencesPage.html
karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/preferences/PreferencesPanel.html
karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/table/ActionsPanel.html
karaf/webconsole/trunk/cxf/src/main/resources/org/apache/karaf/webconsole/cxf/internal/services/CxfServicesPage.html
karaf/webconsole/trunk/cxf/src/main/resources/org/apache/karaf/webconsole/cxf/internal/services/DetailsPage.html
karaf/webconsole/trunk/karaf/admin/src/main/java/org/apache/karaf/webconsole/karaf/admin/list/InstancesPage.java
karaf/webconsole/trunk/karaf/admin/src/main/resources/OSGI-INF/blueprint/admin.xml
karaf/webconsole/trunk/osgi/blueprint/src/main/resources/org/apache/karaf/webconsole/osgi/blueprint/BlueprintPage.html
karaf/webconsole/trunk/osgi/blueprint/src/main/resources/org/apache/karaf/webconsole/osgi/blueprint/details/DetailsPage.html
karaf/webconsole/trunk/osgi/bundle/src/main/resources/org/apache/karaf/webconsole/osgi/bundle/internal/BundlesPage.html
karaf/webconsole/trunk/osgi/bundle/src/main/resources/org/apache/karaf/webconsole/osgi/bundle/internal/DetailsPage.html
karaf/webconsole/trunk/osgi/bundle/src/main/resources/org/apache/karaf/webconsole/osgi/bundle/internal/view/DecorationPanel.html
karaf/webconsole/trunk/osgi/config/src/main/resources/org/apache/karaf/webconsole/osgi/config/ConfigurationEditPage.html
karaf/webconsole/trunk/osgi/config/src/main/resources/org/apache/karaf/webconsole/osgi/config/ConfigurationRemovePage.html
karaf/webconsole/trunk/osgi/config/src/main/resources/org/apache/karaf/webconsole/osgi/config/ConfigurationsPage.html
karaf/webconsole/trunk/osgi/event/src/main/resources/org/apache/karaf/webconsole/osgi/event/EventsPage.html
karaf/webconsole/trunk/osgi/framework/src/main/resources/org/apache/karaf/webconsole/osgi/framework/internal/FrameworkPage.html
karaf/webconsole/trunk/osgi/framework/src/main/resources/org/apache/karaf/webconsole/osgi/framework/internal/OsgiWidgetPanel.html
karaf/webconsole/trunk/osgi/log/src/main/resources/org/apache/karaf/webconsole/osgi/log/LogsPage.html
karaf/webconsole/trunk/osgi/scr/src/main/resources/org/apache/karaf/webconsole/osgi/scr/ScrColumnPanel.html
karaf/webconsole/trunk/servicemix/src/main/resources/org/apache/karaf/webconsole/servicemix/internal/DetailsPage.html
karaf/webconsole/trunk/servicemix/src/main/resources/org/apache/karaf/webconsole/servicemix/internal/ServiceMixPage.html
karaf/webconsole/trunk/servicemix/src/main/resources/org/apache/karaf/webconsole/servicemix/internal/TrackNmrPage.html
Modified: karaf/webconsole/trunk/camel/src/main/resources/org/apache/karaf/webconsole/camel/internal/context/CamelContextsPage.html
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/camel/src/main/resources/org/apache/karaf/webconsole/camel/internal/context/CamelContextsPage.html?rev=1242776&r1=1242775&r2=1242776&view=diff
==============================================================================
--- karaf/webconsole/trunk/camel/src/main/resources/org/apache/karaf/webconsole/camel/internal/context/CamelContextsPage.html (original)
+++ karaf/webconsole/trunk/camel/src/main/resources/org/apache/karaf/webconsole/camel/internal/context/CamelContextsPage.html Fri Feb 10 14:09:22 2012
@@ -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,
@@ -15,19 +15,9 @@
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
Modified: karaf/webconsole/trunk/camel/src/main/resources/org/apache/karaf/webconsole/camel/internal/context/DumpPage.html
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/camel/src/main/resources/org/apache/karaf/webconsole/camel/internal/context/DumpPage.html?rev=1242776&r1=1242775&r2=1242776&view=diff
==============================================================================
--- karaf/webconsole/trunk/camel/src/main/resources/org/apache/karaf/webconsole/camel/internal/context/DumpPage.html (original)
+++ karaf/webconsole/trunk/camel/src/main/resources/org/apache/karaf/webconsole/camel/internal/context/DumpPage.html Fri Feb 10 14:09:22 2012
@@ -15,25 +15,15 @@
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
Modified: karaf/webconsole/trunk/camel/src/main/resources/org/apache/karaf/webconsole/camel/internal/context/TracePage.html
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/camel/src/main/resources/org/apache/karaf/webconsole/camel/internal/context/TracePage.html?rev=1242776&r1=1242775&r2=1242776&view=diff
==============================================================================
--- karaf/webconsole/trunk/camel/src/main/resources/org/apache/karaf/webconsole/camel/internal/context/TracePage.html (original)
+++ karaf/webconsole/trunk/camel/src/main/resources/org/apache/karaf/webconsole/camel/internal/context/TracePage.html Fri Feb 10 14:09:22 2012
@@ -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,
@@ -15,26 +15,16 @@
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>
+
+ <h2>Attached tracers</h2>
+ <ul>
+ <li wicket:id="tracers">ctx-1</li>
+ </ul>
- <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>
-
- </wicket:extend>
-
-</body>
-</html>
\ No newline at end of file
+</wicket:extend>
\ No newline at end of file
Modified: karaf/webconsole/trunk/camel/src/main/resources/org/apache/karaf/webconsole/camel/internal/widget/CamelWidget.html
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/camel/src/main/resources/org/apache/karaf/webconsole/camel/internal/widget/CamelWidget.html?rev=1242776&r1=1242775&r2=1242776&view=diff
==============================================================================
--- karaf/webconsole/trunk/camel/src/main/resources/org/apache/karaf/webconsole/camel/internal/widget/CamelWidget.html (original)
+++ karaf/webconsole/trunk/camel/src/main/resources/org/apache/karaf/webconsole/camel/internal/widget/CamelWidget.html Fri Feb 10 14:09:22 2012
@@ -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,
@@ -15,31 +15,21 @@
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="grid_6 widget">
- <h1>Deployed camel contexts</h1>
-
- <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>
-
- <a href="#" wicket:id="management">Go to context management</a>
- </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="grid_6 widget">
+ <h1>Deployed camel contexts</h1>
+
+ <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>
+
+ <a href="#" wicket:id="management">Go to context management</a>
+ </div>
+</wicket:panel>
\ No newline at end of file
Modified: karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/dashboard/DashboardPage.html
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/dashboard/DashboardPage.html?rev=1242776&r1=1242775&r2=1242776&view=diff
==============================================================================
--- karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/dashboard/DashboardPage.html (original)
+++ karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/dashboard/DashboardPage.html Fri Feb 10 14:09:22 2012
@@ -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,
@@ -15,27 +15,16 @@
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>
-
- <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
+<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>
+
+ <ul id="widgets">
+ <li wicket:id="widgets">
+ <div wicket:id="widget">
+ Widget content.
+ </div>
+ </li>
+ </ul>
+</wicket:extend>
\ No newline at end of file
Modified: karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/form/LabelBorder.html
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/form/LabelBorder.html?rev=1242776&r1=1242775&r2=1242776&view=diff
==============================================================================
--- karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/form/LabelBorder.html (original)
+++ karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/form/LabelBorder.html Fri Feb 10 14:09:22 2012
@@ -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,
@@ -15,19 +15,9 @@
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
Modified: karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/internal/LanguagePanel.html
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/internal/LanguagePanel.html?rev=1242776&r1=1242775&r2=1242776&view=diff
==============================================================================
--- karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/internal/LanguagePanel.html (original)
+++ karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/internal/LanguagePanel.html Fri Feb 10 14:09:22 2012
@@ -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,
@@ -15,23 +15,13 @@
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
Modified: karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/internal/SidebarPanel.html
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/internal/SidebarPanel.html?rev=1242776&r1=1242775&r2=1242776&view=diff
==============================================================================
--- karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/internal/SidebarPanel.html (original)
+++ karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/internal/SidebarPanel.html Fri Feb 10 14:09:22 2012
@@ -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,
@@ -15,39 +15,29 @@
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
Modified: karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/internal/preferences/SystemPreferencesPanel.html
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/internal/preferences/SystemPreferencesPanel.html?rev=1242776&r1=1242775&r2=1242776&view=diff
==============================================================================
--- karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/internal/preferences/SystemPreferencesPanel.html (original)
+++ karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/internal/preferences/SystemPreferencesPanel.html Fri Feb 10 14:09:22 2012
@@ -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,
@@ -15,26 +15,16 @@
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" />
-
- <input wicket:id="submit" type="submit" value="Save" />
- </form>
- </wicket:panel>
-
-</body>
-</html>
\ No newline at end of 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>
\ No newline at end of file
Modified: karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/navigation/markup/NavigationPanel.html
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/navigation/markup/NavigationPanel.html?rev=1242776&r1=1242775&r2=1242776&view=diff
==============================================================================
--- karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/navigation/markup/NavigationPanel.html (original)
+++ karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/navigation/markup/NavigationPanel.html Fri Feb 10 14:09:22 2012
@@ -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,
@@ -15,32 +15,22 @@
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
Modified: karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/page/LoginPage.html
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/page/LoginPage.html?rev=1242776&r1=1242775&r2=1242776&view=diff
==============================================================================
--- karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/page/LoginPage.html (original)
+++ karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/page/LoginPage.html Fri Feb 10 14:09:22 2012
@@ -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,
@@ -15,22 +15,12 @@
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
Modified: karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/page/SecuredPage.html
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/page/SecuredPage.html?rev=1242776&r1=1242775&r2=1242776&view=diff
==============================================================================
--- karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/page/SecuredPage.html (original)
+++ karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/page/SecuredPage.html Fri Feb 10 14:09:22 2012
@@ -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,
@@ -15,33 +15,22 @@
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>
+
+ <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>
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
- <title>Karaf WebConsole</title>
-</head>
-
-<body>
-
- <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>
-
- <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:child />
- </wicket:extend>
-
-</body>
-</html>
\ No newline at end of file
+</wicket:extend>
\ No newline at end of file
Modified: karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/page/SidebarPage.html
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/page/SidebarPage.html?rev=1242776&r1=1242775&r2=1242776&view=diff
==============================================================================
--- karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/page/SidebarPage.html (original)
+++ karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/page/SidebarPage.html Fri Feb 10 14:09:22 2012
@@ -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,
@@ -15,25 +15,13 @@
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
Modified: karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/page/SinglePage.html
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/page/SinglePage.html?rev=1242776&r1=1242775&r2=1242776&view=diff
==============================================================================
--- karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/page/SinglePage.html (original)
+++ karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/page/SinglePage.html Fri Feb 10 14:09:22 2012
@@ -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,
@@ -15,22 +15,10 @@
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
Modified: karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/panel/AbstractImagePanel.html
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/panel/AbstractImagePanel.html?rev=1242776&r1=1242775&r2=1242776&view=diff
==============================================================================
--- karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/panel/AbstractImagePanel.html (original)
+++ karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/panel/AbstractImagePanel.html Fri Feb 10 14:09:22 2012
@@ -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,
@@ -15,18 +15,8 @@
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
Modified: karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/panel/CssImagePanel.html
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/panel/CssImagePanel.html?rev=1242776&r1=1242775&r2=1242776&view=diff
==============================================================================
--- karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/panel/CssImagePanel.html (original)
+++ karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/panel/CssImagePanel.html Fri Feb 10 14:09:22 2012
@@ -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,
@@ -15,16 +15,6 @@
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
Modified: karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/panel/StaticImagePanel.html
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/panel/StaticImagePanel.html?rev=1242776&r1=1242775&r2=1242776&view=diff
==============================================================================
--- karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/panel/StaticImagePanel.html (original)
+++ karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/panel/StaticImagePanel.html Fri Feb 10 14:09:22 2012
@@ -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,
@@ -15,16 +15,6 @@
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
Modified: karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/preferences/PreferencesPage.html
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/preferences/PreferencesPage.html?rev=1242776&r1=1242775&r2=1242776&view=diff
==============================================================================
--- karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/preferences/PreferencesPage.html (original)
+++ karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/preferences/PreferencesPage.html Fri Feb 10 14:09:22 2012
@@ -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,
@@ -15,23 +15,12 @@
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
Modified: karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/preferences/PreferencesPanel.html
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/preferences/PreferencesPanel.html?rev=1242776&r1=1242775&r2=1242776&view=diff
==============================================================================
--- karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/preferences/PreferencesPanel.html (original)
+++ karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/preferences/PreferencesPanel.html Fri Feb 10 14:09:22 2012
@@ -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,
@@ -15,29 +15,19 @@
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="children">
- <div wicket:id="child">child details</div>
- </li>
- </ul>
- </wicket:panel>
-
-</body>
-</html>
\ No newline at end of file
+ <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>
\ No newline at end of file
Modified: karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/table/ActionsPanel.html
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/table/ActionsPanel.html?rev=1242776&r1=1242775&r2=1242776&view=diff
==============================================================================
--- karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/table/ActionsPanel.html (original)
+++ karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/table/ActionsPanel.html Fri Feb 10 14:09:22 2012
@@ -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,
@@ -15,26 +15,16 @@
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
Modified: karaf/webconsole/trunk/cxf/src/main/resources/org/apache/karaf/webconsole/cxf/internal/services/CxfServicesPage.html
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/cxf/src/main/resources/org/apache/karaf/webconsole/cxf/internal/services/CxfServicesPage.html?rev=1242776&r1=1242775&r2=1242776&view=diff
==============================================================================
--- karaf/webconsole/trunk/cxf/src/main/resources/org/apache/karaf/webconsole/cxf/internal/services/CxfServicesPage.html (original)
+++ karaf/webconsole/trunk/cxf/src/main/resources/org/apache/karaf/webconsole/cxf/internal/services/CxfServicesPage.html Fri Feb 10 14:09:22 2012
@@ -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,
@@ -15,19 +15,9 @@
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
Modified: karaf/webconsole/trunk/cxf/src/main/resources/org/apache/karaf/webconsole/cxf/internal/services/DetailsPage.html
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/cxf/src/main/resources/org/apache/karaf/webconsole/cxf/internal/services/DetailsPage.html?rev=1242776&r1=1242775&r2=1242776&view=diff
==============================================================================
--- karaf/webconsole/trunk/cxf/src/main/resources/org/apache/karaf/webconsole/cxf/internal/services/DetailsPage.html (original)
+++ karaf/webconsole/trunk/cxf/src/main/resources/org/apache/karaf/webconsole/cxf/internal/services/DetailsPage.html Fri Feb 10 14:09:22 2012
@@ -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,
@@ -15,167 +15,157 @@
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
Modified: karaf/webconsole/trunk/karaf/admin/src/main/java/org/apache/karaf/webconsole/karaf/admin/list/InstancesPage.java
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/karaf/admin/src/main/java/org/apache/karaf/webconsole/karaf/admin/list/InstancesPage.java?rev=1242776&r1=1242775&r2=1242776&view=diff
==============================================================================
--- karaf/webconsole/trunk/karaf/admin/src/main/java/org/apache/karaf/webconsole/karaf/admin/list/InstancesPage.java (original)
+++ karaf/webconsole/trunk/karaf/admin/src/main/java/org/apache/karaf/webconsole/karaf/admin/list/InstancesPage.java Fri Feb 10 14:09:22 2012
@@ -2,38 +2,41 @@ package org.apache.karaf.webconsole.kara
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));
}
}
Modified: karaf/webconsole/trunk/karaf/admin/src/main/resources/OSGI-INF/blueprint/admin.xml
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/karaf/admin/src/main/resources/OSGI-INF/blueprint/admin.xml?rev=1242776&r1=1242775&r2=1242776&view=diff
==============================================================================
--- karaf/webconsole/trunk/karaf/admin/src/main/resources/OSGI-INF/blueprint/admin.xml (original)
+++ karaf/webconsole/trunk/karaf/admin/src/main/resources/OSGI-INF/blueprint/admin.xml Fri Feb 10 14:09:22 2012
@@ -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
Modified: karaf/webconsole/trunk/osgi/blueprint/src/main/resources/org/apache/karaf/webconsole/osgi/blueprint/BlueprintPage.html
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/osgi/blueprint/src/main/resources/org/apache/karaf/webconsole/osgi/blueprint/BlueprintPage.html?rev=1242776&r1=1242775&r2=1242776&view=diff
==============================================================================
--- karaf/webconsole/trunk/osgi/blueprint/src/main/resources/org/apache/karaf/webconsole/osgi/blueprint/BlueprintPage.html (original)
+++ karaf/webconsole/trunk/osgi/blueprint/src/main/resources/org/apache/karaf/webconsole/osgi/blueprint/BlueprintPage.html Fri Feb 10 14:09:22 2012
@@ -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,
@@ -15,16 +15,8 @@
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
Modified: karaf/webconsole/trunk/osgi/blueprint/src/main/resources/org/apache/karaf/webconsole/osgi/blueprint/details/DetailsPage.html
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/osgi/blueprint/src/main/resources/org/apache/karaf/webconsole/osgi/blueprint/details/DetailsPage.html?rev=1242776&r1=1242775&r2=1242776&view=diff
==============================================================================
--- karaf/webconsole/trunk/osgi/blueprint/src/main/resources/org/apache/karaf/webconsole/osgi/blueprint/details/DetailsPage.html (original)
+++ karaf/webconsole/trunk/osgi/blueprint/src/main/resources/org/apache/karaf/webconsole/osgi/blueprint/details/DetailsPage.html Fri Feb 10 14:09:22 2012
@@ -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,
@@ -15,34 +15,26 @@
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
Modified: karaf/webconsole/trunk/osgi/bundle/src/main/resources/org/apache/karaf/webconsole/osgi/bundle/internal/BundlesPage.html
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/osgi/bundle/src/main/resources/org/apache/karaf/webconsole/osgi/bundle/internal/BundlesPage.html?rev=1242776&r1=1242775&r2=1242776&view=diff
==============================================================================
--- karaf/webconsole/trunk/osgi/bundle/src/main/resources/org/apache/karaf/webconsole/osgi/bundle/internal/BundlesPage.html (original)
+++ karaf/webconsole/trunk/osgi/bundle/src/main/resources/org/apache/karaf/webconsole/osgi/bundle/internal/BundlesPage.html Fri Feb 10 14:09:22 2012
@@ -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,
@@ -15,17 +15,9 @@
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>
Modified: karaf/webconsole/trunk/osgi/bundle/src/main/resources/org/apache/karaf/webconsole/osgi/bundle/internal/DetailsPage.html
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/osgi/bundle/src/main/resources/org/apache/karaf/webconsole/osgi/bundle/internal/DetailsPage.html?rev=1242776&r1=1242775&r2=1242776&view=diff
==============================================================================
--- karaf/webconsole/trunk/osgi/bundle/src/main/resources/org/apache/karaf/webconsole/osgi/bundle/internal/DetailsPage.html (original)
+++ karaf/webconsole/trunk/osgi/bundle/src/main/resources/org/apache/karaf/webconsole/osgi/bundle/internal/DetailsPage.html Fri Feb 10 14:09:22 2012
@@ -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,
@@ -15,52 +15,47 @@
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>
- 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>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 provided by bundle</h3>
- <ul>
- <li wicket:id="servicesExported">
- <span wicket:id="serviceExported">org.osgi.framework</span>
- </li>
- </ul>
- </wicket:extend>
- </body>
-</html>
+<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>
+
+ <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>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>
\ No newline at end of file
Modified: karaf/webconsole/trunk/osgi/bundle/src/main/resources/org/apache/karaf/webconsole/osgi/bundle/internal/view/DecorationPanel.html
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/osgi/bundle/src/main/resources/org/apache/karaf/webconsole/osgi/bundle/internal/view/DecorationPanel.html?rev=1242776&r1=1242775&r2=1242776&view=diff
==============================================================================
--- karaf/webconsole/trunk/osgi/bundle/src/main/resources/org/apache/karaf/webconsole/osgi/bundle/internal/view/DecorationPanel.html (original)
+++ karaf/webconsole/trunk/osgi/bundle/src/main/resources/org/apache/karaf/webconsole/osgi/bundle/internal/view/DecorationPanel.html Fri Feb 10 14:09:22 2012
@@ -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,
@@ -15,22 +15,12 @@
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
Modified: karaf/webconsole/trunk/osgi/config/src/main/resources/org/apache/karaf/webconsole/osgi/config/ConfigurationEditPage.html
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/osgi/config/src/main/resources/org/apache/karaf/webconsole/osgi/config/ConfigurationEditPage.html?rev=1242776&r1=1242775&r2=1242776&view=diff
==============================================================================
--- karaf/webconsole/trunk/osgi/config/src/main/resources/org/apache/karaf/webconsole/osgi/config/ConfigurationEditPage.html (original)
+++ karaf/webconsole/trunk/osgi/config/src/main/resources/org/apache/karaf/webconsole/osgi/config/ConfigurationEditPage.html Fri Feb 10 14:09:22 2012
@@ -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,
@@ -15,30 +15,21 @@
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>
+
+ <p>
+ System properties (not editable)
+ </p>
+ <table wicket:id="system" class="dataview" />
- <wicket:extend>
- <h1>Edit <span wicket:id="pid">org.apache.felix.filemount</span></h1>
-
- <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>
Modified: karaf/webconsole/trunk/osgi/config/src/main/resources/org/apache/karaf/webconsole/osgi/config/ConfigurationRemovePage.html
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/osgi/config/src/main/resources/org/apache/karaf/webconsole/osgi/config/ConfigurationRemovePage.html?rev=1242776&r1=1242775&r2=1242776&view=diff
==============================================================================
--- karaf/webconsole/trunk/osgi/config/src/main/resources/org/apache/karaf/webconsole/osgi/config/ConfigurationRemovePage.html (original)
+++ karaf/webconsole/trunk/osgi/config/src/main/resources/org/apache/karaf/webconsole/osgi/config/ConfigurationRemovePage.html Fri Feb 10 14:09:22 2012
@@ -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,
@@ -15,20 +15,11 @@
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>
Modified: karaf/webconsole/trunk/osgi/config/src/main/resources/org/apache/karaf/webconsole/osgi/config/ConfigurationsPage.html
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/osgi/config/src/main/resources/org/apache/karaf/webconsole/osgi/config/ConfigurationsPage.html?rev=1242776&r1=1242775&r2=1242776&view=diff
==============================================================================
--- karaf/webconsole/trunk/osgi/config/src/main/resources/org/apache/karaf/webconsole/osgi/config/ConfigurationsPage.html (original)
+++ karaf/webconsole/trunk/osgi/config/src/main/resources/org/apache/karaf/webconsole/osgi/config/ConfigurationsPage.html Fri Feb 10 14:09:22 2012
@@ -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,
@@ -15,18 +15,9 @@
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
Modified: karaf/webconsole/trunk/osgi/event/src/main/resources/org/apache/karaf/webconsole/osgi/event/EventsPage.html
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/osgi/event/src/main/resources/org/apache/karaf/webconsole/osgi/event/EventsPage.html?rev=1242776&r1=1242775&r2=1242776&view=diff
==============================================================================
--- karaf/webconsole/trunk/osgi/event/src/main/resources/org/apache/karaf/webconsole/osgi/event/EventsPage.html (original)
+++ karaf/webconsole/trunk/osgi/event/src/main/resources/org/apache/karaf/webconsole/osgi/event/EventsPage.html Fri Feb 10 14:09:22 2012
@@ -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,
@@ -15,17 +15,8 @@
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