You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by ld...@apache.org on 2011/12/28 11:39:55 UTC
svn commit: r1225157 [2/3] - in /karaf/webconsole/trunk: blueprint/
blueprint/src/main/java/org/apache/karaf/webconsole/blueprint/internal/
blueprint/src/main/java/org/apache/karaf/webconsole/blueprint/internal/bundle/
blueprint/src/main/java/org/apach...
Copied: karaf/webconsole/trunk/osgi/blueprint/src/main/resources/org/apache/karaf/webconsole/osgi/blueprint/details/dracula_graffle.js (from r1225156, karaf/webconsole/trunk/blueprint/src/main/resources/org/apache/karaf/webconsole/blueprint/internal/details/dracula_graffle.js)
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/osgi/blueprint/src/main/resources/org/apache/karaf/webconsole/osgi/blueprint/details/dracula_graffle.js?p2=karaf/webconsole/trunk/osgi/blueprint/src/main/resources/org/apache/karaf/webconsole/osgi/blueprint/details/dracula_graffle.js&p1=karaf/webconsole/trunk/blueprint/src/main/resources/org/apache/karaf/webconsole/blueprint/internal/details/dracula_graffle.js&r1=1225156&r2=1225157&rev=1225157&view=diff
==============================================================================
(empty)
Copied: karaf/webconsole/trunk/osgi/blueprint/src/main/resources/org/apache/karaf/webconsole/osgi/blueprint/details/dracula_graph.js (from r1225156, karaf/webconsole/trunk/blueprint/src/main/resources/org/apache/karaf/webconsole/blueprint/internal/details/dracula_graph.js)
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/osgi/blueprint/src/main/resources/org/apache/karaf/webconsole/osgi/blueprint/details/dracula_graph.js?p2=karaf/webconsole/trunk/osgi/blueprint/src/main/resources/org/apache/karaf/webconsole/osgi/blueprint/details/dracula_graph.js&p1=karaf/webconsole/trunk/blueprint/src/main/resources/org/apache/karaf/webconsole/blueprint/internal/details/dracula_graph.js&r1=1225156&r2=1225157&rev=1225157&view=diff
==============================================================================
(empty)
Copied: karaf/webconsole/trunk/osgi/blueprint/src/main/resources/org/apache/karaf/webconsole/osgi/blueprint/details/jquery-1.4.2.min.js (from r1225156, karaf/webconsole/trunk/blueprint/src/main/resources/org/apache/karaf/webconsole/blueprint/internal/details/jquery-1.4.2.min.js)
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/osgi/blueprint/src/main/resources/org/apache/karaf/webconsole/osgi/blueprint/details/jquery-1.4.2.min.js?p2=karaf/webconsole/trunk/osgi/blueprint/src/main/resources/org/apache/karaf/webconsole/osgi/blueprint/details/jquery-1.4.2.min.js&p1=karaf/webconsole/trunk/blueprint/src/main/resources/org/apache/karaf/webconsole/blueprint/internal/details/jquery-1.4.2.min.js&r1=1225156&r2=1225157&rev=1225157&view=diff
==============================================================================
(empty)
Copied: karaf/webconsole/trunk/osgi/blueprint/src/main/resources/org/apache/karaf/webconsole/osgi/blueprint/details/raphael-min.js (from r1225156, karaf/webconsole/trunk/blueprint/src/main/resources/org/apache/karaf/webconsole/blueprint/internal/details/raphael-min.js)
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/osgi/blueprint/src/main/resources/org/apache/karaf/webconsole/osgi/blueprint/details/raphael-min.js?p2=karaf/webconsole/trunk/osgi/blueprint/src/main/resources/org/apache/karaf/webconsole/osgi/blueprint/details/raphael-min.js&p1=karaf/webconsole/trunk/blueprint/src/main/resources/org/apache/karaf/webconsole/blueprint/internal/details/raphael-min.js&r1=1225156&r2=1225157&rev=1225157&view=diff
==============================================================================
(empty)
Copied: karaf/webconsole/trunk/osgi/blueprint/src/main/resources/org/apache/karaf/webconsole/osgi/blueprint/details/seedrandom.js (from r1225156, karaf/webconsole/trunk/blueprint/src/main/resources/org/apache/karaf/webconsole/blueprint/internal/details/seedrandom.js)
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/osgi/blueprint/src/main/resources/org/apache/karaf/webconsole/osgi/blueprint/details/seedrandom.js?p2=karaf/webconsole/trunk/osgi/blueprint/src/main/resources/org/apache/karaf/webconsole/osgi/blueprint/details/seedrandom.js&p1=karaf/webconsole/trunk/blueprint/src/main/resources/org/apache/karaf/webconsole/blueprint/internal/details/seedrandom.js&r1=1225156&r2=1225157&rev=1225157&view=diff
==============================================================================
(empty)
Copied: karaf/webconsole/trunk/osgi/blueprint/src/main/resources/org/apache/karaf/webconsole/osgi/blueprint/navigation.css (from r1225156, karaf/webconsole/trunk/blueprint/src/main/resources/org/apache/karaf/webconsole/blueprint/internal/navigation.css)
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/osgi/blueprint/src/main/resources/org/apache/karaf/webconsole/osgi/blueprint/navigation.css?p2=karaf/webconsole/trunk/osgi/blueprint/src/main/resources/org/apache/karaf/webconsole/osgi/blueprint/navigation.css&p1=karaf/webconsole/trunk/blueprint/src/main/resources/org/apache/karaf/webconsole/blueprint/internal/navigation.css&r1=1225156&r2=1225157&rev=1225157&view=diff
==============================================================================
(empty)
Copied: karaf/webconsole/trunk/osgi/bundle/pom.xml (from r1225156, karaf/webconsole/trunk/osgi/pom.xml)
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/osgi/bundle/pom.xml?p2=karaf/webconsole/trunk/osgi/bundle/pom.xml&p1=karaf/webconsole/trunk/osgi/pom.xml&r1=1225156&r2=1225157&rev=1225157&view=diff
==============================================================================
--- karaf/webconsole/trunk/osgi/pom.xml (original)
+++ karaf/webconsole/trunk/osgi/bundle/pom.xml Wed Dec 28 10:39:46 2011
@@ -20,26 +20,25 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.karaf</groupId>
- <artifactId>webconsole</artifactId>
+ <groupId>org.apache.karaf.webconsole</groupId>
+ <artifactId>osgi</artifactId>
<version>0.3.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.karaf.webconsole</groupId>
- <artifactId>org.apache.karaf.webconsole.osgi</artifactId>
- <name>Apache Karaf :: WebConsole :: OSGi Bundle Presentation</name>
+ <groupId>org.apache.karaf.webconsole.osgi</groupId>
+ <artifactId>org.apache.karaf.webconsole.osgi.bundle</artifactId>
+ <name>Apache Karaf :: WebConsole :: OSGi :: Bundle</name>
<packaging>bundle</packaging>
<dependencies>
<dependency>
- <groupId>org.apache.karaf.webconsole</groupId>
- <artifactId>org.apache.karaf.webconsole.core</artifactId>
+ <groupId>org.apache.karaf.webconsole.osgi</groupId>
+ <artifactId>org.apache.karaf.webconsole.osgi.framework</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <version>4.2.0</version>
+ <artifactId>org.osgi.core</artifactId>
</dependency>
</dependencies>
@@ -48,13 +47,11 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.3.5</version>
- <extensions>true</extensions>
<configuration>
<instructions>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Import-Package>
- !org.apache.karaf.webconsole.osgi*,
+ !org.apache.karaf.webconsole.osgi.bundle*,
*,<!-- let bnd import direct dependencies -->
<!-- transient dependencies -->
org.ops4j.pax.wicket.api,
@@ -62,11 +59,11 @@
org.ops4j.pax.wicket.util.proxy
</Import-Package>
<Export-Package>
- org.apache.karaf.webconsole.osgi.bundle,
- org.apache.karaf.webconsole.osgi.bundle.view
+ org.apache.karaf.webconsole.osgi.bundle
</Export-Package>
</instructions>
</configuration>
+ <extensions>true</extensions>
</plugin>
</plugins>
</build>
Copied: karaf/webconsole/trunk/osgi/bundle/src/main/java/org/apache/karaf/webconsole/osgi/bundle/IActionProvider.java (from r1225156, karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/bundle/IActionProvider.java)
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/osgi/bundle/src/main/java/org/apache/karaf/webconsole/osgi/bundle/IActionProvider.java?p2=karaf/webconsole/trunk/osgi/bundle/src/main/java/org/apache/karaf/webconsole/osgi/bundle/IActionProvider.java&p1=karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/bundle/IActionProvider.java&r1=1225156&r2=1225157&rev=1225157&view=diff
==============================================================================
(empty)
Copied: karaf/webconsole/trunk/osgi/bundle/src/main/java/org/apache/karaf/webconsole/osgi/bundle/IColumnProvider.java (from r1225156, karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/bundle/IColumnProvider.java)
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/osgi/bundle/src/main/java/org/apache/karaf/webconsole/osgi/bundle/IColumnProvider.java?p2=karaf/webconsole/trunk/osgi/bundle/src/main/java/org/apache/karaf/webconsole/osgi/bundle/IColumnProvider.java&p1=karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/bundle/IColumnProvider.java&r1=1225156&r2=1225157&rev=1225157&view=diff
==============================================================================
(empty)
Copied: karaf/webconsole/trunk/osgi/bundle/src/main/java/org/apache/karaf/webconsole/osgi/bundle/IDecorationProvider.java (from r1225156, karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/bundle/IDecorationProvider.java)
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/osgi/bundle/src/main/java/org/apache/karaf/webconsole/osgi/bundle/IDecorationProvider.java?p2=karaf/webconsole/trunk/osgi/bundle/src/main/java/org/apache/karaf/webconsole/osgi/bundle/IDecorationProvider.java&p1=karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/bundle/IDecorationProvider.java&r1=1225156&r2=1225157&rev=1225157&view=diff
==============================================================================
(empty)
Copied: karaf/webconsole/trunk/osgi/bundle/src/main/java/org/apache/karaf/webconsole/osgi/bundle/internal/BundleNavigationProvider.java (from r1225156, karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/navigation/OsgiConsoleTabProvider.java)
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/osgi/bundle/src/main/java/org/apache/karaf/webconsole/osgi/bundle/internal/BundleNavigationProvider.java?p2=karaf/webconsole/trunk/osgi/bundle/src/main/java/org/apache/karaf/webconsole/osgi/bundle/internal/BundleNavigationProvider.java&p1=karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/navigation/OsgiConsoleTabProvider.java&r1=1225156&r2=1225157&rev=1225157&view=diff
==============================================================================
--- karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/navigation/OsgiConsoleTabProvider.java (original)
+++ karaf/webconsole/trunk/osgi/bundle/src/main/java/org/apache/karaf/webconsole/osgi/bundle/internal/BundleNavigationProvider.java Wed Dec 28 10:39:46 2011
@@ -14,28 +14,23 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.webconsole.osgi.internal.navigation;
+package org.apache.karaf.webconsole.osgi.bundle.internal;
-import java.util.Collections;
+import static org.apache.karaf.webconsole.core.util.LinkUtils.createPageLink;
+
+import java.util.ArrayList;
import java.util.List;
-import org.apache.karaf.webconsole.core.navigation.ConsoleTabProvider;
-import org.apache.karaf.webconsole.osgi.internal.bundle.BundlesPage;
+import org.apache.karaf.webconsole.core.navigation.NavigationProvider;
import org.apache.wicket.Page;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.link.BookmarkablePageLink;
import org.apache.wicket.markup.html.link.Link;
-public class OsgiConsoleTabProvider implements ConsoleTabProvider {
-
- public Link<Page> getModuleLink(String componentId, String labelId) {
- Link<Page> link = new BookmarkablePageLink<Page>(componentId, BundlesPage.class);
- link.add(new Label(labelId, "Bundles"));
- return link;
- }
+public class BundleNavigationProvider implements NavigationProvider {
public List<Link<Page>> getItems(String componentId, String labelId) {
- return Collections.emptyList();
+ List<Link<Page>> links = new ArrayList<Link<Page>>();
+ links.add(createPageLink(componentId, labelId, "Bundles", BundlesPage.class));
+ return links;
}
}
Copied: karaf/webconsole/trunk/osgi/bundle/src/main/java/org/apache/karaf/webconsole/osgi/bundle/internal/BundlesDataProvider.java (from r1225156, karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/bundle/BundlesDataProvider.java)
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/osgi/bundle/src/main/java/org/apache/karaf/webconsole/osgi/bundle/internal/BundlesDataProvider.java?p2=karaf/webconsole/trunk/osgi/bundle/src/main/java/org/apache/karaf/webconsole/osgi/bundle/internal/BundlesDataProvider.java&p1=karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/bundle/BundlesDataProvider.java&r1=1225156&r2=1225157&rev=1225157&view=diff
==============================================================================
--- karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/bundle/BundlesDataProvider.java (original)
+++ karaf/webconsole/trunk/osgi/bundle/src/main/java/org/apache/karaf/webconsole/osgi/bundle/internal/BundlesDataProvider.java Wed Dec 28 10:39:46 2011
@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.webconsole.osgi.internal.bundle;
+package org.apache.karaf.webconsole.osgi.bundle.internal;
import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
-import org.apache.karaf.webconsole.osgi.internal.bundle.model.BundleModel;
+import org.apache.karaf.webconsole.osgi.framework.BundleModel;
import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;
import org.apache.wicket.model.IModel;
import org.osgi.framework.Bundle;
@@ -41,7 +41,7 @@ public class BundlesDataProvider extends
}
public IModel<Bundle> model(Bundle object) {
- return new BundleModel(object.getBundleId(), context);
+ return new BundleModel(context, object);
}
public int size() {
Copied: karaf/webconsole/trunk/osgi/bundle/src/main/java/org/apache/karaf/webconsole/osgi/bundle/internal/BundlesPage.java (from r1225156, karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/bundle/BundlesPage.java)
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/osgi/bundle/src/main/java/org/apache/karaf/webconsole/osgi/bundle/internal/BundlesPage.java?p2=karaf/webconsole/trunk/osgi/bundle/src/main/java/org/apache/karaf/webconsole/osgi/bundle/internal/BundlesPage.java&p1=karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/bundle/BundlesPage.java&r1=1225156&r2=1225157&rev=1225157&view=diff
==============================================================================
--- karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/bundle/BundlesPage.java (original)
+++ karaf/webconsole/trunk/osgi/bundle/src/main/java/org/apache/karaf/webconsole/osgi/bundle/internal/BundlesPage.java Wed Dec 28 10:39:46 2011
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.webconsole.osgi.internal.bundle;
+package org.apache.karaf.webconsole.osgi.bundle.internal;
import static org.apache.wicket.model.Model.of;
@@ -25,10 +25,10 @@ import org.apache.karaf.webconsole.core.
import org.apache.karaf.webconsole.osgi.bundle.IActionProvider;
import org.apache.karaf.webconsole.osgi.bundle.IColumnProvider;
import org.apache.karaf.webconsole.osgi.bundle.IDecorationProvider;
-import org.apache.karaf.webconsole.osgi.internal.OsgiPage;
-import org.apache.karaf.webconsole.osgi.internal.bundle.view.BundleActionsPanel;
-import org.apache.karaf.webconsole.osgi.internal.bundle.view.BundlesDataTable;
-import org.apache.karaf.webconsole.osgi.internal.bundle.view.DecorationPanel;
+import org.apache.karaf.webconsole.osgi.bundle.internal.view.BundleActionsPanel;
+import org.apache.karaf.webconsole.osgi.bundle.internal.view.BundlesDataTable;
+import org.apache.karaf.webconsole.osgi.bundle.internal.view.DecorationPanel;
+import org.apache.karaf.webconsole.osgi.framework.OsgiPage;
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.IColumn;
Copied: karaf/webconsole/trunk/osgi/bundle/src/main/java/org/apache/karaf/webconsole/osgi/bundle/internal/DetailsPage.java (from r1225156, karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/bundle/DetailsPage.java)
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/osgi/bundle/src/main/java/org/apache/karaf/webconsole/osgi/bundle/internal/DetailsPage.java?p2=karaf/webconsole/trunk/osgi/bundle/src/main/java/org/apache/karaf/webconsole/osgi/bundle/internal/DetailsPage.java&p1=karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/bundle/DetailsPage.java&r1=1225156&r2=1225157&rev=1225157&view=diff
==============================================================================
--- karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/bundle/DetailsPage.java (original)
+++ karaf/webconsole/trunk/osgi/bundle/src/main/java/org/apache/karaf/webconsole/osgi/bundle/internal/DetailsPage.java Wed Dec 28 10:39:46 2011
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.webconsole.osgi.internal.bundle;
+package org.apache.karaf.webconsole.osgi.bundle.internal;
import java.util.Arrays;
import java.util.List;
Copied: karaf/webconsole/trunk/osgi/bundle/src/main/java/org/apache/karaf/webconsole/osgi/bundle/internal/State.java (from r1225156, karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/bundle/State.java)
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/osgi/bundle/src/main/java/org/apache/karaf/webconsole/osgi/bundle/internal/State.java?p2=karaf/webconsole/trunk/osgi/bundle/src/main/java/org/apache/karaf/webconsole/osgi/bundle/internal/State.java&p1=karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/bundle/State.java&r1=1225156&r2=1225157&rev=1225157&view=diff
==============================================================================
--- karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/bundle/State.java (original)
+++ karaf/webconsole/trunk/osgi/bundle/src/main/java/org/apache/karaf/webconsole/osgi/bundle/internal/State.java Wed Dec 28 10:39:46 2011
@@ -1,4 +1,4 @@
-package org.apache.karaf.webconsole.osgi.internal.bundle;
+package org.apache.karaf.webconsole.osgi.bundle.internal;
public enum State {
UNINSTALLED(1),
Copied: karaf/webconsole/trunk/osgi/bundle/src/main/java/org/apache/karaf/webconsole/osgi/bundle/internal/view/BundleActionsPanel.java (from r1225156, karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/bundle/view/BundleActionsPanel.java)
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/osgi/bundle/src/main/java/org/apache/karaf/webconsole/osgi/bundle/internal/view/BundleActionsPanel.java?p2=karaf/webconsole/trunk/osgi/bundle/src/main/java/org/apache/karaf/webconsole/osgi/bundle/internal/view/BundleActionsPanel.java&p1=karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/bundle/view/BundleActionsPanel.java&r1=1225156&r2=1225157&rev=1225157&view=diff
==============================================================================
--- karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/bundle/view/BundleActionsPanel.java (original)
+++ karaf/webconsole/trunk/osgi/bundle/src/main/java/org/apache/karaf/webconsole/osgi/bundle/internal/view/BundleActionsPanel.java Wed Dec 28 10:39:46 2011
@@ -14,16 +14,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.webconsole.osgi.internal.bundle.view;
+package org.apache.karaf.webconsole.osgi.bundle.internal.view;
import java.util.ArrayList;
import java.util.List;
import org.apache.karaf.webconsole.core.table.ActionsPanel;
import org.apache.karaf.webconsole.osgi.bundle.IActionProvider;
-import org.apache.karaf.webconsole.osgi.internal.bundle.BundlesPage;
-import org.apache.karaf.webconsole.osgi.internal.bundle.DetailsPage;
-import org.apache.karaf.webconsole.osgi.internal.bundle.State;
+import org.apache.karaf.webconsole.osgi.bundle.internal.BundlesPage;
+import org.apache.karaf.webconsole.osgi.bundle.internal.DetailsPage;
+import org.apache.karaf.webconsole.osgi.bundle.internal.State;
import org.apache.wicket.PageParameters;
import org.apache.wicket.RequestCycle;
import org.apache.wicket.Session;
Copied: karaf/webconsole/trunk/osgi/bundle/src/main/java/org/apache/karaf/webconsole/osgi/bundle/internal/view/BundlesDataTable.java (from r1225156, karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/bundle/view/BundlesDataTable.java)
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/osgi/bundle/src/main/java/org/apache/karaf/webconsole/osgi/bundle/internal/view/BundlesDataTable.java?p2=karaf/webconsole/trunk/osgi/bundle/src/main/java/org/apache/karaf/webconsole/osgi/bundle/internal/view/BundlesDataTable.java&p1=karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/bundle/view/BundlesDataTable.java&r1=1225156&r2=1225157&rev=1225157&view=diff
==============================================================================
--- karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/bundle/view/BundlesDataTable.java (original)
+++ karaf/webconsole/trunk/osgi/bundle/src/main/java/org/apache/karaf/webconsole/osgi/bundle/internal/view/BundlesDataTable.java Wed Dec 28 10:39:46 2011
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.webconsole.osgi.internal.bundle.view;
+package org.apache.karaf.webconsole.osgi.bundle.internal.view;
import java.util.List;
Copied: karaf/webconsole/trunk/osgi/bundle/src/main/java/org/apache/karaf/webconsole/osgi/bundle/internal/view/DecorationPanel.java (from r1225156, karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/bundle/view/DecorationPanel.java)
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/osgi/bundle/src/main/java/org/apache/karaf/webconsole/osgi/bundle/internal/view/DecorationPanel.java?p2=karaf/webconsole/trunk/osgi/bundle/src/main/java/org/apache/karaf/webconsole/osgi/bundle/internal/view/DecorationPanel.java&p1=karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/bundle/view/DecorationPanel.java&r1=1225156&r2=1225157&rev=1225157&view=diff
==============================================================================
--- karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/bundle/view/DecorationPanel.java (original)
+++ karaf/webconsole/trunk/osgi/bundle/src/main/java/org/apache/karaf/webconsole/osgi/bundle/internal/view/DecorationPanel.java Wed Dec 28 10:39:46 2011
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.webconsole.osgi.internal.bundle.view;
+package org.apache.karaf.webconsole.osgi.bundle.internal.view;
import java.util.ArrayList;
import java.util.List;
Copied: karaf/webconsole/trunk/osgi/bundle/src/main/java/org/apache/karaf/webconsole/osgi/bundle/internal/view/SystemBundleDecorationProvider.java (from r1225156, karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/bundle/view/SystemBundleDecorationProvider.java)
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/osgi/bundle/src/main/java/org/apache/karaf/webconsole/osgi/bundle/internal/view/SystemBundleDecorationProvider.java?p2=karaf/webconsole/trunk/osgi/bundle/src/main/java/org/apache/karaf/webconsole/osgi/bundle/internal/view/SystemBundleDecorationProvider.java&p1=karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/bundle/view/SystemBundleDecorationProvider.java&r1=1225156&r2=1225157&rev=1225157&view=diff
==============================================================================
--- karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/bundle/view/SystemBundleDecorationProvider.java (original)
+++ karaf/webconsole/trunk/osgi/bundle/src/main/java/org/apache/karaf/webconsole/osgi/bundle/internal/view/SystemBundleDecorationProvider.java Wed Dec 28 10:39:46 2011
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.webconsole.osgi.internal.bundle.view;
+package org.apache.karaf.webconsole.osgi.bundle.internal.view;
import org.apache.karaf.webconsole.core.panel.CssImagePanel;
import org.apache.karaf.webconsole.osgi.bundle.IDecorationProvider;
Copied: karaf/webconsole/trunk/osgi/bundle/src/main/resources/OSGI-INF/blueprint/osgi.xml (from r1225156, karaf/webconsole/trunk/osgi/src/main/resources/OSGI-INF/blueprint/osgi.xml)
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/osgi/bundle/src/main/resources/OSGI-INF/blueprint/osgi.xml?p2=karaf/webconsole/trunk/osgi/bundle/src/main/resources/OSGI-INF/blueprint/osgi.xml&p1=karaf/webconsole/trunk/osgi/src/main/resources/OSGI-INF/blueprint/osgi.xml&r1=1225156&r2=1225157&rev=1225157&view=diff
==============================================================================
--- karaf/webconsole/trunk/osgi/src/main/resources/OSGI-INF/blueprint/osgi.xml (original)
+++ karaf/webconsole/trunk/osgi/bundle/src/main/resources/OSGI-INF/blueprint/osgi.xml Wed Dec 28 10:39:46 2011
@@ -22,44 +22,26 @@
http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd
">
- <service interface="org.apache.karaf.webconsole.core.navigation.ConsoleTabProvider">
- <bean class="org.apache.karaf.webconsole.core.navigation.ExtendableConsoleTabProvider">
- <argument>
- <bean class="org.apache.karaf.webconsole.osgi.internal.navigation.OsgiConsoleTabProvider" />
- </argument>
- <property name="extensions">
- <reference-list interface="org.apache.karaf.webconsole.core.navigation.NavigationProvider"
- availability="optional" filter="(extends=osgi)" />
- </property>
- </bean>
- </service>
-
- <service ref="widgetProvider" interface="org.apache.karaf.webconsole.core.widget.WidgetProvider">
- <service-properties>
- <entry key="intention" value="dashboard" />
- </service-properties>
- </service>
-
- <bean id="widgetProvider" class="org.apache.karaf.webconsole.osgi.internal.widget.OsgiWidgetProvider">
- <argument ref="blueprintBundleContext" />
- </bean>
-
- <bean id="osgiSidebar" class="org.apache.karaf.webconsole.osgi.internal.sidebar.OsgiSidebar" />
-
- <reference id="configurationAdmin" interface="org.osgi.service.cm.ConfigurationAdmin" availability="optional" />
<reference id="startLevel" interface="org.osgi.service.startlevel.StartLevel" />
<reference id="packageAdmin" interface="org.osgi.service.packageadmin.PackageAdmin" />
- <reference id="metaTypeService" interface="org.osgi.service.metatype.MetaTypeService" />
- <reference id="logReader" interface="org.osgi.service.log.LogReaderService" />
<reference-list id="columnProviders" interface="org.apache.karaf.webconsole.osgi.bundle.IColumnProvider" availability="optional" />
<reference-list id="actionProviders" interface="org.apache.karaf.webconsole.osgi.bundle.IActionProvider" availability="optional" />
<reference-list id="decorationProviders" interface="org.apache.karaf.webconsole.osgi.bundle.IDecorationProvider" availability="optional" />
<service auto-export="interfaces">
- <bean class="org.apache.karaf.webconsole.osgi.internal.bundle.view.SystemBundleDecorationProvider">
+ <bean class="org.apache.karaf.webconsole.osgi.bundle.internal.view.SystemBundleDecorationProvider">
<argument ref="startLevel" />
</bean>
</service>
+ <service ref="bundleNavigationProvider" interface="org.apache.karaf.webconsole.core.navigation.NavigationProvider">
+ <service-properties>
+ <entry key="extends" value="osgi" />
+ <entry key="service.ranking" value="1" />
+ </service-properties>
+ </service>
+
+ <bean id="bundleNavigationProvider" class="org.apache.karaf.webconsole.osgi.bundle.internal.BundleNavigationProvider" />
+
</blueprint>
Copied: karaf/webconsole/trunk/osgi/bundle/src/main/resources/org/apache/karaf/webconsole/osgi/bundle/internal/BundlesPage.html (from r1225156, karaf/webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/bundle/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?p2=karaf/webconsole/trunk/osgi/bundle/src/main/resources/org/apache/karaf/webconsole/osgi/bundle/internal/BundlesPage.html&p1=karaf/webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/bundle/BundlesPage.html&r1=1225156&r2=1225157&rev=1225157&view=diff
==============================================================================
(empty)
Copied: karaf/webconsole/trunk/osgi/bundle/src/main/resources/org/apache/karaf/webconsole/osgi/bundle/internal/DetailsPage.html (from r1225156, karaf/webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/bundle/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?p2=karaf/webconsole/trunk/osgi/bundle/src/main/resources/org/apache/karaf/webconsole/osgi/bundle/internal/DetailsPage.html&p1=karaf/webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/bundle/DetailsPage.html&r1=1225156&r2=1225157&rev=1225157&view=diff
==============================================================================
(empty)
Copied: karaf/webconsole/trunk/osgi/bundle/src/main/resources/org/apache/karaf/webconsole/osgi/bundle/internal/view/DecorationPanel.html (from r1225156, karaf/webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/bundle/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?p2=karaf/webconsole/trunk/osgi/bundle/src/main/resources/org/apache/karaf/webconsole/osgi/bundle/internal/view/DecorationPanel.html&p1=karaf/webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/bundle/view/DecorationPanel.html&r1=1225156&r2=1225157&rev=1225157&view=diff
==============================================================================
(empty)
Copied: karaf/webconsole/trunk/osgi/bundle/src/main/resources/org/apache/karaf/webconsole/osgi/bundle/internal/view/decoration.css (from r1225156, karaf/webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/bundle/view/decoration.css)
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/osgi/bundle/src/main/resources/org/apache/karaf/webconsole/osgi/bundle/internal/view/decoration.css?p2=karaf/webconsole/trunk/osgi/bundle/src/main/resources/org/apache/karaf/webconsole/osgi/bundle/internal/view/decoration.css&p1=karaf/webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/bundle/view/decoration.css&r1=1225156&r2=1225157&rev=1225157&view=diff
==============================================================================
(empty)
Copied: karaf/webconsole/trunk/osgi/bundle/src/main/resources/org/apache/karaf/webconsole/osgi/bundle/internal/view/system.gif (from r1225156, karaf/webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/bundle/view/system.gif)
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/osgi/bundle/src/main/resources/org/apache/karaf/webconsole/osgi/bundle/internal/view/system.gif?p2=karaf/webconsole/trunk/osgi/bundle/src/main/resources/org/apache/karaf/webconsole/osgi/bundle/internal/view/system.gif&p1=karaf/webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/bundle/view/system.gif&r1=1225156&r2=1225157&rev=1225157&view=diff
==============================================================================
(empty)
Copied: karaf/webconsole/trunk/osgi/config/pom.xml (from r1225156, karaf/webconsole/trunk/osgi/pom.xml)
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/osgi/config/pom.xml?p2=karaf/webconsole/trunk/osgi/config/pom.xml&p1=karaf/webconsole/trunk/osgi/pom.xml&r1=1225156&r2=1225157&rev=1225157&view=diff
==============================================================================
--- karaf/webconsole/trunk/osgi/pom.xml (original)
+++ karaf/webconsole/trunk/osgi/config/pom.xml Wed Dec 28 10:39:46 2011
@@ -20,26 +20,25 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.karaf</groupId>
- <artifactId>webconsole</artifactId>
+ <groupId>org.apache.karaf.webconsole</groupId>
+ <artifactId>osgi</artifactId>
<version>0.3.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.karaf.webconsole</groupId>
- <artifactId>org.apache.karaf.webconsole.osgi</artifactId>
- <name>Apache Karaf :: WebConsole :: OSGi Bundle Presentation</name>
+ <groupId>org.apache.karaf.webconsole.osgi</groupId>
+ <artifactId>org.apache.karaf.webconsole.osgi.config</artifactId>
+ <name>Apache Karaf :: WebConsole :: OSGi :: Config</name>
<packaging>bundle</packaging>
<dependencies>
<dependency>
- <groupId>org.apache.karaf.webconsole</groupId>
- <artifactId>org.apache.karaf.webconsole.core</artifactId>
+ <groupId>org.apache.karaf.webconsole.osgi</groupId>
+ <artifactId>org.apache.karaf.webconsole.osgi.framework</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
- <version>4.2.0</version>
</dependency>
</dependencies>
@@ -48,25 +47,22 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.3.5</version>
- <extensions>true</extensions>
<configuration>
<instructions>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Import-Package>
- !org.apache.karaf.webconsole.osgi*,
+ !org.apache.karaf.webconsole.osgi.config*,
*,<!-- let bnd import direct dependencies -->
<!-- transient dependencies -->
org.ops4j.pax.wicket.api,
org.ops4j.pax.wicket.util,
org.ops4j.pax.wicket.util.proxy
</Import-Package>
- <Export-Package>
- org.apache.karaf.webconsole.osgi.bundle,
- org.apache.karaf.webconsole.osgi.bundle.view
- </Export-Package>
+ <Export-Package></Export-Package>
+ <Private-Package>org.apache.karaf.webconsole.osgi.config*</Private-Package>
</instructions>
</configuration>
+ <extensions>true</extensions>
</plugin>
</plugins>
</build>
Copied: karaf/webconsole/trunk/osgi/config/src/main/java/org/apache/karaf/webconsole/osgi/config/ConfigurationEditPage.java (from r1225156, karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/configuration/ConfigurationEditPage.java)
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/osgi/config/src/main/java/org/apache/karaf/webconsole/osgi/config/ConfigurationEditPage.java?p2=karaf/webconsole/trunk/osgi/config/src/main/java/org/apache/karaf/webconsole/osgi/config/ConfigurationEditPage.java&p1=karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/configuration/ConfigurationEditPage.java&r1=1225156&r2=1225157&rev=1225157&view=diff
==============================================================================
--- karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/configuration/ConfigurationEditPage.java (original)
+++ karaf/webconsole/trunk/osgi/config/src/main/java/org/apache/karaf/webconsole/osgi/config/ConfigurationEditPage.java Wed Dec 28 10:39:46 2011
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.webconsole.osgi.internal.configuration;
+package org.apache.karaf.webconsole.osgi.config;
import java.io.IOException;
import java.util.Map;
@@ -23,8 +23,8 @@ import org.apache.karaf.webconsole.core.
import org.apache.karaf.webconsole.core.table.map.MapDataProvider;
import org.apache.karaf.webconsole.core.table.map.MapDataTable;
import org.apache.karaf.webconsole.core.util.DictionaryUtils;
-import org.apache.karaf.webconsole.osgi.internal.OsgiPage;
-import org.apache.karaf.webconsole.osgi.internal.configuration.model.ConfigurationModel;
+import org.apache.karaf.webconsole.osgi.config.model.ConfigurationModel;
+import org.apache.karaf.webconsole.osgi.framework.OsgiPage;
import org.apache.wicket.PageParameters;
import org.apache.wicket.RequestCycle;
import org.apache.wicket.Session;
Copied: karaf/webconsole/trunk/osgi/config/src/main/java/org/apache/karaf/webconsole/osgi/config/ConfigurationFilterUtil.java (from r1225156, karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/configuration/ConfigurationFilterUtil.java)
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/osgi/config/src/main/java/org/apache/karaf/webconsole/osgi/config/ConfigurationFilterUtil.java?p2=karaf/webconsole/trunk/osgi/config/src/main/java/org/apache/karaf/webconsole/osgi/config/ConfigurationFilterUtil.java&p1=karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/configuration/ConfigurationFilterUtil.java&r1=1225156&r2=1225157&rev=1225157&view=diff
==============================================================================
--- karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/configuration/ConfigurationFilterUtil.java (original)
+++ karaf/webconsole/trunk/osgi/config/src/main/java/org/apache/karaf/webconsole/osgi/config/ConfigurationFilterUtil.java Wed Dec 28 10:39:46 2011
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.webconsole.osgi.internal.configuration;
+package org.apache.karaf.webconsole.osgi.config;
import java.util.HashMap;
import java.util.Map;
Added: karaf/webconsole/trunk/osgi/config/src/main/java/org/apache/karaf/webconsole/osgi/config/ConfigurationNavigationProvider.java
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/osgi/config/src/main/java/org/apache/karaf/webconsole/osgi/config/ConfigurationNavigationProvider.java?rev=1225157&view=auto
==============================================================================
--- karaf/webconsole/trunk/osgi/config/src/main/java/org/apache/karaf/webconsole/osgi/config/ConfigurationNavigationProvider.java (added)
+++ karaf/webconsole/trunk/osgi/config/src/main/java/org/apache/karaf/webconsole/osgi/config/ConfigurationNavigationProvider.java Wed Dec 28 10:39:46 2011
@@ -0,0 +1,20 @@
+package org.apache.karaf.webconsole.osgi.config;
+
+import static org.apache.karaf.webconsole.core.util.LinkUtils.createPageLink;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.karaf.webconsole.core.navigation.NavigationProvider;
+import org.apache.wicket.Page;
+import org.apache.wicket.markup.html.link.Link;
+
+public class ConfigurationNavigationProvider implements NavigationProvider {
+
+ public List<Link<Page>> getItems(String componentId, String labelId) {
+ List<Link<Page>> links = new ArrayList<Link<Page>>();
+ links.add(createPageLink(componentId, labelId, "Configuration", ConfigurationsPage.class));
+ return links;
+ }
+
+}
Copied: karaf/webconsole/trunk/osgi/config/src/main/java/org/apache/karaf/webconsole/osgi/config/ConfigurationProvider.java (from r1225156, karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/configuration/ConfigurationProvider.java)
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/osgi/config/src/main/java/org/apache/karaf/webconsole/osgi/config/ConfigurationProvider.java?p2=karaf/webconsole/trunk/osgi/config/src/main/java/org/apache/karaf/webconsole/osgi/config/ConfigurationProvider.java&p1=karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/configuration/ConfigurationProvider.java&r1=1225156&r2=1225157&rev=1225157&view=diff
==============================================================================
--- karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/configuration/ConfigurationProvider.java (original)
+++ karaf/webconsole/trunk/osgi/config/src/main/java/org/apache/karaf/webconsole/osgi/config/ConfigurationProvider.java Wed Dec 28 10:39:46 2011
@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.webconsole.osgi.internal.configuration;
+package org.apache.karaf.webconsole.osgi.config;
import java.util.Arrays;
import java.util.Iterator;
-import org.apache.karaf.webconsole.osgi.internal.configuration.model.ConfigurationModel;
-import org.apache.karaf.webconsole.osgi.internal.configuration.model.ConfigurationNotFoundException;
+import org.apache.karaf.webconsole.osgi.config.model.ConfigurationModel;
+import org.apache.karaf.webconsole.osgi.config.model.ConfigurationNotFoundException;
import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;
import org.apache.wicket.model.IModel;
import org.osgi.service.cm.Configuration;
Copied: karaf/webconsole/trunk/osgi/config/src/main/java/org/apache/karaf/webconsole/osgi/config/ConfigurationRemovePage.java (from r1225156, karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/configuration/ConfigurationRemovePage.java)
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/osgi/config/src/main/java/org/apache/karaf/webconsole/osgi/config/ConfigurationRemovePage.java?p2=karaf/webconsole/trunk/osgi/config/src/main/java/org/apache/karaf/webconsole/osgi/config/ConfigurationRemovePage.java&p1=karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/configuration/ConfigurationRemovePage.java&r1=1225156&r2=1225157&rev=1225157&view=diff
==============================================================================
--- karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/configuration/ConfigurationRemovePage.java (original)
+++ karaf/webconsole/trunk/osgi/config/src/main/java/org/apache/karaf/webconsole/osgi/config/ConfigurationRemovePage.java Wed Dec 28 10:39:46 2011
@@ -14,11 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.webconsole.osgi.internal.configuration;
+package org.apache.karaf.webconsole.osgi.config;
-import org.apache.karaf.webconsole.osgi.internal.OsgiPage;
-import org.apache.karaf.webconsole.osgi.internal.configuration.model.ConfigurationModel;
-import org.apache.karaf.webconsole.osgi.internal.configuration.view.ConfigurationRemoveForm;
+import org.apache.karaf.webconsole.osgi.config.model.ConfigurationModel;
+import org.apache.karaf.webconsole.osgi.config.view.ConfigurationRemoveForm;
+import org.apache.karaf.webconsole.osgi.framework.OsgiPage;
import org.apache.wicket.PageParameters;
import org.apache.wicket.markup.html.basic.Label;
import org.ops4j.pax.wicket.api.PaxWicketBean;
Copied: karaf/webconsole/trunk/osgi/config/src/main/java/org/apache/karaf/webconsole/osgi/config/ConfigurationsPage.java (from r1225156, karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/configuration/ConfigurationsPage.java)
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/osgi/config/src/main/java/org/apache/karaf/webconsole/osgi/config/ConfigurationsPage.java?p2=karaf/webconsole/trunk/osgi/config/src/main/java/org/apache/karaf/webconsole/osgi/config/ConfigurationsPage.java&p1=karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/configuration/ConfigurationsPage.java&r1=1225156&r2=1225157&rev=1225157&view=diff
==============================================================================
--- karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/configuration/ConfigurationsPage.java (original)
+++ karaf/webconsole/trunk/osgi/config/src/main/java/org/apache/karaf/webconsole/osgi/config/ConfigurationsPage.java Wed Dec 28 10:39:46 2011
@@ -14,10 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.webconsole.osgi.internal.configuration;
+package org.apache.karaf.webconsole.osgi.config;
-import org.apache.karaf.webconsole.osgi.internal.OsgiPage;
-import org.apache.karaf.webconsole.osgi.internal.configuration.view.ConfigurationsDataTable;
+import org.apache.karaf.webconsole.osgi.config.view.ConfigurationsDataTable;
+import org.apache.karaf.webconsole.osgi.framework.OsgiPage;
import org.apache.wicket.markup.html.CSSPackageResource;
import org.ops4j.pax.wicket.api.PaxWicketBean;
import org.ops4j.pax.wicket.api.PaxWicketMountPoint;
Copied: karaf/webconsole/trunk/osgi/config/src/main/java/org/apache/karaf/webconsole/osgi/config/model/ConfigurationModel.java (from r1225156, karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/configuration/model/ConfigurationModel.java)
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/osgi/config/src/main/java/org/apache/karaf/webconsole/osgi/config/model/ConfigurationModel.java?p2=karaf/webconsole/trunk/osgi/config/src/main/java/org/apache/karaf/webconsole/osgi/config/model/ConfigurationModel.java&p1=karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/configuration/model/ConfigurationModel.java&r1=1225156&r2=1225157&rev=1225157&view=diff
==============================================================================
--- karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/configuration/model/ConfigurationModel.java (original)
+++ karaf/webconsole/trunk/osgi/config/src/main/java/org/apache/karaf/webconsole/osgi/config/model/ConfigurationModel.java Wed Dec 28 10:39:46 2011
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.webconsole.osgi.internal.configuration.model;
+package org.apache.karaf.webconsole.osgi.config.model;
import java.io.IOException;
Copied: karaf/webconsole/trunk/osgi/config/src/main/java/org/apache/karaf/webconsole/osgi/config/model/ConfigurationNotFoundException.java (from r1225156, karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/configuration/model/ConfigurationNotFoundException.java)
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/osgi/config/src/main/java/org/apache/karaf/webconsole/osgi/config/model/ConfigurationNotFoundException.java?p2=karaf/webconsole/trunk/osgi/config/src/main/java/org/apache/karaf/webconsole/osgi/config/model/ConfigurationNotFoundException.java&p1=karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/configuration/model/ConfigurationNotFoundException.java&r1=1225156&r2=1225157&rev=1225157&view=diff
==============================================================================
--- karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/configuration/model/ConfigurationNotFoundException.java (original)
+++ karaf/webconsole/trunk/osgi/config/src/main/java/org/apache/karaf/webconsole/osgi/config/model/ConfigurationNotFoundException.java Wed Dec 28 10:39:46 2011
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.webconsole.osgi.internal.configuration.model;
+package org.apache.karaf.webconsole.osgi.config.model;
public class ConfigurationNotFoundException extends RuntimeException {
Copied: karaf/webconsole/trunk/osgi/config/src/main/java/org/apache/karaf/webconsole/osgi/config/model/ConfigurationsModel.java (from r1225156, karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/configuration/model/ConfigurationsModel.java)
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/osgi/config/src/main/java/org/apache/karaf/webconsole/osgi/config/model/ConfigurationsModel.java?p2=karaf/webconsole/trunk/osgi/config/src/main/java/org/apache/karaf/webconsole/osgi/config/model/ConfigurationsModel.java&p1=karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/configuration/model/ConfigurationsModel.java&r1=1225156&r2=1225157&rev=1225157&view=diff
==============================================================================
--- karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/configuration/model/ConfigurationsModel.java (original)
+++ karaf/webconsole/trunk/osgi/config/src/main/java/org/apache/karaf/webconsole/osgi/config/model/ConfigurationsModel.java Wed Dec 28 10:39:46 2011
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.webconsole.osgi.internal.configuration.model;
+package org.apache.karaf.webconsole.osgi.config.model;
import org.apache.wicket.model.LoadableDetachableModel;
import org.osgi.service.cm.Configuration;
Copied: karaf/webconsole/trunk/osgi/config/src/main/java/org/apache/karaf/webconsole/osgi/config/view/ConfigurationRemoveForm.java (from r1225156, karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/configuration/view/ConfigurationRemoveForm.java)
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/osgi/config/src/main/java/org/apache/karaf/webconsole/osgi/config/view/ConfigurationRemoveForm.java?p2=karaf/webconsole/trunk/osgi/config/src/main/java/org/apache/karaf/webconsole/osgi/config/view/ConfigurationRemoveForm.java&p1=karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/configuration/view/ConfigurationRemoveForm.java&r1=1225156&r2=1225157&rev=1225157&view=diff
==============================================================================
--- karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/configuration/view/ConfigurationRemoveForm.java (original)
+++ karaf/webconsole/trunk/osgi/config/src/main/java/org/apache/karaf/webconsole/osgi/config/view/ConfigurationRemoveForm.java Wed Dec 28 10:39:46 2011
@@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.webconsole.osgi.internal.configuration.view;
+package org.apache.karaf.webconsole.osgi.config.view;
import java.io.IOException;
-import org.apache.karaf.webconsole.osgi.internal.configuration.ConfigurationsPage;
-import org.apache.karaf.webconsole.osgi.internal.configuration.model.ConfigurationNotFoundException;
+import org.apache.karaf.webconsole.osgi.config.ConfigurationsPage;
+import org.apache.karaf.webconsole.osgi.config.model.ConfigurationNotFoundException;
import org.apache.wicket.markup.html.form.Button;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.IFormSubmittingComponent;
Copied: karaf/webconsole/trunk/osgi/config/src/main/java/org/apache/karaf/webconsole/osgi/config/view/ConfigurationsActionPanel.java (from r1225156, karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/configuration/view/ConfigurationsActionPanel.java)
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/osgi/config/src/main/java/org/apache/karaf/webconsole/osgi/config/view/ConfigurationsActionPanel.java?p2=karaf/webconsole/trunk/osgi/config/src/main/java/org/apache/karaf/webconsole/osgi/config/view/ConfigurationsActionPanel.java&p1=karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/configuration/view/ConfigurationsActionPanel.java&r1=1225156&r2=1225157&rev=1225157&view=diff
==============================================================================
--- karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/configuration/view/ConfigurationsActionPanel.java (original)
+++ karaf/webconsole/trunk/osgi/config/src/main/java/org/apache/karaf/webconsole/osgi/config/view/ConfigurationsActionPanel.java Wed Dec 28 10:39:46 2011
@@ -14,14 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.webconsole.osgi.internal.configuration.view;
+package org.apache.karaf.webconsole.osgi.config.view;
import java.util.Arrays;
import java.util.List;
import org.apache.karaf.webconsole.core.table.ActionsPanel;
-import org.apache.karaf.webconsole.osgi.internal.configuration.ConfigurationEditPage;
-import org.apache.karaf.webconsole.osgi.internal.configuration.ConfigurationRemovePage;
+import org.apache.karaf.webconsole.osgi.config.ConfigurationEditPage;
+import org.apache.karaf.webconsole.osgi.config.ConfigurationRemovePage;
import org.apache.wicket.PageParameters;
import org.apache.wicket.behavior.SimpleAttributeModifier;
import org.apache.wicket.markup.html.basic.Label;
Copied: karaf/webconsole/trunk/osgi/config/src/main/java/org/apache/karaf/webconsole/osgi/config/view/ConfigurationsDataTable.java (from r1225156, karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/configuration/view/ConfigurationsDataTable.java)
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/osgi/config/src/main/java/org/apache/karaf/webconsole/osgi/config/view/ConfigurationsDataTable.java?p2=karaf/webconsole/trunk/osgi/config/src/main/java/org/apache/karaf/webconsole/osgi/config/view/ConfigurationsDataTable.java&p1=karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/configuration/view/ConfigurationsDataTable.java&r1=1225156&r2=1225157&rev=1225157&view=diff
==============================================================================
--- karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/configuration/view/ConfigurationsDataTable.java (original)
+++ karaf/webconsole/trunk/osgi/config/src/main/java/org/apache/karaf/webconsole/osgi/config/view/ConfigurationsDataTable.java Wed Dec 28 10:39:46 2011
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.webconsole.osgi.internal.configuration.view;
+package org.apache.karaf.webconsole.osgi.config.view;
import java.util.Arrays;
import java.util.List;
Copied: karaf/webconsole/trunk/osgi/config/src/main/java/org/apache/karaf/webconsole/osgi/config/view/FactoryPidItem.java (from r1225156, karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/configuration/view/FactoryPidItem.java)
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/osgi/config/src/main/java/org/apache/karaf/webconsole/osgi/config/view/FactoryPidItem.java?p2=karaf/webconsole/trunk/osgi/config/src/main/java/org/apache/karaf/webconsole/osgi/config/view/FactoryPidItem.java&p1=karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/configuration/view/FactoryPidItem.java&r1=1225156&r2=1225157&rev=1225157&view=diff
==============================================================================
--- karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/configuration/view/FactoryPidItem.java (original)
+++ karaf/webconsole/trunk/osgi/config/src/main/java/org/apache/karaf/webconsole/osgi/config/view/FactoryPidItem.java Wed Dec 28 10:39:46 2011
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.webconsole.osgi.internal.configuration.view;
+package org.apache.karaf.webconsole.osgi.config.view;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.repeater.OddEvenItem;
Copied: karaf/webconsole/trunk/osgi/config/src/main/resources/OSGI-INF/blueprint/config.xml (from r1225156, karaf/webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/configuration/ConfigurationsPage.html)
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/osgi/config/src/main/resources/OSGI-INF/blueprint/config.xml?p2=karaf/webconsole/trunk/osgi/config/src/main/resources/OSGI-INF/blueprint/config.xml&p1=karaf/webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/configuration/ConfigurationsPage.html&r1=1225156&r2=1225157&rev=1225157&view=diff
==============================================================================
--- karaf/webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/configuration/ConfigurationsPage.html (original)
+++ karaf/webconsole/trunk/osgi/config/src/main/resources/OSGI-INF/blueprint/config.xml Wed Dec 28 10:39:46 2011
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -15,18 +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" >
- <wicket:head>
- <title>Karaf WebConsole</title>
- </wicket:head>
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
- <body>
+ <service ref="configNavigationProvider" interface="org.apache.karaf.webconsole.core.navigation.NavigationProvider">
+ <service-properties>
+ <entry key="extends" value="osgi" />
+ </service-properties>
+ </service>
- <wicket:extend>
- <h1>Configurations</h1>
+ <bean id="configNavigationProvider" class="org.apache.karaf.webconsole.osgi.config.ConfigurationNavigationProvider" />
- <table wicket:id="configurations" class="dataview" />
+ <reference id="configurationAdmin" interface="org.osgi.service.cm.ConfigurationAdmin" />
- </wicket:extend>
- </body>
-</html>
+</blueprint>
Copied: karaf/webconsole/trunk/osgi/config/src/main/resources/org/apache/karaf/webconsole/osgi/config/ConfigurationEditPage.html (from r1225156, karaf/webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/configuration/ConfigurationEditPage.html)
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/osgi/config/src/main/resources/org/apache/karaf/webconsole/osgi/config/ConfigurationEditPage.html?p2=karaf/webconsole/trunk/osgi/config/src/main/resources/org/apache/karaf/webconsole/osgi/config/ConfigurationEditPage.html&p1=karaf/webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/configuration/ConfigurationEditPage.html&r1=1225156&r2=1225157&rev=1225157&view=diff
==============================================================================
(empty)
Copied: karaf/webconsole/trunk/osgi/config/src/main/resources/org/apache/karaf/webconsole/osgi/config/ConfigurationRemovePage.html (from r1225156, karaf/webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/configuration/ConfigurationRemovePage.html)
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/osgi/config/src/main/resources/org/apache/karaf/webconsole/osgi/config/ConfigurationRemovePage.html?p2=karaf/webconsole/trunk/osgi/config/src/main/resources/org/apache/karaf/webconsole/osgi/config/ConfigurationRemovePage.html&p1=karaf/webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/configuration/ConfigurationRemovePage.html&r1=1225156&r2=1225157&rev=1225157&view=diff
==============================================================================
(empty)
Copied: karaf/webconsole/trunk/osgi/config/src/main/resources/org/apache/karaf/webconsole/osgi/config/ConfigurationsPage.html (from r1225156, karaf/webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/configuration/ConfigurationsPage.html)
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/osgi/config/src/main/resources/org/apache/karaf/webconsole/osgi/config/ConfigurationsPage.html?p2=karaf/webconsole/trunk/osgi/config/src/main/resources/org/apache/karaf/webconsole/osgi/config/ConfigurationsPage.html&p1=karaf/webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/configuration/ConfigurationsPage.html&r1=1225156&r2=1225157&rev=1225157&view=diff
==============================================================================
(empty)
Copied: karaf/webconsole/trunk/osgi/config/src/main/resources/org/apache/karaf/webconsole/osgi/config/configurations.css (from r1225156, karaf/webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/configuration/configurations.css)
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/osgi/config/src/main/resources/org/apache/karaf/webconsole/osgi/config/configurations.css?p2=karaf/webconsole/trunk/osgi/config/src/main/resources/org/apache/karaf/webconsole/osgi/config/configurations.css&p1=karaf/webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/configuration/configurations.css&r1=1225156&r2=1225157&rev=1225157&view=diff
==============================================================================
(empty)
Copied: karaf/webconsole/trunk/osgi/event/pom.xml (from r1225156, karaf/webconsole/trunk/osgi/pom.xml)
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/osgi/event/pom.xml?p2=karaf/webconsole/trunk/osgi/event/pom.xml&p1=karaf/webconsole/trunk/osgi/pom.xml&r1=1225156&r2=1225157&rev=1225157&view=diff
==============================================================================
--- karaf/webconsole/trunk/osgi/pom.xml (original)
+++ karaf/webconsole/trunk/osgi/event/pom.xml Wed Dec 28 10:39:46 2011
@@ -20,26 +20,24 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.karaf</groupId>
- <artifactId>webconsole</artifactId>
+ <groupId>org.apache.karaf.webconsole</groupId>
+ <artifactId>osgi</artifactId>
<version>0.3.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.karaf.webconsole</groupId>
- <artifactId>org.apache.karaf.webconsole.osgi</artifactId>
- <name>Apache Karaf :: WebConsole :: OSGi Bundle Presentation</name>
+ <groupId>org.apache.karaf.webconsole.osgi</groupId>
+ <artifactId>org.apache.karaf.webconsole.osgi.event</artifactId>
+ <name>Apache Karaf :: WebConsole :: OSGi :: Event</name>
<packaging>bundle</packaging>
<dependencies>
<dependency>
- <groupId>org.apache.karaf.webconsole</groupId>
- <artifactId>org.apache.karaf.webconsole.core</artifactId>
- <version>${project.version}</version>
+ <groupId>org.apache.karaf.webconsole.osgi</groupId>
+ <artifactId>org.apache.karaf.webconsole.osgi.framework</artifactId>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
- <version>4.2.0</version>
</dependency>
</dependencies>
@@ -48,25 +46,22 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.3.5</version>
- <extensions>true</extensions>
<configuration>
<instructions>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Import-Package>
- !org.apache.karaf.webconsole.osgi*,
+ !org.apache.karaf.webconsole.osgi.event*,
*,<!-- let bnd import direct dependencies -->
<!-- transient dependencies -->
org.ops4j.pax.wicket.api,
org.ops4j.pax.wicket.util,
org.ops4j.pax.wicket.util.proxy
</Import-Package>
- <Export-Package>
- org.apache.karaf.webconsole.osgi.bundle,
- org.apache.karaf.webconsole.osgi.bundle.view
- </Export-Package>
+ <Export-Package></Export-Package>
+ <Private-Package>org.apache.karaf.webconsole.osgi.event*</Private-Package>
</instructions>
</configuration>
+ <extensions>true</extensions>
</plugin>
</plugins>
</build>
Copied: karaf/webconsole/trunk/osgi/event/src/main/java/org/apache/karaf/webconsole/osgi/event/EventNavigationProvider.java (from r1225156, karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/navigation/OsgiConsoleTabProvider.java)
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/osgi/event/src/main/java/org/apache/karaf/webconsole/osgi/event/EventNavigationProvider.java?p2=karaf/webconsole/trunk/osgi/event/src/main/java/org/apache/karaf/webconsole/osgi/event/EventNavigationProvider.java&p1=karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/navigation/OsgiConsoleTabProvider.java&r1=1225156&r2=1225157&rev=1225157&view=diff
==============================================================================
--- karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/navigation/OsgiConsoleTabProvider.java (original)
+++ karaf/webconsole/trunk/osgi/event/src/main/java/org/apache/karaf/webconsole/osgi/event/EventNavigationProvider.java Wed Dec 28 10:39:46 2011
@@ -14,28 +14,26 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.webconsole.osgi.internal.navigation;
+package org.apache.karaf.webconsole.osgi.event;
-import java.util.Collections;
+import static org.apache.karaf.webconsole.core.util.LinkUtils.createPageLink;
+
+import java.util.ArrayList;
import java.util.List;
-import org.apache.karaf.webconsole.core.navigation.ConsoleTabProvider;
-import org.apache.karaf.webconsole.osgi.internal.bundle.BundlesPage;
+import org.apache.karaf.webconsole.core.navigation.NavigationProvider;
import org.apache.wicket.Page;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.link.BookmarkablePageLink;
import org.apache.wicket.markup.html.link.Link;
-public class OsgiConsoleTabProvider implements ConsoleTabProvider {
-
- public Link<Page> getModuleLink(String componentId, String labelId) {
- Link<Page> link = new BookmarkablePageLink<Page>(componentId, BundlesPage.class);
- link.add(new Label(labelId, "Bundles"));
- return link;
- }
+/**
+ * Navigation provider which produces a link to events page.
+ */
+public class EventNavigationProvider implements NavigationProvider {
public List<Link<Page>> getItems(String componentId, String labelId) {
- return Collections.emptyList();
+ List<Link<Page>> links = new ArrayList<Link<Page>>();
+ links.add(createPageLink(componentId, labelId, "Events", EventsPage.class));
+ return links;
}
}
Copied: karaf/webconsole/trunk/osgi/event/src/main/java/org/apache/karaf/webconsole/osgi/event/EventsPage.java (from r1225156, karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/event/EventsPage.java)
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/osgi/event/src/main/java/org/apache/karaf/webconsole/osgi/event/EventsPage.java?p2=karaf/webconsole/trunk/osgi/event/src/main/java/org/apache/karaf/webconsole/osgi/event/EventsPage.java&p1=karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/event/EventsPage.java&r1=1225156&r2=1225157&rev=1225157&view=diff
==============================================================================
--- karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/event/EventsPage.java (original)
+++ karaf/webconsole/trunk/osgi/event/src/main/java/org/apache/karaf/webconsole/osgi/event/EventsPage.java Wed Dec 28 10:39:46 2011
@@ -14,20 +14,23 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.webconsole.osgi.internal.event;
+package org.apache.karaf.webconsole.osgi.event;
import java.util.ArrayList;
import java.util.List;
import org.apache.karaf.webconsole.core.table.OrdinalColumn;
import org.apache.karaf.webconsole.core.table.PropertyColumnExt;
-import org.apache.karaf.webconsole.osgi.internal.OsgiPage;
-import org.apache.karaf.webconsole.osgi.internal.event.model.EventTopicInfo;
-import org.apache.karaf.webconsole.osgi.internal.event.model.EventTopicsProvider;
+import org.apache.karaf.webconsole.osgi.event.model.EventTopicInfo;
+import org.apache.karaf.webconsole.osgi.event.model.EventTopicsProvider;
+import org.apache.karaf.webconsole.osgi.framework.OsgiPage;
import org.apache.wicket.extensions.markup.html.repeater.data.table.DefaultDataTable;
import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
import org.ops4j.pax.wicket.api.PaxWicketMountPoint;
+/**
+ * Events admin.
+ */
@PaxWicketMountPoint(mountPoint = "/osgi/event")
public class EventsPage extends OsgiPage {
Copied: karaf/webconsole/trunk/osgi/event/src/main/java/org/apache/karaf/webconsole/osgi/event/model/EventTopicInfo.java (from r1225156, karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/bundle/model/BundlesModel.java)
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/osgi/event/src/main/java/org/apache/karaf/webconsole/osgi/event/model/EventTopicInfo.java?p2=karaf/webconsole/trunk/osgi/event/src/main/java/org/apache/karaf/webconsole/osgi/event/model/EventTopicInfo.java&p1=karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/bundle/model/BundlesModel.java&r1=1225156&r2=1225157&rev=1225157&view=diff
==============================================================================
--- karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/bundle/model/BundlesModel.java (original)
+++ karaf/webconsole/trunk/osgi/event/src/main/java/org/apache/karaf/webconsole/osgi/event/model/EventTopicInfo.java Wed Dec 28 10:39:46 2011
@@ -14,23 +14,32 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.webconsole.osgi.internal.bundle.model;
+package org.apache.karaf.webconsole.osgi.event.model;
-import org.apache.wicket.model.LoadableDetachableModel;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
+import java.io.Serializable;
-public class BundlesModel extends LoadableDetachableModel<Bundle[]> {
+/**
+ * POJO to collect a topic name and number of subscribers/consumers.
+ */
+public class EventTopicInfo implements Serializable {
+
+ private String topic;
+ private int consumers;
- private final BundleContext context;
+ public EventTopicInfo(String topic, int consumers) {
+ this.topic = topic;
+ this.consumers = consumers;
+ }
- public BundlesModel(BundleContext context) {
- this.context = context;
+ public String getTopic() {
+ return topic;
}
- @Override
- protected Bundle[] load() {
- return context.getBundles();
+ public int getConsumers() {
+ return consumers;
}
+ public void addConsumer() {
+ consumers++;
+ }
}
Copied: karaf/webconsole/trunk/osgi/event/src/main/java/org/apache/karaf/webconsole/osgi/event/model/EventTopicsProvider.java (from r1225156, karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/event/model/EventTopicsProvider.java)
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/osgi/event/src/main/java/org/apache/karaf/webconsole/osgi/event/model/EventTopicsProvider.java?p2=karaf/webconsole/trunk/osgi/event/src/main/java/org/apache/karaf/webconsole/osgi/event/model/EventTopicsProvider.java&p1=karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/event/model/EventTopicsProvider.java&r1=1225156&r2=1225157&rev=1225157&view=diff
==============================================================================
--- karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/event/model/EventTopicsProvider.java (original)
+++ karaf/webconsole/trunk/osgi/event/src/main/java/org/apache/karaf/webconsole/osgi/event/model/EventTopicsProvider.java Wed Dec 28 10:39:46 2011
@@ -1,4 +1,20 @@
-package org.apache.karaf.webconsole.osgi.internal.event.model;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.karaf.webconsole.osgi.event.model;
import java.util.HashMap;
import java.util.Iterator;
@@ -13,6 +29,9 @@ import org.osgi.framework.ServiceReferen
import org.osgi.service.event.EventConstants;
import org.osgi.service.event.EventHandler;
+/**
+ * Simple data provider which collects topic names from a registered listeners.
+ */
public class EventTopicsProvider extends SortableDataProvider<EventTopicInfo> {
private Map<String, EventTopicInfo> topics = new HashMap<String, EventTopicInfo>();
Copied: karaf/webconsole/trunk/osgi/event/src/main/resources/OSGI-INF/blueprint/event.xml (from r1225156, karaf/webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/bundle/BundlesPage.html)
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/osgi/event/src/main/resources/OSGI-INF/blueprint/event.xml?p2=karaf/webconsole/trunk/osgi/event/src/main/resources/OSGI-INF/blueprint/event.xml&p1=karaf/webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/bundle/BundlesPage.html&r1=1225156&r2=1225157&rev=1225157&view=diff
==============================================================================
--- karaf/webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/bundle/BundlesPage.html (original)
+++ karaf/webconsole/trunk/osgi/event/src/main/resources/OSGI-INF/blueprint/event.xml Wed Dec 28 10:39:46 2011
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -15,17 +15,14 @@
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>
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
- <body>
- <wicket:extend>
- <h1>Bundles</h1>
+ <service ref="eventNavigationProvider" interface="org.apache.karaf.webconsole.core.navigation.NavigationProvider">
+ <service-properties>
+ <entry key="extends" value="osgi" />
+ </service-properties>
+ </service>
- <table wicket:id="bundles" class="dataview" />
+ <bean id="eventNavigationProvider" class="org.apache.karaf.webconsole.osgi.event.EventNavigationProvider" />
- </wicket:extend>
- </body>
-</html>
+</blueprint>
Copied: karaf/webconsole/trunk/osgi/event/src/main/resources/org/apache/karaf/webconsole/osgi/event/EventsPage.html (from r1225156, karaf/webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/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?p2=karaf/webconsole/trunk/osgi/event/src/main/resources/org/apache/karaf/webconsole/osgi/event/EventsPage.html&p1=karaf/webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/event/EventsPage.html&r1=1225156&r2=1225157&rev=1225157&view=diff
==============================================================================
(empty)
Copied: karaf/webconsole/trunk/osgi/framework/pom.xml (from r1225156, karaf/webconsole/trunk/osgi/pom.xml)
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/osgi/framework/pom.xml?p2=karaf/webconsole/trunk/osgi/framework/pom.xml&p1=karaf/webconsole/trunk/osgi/pom.xml&r1=1225156&r2=1225157&rev=1225157&view=diff
==============================================================================
--- karaf/webconsole/trunk/osgi/pom.xml (original)
+++ karaf/webconsole/trunk/osgi/framework/pom.xml Wed Dec 28 10:39:46 2011
@@ -20,14 +20,14 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.karaf</groupId>
- <artifactId>webconsole</artifactId>
+ <groupId>org.apache.karaf.webconsole</groupId>
+ <artifactId>osgi</artifactId>
<version>0.3.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.karaf.webconsole</groupId>
- <artifactId>org.apache.karaf.webconsole.osgi</artifactId>
- <name>Apache Karaf :: WebConsole :: OSGi Bundle Presentation</name>
+ <groupId>org.apache.karaf.webconsole.osgi</groupId>
+ <artifactId>org.apache.karaf.webconsole.osgi.framework</artifactId>
+ <name>Apache Karaf :: WebConsole :: OSGi :: Framework</name>
<packaging>bundle</packaging>
<dependencies>
@@ -39,7 +39,6 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
- <version>4.2.0</version>
</dependency>
</dependencies>
@@ -48,25 +47,20 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.3.5</version>
- <extensions>true</extensions>
<configuration>
<instructions>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Import-Package>
- !org.apache.karaf.webconsole.osgi*,
+ !org.apache.karaf.webconsole.osgi.framework*,
*,<!-- let bnd import direct dependencies -->
<!-- transient dependencies -->
org.ops4j.pax.wicket.api,
org.ops4j.pax.wicket.util,
org.ops4j.pax.wicket.util.proxy
</Import-Package>
- <Export-Package>
- org.apache.karaf.webconsole.osgi.bundle,
- org.apache.karaf.webconsole.osgi.bundle.view
- </Export-Package>
</instructions>
</configuration>
+ <extensions>true</extensions>
</plugin>
</plugins>
</build>
Copied: karaf/webconsole/trunk/osgi/framework/src/main/java/org/apache/karaf/webconsole/osgi/framework/BundleModel.java (from r1225156, karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/bundle/model/BundleModel.java)
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/osgi/framework/src/main/java/org/apache/karaf/webconsole/osgi/framework/BundleModel.java?p2=karaf/webconsole/trunk/osgi/framework/src/main/java/org/apache/karaf/webconsole/osgi/framework/BundleModel.java&p1=karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/bundle/model/BundleModel.java&r1=1225156&r2=1225157&rev=1225157&view=diff
==============================================================================
--- karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/bundle/model/BundleModel.java (original)
+++ karaf/webconsole/trunk/osgi/framework/src/main/java/org/apache/karaf/webconsole/osgi/framework/BundleModel.java Wed Dec 28 10:39:46 2011
@@ -9,25 +9,29 @@
* 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,
+ * distributed under the License is .istributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.webconsole.osgi.internal.bundle.model;
+package org.apache.karaf.webconsole.osgi.framework;
import org.apache.wicket.model.LoadableDetachableModel;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
+/**
+ * Bundle model, allows to use a bundle properties wrapped in CompoundPropertyModel.
+ */
public class BundleModel extends LoadableDetachableModel<Bundle> {
- private long bundleId;
private BundleContext context;
+ private long bundleId;
- public BundleModel(long bundleId, BundleContext context) {
- this.bundleId = bundleId;
+ public BundleModel(BundleContext context, Bundle bundle) {
+ super(bundle);
this.context = context;
+ bundleId = bundle.getBundleId();
}
@Override
Copied: karaf/webconsole/trunk/osgi/framework/src/main/java/org/apache/karaf/webconsole/osgi/framework/OsgiPage.java (from r1225156, karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/OsgiPage.java)
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/osgi/framework/src/main/java/org/apache/karaf/webconsole/osgi/framework/OsgiPage.java?p2=karaf/webconsole/trunk/osgi/framework/src/main/java/org/apache/karaf/webconsole/osgi/framework/OsgiPage.java&p1=karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/OsgiPage.java&r1=1225156&r2=1225157&rev=1225157&view=diff
==============================================================================
--- karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/OsgiPage.java (original)
+++ karaf/webconsole/trunk/osgi/framework/src/main/java/org/apache/karaf/webconsole/osgi/framework/OsgiPage.java Wed Dec 28 10:39:46 2011
@@ -14,23 +14,25 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.webconsole.osgi.internal;
+package org.apache.karaf.webconsole.osgi.framework;
-import org.apache.karaf.webconsole.core.navigation.SidebarProvider;
-import org.apache.karaf.webconsole.core.page.SidebarPage;
+import org.apache.karaf.webconsole.core.page.SecuredPage;
import org.ops4j.pax.wicket.api.PaxWicketBean;
import org.osgi.framework.BundleContext;
-public abstract class OsgiPage extends SidebarPage {
+/**
+ * Base page class for extensions which use {@link BundleContext}.
+ */
+public abstract class OsgiPage extends SecuredPage {
- @PaxWicketBean(name = "osgiSidebar")
- private SidebarProvider provider;
+ //@PaxWicketBean(name = "osgiSidebar")
+ //private SidebarProvider provider;
@PaxWicketBean(name = "blueprintBundleContext")
protected BundleContext context;
protected OsgiPage() {
- setSidebarProvider(provider);
+ //setSidebarProvider(provider);
}
}
Copied: karaf/webconsole/trunk/osgi/framework/src/main/java/org/apache/karaf/webconsole/osgi/framework/SystemBundleModel.java (from r1225156, karaf/webconsole/trunk/blueprint/src/main/java/org/apache/karaf/webconsole/blueprint/internal/BlueprintState.java)
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/osgi/framework/src/main/java/org/apache/karaf/webconsole/osgi/framework/SystemBundleModel.java?p2=karaf/webconsole/trunk/osgi/framework/src/main/java/org/apache/karaf/webconsole/osgi/framework/SystemBundleModel.java&p1=karaf/webconsole/trunk/blueprint/src/main/java/org/apache/karaf/webconsole/blueprint/internal/BlueprintState.java&r1=1225156&r2=1225157&rev=1225157&view=diff
==============================================================================
--- karaf/webconsole/trunk/blueprint/src/main/java/org/apache/karaf/webconsole/blueprint/internal/BlueprintState.java (original)
+++ karaf/webconsole/trunk/osgi/framework/src/main/java/org/apache/karaf/webconsole/osgi/framework/SystemBundleModel.java Wed Dec 28 10:39:46 2011
@@ -14,18 +14,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.webconsole.blueprint.internal;
+package org.apache.karaf.webconsole.osgi.framework;
+
+import org.osgi.framework.BundleContext;
/**
- * Copied from karaf sell console. ;)
+ * A system bundle model. Requires only a bundle context to work.
*/
-public enum BlueprintState {
- Unknown,
- Creating,
- Created,
- Destroying,
- Destroyed,
- Failure,
- GracePeriod,
- Waiting
-}
\ No newline at end of file
+public class SystemBundleModel extends BundleModel {
+
+ public SystemBundleModel(BundleContext context) {
+ super(context, context.getBundle(0));
+ }
+
+}