(karaf) branch karaf-4.4.x updated: KARAF-7795 Fix handling of custom info providers in shell:info command.

[ldywicki]

This is an automated email from the ASF dual-hosted git repository.

ldywicki pushed a commit to branch karaf-4.4.x
in repository https://gitbox.apache.org/repos/asf/karaf.git


The following commit(s) were added to refs/heads/karaf-4.4.x by this push:
 new ce6cb4ca66 KARAF-7795 Fix handling of custom info providers in 
shell:info command.
ce6cb4ca66 is described below

commit ce6cb4ca660429d0dfa527c0c0e475d245ef7a10
Author: Łukasz Dywicki 
AuthorDate: Tue Jan 9 13:41:09 2024 +0100

KARAF-7795 Fix handling of custom info providers in shell:info command.

Signed-off-by: Łukasz Dywicki 
---
 .../src/main/java/org/apache/karaf/shell/commands/impl/InfoAction.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git 
a/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/InfoAction.java
 
b/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/InfoAction.java
index 22dea86509..040edb09c5 100644
--- 
a/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/InfoAction.java
+++ 
b/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/InfoAction.java
@@ -40,6 +40,7 @@ import java.util.Map;
 import java.util.Properties;
 import java.util.concurrent.Callable;
 
+import org.apache.karaf.shell.api.action.lifecycle.Reference;
 import org.apache.karaf.shell.commands.info.InfoProvider;
 import org.apache.karaf.shell.api.action.Action;
 import org.apache.karaf.shell.api.action.Command;
@@ -63,7 +64,7 @@ public class InfoAction implements Action {
 @Option(name="--memory-pools", aliases= {"-mp"}, description="Includes 
detailed information about memory pools")
 protected boolean showMemoryPools;
 
-//@Reference
+@Reference
 List infoProviders;
 
 public InfoAction() {

(karaf) branch main updated: KARAF-7795 Fix handling of custom info providers in shell:info command.

[ldywicki]

This is an automated email from the ASF dual-hosted git repository.

ldywicki pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/karaf.git


The following commit(s) were added to refs/heads/main by this push:
 new cba422e810 KARAF-7795 Fix handling of custom info providers in 
shell:info command.
cba422e810 is described below

commit cba422e8103d8677e313ef95c3c0f171cbd82c0e
Author: Łukasz Dywicki 
AuthorDate: Tue Jan 9 13:41:09 2024 +0100

KARAF-7795 Fix handling of custom info providers in shell:info command.

Signed-off-by: Łukasz Dywicki 
---
 .../src/main/java/org/apache/karaf/shell/commands/impl/InfoAction.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git 
a/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/InfoAction.java
 
b/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/InfoAction.java
index 22dea86509..040edb09c5 100644
--- 
a/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/InfoAction.java
+++ 
b/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/InfoAction.java
@@ -40,6 +40,7 @@ import java.util.Map;
 import java.util.Properties;
 import java.util.concurrent.Callable;
 
+import org.apache.karaf.shell.api.action.lifecycle.Reference;
 import org.apache.karaf.shell.commands.info.InfoProvider;
 import org.apache.karaf.shell.api.action.Action;
 import org.apache.karaf.shell.api.action.Command;
@@ -63,7 +64,7 @@ public class InfoAction implements Action {
 @Option(name="--memory-pools", aliases= {"-mp"}, description="Includes 
detailed information about memory pools")
 protected boolean showMemoryPools;
 
-//@Reference
+@Reference
 List infoProviders;
 
 public InfoAction() {

(karaf) branch karaf-4.3.x updated: KARAF-7795 Fix handling of custom info providers in shell:info command.

[ldywicki]

This is an automated email from the ASF dual-hosted git repository.

ldywicki pushed a commit to branch karaf-4.3.x
in repository https://gitbox.apache.org/repos/asf/karaf.git


The following commit(s) were added to refs/heads/karaf-4.3.x by this push:
 new 192eff4f79 KARAF-7795 Fix handling of custom info providers in 
shell:info command.
192eff4f79 is described below

commit 192eff4f795f76c918a99ecd6c0a28a265846977
Author: Łukasz Dywicki 
AuthorDate: Tue Jan 9 13:41:09 2024 +0100

KARAF-7795 Fix handling of custom info providers in shell:info command.

Signed-off-by: Łukasz Dywicki 
---
 .../src/main/java/org/apache/karaf/shell/commands/impl/InfoAction.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git 
a/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/InfoAction.java
 
b/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/InfoAction.java
index 22dea86509..040edb09c5 100644
--- 
a/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/InfoAction.java
+++ 
b/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/InfoAction.java
@@ -40,6 +40,7 @@ import java.util.Map;
 import java.util.Properties;
 import java.util.concurrent.Callable;
 
+import org.apache.karaf.shell.api.action.lifecycle.Reference;
 import org.apache.karaf.shell.commands.info.InfoProvider;
 import org.apache.karaf.shell.api.action.Action;
 import org.apache.karaf.shell.api.action.Command;
@@ -63,7 +64,7 @@ public class InfoAction implements Action {
 @Option(name="--memory-pools", aliases= {"-mp"}, description="Includes 
detailed information about memory pools")
 protected boolean showMemoryPools;
 
-//@Reference
+@Reference
 List infoProviders;
 
 public InfoAction() {

(karaf) branch karaf-4.2.x updated: KARAF-7795 Fix handling of custom info providers in shell:info command.

[ldywicki]

This is an automated email from the ASF dual-hosted git repository.

ldywicki pushed a commit to branch karaf-4.2.x
in repository https://gitbox.apache.org/repos/asf/karaf.git


The following commit(s) were added to refs/heads/karaf-4.2.x by this push:
 new 3aa0d37074 KARAF-7795 Fix handling of custom info providers in 
shell:info command.
3aa0d37074 is described below

commit 3aa0d37074a50ad33dfc5b80d50e96b6faf62d5c
Author: Łukasz Dywicki 
AuthorDate: Tue Jan 9 13:41:09 2024 +0100

KARAF-7795 Fix handling of custom info providers in shell:info command.

Signed-off-by: Łukasz Dywicki 
---
 .../src/main/java/org/apache/karaf/shell/commands/impl/InfoAction.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git 
a/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/InfoAction.java
 
b/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/InfoAction.java
index 22dea86509..040edb09c5 100644
--- 
a/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/InfoAction.java
+++ 
b/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/InfoAction.java
@@ -40,6 +40,7 @@ import java.util.Map;
 import java.util.Properties;
 import java.util.concurrent.Callable;
 
+import org.apache.karaf.shell.api.action.lifecycle.Reference;
 import org.apache.karaf.shell.commands.info.InfoProvider;
 import org.apache.karaf.shell.api.action.Action;
 import org.apache.karaf.shell.api.action.Command;
@@ -63,7 +64,7 @@ public class InfoAction implements Action {
 @Option(name="--memory-pools", aliases= {"-mp"}, description="Includes 
detailed information about memory pools")
 protected boolean showMemoryPools;
 
-//@Reference
+@Reference
 List infoProviders;
 
 public InfoAction() {

[karaf] branch karaf-4.1.x updated: KARAF-5994 karaf-maven-plugin use user supplied settings.xml

[ldywicki]

This is an automated email from the ASF dual-hosted git repository.

ldywicki pushed a commit to branch karaf-4.1.x
in repository https://gitbox.apache.org/repos/asf/karaf.git


The following commit(s) were added to refs/heads/karaf-4.1.x by this push:
 new f50524d  KARAF-5994 karaf-maven-plugin use user supplied settings.xml
f50524d is described below

commit f50524d1c5d2fb094055045631ca10fa12905316
Author: Paul Campbell 
AuthorDate: Fri Sep 28 16:49:20 2018 +0100

KARAF-5994 karaf-maven-plugin use user supplied settings.xml
---
 .../src/main/java/org/apache/karaf/tooling/utils/MojoSupport.java | 8 
 1 file changed, 8 insertions(+)

diff --git 
a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/utils/MojoSupport.java
 
b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/utils/MojoSupport.java
index 0c2f4fa..dd415cf 100644
--- 
a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/utils/MojoSupport.java
+++ 
b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/utils/MojoSupport.java
@@ -129,6 +129,14 @@ public abstract class MojoSupport extends AbstractMojo {
 // called by Plexus when injecting the mojo's session
 public void setMavenSession(MavenSession mavenSession) {
 this.mavenSession = mavenSession;
+
+if (mavenSession != null) {
+// check for custom settings.xml and pass it onto pax-url-aether
+File settingsFile = 
mavenSession.getRequest().getUserSettingsFile();
+if (settingsFile != null && settingsFile.isFile()) {
+System.setProperty("org.ops4j.pax.url.mvn.settings", 
settingsFile.getPath());
+}
+}
 }
 
 protected Map createManagedVersionMap(String projectId,

[karaf] branch karaf-4.0.x updated: KARAF-5994 karaf-maven-plugin use user supplied settings.xml

[ldywicki]

This is an automated email from the ASF dual-hosted git repository.

ldywicki pushed a commit to branch karaf-4.0.x
in repository https://gitbox.apache.org/repos/asf/karaf.git


The following commit(s) were added to refs/heads/karaf-4.0.x by this push:
 new f0c396c  KARAF-5994 karaf-maven-plugin use user supplied settings.xml
f0c396c is described below

commit f0c396cede58acbee98041abde7de4e315b36dca
Author: Paul Campbell 
AuthorDate: Fri Sep 28 16:49:20 2018 +0100

KARAF-5994 karaf-maven-plugin use user supplied settings.xml
---
 .../src/main/java/org/apache/karaf/tooling/utils/MojoSupport.java | 8 
 1 file changed, 8 insertions(+)

diff --git 
a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/utils/MojoSupport.java
 
b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/utils/MojoSupport.java
index 6794f8b..a77d8cd 100644
--- 
a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/utils/MojoSupport.java
+++ 
b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/utils/MojoSupport.java
@@ -129,6 +129,14 @@ public abstract class MojoSupport extends AbstractMojo {
 // called by Plexus when injecting the mojo's session
 public void setMavenSession(MavenSession mavenSession) {
 this.mavenSession = mavenSession;
+
+if (mavenSession != null) {
+// check for custom settings.xml and pass it onto pax-url-aether
+File settingsFile = 
mavenSession.getRequest().getUserSettingsFile();
+if (settingsFile != null && settingsFile.isFile()) {
+System.setProperty("org.ops4j.pax.url.mvn.settings", 
settingsFile.getPath());
+}
+}
 }
 
 protected Map createManagedVersionMap(String projectId,

[karaf] branch karaf-4.1.x updated: KARAF-5992 Allow multiple values for profilesUri option.

[ldywicki]

This is an automated email from the ASF dual-hosted git repository.

ldywicki pushed a commit to branch karaf-4.1.x
in repository https://gitbox.apache.org/repos/asf/karaf.git


The following commit(s) were added to refs/heads/karaf-4.1.x by this push:
 new d279e36  KARAF-5992 Allow multiple values for profilesUri option.
d279e36 is described below

commit d279e36f3e8fc9a2ed02e3e32b860dd908fa2d6d
Author: Łukasz Dywicki 
AuthorDate: Mon Oct 29 19:39:37 2018 +0100

KARAF-5992 Allow multiple values for profilesUri option.
---
 .../src/main/java/org/apache/karaf/tooling/AssemblyMojo.java | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git 
a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/AssemblyMojo.java
 
b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/AssemblyMojo.java
index a2d2418..d659789 100644
--- 
a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/AssemblyMojo.java
+++ 
b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/AssemblyMojo.java
@@ -25,6 +25,7 @@ import java.io.InputStream;
 import java.nio.file.Files;
 import java.nio.file.attribute.PosixFilePermissions;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
@@ -431,7 +432,9 @@ public class AssemblyMojo extends MojoSupport {
.defaultAddAll(installAllFeaturesByDefault)
.ignoreDependencyFlag(ignoreDependencyFlag);
 if (profilesUri != null) {
-builder.profilesUris(profilesUri);
+Arrays.stream(profilesUri.split(","))
+.map(String::trim)
+.forEach(builder::profilesUris);
 }
 if (libraries != null) {
 builder.libraries(libraries.toArray(new String[libraries.size()]));

[karaf] branch karaf-4.0.x updated: [KARAF-5585] Do not provide maven settings to pax url if they are gone.

[ldywicki]

This is an automated email from the ASF dual-hosted git repository.

ldywicki pushed a commit to branch karaf-4.0.x
in repository https://gitbox.apache.org/repos/asf/karaf.git


The following commit(s) were added to refs/heads/karaf-4.0.x by this push:
 new 002718d  [KARAF-5585] Do not provide maven settings to pax url if they 
are gone.
002718d is described below

commit 002718dfe7f1f7c67c86b0e526ad1182b278298c
Author: Łukasz Dywicki <l...@code-house.org>
AuthorDate: Wed Jan 31 14:01:42 2018 +0100

[KARAF-5585] Do not provide maven settings to pax url if they are gone.
---
 .../src/main/java/org/apache/karaf/tooling/VerifyMojo.java| 6 +-
 .../src/main/java/org/apache/karaf/tooling/utils/MojoSupport.java | 8 
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git 
a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/VerifyMojo.java
 
b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/VerifyMojo.java
index 5d8c2a7..c9da133 100644
--- 
a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/VerifyMojo.java
+++ 
b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/VerifyMojo.java
@@ -169,7 +169,11 @@ public class VerifyMojo extends MojoSupport {
 getLog().info("Using repositories: " + remote.toString());
 config.put("maven.repositories", remote.toString());
 config.put("maven.localRepository", localRepo.getBasedir());
-config.put("maven.settings", 
mavenSession.getRequest().getUserSettingsFile().toString());
+
+if (mavenSession.getRequest().getUserSettingsFile().exists()) {
+config.put("maven.settings", 
mavenSession.getRequest().getUserSettingsFile().toString());
+}
+
 // TODO: add more configuration bits ?
 resolver = MavenResolvers.createMavenResolver(config, "maven");
 doExecute();
diff --git 
a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/utils/MojoSupport.java
 
b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/utils/MojoSupport.java
index a77d8cd..6794f8b 100644
--- 
a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/utils/MojoSupport.java
+++ 
b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/utils/MojoSupport.java
@@ -129,14 +129,6 @@ public abstract class MojoSupport extends AbstractMojo {
 // called by Plexus when injecting the mojo's session
 public void setMavenSession(MavenSession mavenSession) {
 this.mavenSession = mavenSession;
-
-if (mavenSession != null) {
-// check for custom settings.xml and pass it onto pax-url-aether
-File settingsFile = 
mavenSession.getRequest().getUserSettingsFile();
-if (settingsFile != null && settingsFile.isFile()) {
-System.setProperty("org.ops4j.pax.url.mvn.settings", 
settingsFile.getPath());
-}
-}
 }
 
 protected Map createManagedVersionMap(String projectId,

-- 
To stop receiving notification emails like this one, please contact
ldywi...@apache.org.

[karaf] branch karaf-4.1.x updated (36ff99d -> fac27e4)

[ldywicki]

This is an automated email from the ASF dual-hosted git repository.

ldywicki pushed a change to branch karaf-4.1.x
in repository https://gitbox.apache.org/repos/asf/karaf.git.


from 36ff99d  [KARAF-5572] Fix version in manual module
 add fac27e4  KARAF-5585 Do not provide maven settings to pax url if they 
are gone.

No new revisions were added by this update.

Summary of changes:
 .../src/main/java/org/apache/karaf/tooling/VerifyMojo.java| 6 +-
 .../src/main/java/org/apache/karaf/tooling/utils/MojoSupport.java | 8 
 2 files changed, 5 insertions(+), 9 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
ldywi...@apache.org.

[karaf] branch master updated: [KARAF-5533] Make sure KarArtifactInstaller does not install same KAR twice.

[ldywicki]

This is an automated email from the ASF dual-hosted git repository.

ldywicki pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/karaf.git


The following commit(s) were added to refs/heads/master by this push:
 new bc6aa37  [KARAF-5533] Make sure KarArtifactInstaller does not install 
same KAR twice.
bc6aa37 is described below

commit bc6aa37ca25be4143e08c8116cd9e47cc5a90fee
Author: Łukasz Dywicki <l...@code-house.org>
AuthorDate: Wed Dec 13 01:56:00 2017 +0100

[KARAF-5533] Make sure KarArtifactInstaller does not install same KAR twice.
---
 .../karaf/deployer/kar/KarArtifactInstaller.java   | 10 +++---
 .../deployer/kar/KarArtifactInstallerTest.java | 37 +-
 2 files changed, 41 insertions(+), 6 deletions(-)

diff --git 
a/deployer/kar/src/main/java/org/apache/karaf/deployer/kar/KarArtifactInstaller.java
 
b/deployer/kar/src/main/java/org/apache/karaf/deployer/kar/KarArtifactInstaller.java
index 15feb56..8ed983d 100644
--- 
a/deployer/kar/src/main/java/org/apache/karaf/deployer/kar/KarArtifactInstaller.java
+++ 
b/deployer/kar/src/main/java/org/apache/karaf/deployer/kar/KarArtifactInstaller.java
@@ -40,7 +40,7 @@ public class KarArtifactInstaller implements 
ArtifactInstaller {
 
public void install(File file) throws Exception {
 // check if the KAR is not already installed
-if (karService.list().contains(file.getName())) {
+if (karService.list().contains(getKarName(file))) {
 LOGGER.info("KAR {} is already installed. Please uninstall it 
first.", file.getName());
 return;
 }
@@ -61,12 +61,12 @@ public class KarArtifactInstaller implements 
ArtifactInstaller {
 karService.uninstall(getKarName(file));
 karService.install(file.toURI());
}
-   
-   private String getKarName(File karFile) {
-   String karName = karFile.getName();
+
+String getKarName(File karFile) {
+String karName = karFile.getName();
 karName = karName.substring(0, karName.lastIndexOf("."));
 return karName;
-   }
+}
 
 public boolean canHandle(File file) {
// If the file ends with .kar, then we can handle it!
diff --git 
a/deployer/kar/src/test/java/org/apache/karaf/deployer/kar/KarArtifactInstallerTest.java
 
b/deployer/kar/src/test/java/org/apache/karaf/deployer/kar/KarArtifactInstallerTest.java
index f455a05..1ef4190 100644
--- 
a/deployer/kar/src/test/java/org/apache/karaf/deployer/kar/KarArtifactInstallerTest.java
+++ 
b/deployer/kar/src/test/java/org/apache/karaf/deployer/kar/KarArtifactInstallerTest.java
@@ -18,12 +18,14 @@
  */
 package org.apache.karaf.deployer.kar;
 
-import static org.easymock.EasyMock.createMock;
+import static org.easymock.EasyMock.*;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
 import java.io.File;
 import java.net.URI;
+import java.util.Collections;
+import java.util.List;
 
 import org.apache.karaf.kar.KarService;
 import org.junit.Before;
@@ -72,4 +74,37 @@ public class KarArtifactInstallerTest {
assertFalse(karArtifactInstaller.canHandle(new 
File(badZipFile)));
}
 
+/**
+ * This is test for KARAF-5533. Issue comes from fact that internally KAR 
service process file in it's own way.
+ *
+ * Because of that artifact installer must follow the same logic of 
service it calls, as returned list of installed.
+ * KAR files is not list of full file names, but files with stripped 
extensions.
+ *
+ * @throws Exception Any exception causes test failure.
+ */
+@Test
+public void shouldNotInstallSameFileTwice() throws Exception {
+File file = new File(goodKarFile);
+URI uri = file.toURI();
+
+// make sure we have clean state.
+presentKarList(Collections.emptyList());
+karService.install(uri);
+
+replay(karService);
+
+karArtifactInstaller.install(file);
+verify(karService);
+
+// once again,
+reset(karService);
+
presentKarList(Collections.singletonList(karArtifactInstaller.getKarName(file)));
+replay(karService);
+karArtifactInstaller.install(file);
+verify(karService);
+}
+
+private void presentKarList(List deployedKars) throws Exception {
+expect(karService.list()).andReturn(deployedKars).once();
+}
 }

-- 
To stop receiving notification emails like this one, please contact
['"commits@karaf.apache.org" <commits@karaf.apache.org>'].

[karaf] branch karaf-4.1.x updated: [KARAF-5533] Make sure KarArtifactInstaller does not install same KAR twice.

[ldywicki]

This is an automated email from the ASF dual-hosted git repository.

ldywicki pushed a commit to branch karaf-4.1.x
in repository https://gitbox.apache.org/repos/asf/karaf.git


The following commit(s) were added to refs/heads/karaf-4.1.x by this push:
 new 33e8a2e  [KARAF-5533] Make sure KarArtifactInstaller does not install 
same KAR twice.
33e8a2e is described below

commit 33e8a2e258a567650a692833c8d5e448f13aa1f5
Author: Łukasz Dywicki <l...@code-house.org>
AuthorDate: Wed Dec 13 01:56:00 2017 +0100

[KARAF-5533] Make sure KarArtifactInstaller does not install same KAR twice.
---
 .../karaf/deployer/kar/KarArtifactInstaller.java   | 10 +++---
 .../deployer/kar/KarArtifactInstallerTest.java | 37 +-
 2 files changed, 41 insertions(+), 6 deletions(-)

diff --git 
a/deployer/kar/src/main/java/org/apache/karaf/deployer/kar/KarArtifactInstaller.java
 
b/deployer/kar/src/main/java/org/apache/karaf/deployer/kar/KarArtifactInstaller.java
index 15feb56..8ed983d 100644
--- 
a/deployer/kar/src/main/java/org/apache/karaf/deployer/kar/KarArtifactInstaller.java
+++ 
b/deployer/kar/src/main/java/org/apache/karaf/deployer/kar/KarArtifactInstaller.java
@@ -40,7 +40,7 @@ public class KarArtifactInstaller implements 
ArtifactInstaller {
 
public void install(File file) throws Exception {
 // check if the KAR is not already installed
-if (karService.list().contains(file.getName())) {
+if (karService.list().contains(getKarName(file))) {
 LOGGER.info("KAR {} is already installed. Please uninstall it 
first.", file.getName());
 return;
 }
@@ -61,12 +61,12 @@ public class KarArtifactInstaller implements 
ArtifactInstaller {
 karService.uninstall(getKarName(file));
 karService.install(file.toURI());
}
-   
-   private String getKarName(File karFile) {
-   String karName = karFile.getName();
+
+String getKarName(File karFile) {
+String karName = karFile.getName();
 karName = karName.substring(0, karName.lastIndexOf("."));
 return karName;
-   }
+}
 
 public boolean canHandle(File file) {
// If the file ends with .kar, then we can handle it!
diff --git 
a/deployer/kar/src/test/java/org/apache/karaf/deployer/kar/KarArtifactInstallerTest.java
 
b/deployer/kar/src/test/java/org/apache/karaf/deployer/kar/KarArtifactInstallerTest.java
index f455a05..1ef4190 100644
--- 
a/deployer/kar/src/test/java/org/apache/karaf/deployer/kar/KarArtifactInstallerTest.java
+++ 
b/deployer/kar/src/test/java/org/apache/karaf/deployer/kar/KarArtifactInstallerTest.java
@@ -18,12 +18,14 @@
  */
 package org.apache.karaf.deployer.kar;
 
-import static org.easymock.EasyMock.createMock;
+import static org.easymock.EasyMock.*;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
 import java.io.File;
 import java.net.URI;
+import java.util.Collections;
+import java.util.List;
 
 import org.apache.karaf.kar.KarService;
 import org.junit.Before;
@@ -72,4 +74,37 @@ public class KarArtifactInstallerTest {
assertFalse(karArtifactInstaller.canHandle(new 
File(badZipFile)));
}
 
+/**
+ * This is test for KARAF-5533. Issue comes from fact that internally KAR 
service process file in it's own way.
+ *
+ * Because of that artifact installer must follow the same logic of 
service it calls, as returned list of installed.
+ * KAR files is not list of full file names, but files with stripped 
extensions.
+ *
+ * @throws Exception Any exception causes test failure.
+ */
+@Test
+public void shouldNotInstallSameFileTwice() throws Exception {
+File file = new File(goodKarFile);
+URI uri = file.toURI();
+
+// make sure we have clean state.
+presentKarList(Collections.emptyList());
+karService.install(uri);
+
+replay(karService);
+
+karArtifactInstaller.install(file);
+verify(karService);
+
+// once again,
+reset(karService);
+
presentKarList(Collections.singletonList(karArtifactInstaller.getKarName(file)));
+replay(karService);
+karArtifactInstaller.install(file);
+verify(karService);
+}
+
+private void presentKarList(List deployedKars) throws Exception {
+expect(karService.list()).andReturn(deployedKars).once();
+}
 }

-- 
To stop receiving notification emails like this one, please contact
['"commits@karaf.apache.org" <commits@karaf.apache.org>'].

[karaf] branch karaf-4.1.x updated: [KARAF-5418] Add LDAPPubkeyLoginModule JAAS module

[ldywicki]

This is an automated email from the ASF dual-hosted git repository.

ldywicki pushed a commit to branch karaf-4.1.x
in repository https://gitbox.apache.org/repos/asf/karaf.git


The following commit(s) were added to refs/heads/karaf-4.1.x by this push:
 new fcff64f  [KARAF-5418] Add LDAPPubkeyLoginModule JAAS module
fcff64f is described below

commit fcff64f6e95dbe92582d0e4a8ba9db2125ad1086
Author: Ciprian Ciubotariu <cheepe...@gmx.net>
AuthorDate: Mon Oct 9 20:41:53 2017 +0300

[KARAF-5418] Add LDAPPubkeyLoginModule JAAS module

This commit contains two test public/private key pairs that are used to 
exercise the LDAPPubkeyLoginModule
---
 jaas/modules/pom.xml   |  11 ++
 .../apache/karaf/jaas/modules/ldap/LDAPCache.java  |  42 ++
 .../karaf/jaas/modules/ldap/LDAPLoginModule.java   |  30 +---
 .../karaf/jaas/modules/ldap/LDAPOptions.java   |   5 +
 .../jaas/modules/ldap/LDAPPubkeyLoginModule.java   | 158 
 .../org/apache/karaf/jaas/modules/ldap/Util.java   |  48 ++
 .../modules/publickey/PublickeyLoginModule.java|   6 +-
 .../jaas/modules/NamePubkeyCallbackHandler.java|  63 
 .../modules/ldap/LDAPPubkeyLoginModuleTest.java| 161 +
 .../jaas/modules/ldap/LdapLoginModuleTest.java |   4 +
 .../jaas/modules/ldap/example.com_pubkey.ldif  |  68 +
 .../karaf/jaas/modules/ldap/ldap_pubkey.properties |  37 +
 .../karaf/jaas/modules/ldap/ldaptest.admin.id_rsa  |  15 ++
 .../jaas/modules/ldap/ldaptest.admin.id_rsa.pub|   1 +
 .../karaf/jaas/modules/ldap/ldaptest.cheese.id_rsa |  15 ++
 .../jaas/modules/ldap/ldaptest.cheese.id_rsa.pub   |   1 +
 16 files changed, 633 insertions(+), 32 deletions(-)

diff --git a/jaas/modules/pom.xml b/jaas/modules/pom.xml
index 0e20efd..09a2792 100644
--- a/jaas/modules/pom.xml
+++ b/jaas/modules/pom.xml
@@ -115,6 +115,17 @@
 ${derby-version}
 test
 
+
+org.apache.sshd
+sshd-core
+test
+
+
+org.hamcrest
+hamcrest-all
+1.3
+test
+
 
 
 
diff --git 
a/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/LDAPCache.java 
b/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/LDAPCache.java
index f80af8c..bf9b83b 100644
--- 
a/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/LDAPCache.java
+++ 
b/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/LDAPCache.java
@@ -69,6 +69,7 @@ public class LDAPCache implements Closeable, 
NamespaceChangeListener, ObjectChan
 
 private final Map<String, String[]> userDnAndNamespace;
 private final Map<String, String[]> userRoles;
+private final Map<String, String[]> userPubkeys;
 private final LDAPOptions options;
 private DirContext context;
 
@@ -76,6 +77,7 @@ public class LDAPCache implements Closeable, 
NamespaceChangeListener, ObjectChan
 this.options = options;
 userDnAndNamespace = new HashMap<>();
 userRoles = new HashMap<>();
+userPubkeys = new HashMap<>();
 }
 
 @Override
@@ -212,6 +214,18 @@ public class LDAPCache implements Closeable, 
NamespaceChangeListener, ObjectChan
 return result;
 }
 
+public synchronized String[] getUserPubkeys(String userDn) throws 
NamingException {
+String[] result = userPubkeys.get(userDn);
+if (result == null) {
+result = doGetUserPubkeys(userDn);
+if (!options.getDisableCache()) {
+userPubkeys.put(userDn, result);
+}
+}
+return result;
+}
+
+
 protected Set tryMappingRole(String role) {
 Set roles = new HashSet<>();
 if (options.getRoleMapping().isEmpty()) {
@@ -292,6 +306,33 @@ public class LDAPCache implements Closeable, 
NamespaceChangeListener, ObjectChan
 }
 }
 
+private String[] doGetUserPubkeys(String userDn) throws NamingException {
+DirContext context = open();
+
+String userPubkeyAttribute = options.getUserPubkeyAttribute();
+if (userPubkeyAttribute != null) {
+LOGGER.debug("Looking for public keys of user {} in attribute {}", 
userDn, userPubkeyAttribute);
+
+Attributes attributes = context.getAttributes(userDn, new 
String[]{userPubkeyAttribute});
+Attribute pubkeyAttribute = attributes.get(userPubkeyAttribute);
+
+List pubkeyList = new ArrayList<>();
+if (pubkeyAttribute != null) {
+for (int i = 0; i < pubkeyAttribute.size(); i++) {
+String pk = (String) pubkeyAttribute.get(i);
+if (pk != null) {
+pubkeyList.add(pk);
+}
+}
+}
+return pubkeyList.toArray(new String[pubkeyList.size()]

[karaf] branch master updated: [KARAF-5418] Add LDAPPubkeyLoginModule JAAS module

[ldywicki]

This is an automated email from the ASF dual-hosted git repository.

ldywicki pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/karaf.git


The following commit(s) were added to refs/heads/master by this push:
 new d9d15d7  [KARAF-5418] Add LDAPPubkeyLoginModule JAAS module
d9d15d7 is described below

commit d9d15d7e40f7aa8a2ccf2e90464faba685df852b
Author: Ciprian Ciubotariu <cheepe...@gmx.net>
AuthorDate: Mon Oct 9 20:41:53 2017 +0300

[KARAF-5418] Add LDAPPubkeyLoginModule JAAS module

This commit contains two test public/private key pairs that are used to 
exercise the LDAPPubkeyLoginModule
---
 jaas/modules/pom.xml   |   5 +
 .../apache/karaf/jaas/modules/ldap/LDAPCache.java  |  42 ++
 .../karaf/jaas/modules/ldap/LDAPLoginModule.java   |  30 +---
 .../karaf/jaas/modules/ldap/LDAPOptions.java   |   5 +
 .../jaas/modules/ldap/LDAPPubkeyLoginModule.java   | 158 
 .../org/apache/karaf/jaas/modules/ldap/Util.java   |  48 ++
 .../modules/publickey/PublickeyLoginModule.java|   6 +-
 .../jaas/modules/NamePubkeyCallbackHandler.java|  63 
 .../modules/ldap/LDAPPubkeyLoginModuleTest.java| 161 +
 .../jaas/modules/ldap/example.com_pubkey.ldif  |  68 +
 .../karaf/jaas/modules/ldap/ldap_pubkey.properties |  37 +
 .../karaf/jaas/modules/ldap/ldaptest.admin.id_rsa  |  15 ++
 .../jaas/modules/ldap/ldaptest.admin.id_rsa.pub|   1 +
 .../karaf/jaas/modules/ldap/ldaptest.cheese.id_rsa |  15 ++
 .../jaas/modules/ldap/ldaptest.cheese.id_rsa.pub   |   1 +
 15 files changed, 623 insertions(+), 32 deletions(-)

diff --git a/jaas/modules/pom.xml b/jaas/modules/pom.xml
index 8038102..a709599 100644
--- a/jaas/modules/pom.xml
+++ b/jaas/modules/pom.xml
@@ -116,6 +116,11 @@
 test
 
 
+org.apache.sshd
+sshd-core
+test
+
+
 org.hamcrest
 hamcrest-all
 1.3
diff --git 
a/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/LDAPCache.java 
b/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/LDAPCache.java
index 7566165..ed04fdc 100644
--- 
a/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/LDAPCache.java
+++ 
b/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/LDAPCache.java
@@ -69,6 +69,7 @@ public class LDAPCache implements Closeable, 
NamespaceChangeListener, ObjectChan
 
 private final Map<String, String[]> userDnAndNamespace;
 private final Map<String, String[]> userRoles;
+private final Map<String, String[]> userPubkeys;
 private final LDAPOptions options;
 private DirContext context;
 
@@ -76,6 +77,7 @@ public class LDAPCache implements Closeable, 
NamespaceChangeListener, ObjectChan
 this.options = options;
 userDnAndNamespace = new HashMap<>();
 userRoles = new HashMap<>();
+userPubkeys = new HashMap<>();
 }
 
 @Override
@@ -212,6 +214,18 @@ public class LDAPCache implements Closeable, 
NamespaceChangeListener, ObjectChan
 return result;
 }
 
+public synchronized String[] getUserPubkeys(String userDn) throws 
NamingException {
+String[] result = userPubkeys.get(userDn);
+if (result == null) {
+result = doGetUserPubkeys(userDn);
+if (!options.getDisableCache()) {
+userPubkeys.put(userDn, result);
+}
+}
+return result;
+}
+
+
 protected Set tryMappingRole(String role) {
 Set roles = new HashSet<>();
 if (options.getRoleMapping().isEmpty()) {
@@ -292,6 +306,33 @@ public class LDAPCache implements Closeable, 
NamespaceChangeListener, ObjectChan
 }
 }
 
+private String[] doGetUserPubkeys(String userDn) throws NamingException {
+DirContext context = open();
+
+String userPubkeyAttribute = options.getUserPubkeyAttribute();
+if (userPubkeyAttribute != null) {
+LOGGER.debug("Looking for public keys of user {} in attribute {}", 
userDn, userPubkeyAttribute);
+
+Attributes attributes = context.getAttributes(userDn, new 
String[]{userPubkeyAttribute});
+Attribute pubkeyAttribute = attributes.get(userPubkeyAttribute);
+
+List pubkeyList = new ArrayList<>();
+if (pubkeyAttribute != null) {
+for (int i = 0; i < pubkeyAttribute.size(); i++) {
+String pk = (String) pubkeyAttribute.get(i);
+if (pk != null) {
+pubkeyList.add(pk);
+}
+}
+}
+return pubkeyList.toArray(new String[pubkeyList.size()]);
+} else {
+LOGGER.debug("The user public key attribute is null so no keys 
were retrieved");
+

karaf git commit: KARAF-5403 Fix for loosing order of features given in tooling configuration.

[ldywicki]

Repository: karaf
Updated Branches:
  refs/heads/karaf-4.0.x b8fdb76ce -> 51f340673


KARAF-5403 Fix for loosing order of features given in tooling configuration.


Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/51f34067
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/51f34067
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/51f34067

Branch: refs/heads/karaf-4.0.x
Commit: 51f34067365d72fd853b85ff8b8fd858326871d3
Parents: b8fdb76
Author: Łukasz Dywicki 
Authored: Tue Oct 3 14:59:17 2017 +0200
Committer: Łukasz Dywicki 
Committed: Tue Oct 3 15:16:58 2017 +0200

--
 .../apache/karaf/profile/assembly/Builder.java   | 19 +--
 1 file changed, 9 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/karaf/blob/51f34067/profile/src/main/java/org/apache/karaf/profile/assembly/Builder.java
--
diff --git 
a/profile/src/main/java/org/apache/karaf/profile/assembly/Builder.java 
b/profile/src/main/java/org/apache/karaf/profile/assembly/Builder.java
index ff121f4..27aac7d 100644
--- a/profile/src/main/java/org/apache/karaf/profile/assembly/Builder.java
+++ b/profile/src/main/java/org/apache/karaf/profile/assembly/Builder.java
@@ -32,7 +32,6 @@ import java.util.Collections;
 import java.util.Dictionary;
 import java.util.EnumSet;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Hashtable;
 import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
@@ -738,7 +737,7 @@ public class Builder {
 // Load startup repositories
 Map installedRepositories = 
loadRepositories(manager, installedEffective.getRepositories(), true);
 // Compute startup feature dependencies
-Set allInstalledFeatures = new HashSet<>();
+Set allInstalledFeatures = new LinkedHashSet<>();
 for (Features repo : installedRepositories.values()) {
 allInstalledFeatures.addAll(repo.getFeature());
 }
@@ -781,12 +780,12 @@ public class Builder {
 // Load startup repositories
 Map bootRepositories = loadRepositories(manager, 
bootEffective.getRepositories(), true);
 // Compute startup feature dependencies
-Set allBootFeatures = new HashSet<>();
+Set allBootFeatures = new LinkedHashSet<>();
 for (Features repo : bootRepositories.values()) {
 allBootFeatures.addAll(repo.getFeature());
 }
 // Generate a global feature
-Map generatedDep = new HashMap<>();
+Map generatedDep = new LinkedHashMap<>();
 Feature generated = new Feature();
 generated.setName(UUID.randomUUID().toString());
 // Add feature dependencies
@@ -815,13 +814,13 @@ public class Builder {
 Downloader downloader = manager.createDownloader();
 
 // Compute startup feature dependencies
-Set bootFeatures = new HashSet<>();
+Set bootFeatures = new LinkedHashSet<>();
 addFeatures(allBootFeatures, generated.getName(), bootFeatures, true);
 for (Feature feature : bootFeatures) {
 // the feature is a startup feature, updating startup.properties 
file
 LOGGER.info("Feature " + feature.getName() + " is defined as a 
boot feature");
 // add the feature in the system folder
-Set locations = new HashSet<>();
+Set locations = new LinkedHashSet<>();
 for (Bundle bundle : feature.getBundle()) {
 if (!ignoreDependencyFlag || !bundle.isDependency()) {
 locations.add(bundle.getLocation().trim());
@@ -937,7 +936,7 @@ public class Builder {
 
 private String getRepos(Features rep) {
 StringBuilder repos = new StringBuilder();
-for (String repo : new HashSet<>(rep.getRepository())) {
+for (String repo : new LinkedHashSet<>(rep.getRepository())) {
 if (repos.length() > 0) {
 repos.append(",");
 }
@@ -1087,7 +1086,7 @@ public class Builder {
 name = feature;
 range = new VersionRange(Version.emptyVersion);
 }
-Set set = new HashSet<>();
+Set set = new LinkedHashSet<>();
 for (Feature f : allFeatures) {
 if (f.getName().equals(name) && 
range.contains(VersionTable.getVersion(f.getVersion( {
 set.add(f);
@@ -1252,7 +1251,7 @@ public class Builder {
 for (String bundle : bundles) {
 MapUtils.addToMapSet(request.requirements, 
FeaturesService.ROOT_REGION, "bundle:" + bundle);
 }
-Set prereqs = new HashSet<>();
+Set prereqs = new 

karaf git commit: [KARAF-4651] Update to wagon-http 2.10.

[ldywicki]

Repository: karaf
Updated Branches:
  refs/heads/karaf-4.0.x a455c2c9c -> 33f57704e


[KARAF-4651] Update to wagon-http 2.10.


Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/33f57704
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/33f57704
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/33f57704

Branch: refs/heads/karaf-4.0.x
Commit: 33f57704e4ab4909ecd74ec924a68930a10e5eee
Parents: a455c2c
Author: Łukasz Dywicki 
Authored: Tue Aug 9 15:28:04 2016 +0200
Committer: Łukasz Dywicki 
Committed: Tue Aug 9 16:02:28 2016 +0200

--
 tooling/karaf-maven-plugin/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/karaf/blob/33f57704/tooling/karaf-maven-plugin/pom.xml
--
diff --git a/tooling/karaf-maven-plugin/pom.xml 
b/tooling/karaf-maven-plugin/pom.xml
index 98cbdd5..df57c16 100644
--- a/tooling/karaf-maven-plugin/pom.xml
+++ b/tooling/karaf-maven-plugin/pom.xml
@@ -86,7 +86,7 @@
 
 org.apache.maven.wagon
 wagon-http
-2.8
+2.10
 
 
 org.apache.karaf

karaf git commit: [KARAF-4651] Update to wagon-http 2.10.

[ldywicki]

Repository: karaf
Updated Branches:
  refs/heads/karaf-3.0.x ffb955561 -> f1c8ed04f


[KARAF-4651] Update to wagon-http 2.10.


Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/f1c8ed04
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/f1c8ed04
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/f1c8ed04

Branch: refs/heads/karaf-3.0.x
Commit: f1c8ed04f82e7810ee1868a8b754c6bc6d4a1228
Parents: ffb9555
Author: Łukasz Dywicki 
Authored: Tue Aug 9 15:28:04 2016 +0200
Committer: Łukasz Dywicki 
Committed: Tue Aug 9 16:03:33 2016 +0200

--
 tooling/karaf-maven-plugin/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/karaf/blob/f1c8ed04/tooling/karaf-maven-plugin/pom.xml
--
diff --git a/tooling/karaf-maven-plugin/pom.xml 
b/tooling/karaf-maven-plugin/pom.xml
index a54f5f7..f92f69b 100644
--- a/tooling/karaf-maven-plugin/pom.xml
+++ b/tooling/karaf-maven-plugin/pom.xml
@@ -81,7 +81,7 @@
 
 org.apache.maven.wagon
 wagon-http
-2.8
+2.10
 
 
 

karaf git commit: [KARAF-4651] Update to wagon-http 2.10.

[ldywicki]

Repository: karaf
Updated Branches:
  refs/heads/master 9c96f8e54 -> e3773d890


[KARAF-4651] Update to wagon-http 2.10.


Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/e3773d89
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/e3773d89
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/e3773d89

Branch: refs/heads/master
Commit: e3773d890d5b04c45d5cdcc7adc895f7c5903bdd
Parents: 9c96f8e
Author: Łukasz Dywicki 
Authored: Tue Aug 9 15:28:04 2016 +0200
Committer: Łukasz Dywicki 
Committed: Tue Aug 9 15:55:06 2016 +0200

--
 tooling/karaf-maven-plugin/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/karaf/blob/e3773d89/tooling/karaf-maven-plugin/pom.xml
--
diff --git a/tooling/karaf-maven-plugin/pom.xml 
b/tooling/karaf-maven-plugin/pom.xml
index 5a7c4cf..40c6329 100644
--- a/tooling/karaf-maven-plugin/pom.xml
+++ b/tooling/karaf-maven-plugin/pom.xml
@@ -86,7 +86,7 @@
 
 org.apache.maven.wagon
 wagon-http
-2.8
+2.10
 
 
 org.apache.karaf

[2/2] karaf git commit: [KARAF-5365] Added section in docs about prerequisite attribute.

[ldywicki]

[KARAF-5365] Added section in docs about prerequisite attribute.


Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/e41bf62f
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/e41bf62f
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/e41bf62f

Branch: refs/heads/karaf-4.0.x
Commit: e41bf62f7c1fdd0b3d174df90be4793cd3a48f10
Parents: 32932c6
Author: Łukasz Dywicki 
Authored: Sat Feb 27 21:11:42 2016 +0100
Committer: Łukasz Dywicki 
Committed: Sat Feb 27 21:33:19 2016 +0100

--
 manual/src/main/asciidoc/developer-guide/creating-bundles.adoc | 2 ++
 manual/src/main/asciidoc/user-guide/provisioning.adoc  | 4 
 2 files changed, 6 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/karaf/blob/e41bf62f/manual/src/main/asciidoc/developer-guide/creating-bundles.adoc
--
diff --git a/manual/src/main/asciidoc/developer-guide/creating-bundles.adoc 
b/manual/src/main/asciidoc/developer-guide/creating-bundles.adoc
index 8c8e8d8..d816421 100644
--- a/manual/src/main/asciidoc/developer-guide/creating-bundles.adoc
+++ b/manual/src/main/asciidoc/developer-guide/creating-bundles.adoc
@@ -127,6 +127,8 @@ Important notice : Add as child of your feature definition, 
the reference to wra
 wrap
 
 
+Additional information about meaning of `prerequisiste` attribute can be found 
in link:provisioning[Feature prerequisites] description.
+
 For instance : 
 
 

http://git-wip-us.apache.org/repos/asf/karaf/blob/e41bf62f/manual/src/main/asciidoc/user-guide/provisioning.adoc
--
diff --git a/manual/src/main/asciidoc/user-guide/provisioning.adoc 
b/manual/src/main/asciidoc/user-guide/provisioning.adoc
index 07eb99c..c116a33 100644
--- a/manual/src/main/asciidoc/user-guide/provisioning.adoc
+++ b/manual/src/main/asciidoc/user-guide/provisioning.adoc
@@ -213,6 +213,10 @@ If a single version is specified, this version will be 
chosen.
 
 If nothing is specified, the highest available will be installed.
 
+= Feature prerequisites
+
+Prerequisite feature is special kind of dependency. If you will add 
`prerequisite` attribute to dependant feature tag then it will force 
installation and also activation of bundles in dependant feature before 
installation of actual feature. This may be handy in case if bundles enlisted 
in given feature are not using pre installed URL such `wrap` or `war`.
+
  Feature configurations
 
 The `` element in a feature XML allows a feature to create and/or 
populate a configuration (identified by a configuration PID).

[1/2] karaf git commit: [KARAF-5365] Add notice about wrap feature

[ldywicki]

Repository: karaf
Updated Branches:
  refs/heads/karaf-4.0.x e5fc4472f -> e41bf62f7


[KARAF-5365] Add notice about wrap feature

Add a notice to inform that wrap feature is a prerequisite to manage bundle 
installed using wrap protocol


Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/32932c68
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/32932c68
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/32932c68

Branch: refs/heads/karaf-4.0.x
Commit: 32932c6898c654182c44b6b457c7b24f3d554453
Parents: e5fc447
Author: Mat V 
Authored: Thu Feb 25 16:12:52 2016 +0100
Committer: Łukasz Dywicki 
Committed: Sat Feb 27 21:33:13 2016 +0100

--
 .../developer-guide/creating-bundles.adoc   | 20 +++-
 1 file changed, 19 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/karaf/blob/32932c68/manual/src/main/asciidoc/developer-guide/creating-bundles.adoc
--
diff --git a/manual/src/main/asciidoc/developer-guide/creating-bundles.adoc 
b/manual/src/main/asciidoc/developer-guide/creating-bundles.adoc
index 1838f21..8c8e8d8 100644
--- a/manual/src/main/asciidoc/developer-guide/creating-bundles.adoc
+++ b/manual/src/main/asciidoc/developer-guide/creating-bundles.adoc
@@ -121,6 +121,24 @@ root@karaf> bundles:install 
'wrap:mvn:commons-lang/commons-lang/2.4$Bundle-Symbo
 
wrap:mvn:commons-lang/commons-lang/2.4$Bundle-SymbolicName=commons-langBundle-Version=2.4
 
 
+Important notice : Add as child of your feature definition, the reference to 
wrap feature
+
+
+wrap
+
+
+For instance : 
+
+
+http://karaf.apache.org/xmlns/features/v1.4.0; 
name="app-2.0.0">
+   
+   External dependencies
+   wrap
+   wrap:mvn:net.sf.ehcache/ehcache-core/2.6.11$Bundle-SymbolicName=ehcache-coreBundle-Version=2.6.11

+   
+
+
+
  Statically bundling jars
 
 You can also create a wrap bundle for a third party dependency.
@@ -210,4 +228,4 @@ The resulting OSGi bundle can now be deployed directly:
 
 
 root@karaf> bundles:install -s mvn:osgi.commons-lang/osgi.commons-lang/2.4
-
\ No newline at end of file
+

[2/2] karaf git commit: [KARAF-5365] Added section in docs about prerequisite attribute.

[ldywicki]

[KARAF-5365] Added section in docs about prerequisite attribute.


Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/6a9ca438
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/6a9ca438
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/6a9ca438

Branch: refs/heads/master
Commit: 6a9ca438ccf284cd5a36b2e51768172d21290110
Parents: cf896d4
Author: Łukasz Dywicki 
Authored: Sat Feb 27 21:11:42 2016 +0100
Committer: Łukasz Dywicki 
Committed: Sat Feb 27 21:27:00 2016 +0100

--
 manual/src/main/asciidoc/developer-guide/creating-bundles.adoc | 2 ++
 manual/src/main/asciidoc/user-guide/provisioning.adoc  | 4 
 2 files changed, 6 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/karaf/blob/6a9ca438/manual/src/main/asciidoc/developer-guide/creating-bundles.adoc
--
diff --git a/manual/src/main/asciidoc/developer-guide/creating-bundles.adoc 
b/manual/src/main/asciidoc/developer-guide/creating-bundles.adoc
index 8c8e8d8..d816421 100644
--- a/manual/src/main/asciidoc/developer-guide/creating-bundles.adoc
+++ b/manual/src/main/asciidoc/developer-guide/creating-bundles.adoc
@@ -127,6 +127,8 @@ Important notice : Add as child of your feature definition, 
the reference to wra
 wrap
 
 
+Additional information about meaning of `prerequisiste` attribute can be found 
in link:provisioning[Feature prerequisites] description.
+
 For instance : 
 
 

http://git-wip-us.apache.org/repos/asf/karaf/blob/6a9ca438/manual/src/main/asciidoc/user-guide/provisioning.adoc
--
diff --git a/manual/src/main/asciidoc/user-guide/provisioning.adoc 
b/manual/src/main/asciidoc/user-guide/provisioning.adoc
index 5dffb86..789ac88 100644
--- a/manual/src/main/asciidoc/user-guide/provisioning.adoc
+++ b/manual/src/main/asciidoc/user-guide/provisioning.adoc
@@ -225,6 +225,10 @@ If a single version is specified, this version will be 
chosen.
 
 If nothing is specified, the highest available will be installed.
 
+= Feature prerequisites
+
+Prerequisite feature is special kind of dependency. If you will add 
`prerequisite` attribute to dependant feature tag then it will force 
installation and also activation of bundles in dependant feature before 
installation of actual feature. This may be handy in case if bundles enlisted 
in given feature are not using pre installed URL such `wrap` or `war`.
+
  Feature configurations
 
 The `` element in a feature XML allows a feature to create and/or 
populate a configuration (identified by a configuration PID).

[1/2] karaf git commit: [KARAF-5365] Add notice about wrap feature

[ldywicki]

Repository: karaf
Updated Branches:
  refs/heads/master 47024fbf2 -> 6a9ca438c


[KARAF-5365] Add notice about wrap feature

Add a notice to inform that wrap feature is a prerequisite to manage bundle 
installed using wrap protocol


Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/cf896d44
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/cf896d44
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/cf896d44

Branch: refs/heads/master
Commit: cf896d446e0ba83b749725f6a4373b57361816b3
Parents: 47024fb
Author: Mat V 
Authored: Thu Feb 25 16:12:52 2016 +0100
Committer: Łukasz Dywicki 
Committed: Sat Feb 27 21:26:56 2016 +0100

--
 .../developer-guide/creating-bundles.adoc   | 20 +++-
 1 file changed, 19 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/karaf/blob/cf896d44/manual/src/main/asciidoc/developer-guide/creating-bundles.adoc
--
diff --git a/manual/src/main/asciidoc/developer-guide/creating-bundles.adoc 
b/manual/src/main/asciidoc/developer-guide/creating-bundles.adoc
index 1838f21..8c8e8d8 100644
--- a/manual/src/main/asciidoc/developer-guide/creating-bundles.adoc
+++ b/manual/src/main/asciidoc/developer-guide/creating-bundles.adoc
@@ -121,6 +121,24 @@ root@karaf> bundles:install 
'wrap:mvn:commons-lang/commons-lang/2.4$Bundle-Symbo
 
wrap:mvn:commons-lang/commons-lang/2.4$Bundle-SymbolicName=commons-langBundle-Version=2.4
 
 
+Important notice : Add as child of your feature definition, the reference to 
wrap feature
+
+
+wrap
+
+
+For instance : 
+
+
+http://karaf.apache.org/xmlns/features/v1.4.0; 
name="app-2.0.0">
+   
+   External dependencies
+   wrap
+   wrap:mvn:net.sf.ehcache/ehcache-core/2.6.11$Bundle-SymbolicName=ehcache-coreBundle-Version=2.6.11

+   
+
+
+
  Statically bundling jars
 
 You can also create a wrap bundle for a third party dependency.
@@ -210,4 +228,4 @@ The resulting OSGi bundle can now be deployed directly:
 
 
 root@karaf> bundles:install -s mvn:osgi.commons-lang/osgi.commons-lang/2.4
-
\ No newline at end of file
+

svn commit: r1438150 - /karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/navigation/markup/ModuleTabPanel.java

[ldywicki]

Author: ldywicki
Date: Thu Jan 24 19:58:58 2013
New Revision: 1438150

URL: http://svn.apache.org/viewvc?rev=1438150view=rev
Log:
Another fix in active trail detection

Modified:

karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/navigation/markup/ModuleTabPanel.java

Modified: 
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/navigation/markup/ModuleTabPanel.java
URL: 
http://svn.apache.org/viewvc/karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/navigation/markup/ModuleTabPanel.java?rev=1438150r1=1438149r2=1438150view=diff
==
--- 
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/navigation/markup/ModuleTabPanel.java
 (original)
+++ 
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/navigation/markup/ModuleTabPanel.java
 Thu Jan 24 19:58:58 2013
@@ -58,7 +58,7 @@ public class ModuleTabPanel extends Pane
 LinkPage link = item.getModelObject();
 item.add(link);
 if (LinkUtils.isActiveTrail(link)) {
-item.getParent().add(new AttributeModifier(class, 
active));
+item.add(new AttributeModifier(class, active));
 }
 }
 });

svn commit: r1435083 - /karaf/trunk/manual/src/main/webapp/developers-guide/extending-console.conf

[ldywicki]

Author: ldywicki
Date: Fri Jan 18 10:55:45 2013
New Revision: 1435083

URL: http://svn.apache.org/viewvc?rev=1435083view=rev
Log:
[KARAF-1287] - extending-console synced with KARAF-1001

Author: Krzysztof Sobkowiak krzys.sobkow...@gmail.com
Signed-off-by: Lukasz Dywicki l...@code-house.org

Modified:
karaf/trunk/manual/src/main/webapp/developers-guide/extending-console.conf

Modified: 
karaf/trunk/manual/src/main/webapp/developers-guide/extending-console.conf
URL: 
http://svn.apache.org/viewvc/karaf/trunk/manual/src/main/webapp/developers-guide/extending-console.conf?rev=1435083r1=1435082r2=1435083view=diff
==
--- karaf/trunk/manual/src/main/webapp/developers-guide/extending-console.conf 
(original)
+++ karaf/trunk/manual/src/main/webapp/developers-guide/extending-console.conf 
Fri Jan 18 10:55:45 2013
@@ -166,7 +166,7 @@ Inside this directory, create the {{OSGI
 blueprint xmlns=http://www.osgi.org/xmlns/blueprint/v1.0.0;
 
 command-bundle xmlns=http://karaf.apache.org/xmlns/shell/v1.1.0;
-command name=test/hello
+command
 action class=org.apache.karaf.shell.samples.HelloShellCommand/
 /command
 /command-bundle
@@ -278,7 +278,7 @@ Using Blueprint, you can inject the co
 blueprint xmlns=http://www.osgi.org/xmlns/blueprint/v1.0.0;
 
 command-bundle xmlns=http://karaf.apache.org/xmlns/shell/v1.1.0;
-command name=test/hello
+command
 action class=org.apache.karaf.shell.samples.HelloShellCommand/
 completers
 ref component-id=simpleNameCompleter/
@@ -331,7 +331,7 @@ blueprint configuration that will associ
 blueprint xmlns=http://www.osgi.org/xmlns/blueprint/v1.0.0;
 
 command-bundle xmlns=http://karaf.apache.org/xmlns/shell/v1.1.0;
-command name=test/hello
+command
 action class=org.apache.karaf.shell.samples.HelloShellCommand/
 completers
 ref component-id=simpleNameCompleter/

svn commit: r1434408 - /karaf/webconsole/branches/webconsole-2.2.x/

[ldywicki]

Author: ldywicki
Date: Wed Jan 16 21:17:24 2013
New Revision: 1434408

URL: http://svn.apache.org/viewvc?rev=1434408view=rev
Log:
Create branch webconsole-2.2.x

Added:
karaf/webconsole/branches/webconsole-2.2.x/
  - copied from r1426589, karaf/webconsole/trunk/

svn commit: r1426495 [1/5] - in /karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/behavior/bootstrap: css/ img/ js/

[ldywicki]

Author: ldywicki
Date: Fri Dec 28 13:12:34 2012
New Revision: 1426495

URL: http://svn.apache.org/viewvc?rev=1426495view=rev
Log:
Upgrade to bootstrap 2.2.2

Signed-off-by: Lukasz Dywicki l...@code-house.org

Added:

karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/behavior/bootstrap/js/bootstrap-affix.js

karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/behavior/bootstrap/js/bootstrap.js

karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/behavior/bootstrap/js/bootstrap.min.js
Modified:

karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/behavior/bootstrap/css/bootstrap.css

karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/behavior/bootstrap/img/glyphicons-halflings-white.png

karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/behavior/bootstrap/img/glyphicons-halflings.png

karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/behavior/bootstrap/js/bootstrap-alert.js

karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/behavior/bootstrap/js/bootstrap-button.js

karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/behavior/bootstrap/js/bootstrap-carousel.js

karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/behavior/bootstrap/js/bootstrap-collapse.js

karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/behavior/bootstrap/js/bootstrap-dropdown.js

karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/behavior/bootstrap/js/bootstrap-modal.js

karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/behavior/bootstrap/js/bootstrap-popover.js

karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/behavior/bootstrap/js/bootstrap-scrollspy.js

karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/behavior/bootstrap/js/bootstrap-tab.js

karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/behavior/bootstrap/js/bootstrap-tooltip.js

karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/behavior/bootstrap/js/bootstrap-transition.js

karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/behavior/bootstrap/js/bootstrap-typeahead.js

svn commit: r1426495 [5/5] - in /karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/behavior/bootstrap: css/ img/ js/

[ldywicki]

Added: 
karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/behavior/bootstrap/js/bootstrap.min.js
URL: 
http://svn.apache.org/viewvc/karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/behavior/bootstrap/js/bootstrap.min.js?rev=1426495view=auto
==
--- 
karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/behavior/bootstrap/js/bootstrap.min.js
 (added)
+++ 
karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/behavior/bootstrap/js/bootstrap.min.js
 Fri Dec 28 13:12:34 2012
@@ -0,0 +1,6 @@
+/**
+* Bootstrap.js v2.2.2 by @fat  @mdo
+* Copyright 2012 Twitter, Inc.
+* http://www.apache.org/licenses/LICENSE-2.0.txt
+*/
+!function($){use strict;$(function(){$.support.transition=function(){var 
transitionEnd=function(){var 
name,el=document.createElement(bootstrap),transEndEventNames={WebkitTransition:webkitTransitionEnd,MozTransition:transitionend,OTransition:oTransitionEnd
 otransitionend,transition:transitionend};for(name in 
transEndEventNames)if(void 0!==el.style[name])return 
transEndEventNames[name]}();return 
transitionEnd{end:transitionEnd}}()})}(window.jQuery),!function($){use 
strict;var 
dismiss='[data-dismiss=alert]',Alert=function(el){$(el).on(click,dismiss,this.close)};Alert.prototype.close=function(e){function
 removeElement(){$parent.trigger(closed).remove()}var 
$parent,$this=$(this),selector=$this.attr(data-target);selector||(selector=$this.attr(href),selector=selectorselector.replace(/.*(?=#[^\s]*$)/,)),$parent=$(selector),ee.preventDefault(),$parent.length||($parent=$this.hasClass(alert)?$this:$this.parent()),$parent.trigger(e=$.Event(close)),e.i
 
sDefaultPrevented()||($parent.removeClass(in),$.support.transition$parent.hasClass(fade)?$parent.on($.support.transition.end,removeElement):removeElement())};var
 old=$.fn.alert;$.fn.alert=function(option){return this.each(function(){var 
$this=$(this),data=$this.data(alert);data||$this.data(alert,data=new 
Alert(this)),string==typeof 
optiondata[option].call($this)})},$.fn.alert.Constructor=Alert,$.fn.alert.noConflict=function(){return
 
$.fn.alert=old,this},$(document).on(click.alert.data-api,dismiss,Alert.prototype.close)}(window.jQuery),!function($){use
 strict;var 
Button=function(element,options){this.$element=$(element),this.options=$.extend({},$.fn.button.defaults,options)};Button.prototype.setState=function(state){var
 
d=disabled,$el=this.$element,data=$el.data(),val=$el.is(input)?val:html;state+=Text,data.resetText||$el.data(resetText,$el[val]()),$el[val](data[state]||this.options[state]),setTimeout(function(){loadingText==state?$el.addClass(
 
d).attr(d,d):$el.removeClass(d).removeAttr(d)},0)},Button.prototype.toggle=function(){var
 
$parent=this.$element.closest('[data-toggle=buttons-radio]');$parent$parent.find(.active).removeClass(active),this.$element.toggleClass(active)};var
 old=$.fn.button;$.fn.button=function(option){return this.each(function(){var 
$this=$(this),data=$this.data(button),options=object==typeof 
optionoption;data||$this.data(button,data=new 
Button(this,options)),toggle==option?data.toggle():optiondata.setState(option)})},$.fn.button.defaults={loadingText:loading...},$.fn.button.Constructor=Button,$.fn.button.noConflict=function(){return
 
$.fn.button=old,this},$(document).on(click.button.data-api,[data-toggle^=button],function(e){var
 
$btn=$(e.target);$btn.hasClass(btn)||($btn=$btn.closest(.btn)),$btn.button(toggle)})}(window.jQuery),!function($){use
 strict;var 
Carousel=function(element,options){this.$element=$(element),this.options=options,hover==this.options.p
 
ausethis.$element.on(mouseenter,$.proxy(this.pause,this)).on(mouseleave,$.proxy(this.cycle,this))};Carousel.prototype={cycle:function(e){return
 
e||(this.paused=!1),this.options.interval!this.paused(this.interval=setInterval($.proxy(this.next,this),this.options.interval)),this},to:function(pos){var
 
$active=this.$element.find(.item.active),children=$active.parent().children(),activePos=children.index($active),that=this;if(!(poschildren.length-1||0pos))return
 
this.sliding?this.$element.one(slid,function(){that.to(pos)}):activePos==pos?this.pause().cycle():this.slide(posactivePos?next:prev,$(children[pos]))},pause:function(e){return
 e||(this.paused=!0),this.$element.find(.next, 
.prev).length$.support.transition.end(this.$element.trigger($.support.transition.end),this.cycle()),clearInterval(this.interval),this.interval=null,this},next:function(){return
 this.sliding?void 0:this.slide(next)},prev:function(){return 
this.sliding?void 0:this.slide(prev)}
 ,slide:function(type,next){var 

svn commit: r1381414 - in /karaf/webconsole/trunk: core/src/main/java/org/apache/karaf/webconsole/core/form/ core/src/main/java/org/apache/karaf/webconsole/core/util/ osgi/config/src/main/java/org/apa

[ldywicki]

Author: ldywicki
Date: Wed Sep  5 22:08:25 2012
New Revision: 1381414

URL: http://svn.apache.org/viewvc?rev=1381414view=rev
Log:
KARAF-1793 Fix configuration edit form

Signed-off-by: Lukasz Dywicki l...@code-house.org

Modified:

karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/form/LabelBorder.java

karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/form/MapEditForm.java

karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/util/DictionaryUtils.java

karaf/webconsole/trunk/osgi/config/src/main/java/org/apache/karaf/webconsole/osgi/config/ConfigurationEditPage.java

karaf/webconsole/trunk/osgi/config/src/main/java/org/apache/karaf/webconsole/osgi/config/ConfigurationProvider.java

karaf/webconsole/trunk/osgi/config/src/main/java/org/apache/karaf/webconsole/osgi/config/model/ConfigurationModel.java

Modified: 
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/form/LabelBorder.java
URL: 
http://svn.apache.org/viewvc/karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/form/LabelBorder.java?rev=1381414r1=1381413r2=1381414view=diff
==
--- 
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/form/LabelBorder.java
 (original)
+++ 
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/form/LabelBorder.java
 Wed Sep  5 22:08:25 2012
@@ -30,22 +30,27 @@ public class LabelBorder extends Border 
 private static final long serialVersionUID = 1L;
 private final FormComponent? component;
 
+private Label help;
+
 public LabelBorder(String id, FormComponent? component) {
 super(id);
 this.component = component;
-getBodyContainer().add(component);
 
-add(new SimpleFormComponentLabel(label, component));
-add(new Label(help, ));
-add(new ComponentFeedbackPanel(error, component));
+add(component);
+
+addToBorder(
+new SimpleFormComponentLabel(label, component),
+help = new Label(help, ),
+new ComponentFeedbackPanel(error, component)
+);
 }
 
 public void setHelp(String message) {
-addOrReplace(new Label(help, message));
+help.setDefaultModelObject(message);
 }
 
 public void setHelp(IModel? message) {
-addOrReplace(new Label(help, message));
+help.setDefaultModel(message);
 }
 
 @Override

Modified: 
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/form/MapEditForm.java
URL: 
http://svn.apache.org/viewvc/karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/form/MapEditForm.java?rev=1381414r1=1381413r2=1381414view=diff
==
--- 
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/form/MapEditForm.java
 (original)
+++ 
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/form/MapEditForm.java
 Wed Sep  5 22:08:25 2012
@@ -44,16 +44,21 @@ public abstract class MapEditFormK, V 
 RepeatingView repeatingView = new RepeatingView(entries);
 
 for (K key : model.getObject().keySet()) {
-IModelV bind = model.bind( + key);
+IModelV bind = model.bind([ + key + ]);
 repeatingView.add(populateItem(repeatingView.newChildId(), key, 
bind));
 }
 add(repeatingView);
 }
 
 protected Component populateItem(String componentId, K key, IModelV 
value) {
+return new LabelBorder(componentId, createField(key, value));
+}
+
+private FormComponent? createField(K key, IModelV value) {
 FormComponentV field = new TextFieldV(value, value);
+field.setType(String.class);
 field.setLabel(of(key.toString()));
-LabelBorder border = new LabelBorder(componentId, field);
-return border;
+return field;
 }
+
 }

Modified: 
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/util/DictionaryUtils.java
URL: 
http://svn.apache.org/viewvc/karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/util/DictionaryUtils.java?rev=1381414r1=1381413r2=1381414view=diff
==
--- 
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/util/DictionaryUtils.java
 (original)
+++ 
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/util/DictionaryUtils.java
 Wed Sep  5 22:08:25 2012
@@ -28,7 +28,7 @@ import java.util.Map;
 public abstract class DictionaryUtils {
 
 private DictionaryUtils() {
-System.out.println(How you did that?);
+// utility class, no public constructor
 }
 
 /**

Modified: 
karaf/webconsole/trunk/osgi/config/src/main/java/org/apache/karaf

svn commit: r1381415 - in /karaf/webconsole/trunk/camel/src/main/java/org/apache/karaf/webconsole/camel/internal/context: ContextActionsPanel.java link/ link/ContextLink.java link/ResumeLink.java link

[ldywicki]

Author: ldywicki
Date: Wed Sep  5 22:08:41 2012
New Revision: 1381415

URL: http://svn.apache.org/viewvc?rev=1381415view=rev
Log:
KARAF-1794 - Extend Camel plugin with support for suspending/resuming context

Signed-off-by: Lukasz Dywicki l...@code-house.org

Added:

karaf/webconsole/trunk/camel/src/main/java/org/apache/karaf/webconsole/camel/internal/context/link/

karaf/webconsole/trunk/camel/src/main/java/org/apache/karaf/webconsole/camel/internal/context/link/ContextLink.java

karaf/webconsole/trunk/camel/src/main/java/org/apache/karaf/webconsole/camel/internal/context/link/ResumeLink.java

karaf/webconsole/trunk/camel/src/main/java/org/apache/karaf/webconsole/camel/internal/context/link/SuspendLink.java
Modified:

karaf/webconsole/trunk/camel/src/main/java/org/apache/karaf/webconsole/camel/internal/context/ContextActionsPanel.java

Modified: 
karaf/webconsole/trunk/camel/src/main/java/org/apache/karaf/webconsole/camel/internal/context/ContextActionsPanel.java
URL: 
http://svn.apache.org/viewvc/karaf/webconsole/trunk/camel/src/main/java/org/apache/karaf/webconsole/camel/internal/context/ContextActionsPanel.java?rev=1381415r1=1381414r2=1381415view=diff
==
--- 
karaf/webconsole/trunk/camel/src/main/java/org/apache/karaf/webconsole/camel/internal/context/ContextActionsPanel.java
 (original)
+++ 
karaf/webconsole/trunk/camel/src/main/java/org/apache/karaf/webconsole/camel/internal/context/ContextActionsPanel.java
 Wed Sep  5 22:08:41 2012
@@ -20,6 +20,8 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.camel.CamelContext;
+import org.apache.karaf.webconsole.camel.internal.context.link.ResumeLink;
+import org.apache.karaf.webconsole.camel.internal.context.link.SuspendLink;
 import org.apache.karaf.webconsole.camel.internal.tracking.TraceContainer;
 import org.apache.karaf.webconsole.core.table.ActionsPanel;
 import org.apache.wicket.Session;
@@ -85,6 +87,16 @@ public class ContextActionsPanel extends
 links.add(link);
 }
 
+if (!object.isSuspended()) {
+Link link = new SuspendLink(linkId, getModel());
+link.add(new Label(labelId, Suspend));
+links.add(link);
+} else {
+Link link = new ResumeLink(linkId, getModel());
+link.add(new Label(labelId, Resume));
+links.add(link);
+}
+
 return links;
 }
 

Added: 
karaf/webconsole/trunk/camel/src/main/java/org/apache/karaf/webconsole/camel/internal/context/link/ContextLink.java
URL: 
http://svn.apache.org/viewvc/karaf/webconsole/trunk/camel/src/main/java/org/apache/karaf/webconsole/camel/internal/context/link/ContextLink.java?rev=1381415view=auto
==
--- 
karaf/webconsole/trunk/camel/src/main/java/org/apache/karaf/webconsole/camel/internal/context/link/ContextLink.java
 (added)
+++ 
karaf/webconsole/trunk/camel/src/main/java/org/apache/karaf/webconsole/camel/internal/context/link/ContextLink.java
 Wed Sep  5 22:08:41 2012
@@ -0,0 +1,41 @@
+/*
+ * 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.camel.internal.context.link;
+
+import org.apache.camel.CamelContext;
+import org.apache.wicket.markup.html.link.Link;
+import org.apache.wicket.model.IModel;
+
+/**
+ * Base link for context releated stuff.
+ */
+public abstract class ContextLink extends LinkCamelContext {
+
+private static final long serialVersionUID = 1L;
+
+public ContextLink(String id, IModelCamelContext model) {
+super(id, model);
+}
+
+@Override
+public void onClick() {
+onClick((CamelContext) getDefaultModelObject());
+}
+
+protected abstract void onClick(CamelContext context);
+
+}

Added: 
karaf/webconsole/trunk/camel/src/main/java/org/apache/karaf/webconsole/camel/internal/context/link/ResumeLink.java
URL: 
http://svn.apache.org/viewvc/karaf/webconsole/trunk/camel/src/main/java/org/apache/karaf/webconsole/camel/internal/context/link/ResumeLink.java?rev=1381415view=auto

svn commit: r1381416 - in /karaf/webconsole/trunk/camel/src/main: java/org/apache/karaf/webconsole/camel/internal/widget/ resources/OSGI-INF/blueprint/ resources/org/apache/karaf/webconsole/camel/inte

[ldywicki]

Author: ldywicki
Date: Wed Sep  5 22:09:02 2012
New Revision: 1381416

URL: http://svn.apache.org/viewvc?rev=1381416view=rev
Log:
KARAF-1795 Fix camel widget and provide additional information about delpoyed 
contexts

Signed-off-by: Lukasz Dywicki l...@code-house.org

Modified:

karaf/webconsole/trunk/camel/src/main/java/org/apache/karaf/webconsole/camel/internal/widget/CamelWidget.java

karaf/webconsole/trunk/camel/src/main/java/org/apache/karaf/webconsole/camel/internal/widget/CamelWidgetProvider.java
karaf/webconsole/trunk/camel/src/main/resources/OSGI-INF/blueprint/camel.xml

karaf/webconsole/trunk/camel/src/main/resources/org/apache/karaf/webconsole/camel/internal/widget/CamelWidget.html

Modified: 
karaf/webconsole/trunk/camel/src/main/java/org/apache/karaf/webconsole/camel/internal/widget/CamelWidget.java
URL: 
http://svn.apache.org/viewvc/karaf/webconsole/trunk/camel/src/main/java/org/apache/karaf/webconsole/camel/internal/widget/CamelWidget.java?rev=1381416r1=1381415r2=1381416view=diff
==
--- 
karaf/webconsole/trunk/camel/src/main/java/org/apache/karaf/webconsole/camel/internal/widget/CamelWidget.java
 (original)
+++ 
karaf/webconsole/trunk/camel/src/main/java/org/apache/karaf/webconsole/camel/internal/widget/CamelWidget.java
 Wed Sep  5 22:09:02 2012
@@ -25,6 +25,7 @@ import org.apache.wicket.markup.html.lin
 import org.apache.wicket.markup.html.list.ListItem;
 import org.apache.wicket.markup.html.list.ListView;
 import org.apache.wicket.markup.html.panel.Panel;
+import org.ops4j.pax.wicket.api.PaxWicketBean;
 
 /**
  * Widget with list of camel contexts.
@@ -33,21 +34,22 @@ public class CamelWidget extends Panel {
 
 private static final long serialVersionUID = 1L;
 
+@PaxWicketBean(name = contexts)
+private ListCamelContext contexts;
+
 @SuppressWarnings(serial)
-public CamelWidget(String id, ListCamelContext contexts) {
+public CamelWidget(String id) {
 super(id);
 
-//ListCamelContext subList = new ArrayListCamelContext(contexts);
-//if (subList.size()  4) {
-//subList = subList.subList(0, 4);
-//}
 add(new Label(count,  + contexts.size()));
 
-add(new ListViewCamelContext(contexts/*, subList*/) {
+add(new ListViewCamelContext(contexts, contexts) {
 @Override
 protected void populateItem(ListItemCamelContext item) {
 CamelContext model = item.getModelObject();
-add(new Label(name, model.getName()));
+item.add(new Label(name, model.getName()));
+item.add(new Label(uptime, model.getUptime()));
+item.add(new Label(routeCount, + 
model.getRouteDefinitions().size()));
 }
 });
 

Modified: 
karaf/webconsole/trunk/camel/src/main/java/org/apache/karaf/webconsole/camel/internal/widget/CamelWidgetProvider.java
URL: 
http://svn.apache.org/viewvc/karaf/webconsole/trunk/camel/src/main/java/org/apache/karaf/webconsole/camel/internal/widget/CamelWidgetProvider.java?rev=1381416r1=1381415r2=1381416view=diff
==
--- 
karaf/webconsole/trunk/camel/src/main/java/org/apache/karaf/webconsole/camel/internal/widget/CamelWidgetProvider.java
 (original)
+++ 
karaf/webconsole/trunk/camel/src/main/java/org/apache/karaf/webconsole/camel/internal/widget/CamelWidgetProvider.java
 Wed Sep  5 22:09:02 2012
@@ -16,22 +16,13 @@
  */
 package org.apache.karaf.webconsole.camel.internal.widget;
 
-import java.util.List;
-
-import org.apache.camel.CamelContext;
 import org.apache.karaf.webconsole.core.widget.WidgetProvider;
 import org.apache.wicket.markup.html.panel.Panel;
 
 public class CamelWidgetProvider implements WidgetProvider {
 
-private final ListCamelContext contexts;
-
-public CamelWidgetProvider(ListCamelContext contexts) {
-this.contexts = contexts;
-}
-
 public Panel createPanel(String id) {
-return new CamelWidget(id, contexts);
+return new CamelWidget(id);
 }
 
 }

Modified: 
karaf/webconsole/trunk/camel/src/main/resources/OSGI-INF/blueprint/camel.xml
URL: 
http://svn.apache.org/viewvc/karaf/webconsole/trunk/camel/src/main/resources/OSGI-INF/blueprint/camel.xml?rev=1381416r1=1381415r2=1381416view=diff
==
--- 
karaf/webconsole/trunk/camel/src/main/resources/OSGI-INF/blueprint/camel.xml 
(original)
+++ 
karaf/webconsole/trunk/camel/src/main/resources/OSGI-INF/blueprint/camel.xml 
Wed Sep  5 22:09:02 2012
@@ -23,17 +23,15 @@
 
 bean id=tracer 
class=org.apache.karaf.webconsole.camel.internal.tracking.DefaultTracerContainer
 /
 
-reference-list id=contexts interface=org.apache.camel.CamelContext/
+reference-list id=contexts interface=org.apache.camel.CamelContext 
availability=optional /
 
-service ref

svn commit: r1381418 - /karaf/site/trunk/src/main/webapp/index/subprojects/webconsole.page

[ldywicki]

Author: ldywicki
Date: Wed Sep  5 22:15:33 2012
New Revision: 1381418

URL: http://svn.apache.org/viewvc?rev=1381418view=rev
Log:
Fix webconsole url

Modified:
karaf/site/trunk/src/main/webapp/index/subprojects/webconsole.page

Modified: karaf/site/trunk/src/main/webapp/index/subprojects/webconsole.page
URL: 
http://svn.apache.org/viewvc/karaf/site/trunk/src/main/webapp/index/subprojects/webconsole.page?rev=1381418r1=1381417r2=1381418view=diff
==
--- karaf/site/trunk/src/main/webapp/index/subprojects/webconsole.page 
(original)
+++ karaf/site/trunk/src/main/webapp/index/subprojects/webconsole.page Wed Sep  
5 22:15:33 2012
@@ -20,8 +20,8 @@ karaf@root feature:add-url mvn:org.apac
 karaf@root feature:install webconsole-wicket
 {code}
 
-You can open the WebConsole CNS URL in your browser:
+You can open the WebConsole in your browser:
 
 {code}
-http://localhost:8181/cns
+http://localhost:8181/console
 {code}

svn commit: r1381425 - /karaf/webconsole/trunk/osgi/config/src/main/java/org/apache/karaf/webconsole/osgi/config/ConfigurationEditPage.java

[ldywicki]

Author: ldywicki
Date: Wed Sep  5 22:33:10 2012
New Revision: 1381425

URL: http://svn.apache.org/viewvc?rev=1381425view=rev
Log:
KARAF-1793 Fix configuration edit form (file missed in previous commit).

Signed-off-by: Lukasz Dywicki l...@code-house.org

Modified:

karaf/webconsole/trunk/osgi/config/src/main/java/org/apache/karaf/webconsole/osgi/config/ConfigurationEditPage.java

Modified: 
karaf/webconsole/trunk/osgi/config/src/main/java/org/apache/karaf/webconsole/osgi/config/ConfigurationEditPage.java
URL: 
http://svn.apache.org/viewvc/karaf/webconsole/trunk/osgi/config/src/main/java/org/apache/karaf/webconsole/osgi/config/ConfigurationEditPage.java?rev=1381425r1=1381424r2=1381425view=diff
==
--- 
karaf/webconsole/trunk/osgi/config/src/main/java/org/apache/karaf/webconsole/osgi/config/ConfigurationEditPage.java
 (original)
+++ 
karaf/webconsole/trunk/osgi/config/src/main/java/org/apache/karaf/webconsole/osgi/config/ConfigurationEditPage.java
 Wed Sep  5 22:33:10 2012
@@ -53,20 +53,20 @@ public class ConfigurationEditPage exten
 pid = params.get(pid).toString();
 
 add(new Label(pid, pid));
-Configuration configuration = new ConfigurationModel(pid, 
configurationAdmin).getObject();
+ConfigurationModel configuration = new ConfigurationModel(pid, 
configurationAdmin);
+setDefaultModel(configuration);
 
 @SuppressWarnings(unchecked)
-MapString, String properties = 
DictionaryUtils.map(configuration.getProperties());
+MapString, String properties = 
DictionaryUtils.map(configuration.getObject().getProperties());
 MapString, String system = 
ConfigurationFilterUtil.filter(properties);
-CompoundPropertyModelMapString, String formModel = new 
CompoundPropertyModelMapString, String(properties);
 
-MapEditFormString, String mapEditForm = new MapEditFormString, 
String(edit, formModel) {
+MapEditFormString, String mapEditForm = new MapEditFormString, 
String(edit, new CompoundPropertyModelMapString, String(properties)) {
 @Override
 protected void onSubmit() {
 MapString, String map = getModelObject();
 
+Configuration configuration = (Configuration) 
ConfigurationEditPage.this.getDefaultModelObject();
 try {
-Configuration configuration = new ConfigurationModel(pid, 
configurationAdmin).getObject();
 if (configuration.getBundleLocation() != null) {
 configuration.setBundleLocation(null);
 }
@@ -75,7 +75,7 @@ public class ConfigurationEditPage exten
 Session.get().info(Configuration  + pid +  updated.);
 
RequestCycle.get().setResponsePage(ConfigurationsPage.class);
 } catch (IOException e) {
-e.printStackTrace();
+error(Unable to update configuration  + e.getMessage());
 }
 }
 };

svn commit: r1379099 - in /karaf/webconsole/trunk/osgi/log/src/main: java/org/apache/karaf/webconsole/osgi/log/LogEntriesDataProvider.java java/org/apache/karaf/webconsole/osgi/log/LogsPage.java resou

[ldywicki]

Author: ldywicki
Date: Thu Aug 30 19:58:03 2012
New Revision: 1379099

URL: http://svn.apache.org/viewvc?rev=1379099view=rev
Log:
KARAF-1780 Solve serialization issues in log plugin

Modified:

karaf/webconsole/trunk/osgi/log/src/main/java/org/apache/karaf/webconsole/osgi/log/LogEntriesDataProvider.java

karaf/webconsole/trunk/osgi/log/src/main/java/org/apache/karaf/webconsole/osgi/log/LogsPage.java

karaf/webconsole/trunk/osgi/log/src/main/resources/OSGI-INF/blueprint/log.xml

Modified: 
karaf/webconsole/trunk/osgi/log/src/main/java/org/apache/karaf/webconsole/osgi/log/LogEntriesDataProvider.java
URL: 
http://svn.apache.org/viewvc/karaf/webconsole/trunk/osgi/log/src/main/java/org/apache/karaf/webconsole/osgi/log/LogEntriesDataProvider.java?rev=1379099r1=1379098r2=1379099view=diff
==
--- 
karaf/webconsole/trunk/osgi/log/src/main/java/org/apache/karaf/webconsole/osgi/log/LogEntriesDataProvider.java
 (original)
+++ 
karaf/webconsole/trunk/osgi/log/src/main/java/org/apache/karaf/webconsole/osgi/log/LogEntriesDataProvider.java
 Thu Aug 30 19:58:03 2012
@@ -40,7 +40,7 @@ final class LogEntriesDataProvider exten
 
 private Options options;
 
-private transient ListMatcher matchers;
+private ListMatcher matchers;
 
 public LogEntriesDataProvider(LogReaderService logReader, Options options, 
ListMatcher matchers) {
 this.logReader = logReader;

Modified: 
karaf/webconsole/trunk/osgi/log/src/main/java/org/apache/karaf/webconsole/osgi/log/LogsPage.java
URL: 
http://svn.apache.org/viewvc/karaf/webconsole/trunk/osgi/log/src/main/java/org/apache/karaf/webconsole/osgi/log/LogsPage.java?rev=1379099r1=1379098r2=1379099view=diff
==
--- 
karaf/webconsole/trunk/osgi/log/src/main/java/org/apache/karaf/webconsole/osgi/log/LogsPage.java
 (original)
+++ 
karaf/webconsole/trunk/osgi/log/src/main/java/org/apache/karaf/webconsole/osgi/log/LogsPage.java
 Thu Aug 30 19:58:03 2012
@@ -23,12 +23,7 @@ import java.util.List;
 
 import org.apache.karaf.webconsole.core.table.PropertyColumnExt;
 import org.apache.karaf.webconsole.osgi.core.shared.OsgiPage;
-import org.apache.karaf.webconsole.osgi.log.search.BundleMatcher;
-import org.apache.karaf.webconsole.osgi.log.search.DateFromMatcher;
-import org.apache.karaf.webconsole.osgi.log.search.DateToMatcher;
 import org.apache.karaf.webconsole.osgi.log.search.Matcher;
-import org.apache.karaf.webconsole.osgi.log.search.MessageMatcher;
-import org.apache.karaf.webconsole.osgi.log.search.PriorityMatcher;
 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;
@@ -55,6 +50,9 @@ public class LogsPage extends OsgiPage {
 @PaxWicketBean(name = logReader)
 private LogReaderService logReader;
 
+@PaxWicketBean(name = matchers)
+private ListMatcher matchers;
+
 private Options options = new Options();
 
 @SuppressWarnings(serial)
@@ -84,14 +82,6 @@ public class LogsPage extends OsgiPage {
 
 OptionsForm form = new OptionsForm(filters, model);
 
-ListMatcher matchers = Arrays.asList(
-new PriorityMatcher(),
-new MessageMatcher(),
-new BundleMatcher(),
-new DateFromMatcher(),
-new DateToMatcher()
-);
-
 LogEntriesDataProvider provider = new 
LogEntriesDataProvider(logReader, options, matchers);
 DefaultDataTableLogEntry table = new 
DefaultDataTableLogEntry(logs, Arrays.asList(columns), provider, 20);
 

Modified: 
karaf/webconsole/trunk/osgi/log/src/main/resources/OSGI-INF/blueprint/log.xml
URL: 
http://svn.apache.org/viewvc/karaf/webconsole/trunk/osgi/log/src/main/resources/OSGI-INF/blueprint/log.xml?rev=1379099r1=1379098r2=1379099view=diff
==
--- 
karaf/webconsole/trunk/osgi/log/src/main/resources/OSGI-INF/blueprint/log.xml 
(original)
+++ 
karaf/webconsole/trunk/osgi/log/src/main/resources/OSGI-INF/blueprint/log.xml 
Thu Aug 30 19:58:03 2012
@@ -27,4 +27,22 @@
 
 reference id=logReader 
interface=org.osgi.service.log.LogReaderService /
 
+reference-list id=matchers 
interface=org.apache.karaf.webconsole.osgi.log.search.Matcher 
availability=optional /
+
+service auto-export=interfaces
+bean 
class=org.apache.karaf.webconsole.osgi.log.search.PriorityMatcher /
+/service
+service auto-export=interfaces
+bean 
class=org.apache.karaf.webconsole.osgi.log.search.MessageMatcher /
+/service
+service auto-export=interfaces
+bean 
class=org.apache.karaf.webconsole.osgi.log.search.BundleMatcher /
+/service
+service auto-export=interfaces
+bean 
class

svn commit: r1379101 - in /karaf/webconsole/trunk/osgi/blueprint/src/main: java/org/apache/karaf/webconsole/osgi/blueprint/bundle/ java/org/apache/karaf/webconsole/osgi/blueprint/details/ resources/OS

[ldywicki]

Author: ldywicki
Date: Thu Aug 30 19:58:27 2012
New Revision: 1379101

URL: http://svn.apache.org/viewvc?rev=1379101view=rev
Log:
KARAF-1782 - Solve serialization issues in blueprint plugin

Signed-off-by: Lukasz Dywicki l...@code-house.org

Added:

karaf/webconsole/trunk/osgi/blueprint/src/main/java/org/apache/karaf/webconsole/osgi/blueprint/bundle/BlueprintColumn.java

karaf/webconsole/trunk/osgi/blueprint/src/main/java/org/apache/karaf/webconsole/osgi/blueprint/bundle/BlueprintPanel.java

karaf/webconsole/trunk/osgi/blueprint/src/main/resources/org/apache/karaf/webconsole/osgi/blueprint/bundle/BlueprintPanel.html
Modified:

karaf/webconsole/trunk/osgi/blueprint/src/main/java/org/apache/karaf/webconsole/osgi/blueprint/bundle/BlueprintColumnProvider.java

karaf/webconsole/trunk/osgi/blueprint/src/main/java/org/apache/karaf/webconsole/osgi/blueprint/details/MetadataModel.java

karaf/webconsole/trunk/osgi/blueprint/src/main/resources/OSGI-INF/blueprint/blueprint.xml

Added: 
karaf/webconsole/trunk/osgi/blueprint/src/main/java/org/apache/karaf/webconsole/osgi/blueprint/bundle/BlueprintColumn.java
URL: 
http://svn.apache.org/viewvc/karaf/webconsole/trunk/osgi/blueprint/src/main/java/org/apache/karaf/webconsole/osgi/blueprint/bundle/BlueprintColumn.java?rev=1379101view=auto
==
--- 
karaf/webconsole/trunk/osgi/blueprint/src/main/java/org/apache/karaf/webconsole/osgi/blueprint/bundle/BlueprintColumn.java
 (added)
+++ 
karaf/webconsole/trunk/osgi/blueprint/src/main/java/org/apache/karaf/webconsole/osgi/blueprint/bundle/BlueprintColumn.java
 Thu Aug 30 19:58:27 2012
@@ -0,0 +1,41 @@
+/*
+ * 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.blueprint.bundle;
+
+import static org.apache.wicket.model.Model.of;
+
+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.markup.repeater.Item;
+import org.apache.wicket.model.IModel;
+import org.osgi.framework.Bundle;
+
+/**
+ * Column representing items blueprint state.
+ */
+class BlueprintColumn extends AbstractColumnBundle {
+
+private static final long serialVersionUID = 1L;
+
+public BlueprintColumn() {
+super(of(Blueprint));
+}
+
+public void populateItem(ItemICellPopulatorBundle cellItem, String 
componentId, IModelBundle rowModel) {
+cellItem.add(new BlueprintPanel(componentId, rowModel));
+}
+}
\ No newline at end of file

Modified: 
karaf/webconsole/trunk/osgi/blueprint/src/main/java/org/apache/karaf/webconsole/osgi/blueprint/bundle/BlueprintColumnProvider.java
URL: 
http://svn.apache.org/viewvc/karaf/webconsole/trunk/osgi/blueprint/src/main/java/org/apache/karaf/webconsole/osgi/blueprint/bundle/BlueprintColumnProvider.java?rev=1379101r1=1379100r2=1379101view=diff
==
--- 
karaf/webconsole/trunk/osgi/blueprint/src/main/java/org/apache/karaf/webconsole/osgi/blueprint/bundle/BlueprintColumnProvider.java
 (original)
+++ 
karaf/webconsole/trunk/osgi/blueprint/src/main/java/org/apache/karaf/webconsole/osgi/blueprint/bundle/BlueprintColumnProvider.java
 Thu Aug 30 19:58:27 2012
@@ -16,16 +16,8 @@
  */
 package org.apache.karaf.webconsole.osgi.blueprint.bundle;
 
-import org.apache.karaf.webconsole.osgi.blueprint.BlueprintState;
-import org.apache.karaf.webconsole.osgi.blueprint.IBlueprintBundleStateTracker;
 import org.apache.karaf.webconsole.osgi.core.spi.IColumnProvider;
-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;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.repeater.Item;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.Model;
 import org.osgi.framework.Bundle;
 
 /**
@@ -33,25 +25,8 @@ import org.osgi.framework.Bundle;
  */
 public class BlueprintColumnProvider implements

svn commit: r1379102 - in /karaf/webconsole/trunk: core/src/main/resources/org/apache/karaf/webconsole/core/table/ osgi/core/src/main/java/org/apache/karaf/webconsole/osgi/core/bundle/list/ osgi/core/

[ldywicki]

Author: ldywicki
Date: Thu Aug 30 19:58:58 2012
New Revision: 1379102

URL: http://svn.apache.org/viewvc?rev=1379102view=rev
Log:
KARAF-1783 - Support for additional actions in bundles list

Signed-off-by: Lukasz Dywicki l...@code-house.org

Added:

karaf/webconsole/trunk/osgi/core/src/main/java/org/apache/karaf/webconsole/osgi/core/bundle/list/ExtensionsPanel.java

karaf/webconsole/trunk/osgi/core/src/main/resources/org/apache/karaf/webconsole/osgi/core/bundle/list/BundleActionsPanel.html
  - copied, changed from r1379101, 
karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/table/ActionsPanel.html

karaf/webconsole/trunk/osgi/core/src/main/resources/org/apache/karaf/webconsole/osgi/core/bundle/list/ExtensionsPanel.html
  - copied, changed from r1379101, 
karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/table/ActionsPanel.html
Modified:

karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/table/ActionsPanel.html

karaf/webconsole/trunk/osgi/core/src/main/java/org/apache/karaf/webconsole/osgi/core/bundle/list/BundleActionsPanel.java

karaf/webconsole/trunk/osgi/core/src/main/java/org/apache/karaf/webconsole/osgi/core/bundle/list/BundlePage.java

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=1379102r1=1379101r2=1379102view=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
 Thu Aug 30 19:58:58 2012
@@ -16,7 +16,7 @@
limitations under the License.
 --
 wicket:panel 
xmlns:wicket=http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd;
-div class=actions
+div class=actions pull-right
 ul
 li wicket:id=actions
 a wicket:id=action

Modified: 
karaf/webconsole/trunk/osgi/core/src/main/java/org/apache/karaf/webconsole/osgi/core/bundle/list/BundleActionsPanel.java
URL: 
http://svn.apache.org/viewvc/karaf/webconsole/trunk/osgi/core/src/main/java/org/apache/karaf/webconsole/osgi/core/bundle/list/BundleActionsPanel.java?rev=1379102r1=1379101r2=1379102view=diff
==
--- 
karaf/webconsole/trunk/osgi/core/src/main/java/org/apache/karaf/webconsole/osgi/core/bundle/list/BundleActionsPanel.java
 (original)
+++ 
karaf/webconsole/trunk/osgi/core/src/main/java/org/apache/karaf/webconsole/osgi/core/bundle/list/BundleActionsPanel.java
 Thu Aug 30 19:58:58 2012
@@ -28,7 +28,6 @@ import org.apache.karaf.webconsole.osgi.
 import org.apache.karaf.webconsole.osgi.core.bundle.list.link.UninstallLink;
 import org.apache.karaf.webconsole.osgi.core.bundle.list.link.UpdateLink;
 import org.apache.karaf.webconsole.osgi.core.shared.State;
-import org.apache.karaf.webconsole.osgi.core.spi.IActionProvider;
 import org.apache.wicket.AttributeModifier;
 import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.markup.html.link.Link;
@@ -43,17 +42,10 @@ public class BundleActionsPanel extends 
 
 private static final long serialVersionUID = 1L;
 
-public BundleActionsPanel(String componentId, final IModelBundle model, 
ListIActionProvider actionProviders) {
+public BundleActionsPanel(String componentId, final IModelBundle model) {
 super(componentId, model);
 
-/*
-add(new ListViewIActionProvider(extensions, new 
ListModelIActionProvider(actionProviders)) {
-@Override
-protected void populateItem(ListItemIActionProvider item) {
-item.add(item.getModelObject().create(extension, 
model.getObject()));
-}
-});
-*/
+add(new ExtensionsPanel(extend, model));
 }
 
 @Override

Modified: 
karaf/webconsole/trunk/osgi/core/src/main/java/org/apache/karaf/webconsole/osgi/core/bundle/list/BundlePage.java
URL: 
http://svn.apache.org/viewvc/karaf/webconsole/trunk/osgi/core/src/main/java/org/apache/karaf/webconsole/osgi/core/bundle/list/BundlePage.java?rev=1379102r1=1379101r2=1379102view=diff
==
--- 
karaf/webconsole/trunk/osgi/core/src/main/java/org/apache/karaf/webconsole/osgi/core/bundle/list/BundlePage.java
 (original)
+++ 
karaf/webconsole/trunk/osgi/core/src/main/java/org/apache/karaf/webconsole/osgi/core/bundle/list/BundlePage.java
 Thu Aug 30 19:58:58 2012
@@ -26,7 +26,6 @@ import org.apache.karaf.webconsole.osgi.
 import org.apache.karaf.webconsole.osgi.core.shared.BundleDataProvider;
 import

svn commit: r1379103 - in /karaf/webconsole/trunk: core/src/main/java/org/apache/karaf/webconsole/core/panel/ core/src/main/java/org/apache/karaf/webconsole/core/util/ core/src/main/resources/org/apac

[ldywicki]

Author: ldywicki
Date: Thu Aug 30 19:59:27 2012
New Revision: 1379103

URL: http://svn.apache.org/viewvc?rev=1379103view=rev
Log:
KARAF-1784 Provide additional actions for blueprint-enabled bundles

Signed-off-by: Lukasz Dywicki l...@code-house.org

Added:

karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/panel/SingleLinkPanel.java

karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/panel/SingleLinkPanel.html

karaf/webconsole/trunk/osgi/blueprint/src/main/java/org/apache/karaf/webconsole/osgi/blueprint/bundle/BlueprintActionPanel.java
  - copied, changed from r1379102, 
karaf/webconsole/trunk/osgi/blueprint/src/main/java/org/apache/karaf/webconsole/osgi/blueprint/bundle/BlueprintActionProvider.java
Modified:

karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/util/LinkUtils.java

karaf/webconsole/trunk/osgi/blueprint/src/main/java/org/apache/karaf/webconsole/osgi/blueprint/bundle/BlueprintActionProvider.java

karaf/webconsole/trunk/osgi/blueprint/src/main/java/org/apache/karaf/webconsole/osgi/blueprint/details/DetailsPage.java

Added: 
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/panel/SingleLinkPanel.java
URL: 
http://svn.apache.org/viewvc/karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/panel/SingleLinkPanel.java?rev=1379103view=auto
==
--- 
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/panel/SingleLinkPanel.java
 (added)
+++ 
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/panel/SingleLinkPanel.java
 Thu Aug 30 19:59:27 2012
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the License); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.karaf.webconsole.core.panel;
+
+import org.apache.wicket.markup.html.panel.Panel;
+
+/**
+ * Simple panel with one link inside.
+ */
+public class SingleLinkPanel extends Panel {
+
+private static final long serialVersionUID = 1L;
+
+public SingleLinkPanel(String id) {
+super(id);
+}
+
+}

Modified: 
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/util/LinkUtils.java
URL: 
http://svn.apache.org/viewvc/karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/util/LinkUtils.java?rev=1379103r1=1379102r2=1379103view=diff
==
--- 
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/util/LinkUtils.java
 (original)
+++ 
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/util/LinkUtils.java
 Thu Aug 30 19:59:27 2012
@@ -22,6 +22,7 @@ import org.apache.wicket.markup.html.lin
 import org.apache.wicket.markup.html.link.Link;
 import org.apache.wicket.protocol.http.RequestUtils;
 import org.apache.wicket.request.cycle.RequestCycle;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
 
 /**
  * Utility class to create links.
@@ -39,9 +40,25 @@ public abstract class LinkUtils {
  * @param page Page class to link.
  * @return Bookmarkable link.
  */
-@SuppressWarnings({rawtypes, unchecked})
 public static T extends Page LinkPage createPageLink(String linkId, 
String labelId, String label, ClassT page) {
-Link link = new BookmarkablePageLinkT(linkId, page);
+return createPageLink(linkId, labelId, label, page, new 
PageParameters());
+}
+
+/**
+ * Creates bookmarkable page link with given page class and parameters.
+ * 
+ * @param T Type of page.
+ * 
+ * @param linkId Link element id.
+ * @param labelId Inner link element label.
+ * @param label Text label.
+ * @param page Page class to link.
+ * @param params Page parameters.
+ * @return Bookmarkable link.
+ */
+@SuppressWarnings({rawtypes, unchecked})
+public static T extends Page LinkPage createPageLink(String linkId, 
String labelId, String label, ClassT page, PageParameters params) {
+Link link = new BookmarkablePageLinkT(linkId, page, params);
 link.add(new Label(labelId, label));
 return link

svn commit: r1379104 - in /karaf/webconsole/trunk/osgi/scr: ./ src/main/java/org/apache/karaf/webconsole/osgi/scr/ src/main/resources/OSGI-INF/ src/main/resources/org/apache/karaf/webconsole/osgi/scr/

[ldywicki]

Author: ldywicki
Date: Thu Aug 30 19:59:51 2012
New Revision: 1379104

URL: http://svn.apache.org/viewvc?rev=1379104view=rev
Log:
 KARAF-1786 - Fix serialization issues in scr plugin

Signed-off-by: Lukasz Dywicki l...@code-house.org

Added:
karaf/webconsole/trunk/osgi/scr/src/main/resources/OSGI-INF/component.xml
  - copied, changed from r1379103, 
karaf/webconsole/trunk/osgi/scr/src/main/resources/OSGI-INF/column.xml

karaf/webconsole/trunk/osgi/scr/src/main/resources/org/apache/karaf/webconsole/osgi/scr/scr.png
Removed:

karaf/webconsole/trunk/osgi/scr/src/main/resources/org/apache/karaf/webconsole/osgi/scr/scr.gif
Modified:
karaf/webconsole/trunk/osgi/scr/pom.xml

karaf/webconsole/trunk/osgi/scr/src/main/java/org/apache/karaf/webconsole/osgi/scr/ScrColumn.java

karaf/webconsole/trunk/osgi/scr/src/main/java/org/apache/karaf/webconsole/osgi/scr/ScrColumnPanel.java

karaf/webconsole/trunk/osgi/scr/src/main/java/org/apache/karaf/webconsole/osgi/scr/ScrColumnProvider.java

karaf/webconsole/trunk/osgi/scr/src/main/java/org/apache/karaf/webconsole/osgi/scr/ScrComponent.java

karaf/webconsole/trunk/osgi/scr/src/main/java/org/apache/karaf/webconsole/osgi/scr/ScrDecorationProvider.java
karaf/webconsole/trunk/osgi/scr/src/main/resources/OSGI-INF/column.xml
karaf/webconsole/trunk/osgi/scr/src/main/resources/OSGI-INF/decoration.xml

karaf/webconsole/trunk/osgi/scr/src/main/resources/org/apache/karaf/webconsole/osgi/scr/decorator.css

Modified: karaf/webconsole/trunk/osgi/scr/pom.xml
URL: 
http://svn.apache.org/viewvc/karaf/webconsole/trunk/osgi/scr/pom.xml?rev=1379104r1=1379103r2=1379104view=diff
==
--- karaf/webconsole/trunk/osgi/scr/pom.xml (original)
+++ karaf/webconsole/trunk/osgi/scr/pom.xml Thu Aug 30 19:59:51 2012
@@ -61,7 +61,7 @@
 /Import-Package
 Export-Package/Export-Package
 
Private-Packageorg.apache.karaf.webconsole.osgi.scr*,/Private-Package
-
Service-ComponentOSGI-INF/column.xml,OSGI-INF/decoration.xml/Service-Component
+
Service-ComponentOSGI-INF/column.xml,OSGI-INF/decoration.xml,OSGI-INF/component.xml/Service-Component
 /instructions
 /configuration
 /plugin

Modified: 
karaf/webconsole/trunk/osgi/scr/src/main/java/org/apache/karaf/webconsole/osgi/scr/ScrColumn.java
URL: 
http://svn.apache.org/viewvc/karaf/webconsole/trunk/osgi/scr/src/main/java/org/apache/karaf/webconsole/osgi/scr/ScrColumn.java?rev=1379104r1=1379103r2=1379104view=diff
==
--- 
karaf/webconsole/trunk/osgi/scr/src/main/java/org/apache/karaf/webconsole/osgi/scr/ScrColumn.java
 (original)
+++ 
karaf/webconsole/trunk/osgi/scr/src/main/java/org/apache/karaf/webconsole/osgi/scr/ScrColumn.java
 Thu Aug 30 19:59:51 2012
@@ -34,24 +34,20 @@ public class ScrColumn extends AbstractC
 
 private static final long serialVersionUID = 1L;
 
-private ScrService scr;
-
-public ScrColumn(ScrService scr, String title) {
+public ScrColumn(String title) {
 super(of(title));
-this.scr = scr;
 }
 
 public void populateItem(ItemICellPopulatorBundle cellItem, String 
componentId, IModelBundle rowModel) {
-if (scr == null) {
-return;
-}
+ScrService scr = ScrComponent.getScrService();
 
-Component[] components = scr.getComponents(rowModel.getObject());
-if (components != null) {
-cellItem.add(new ScrColumnPanel(componentId, components));
-} else {
+Component[] components = null;
+if (scr == null || (components = 
scr.getComponents(rowModel.getObject())) == null) {
 // no scr for this bundle
 cellItem.add(new Label(componentId));
+return;
 }
+
+cellItem.add(new ScrColumnPanel(componentId, components));
 }
 }
\ No newline at end of file

Modified: 
karaf/webconsole/trunk/osgi/scr/src/main/java/org/apache/karaf/webconsole/osgi/scr/ScrColumnPanel.java
URL: 
http://svn.apache.org/viewvc/karaf/webconsole/trunk/osgi/scr/src/main/java/org/apache/karaf/webconsole/osgi/scr/ScrColumnPanel.java?rev=1379104r1=1379103r2=1379104view=diff
==
--- 
karaf/webconsole/trunk/osgi/scr/src/main/java/org/apache/karaf/webconsole/osgi/scr/ScrColumnPanel.java
 (original)
+++ 
karaf/webconsole/trunk/osgi/scr/src/main/java/org/apache/karaf/webconsole/osgi/scr/ScrColumnPanel.java
 Thu Aug 30 19:59:51 2012
@@ -16,8 +16,6 @@
  */
 package org.apache.karaf.webconsole.osgi.scr;
 
-import static org.apache.wicket.model.Model.of;
-
 import org.apache.felix.scr.Component;
 import org.apache.wicket.MarkupContainer;
 import org.apache.wicket.markup.html.WebMarkupContainer

svn commit: r1379106 - in /karaf/webconsole/trunk/osgi/scr: ./ src/main/java/org/apache/karaf/webconsole/osgi/scr/ src/main/java/org/apache/karaf/webconsole/osgi/scr/link/ src/main/resources/OSGI-INF/

[ldywicki]

Author: ldywicki
Date: Thu Aug 30 20:00:15 2012
New Revision: 1379106

URL: http://svn.apache.org/viewvc?rev=1379106view=rev
Log:
KARAF-1785 Provide additional actions for SCR plugin

Signed-off-by: Lukasz Dywicki l...@code-house.org

Added:

karaf/webconsole/trunk/osgi/scr/src/main/java/org/apache/karaf/webconsole/osgi/scr/ScrActionPanel.java

karaf/webconsole/trunk/osgi/scr/src/main/java/org/apache/karaf/webconsole/osgi/scr/ScrActionProvider.java

karaf/webconsole/trunk/osgi/scr/src/main/java/org/apache/karaf/webconsole/osgi/scr/link/

karaf/webconsole/trunk/osgi/scr/src/main/java/org/apache/karaf/webconsole/osgi/scr/link/DisableLink.java

karaf/webconsole/trunk/osgi/scr/src/main/java/org/apache/karaf/webconsole/osgi/scr/link/EnableLink.java

karaf/webconsole/trunk/osgi/scr/src/main/java/org/apache/karaf/webconsole/osgi/scr/link/ScrLink.java
karaf/webconsole/trunk/osgi/scr/src/main/resources/OSGI-INF/action.xml

karaf/webconsole/trunk/osgi/scr/src/main/resources/org/apache/karaf/webconsole/osgi/scr/ScrActionPanel.html
Modified:
karaf/webconsole/trunk/osgi/scr/pom.xml

Modified: karaf/webconsole/trunk/osgi/scr/pom.xml
URL: 
http://svn.apache.org/viewvc/karaf/webconsole/trunk/osgi/scr/pom.xml?rev=1379106r1=1379105r2=1379106view=diff
==
--- karaf/webconsole/trunk/osgi/scr/pom.xml (original)
+++ karaf/webconsole/trunk/osgi/scr/pom.xml Thu Aug 30 20:00:15 2012
@@ -61,7 +61,7 @@
 /Import-Package
 Export-Package/Export-Package
 
Private-Packageorg.apache.karaf.webconsole.osgi.scr*,/Private-Package
-
Service-ComponentOSGI-INF/column.xml,OSGI-INF/decoration.xml,OSGI-INF/component.xml/Service-Component
+
Service-ComponentOSGI-INF/column.xml,OSGI-INF/decoration.xml,OSGI-INF/action.xml,OSGI-INF/component.xml/Service-Component
 /instructions
 /configuration
 /plugin

Added: 
karaf/webconsole/trunk/osgi/scr/src/main/java/org/apache/karaf/webconsole/osgi/scr/ScrActionPanel.java
URL: 
http://svn.apache.org/viewvc/karaf/webconsole/trunk/osgi/scr/src/main/java/org/apache/karaf/webconsole/osgi/scr/ScrActionPanel.java?rev=1379106view=auto
==
--- 
karaf/webconsole/trunk/osgi/scr/src/main/java/org/apache/karaf/webconsole/osgi/scr/ScrActionPanel.java
 (added)
+++ 
karaf/webconsole/trunk/osgi/scr/src/main/java/org/apache/karaf/webconsole/osgi/scr/ScrActionPanel.java
 Thu Aug 30 20:00:15 2012
@@ -0,0 +1,82 @@
+/*
+ * 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.scr;
+
+import org.apache.felix.scr.Component;
+import org.apache.karaf.webconsole.osgi.scr.link.DisableLink;
+import org.apache.karaf.webconsole.osgi.scr.link.EnableLink;
+import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.link.Link;
+import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.markup.repeater.RepeatingView;
+import org.apache.wicket.model.IModel;
+import org.osgi.framework.Bundle;
+
+public class ScrActionPanel extends Panel {
+
+private static final long serialVersionUID = 1L;
+private RepeatingView view;
+private int childCount = 0;
+
+public ScrActionPanel(String componentId, IModelBundle model, 
Component[] components) {
+super(componentId, model);
+
+view = new RepeatingView(components);
+for (Component component : components) {
+switch (component.getState()) {
+case Component.STATE_ACTIVE:
+view.add(createDisableLink(component, view.newChildId()));
+childCount++;
+break;
+case Component.STATE_DISABLED:
+view.add(createEnableLink(component, view.newChildId()));
+childCount++;
+break;
+}
+}
+
+add(view);
+}
+
+private WebMarkupContainer createDisableLink(Component component, String 
childId

svn commit: r1378579 - in /karaf/webconsole/trunk: ./ core/src/main/java/org/apache/karaf/webconsole/core/behavior/ core/src/main/resources/ core/src/main/resources/org/apache/karaf/webconsole/core/in

[ldywicki]

Author: ldywicki
Date: Wed Aug 29 14:33:11 2012
New Revision: 1378579

URL: http://svn.apache.org/viewvc?rev=1378579view=rev
Log:
KARAF-1775 Prepare profiles for deploy / release / rat

Signed-off-by: Lukasz Dywicki l...@code-house.org

Removed:
karaf/webconsole/trunk/core/src/main/resources/log4j.properties
Modified:

karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/behavior/CssBehavior.java

karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/behavior/JavaScriptBehavior.java

karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/internal/LanguagePanel.properties

karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/internal/LanguagePanel_fr.properties

karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/navigation/markup/NavigationPanel.properties

karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/navigation/markup/NavigationPanel_de.properties

karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/navigation/markup/NavigationPanel_fr.properties
karaf/webconsole/trunk/core/src/test/resources/log4j.properties

karaf/webconsole/trunk/karaf/feature/src/main/resources/org/apache/karaf/webconsole/karaf/feature/feature/FeaturesPage.properties

karaf/webconsole/trunk/karaf/feature/src/main/resources/org/apache/karaf/webconsole/karaf/feature/feature/FeaturesPage_de.properties

karaf/webconsole/trunk/karaf/feature/src/main/resources/org/apache/karaf/webconsole/karaf/feature/feature/FeaturesPage_fr.properties

karaf/webconsole/trunk/karaf/feature/src/main/resources/org/apache/karaf/webconsole/karaf/feature/feature/features.css

karaf/webconsole/trunk/karaf/feature/src/main/resources/org/apache/karaf/webconsole/karaf/feature/navigation/package_fr.properties

karaf/webconsole/trunk/karaf/feature/src/main/resources/org/apache/karaf/webconsole/karaf/feature/repository/AddRepositoryPage.properties

karaf/webconsole/trunk/osgi/core/src/main/java/org/apache/karaf/webconsole/osgi/core/pkg/list/ExportPackageModel.java

karaf/webconsole/trunk/osgi/core/src/main/java/org/apache/karaf/webconsole/osgi/core/pkg/list/PackageDataProvider.java
karaf/webconsole/trunk/pom.xml

karaf/webconsole/trunk/servicemix/src/main/resources/org/apache/karaf/webconsole/servicemix/internal/message.css

Modified: 
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/behavior/CssBehavior.java
URL: 
http://svn.apache.org/viewvc/karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/behavior/CssBehavior.java?rev=1378579r1=1378578r2=1378579view=diff
==
--- 
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/behavior/CssBehavior.java
 (original)
+++ 
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/behavior/CssBehavior.java
 Wed Aug 29 14:33:11 2012
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the License); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.apache.karaf.webconsole.core.behavior;
 
 import org.apache.wicket.Component;

Modified: 
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/behavior/JavaScriptBehavior.java
URL: 
http://svn.apache.org/viewvc/karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/behavior/JavaScriptBehavior.java?rev=1378579r1=1378578r2=1378579view=diff
==
--- 
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/behavior/JavaScriptBehavior.java
 (original)
+++ 
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/behavior/JavaScriptBehavior.java
 Wed Aug 29 14:33:11 2012
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the License); you may

svn commit: r1378690 - in /karaf/webconsole/trunk: ./ assembly/src/main/resources/ camel/ core/ cxf/ examples/branding/ examples/events/consumer/ examples/events/provider/ examples/scala/ examples/scr

[ldywicki]

Author: ldywicki
Date: Wed Aug 29 19:27:01 2012
New Revision: 1378690

URL: http://svn.apache.org/viewvc?rev=1378690view=rev
Log:
KARAF-1776 Move all versions to parent pom instead of splitting them across 
modules

Modified:
karaf/webconsole/trunk/assembly/src/main/resources/features.xml
karaf/webconsole/trunk/camel/pom.xml
karaf/webconsole/trunk/core/pom.xml
karaf/webconsole/trunk/cxf/pom.xml
karaf/webconsole/trunk/examples/branding/pom.xml
karaf/webconsole/trunk/examples/events/consumer/pom.xml
karaf/webconsole/trunk/examples/events/provider/pom.xml
karaf/webconsole/trunk/examples/scala/pom.xml
karaf/webconsole/trunk/examples/scr/pom.xml
karaf/webconsole/trunk/itest/pom.xml
karaf/webconsole/trunk/karaf/admin/pom.xml
karaf/webconsole/trunk/karaf/core/pom.xml
karaf/webconsole/trunk/karaf/feature/pom.xml
karaf/webconsole/trunk/karaf/pom.xml
karaf/webconsole/trunk/manual/pom.xml
karaf/webconsole/trunk/osgi/blueprint/pom.xml
karaf/webconsole/trunk/osgi/config/pom.xml
karaf/webconsole/trunk/osgi/core/pom.xml
karaf/webconsole/trunk/osgi/event/pom.xml
karaf/webconsole/trunk/osgi/log/pom.xml
karaf/webconsole/trunk/osgi/scr/pom.xml
karaf/webconsole/trunk/pom.xml
karaf/webconsole/trunk/servicemix/pom.xml
karaf/webconsole/trunk/web/pom.xml

Modified: karaf/webconsole/trunk/assembly/src/main/resources/features.xml
URL: 
http://svn.apache.org/viewvc/karaf/webconsole/trunk/assembly/src/main/resources/features.xml?rev=1378690r1=1378689r2=1378690view=diff
==
--- karaf/webconsole/trunk/assembly/src/main/resources/features.xml (original)
+++ karaf/webconsole/trunk/assembly/src/main/resources/features.xml Wed Aug 29 
19:27:01 2012
@@ -17,7 +17,7 @@
 --
 features name=karaf-webconsole-${project.version}
 
-  
repositorymvn:org.ops4j.pax.wicket/features/${ops4j.paxwicket.version}/xml/features/repository
+  
repositorymvn:org.ops4j.pax.wicket/features/${pax-wicket.version}/xml/features/repository
 
   feature name=webconsole-wicket version=${project.version} 
description=Karaf Wicket Webconsole
 featurewebconsole-core/feature

Modified: karaf/webconsole/trunk/camel/pom.xml
URL: 
http://svn.apache.org/viewvc/karaf/webconsole/trunk/camel/pom.xml?rev=1378690r1=1378689r2=1378690view=diff
==
--- karaf/webconsole/trunk/camel/pom.xml (original)
+++ karaf/webconsole/trunk/camel/pom.xml Wed Aug 29 19:27:01 2012
@@ -34,13 +34,10 @@
 dependency
 groupIdorg.apache.karaf.webconsole/groupId
 artifactIdorg.apache.karaf.webconsole.core/artifactId
-version${project.version}/version
 /dependency
-
 dependency
 groupIdorg.apache.camel/groupId
 artifactIdcamel-core/artifactId
-version${camel.version}/version
 /dependency
 /dependencies
 
@@ -49,7 +46,6 @@
 plugin
 groupIdorg.apache.felix/groupId
 artifactIdmaven-bundle-plugin/artifactId
-version${maven-bundle.version}/version
 extensionstrue/extensions
 configuration
 instructions

Modified: karaf/webconsole/trunk/core/pom.xml
URL: 
http://svn.apache.org/viewvc/karaf/webconsole/trunk/core/pom.xml?rev=1378690r1=1378689r2=1378690view=diff
==
--- karaf/webconsole/trunk/core/pom.xml (original)
+++ karaf/webconsole/trunk/core/pom.xml Wed Aug 29 19:27:01 2012
@@ -44,42 +44,36 @@
 dependency
 groupIdorg.ops4j.pax.wicket/groupId
 artifactIdorg.ops4j.pax.wicket.service/artifactId
-version${ops4j.paxwicket.version}/version
 /dependency
 dependency
 groupIdorg.apache.karaf.jaas/groupId
 artifactIdorg.apache.karaf.jaas.modules/artifactId
-version${karaf.version}/version
 /dependency
 
 dependency
-groupIdjavax.servlet/groupId
-artifactIdservlet-api/artifactId
-version2.5/version
+groupIdorg.apache.geronimo.specs/groupId
+artifactIdgeronimo-servlet_2.5_spec/artifactId
 scopeprovided/scope
 /dependency
 
 dependency
 groupIdjunit/groupId
 artifactIdjunit/artifactId
-version4.8.2/version
 scopetest/scope
 /dependency
 dependency
 groupIdorg.ops4j.pax.wicket/groupId
 artifactIdorg.ops4j.pax.wicket.test/artifactId
-version${ops4j.paxwicket.version}/version
+scopetest/scope
 /dependency
 dependency
 groupIdorg.slf4j/groupId
 artifactIdslf4j-log4j12/artifactId
-version${slf4j.version}/version
 scopetest

svn commit: r1373636 - /karaf/webconsole/trunk/core/src/main/resources/OSGI-INF/blueprint/core.xml

[ldywicki]

Author: ldywicki
Date: Wed Aug 15 21:28:28 2012
New Revision: 1373636

URL: http://svn.apache.org/viewvc?rev=1373636view=rev
Log:
KARAF-1730 Change default context path to /console

Modified:
karaf/webconsole/trunk/core/src/main/resources/OSGI-INF/blueprint/core.xml

Modified: 
karaf/webconsole/trunk/core/src/main/resources/OSGI-INF/blueprint/core.xml
URL: 
http://svn.apache.org/viewvc/karaf/webconsole/trunk/core/src/main/resources/OSGI-INF/blueprint/core.xml?rev=1373636r1=1373635r2=1373636view=diff
==
--- karaf/webconsole/trunk/core/src/main/resources/OSGI-INF/blueprint/core.xml 
(original)
+++ karaf/webconsole/trunk/core/src/main/resources/OSGI-INF/blueprint/core.xml 
Wed Aug 15 21:28:28 2012
@@ -19,7 +19,7 @@
 
 wicket:application id=karafWebConsole 
 class=org.apache.karaf.webconsole.core.internal.WebConsoleApplication
-applicationName=karafWebConsole mountPoint=cns /
+applicationName=karafWebConsole mountPoint=console /
 
 reference-list id=tabs 
interface=org.apache.karaf.webconsole.core.navigation.ConsoleTabProvider 
availability=optional /
 

svn commit: r1373662 - /karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/util/LinkUtils.java

[ldywicki]

Author: ldywicki
Date: Wed Aug 15 22:36:48 2012
New Revision: 1373662

URL: http://svn.apache.org/viewvc?rev=1373662view=rev
Log:
KARAF-1731 Active trail detection is broken after upgrade to wicket 1.5

Modified:

karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/util/LinkUtils.java

Modified: 
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/util/LinkUtils.java
URL: 
http://svn.apache.org/viewvc/karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/util/LinkUtils.java?rev=1373662r1=1373661r2=1373662view=diff
==
--- 
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/util/LinkUtils.java
 (original)
+++ 
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/util/LinkUtils.java
 Wed Aug 15 22:36:48 2012
@@ -20,6 +20,7 @@ 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;
+import org.apache.wicket.protocol.http.RequestUtils;
 import org.apache.wicket.request.cycle.RequestCycle;
 
 /**
@@ -54,13 +55,13 @@ public abstract class LinkUtils {
  */
 public static boolean isActiveTrail(Link? link) {
 if (link instanceof BookmarkablePageLink) {
+RequestCycle requestCycle = RequestCycle.get();
+String requestPath = requestCycle.getRequest().getUrl().toString();
 Class? extends Page pageClass = ((BookmarkablePageLink?) 
link).getPageClass();
 
-RequestCycle requestCycle = RequestCycle.get();
-String linkPath = (requestCycle.urlFor(pageClass, null) + 
).replace(../, );
+String linkPath = requestCycle.urlFor(pageClass, null).toString();
 
-String requestPath = requestCycle.getRequest().getUrl().toString();
-return requestPath.contains(linkPath);
+return 
requestPath.contains(RequestUtils.toAbsolutePath(requestPath, linkPath));
 }
 return false;
 }

svn commit: r1371626 - /karaf/webconsole/trunk/pom.xml

[ldywicki]

Author: ldywicki
Date: Fri Aug 10 09:43:25 2012
New Revision: 1371626

URL: http://svn.apache.org/viewvc?rev=1371626view=rev
Log:
Update to Pax wicket 1.0.2

Signed-off-by: Lukasz Dywicki l...@code-house.org

Modified:
karaf/webconsole/trunk/pom.xml

Modified: karaf/webconsole/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/karaf/webconsole/trunk/pom.xml?rev=1371626r1=1371625r2=1371626view=diff
==
--- karaf/webconsole/trunk/pom.xml (original)
+++ karaf/webconsole/trunk/pom.xml Fri Aug 10 09:43:25 2012
@@ -34,7 +34,7 @@
 felix-scr.version1.6.0/felix-scr.version
 slf4j.version1.6.1/slf4j.version
 log4j.version1.2.14/log4j.version
-ops4j.paxwicket.version1.0.1/ops4j.paxwicket.version
+ops4j.paxwicket.version1.0.2/ops4j.paxwicket.version
 karaf.version2.2.8/karaf.version
 nmr.version1.4.0/nmr.version
 camel.version2.6.0/camel.version

svn commit: r1292573 - in /karaf/webconsole/trunk/examples: ./ scala/ scala/src/ scala/src/main/ scala/src/main/resources/ scala/src/main/resources/OSGI-INF/ scala/src/main/resources/OSGI-INF/blueprin

[ldywicki]

Author: ldywicki
Date: Wed Feb 22 23:08:08 2012
New Revision: 1292573

URL: http://svn.apache.org/viewvc?rev=1292573view=rev
Log:
Add scala example for webconsole. It requires scala runtime to work, and does 
the job.

Added:
karaf/webconsole/trunk/examples/scala/
karaf/webconsole/trunk/examples/scala/pom.xml
karaf/webconsole/trunk/examples/scala/src/
karaf/webconsole/trunk/examples/scala/src/main/
karaf/webconsole/trunk/examples/scala/src/main/resources/
karaf/webconsole/trunk/examples/scala/src/main/resources/OSGI-INF/
karaf/webconsole/trunk/examples/scala/src/main/resources/OSGI-INF/blueprint/

karaf/webconsole/trunk/examples/scala/src/main/resources/OSGI-INF/blueprint/jmx.xml
   (contents, props changed)
  - copied, changed from r1291796, karaf/webconsole/trunk/examples/pom.xml
karaf/webconsole/trunk/examples/scala/src/main/resources/org/
karaf/webconsole/trunk/examples/scala/src/main/resources/org/apache/
karaf/webconsole/trunk/examples/scala/src/main/resources/org/apache/karaf/

karaf/webconsole/trunk/examples/scala/src/main/resources/org/apache/karaf/webconsole/

karaf/webconsole/trunk/examples/scala/src/main/resources/org/apache/karaf/webconsole/examples/

karaf/webconsole/trunk/examples/scala/src/main/resources/org/apache/karaf/webconsole/examples/scala/

karaf/webconsole/trunk/examples/scala/src/main/resources/org/apache/karaf/webconsole/examples/scala/ExampleScalaPage.html
karaf/webconsole/trunk/examples/scala/src/main/scala/
karaf/webconsole/trunk/examples/scala/src/main/scala/org/
karaf/webconsole/trunk/examples/scala/src/main/scala/org/apache/
karaf/webconsole/trunk/examples/scala/src/main/scala/org/apache/karaf/

karaf/webconsole/trunk/examples/scala/src/main/scala/org/apache/karaf/webconsole/

karaf/webconsole/trunk/examples/scala/src/main/scala/org/apache/karaf/webconsole/examples/

karaf/webconsole/trunk/examples/scala/src/main/scala/org/apache/karaf/webconsole/examples/scala/

karaf/webconsole/trunk/examples/scala/src/main/scala/org/apache/karaf/webconsole/examples/scala/ExampleScalaPage.scala

karaf/webconsole/trunk/examples/scala/src/main/scala/org/apache/karaf/webconsole/examples/scala/ScalaNavigationProvider.scala
Modified:
karaf/webconsole/trunk/examples/pom.xml

Modified: karaf/webconsole/trunk/examples/pom.xml
URL: 
http://svn.apache.org/viewvc/karaf/webconsole/trunk/examples/pom.xml?rev=1292573r1=1292572r2=1292573view=diff
==
--- karaf/webconsole/trunk/examples/pom.xml (original)
+++ karaf/webconsole/trunk/examples/pom.xml Wed Feb 22 23:08:08 2012
@@ -34,6 +34,7 @@
 modulebranding/module
 moduleevents/module
 modulescr/module
+modulescala/module
 /modules
 
 /project

Added: karaf/webconsole/trunk/examples/scala/pom.xml
URL: 
http://svn.apache.org/viewvc/karaf/webconsole/trunk/examples/scala/pom.xml?rev=1292573view=auto
==
--- karaf/webconsole/trunk/examples/scala/pom.xml (added)
+++ karaf/webconsole/trunk/examples/scala/pom.xml Wed Feb 22 23:08:08 2012
@@ -0,0 +1,82 @@
+?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
+   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.
+--
+project xmlns=http://maven.apache.org/POM/4.0.0; 
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
+xsi:schemaLocation=http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd;
+modelVersion4.0.0/modelVersion
+
+parent
+groupIdorg.apache.karaf.webconsole/groupId
+artifactIdexamples/artifactId
+version0.3.0-SNAPSHOT/version
+/parent
+
+groupIdorg.apache.karaf.webconsole.examples/groupId
+artifactIdscala/artifactId
+nameApache Karaf :: WebConsole :: Examples :: Scala/name
+packagingbundle/packaging
+
+dependencies
+dependency
+groupIdorg.apache.karaf.webconsole/groupId
+artifactIdorg.apache.karaf.webconsole.core/artifactId
+version${project.version}/version
+/dependency
+dependency
+groupIdorg.scala-lang/groupId
+artifactIdscala-library

svn commit: r1291052 - in /karaf/webconsole/trunk: core/src/main/java/org/apache/karaf/webconsole/core/table/ core/src/main/resources/org/apache/karaf/webconsole/core/page/ core/src/main/resources/org

[ldywicki]

Author: ldywicki
Date: Sun Feb 19 20:13:16 2012
New Revision: 1291052

URL: http://svn.apache.org/viewvc?rev=1291052view=rev
Log:
Refactor of osgi/core module:
- restructured list of bundles with new icons instead of labels
- separate links for every operation instead of annonymous classes inside 
BundleActionsPanel
- first translations

Added:

karaf/webconsole/trunk/osgi/core/src/main/java/org/apache/karaf/webconsole/osgi/core/bundle/list/link/

karaf/webconsole/trunk/osgi/core/src/main/java/org/apache/karaf/webconsole/osgi/core/bundle/list/link/RefreshLink.java

karaf/webconsole/trunk/osgi/core/src/main/java/org/apache/karaf/webconsole/osgi/core/bundle/list/link/ResolveLink.java

karaf/webconsole/trunk/osgi/core/src/main/java/org/apache/karaf/webconsole/osgi/core/bundle/list/link/StartLink.java

karaf/webconsole/trunk/osgi/core/src/main/java/org/apache/karaf/webconsole/osgi/core/bundle/list/link/StopLink.java

karaf/webconsole/trunk/osgi/core/src/main/java/org/apache/karaf/webconsole/osgi/core/bundle/list/link/UninstallLink.java

karaf/webconsole/trunk/osgi/core/src/main/java/org/apache/karaf/webconsole/osgi/core/bundle/list/link/UpdateLink.java

karaf/webconsole/trunk/osgi/core/src/main/resources/org/apache/karaf/webconsole/osgi/core/package.properties
Removed:

karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/page/SecuredPage.properties

karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/page/SecuredPage_fr.properties
Modified:

karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/table/ActionsPanel.java

karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/table/ActionsPanel.html

karaf/webconsole/trunk/osgi/core/src/main/java/org/apache/karaf/webconsole/osgi/core/bundle/list/BundleActionsPanel.java

karaf/webconsole/trunk/osgi/core/src/main/java/org/apache/karaf/webconsole/osgi/core/bundle/list/BundlePage.java

karaf/webconsole/trunk/osgi/core/src/main/java/org/apache/karaf/webconsole/osgi/core/bundle/list/DecorationPanel.java

karaf/webconsole/trunk/osgi/core/src/main/resources/org/apache/karaf/webconsole/osgi/core/bundle/list/BundlePage.html

Modified: 
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/table/ActionsPanel.java
URL: 
http://svn.apache.org/viewvc/karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/table/ActionsPanel.java?rev=1291052r1=1291051r2=1291052view=diff
==
--- 
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/table/ActionsPanel.java
 (original)
+++ 
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/table/ActionsPanel.java
 Sun Feb 19 20:13:16 2012
@@ -64,4 +64,13 @@ public class ActionsPanelT extends Pan
 return Collections.emptyList();
 }
 
+/**
+ * Gets model
+ * 
+ * @return model
+ */
+@SuppressWarnings(unchecked)
+public final IModelT getModel() {
+return (IModelT) getDefaultModel();
+}
 }

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=1291052r1=1291051r2=1291052view=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
 Sun Feb 19 20:13:16 2012
@@ -20,7 +20,7 @@
 ul
 li wicket:id=actions
 a wicket:id=action
-span wicket:id=labellabel/span
+span wicket:id=label/span
 /a
 /li
 /ul

Modified: 
karaf/webconsole/trunk/osgi/core/src/main/java/org/apache/karaf/webconsole/osgi/core/bundle/list/BundleActionsPanel.java
URL: 
http://svn.apache.org/viewvc/karaf/webconsole/trunk/osgi/core/src/main/java/org/apache/karaf/webconsole/osgi/core/bundle/list/BundleActionsPanel.java?rev=1291052r1=1291051r2=1291052view=diff
==
--- 
karaf/webconsole/trunk/osgi/core/src/main/java/org/apache/karaf/webconsole/osgi/core/bundle/list/BundleActionsPanel.java
 (original)
+++ 
karaf/webconsole/trunk/osgi/core/src/main/java/org/apache/karaf/webconsole/osgi/core/bundle/list/BundleActionsPanel.java
 Sun Feb 19 20:13:16 2012
@@ -21,19 +21,19 @@ import java.util.List;
 
 import org.apache.karaf.webconsole.core.table.ActionsPanel;
 import org.apache.karaf.webconsole.osgi.core.bundle.SingleBundlePage;
+import

svn commit: r1291053 - in /karaf/webconsole/trunk: core/src/main/java/org/apache/karaf/webconsole/core/dashboard/ core/src/main/java/org/apache/karaf/webconsole/core/navigation/markup/ core/src/main/r

[ldywicki]

Author: ldywicki
Date: Sun Feb 19 20:24:13 2012
New Revision: 1291053

URL: http://svn.apache.org/viewvc?rev=1291053view=rev
Log:
English translation for core and clean up of core markup. Use shorter method 
for getting translated string.

Added:

karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/dashboard/package.properties

karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/package.properties
Modified:

karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/dashboard/DashboardPage.java

karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/navigation/markup/NavigationTopPanel.java

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/navigation/markup/LanguageTopPanel.html

karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/navigation/markup/ModuleTabPanel.html

karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/navigation/markup/NavigationTopPanel.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/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/preferences/PreferencesPage.html

karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/preferences/PreferencesPanel.html

karaf/webconsole/trunk/osgi/core/src/main/java/org/apache/karaf/webconsole/osgi/core/bundle/list/link/RefreshLink.java

karaf/webconsole/trunk/osgi/core/src/main/java/org/apache/karaf/webconsole/osgi/core/bundle/list/link/ResolveLink.java

karaf/webconsole/trunk/osgi/core/src/main/java/org/apache/karaf/webconsole/osgi/core/bundle/list/link/StartLink.java

karaf/webconsole/trunk/osgi/core/src/main/java/org/apache/karaf/webconsole/osgi/core/bundle/list/link/StopLink.java

karaf/webconsole/trunk/osgi/core/src/main/java/org/apache/karaf/webconsole/osgi/core/bundle/list/link/UninstallLink.java

karaf/webconsole/trunk/osgi/core/src/main/java/org/apache/karaf/webconsole/osgi/core/bundle/list/link/UpdateLink.java

karaf/webconsole/trunk/osgi/core/src/main/resources/org/apache/karaf/webconsole/osgi/core/bundle/install/InstallBundlePage.html

Modified: 
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/dashboard/DashboardPage.java
URL: 
http://svn.apache.org/viewvc/karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/dashboard/DashboardPage.java?rev=1291053r1=1291052r2=1291053view=diff
==
--- 
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/dashboard/DashboardPage.java
 (original)
+++ 
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/dashboard/DashboardPage.java
 Sun Feb 19 20:24:13 2012
@@ -41,7 +41,7 @@ public class DashboardPage extends Singl
 public DashboardPage(PageParameters parameters) {
 add(CSSPackageResource.getHeaderContribution(DashboardPage.class, 
dashboard.css));
 
-add(new Label(noWidgets, So far there is no widgets to display) {
+add(new Label(noWidgets, getString(widgets.empty)) {
 private static final long serialVersionUID = 1L;
 
 @Override

Modified: 
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/navigation/markup/NavigationTopPanel.java
URL: 
http://svn.apache.org/viewvc/karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/navigation/markup/NavigationTopPanel.java?rev=1291053r1=1291052r2=1291053view=diff
==
--- 
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/navigation/markup/NavigationTopPanel.java
 (original)
+++ 
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/navigation/markup/NavigationTopPanel.java
 Sun Feb 19 20:24:13 2012
@@ -36,7 +36,6 @@ import org.apache.wicket.markup.html.lis
 import org.apache.wicket.markup.repeater.RepeatingView;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.Model;
-import org.apache.wicket.model.StringResourceModel;
 import org.ops4j.pax.wicket.api.PaxWicketBean;
 import org.osgi.service.prefs.PreferencesService;
 
@@ -64,10 +63,7 @@ public class NavigationTopPanel extends 
 add(new Label(username, username));
 add(new SecuredPageLinkPreferencesPage(preferencesLink, 
PreferencesPage.class));
 
-LinkVoid aLink = new LogoutLink(logoutLink);
-aLink.add(new

svn commit: r1291139 [2/2] - in /karaf/webconsole/trunk/osgi: blueprint/src/main/java/org/apache/karaf/webconsole/osgi/blueprint/details/ blueprint/src/main/resources/org/apache/karaf/webconsole/osgi/

[ldywicki]

Added: 
karaf/webconsole/trunk/osgi/core/src/main/java/org/apache/karaf/webconsole/osgi/core/service/ImportServiceTable.java
URL: 
http://svn.apache.org/viewvc/karaf/webconsole/trunk/osgi/core/src/main/java/org/apache/karaf/webconsole/osgi/core/service/ImportServiceTable.java?rev=1291139view=auto
==
--- 
karaf/webconsole/trunk/osgi/core/src/main/java/org/apache/karaf/webconsole/osgi/core/service/ImportServiceTable.java
 (added)
+++ 
karaf/webconsole/trunk/osgi/core/src/main/java/org/apache/karaf/webconsole/osgi/core/service/ImportServiceTable.java
 Mon Feb 20 07:41:08 2012
@@ -0,0 +1,43 @@
+/*
+ * 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.core.service;
+
+import org.apache.karaf.webconsole.osgi.core.service.column.ObjectClassColumn;
+import 
org.apache.karaf.webconsole.osgi.core.service.column.ServicePropertyColumn;
+import 
org.apache.karaf.webconsole.osgi.core.service.column.ServiceProviderColumn;
+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.model.Model;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.Constants;
+import org.osgi.framework.ServiceReference;
+
+public class ImportServiceTable extends DefaultDataTableServiceReference {
+
+private static final long serialVersionUID = 1L;
+
+private static IColumnServiceReference[] columns = new IColumn[] {
+new ServicePropertyColumn(Service Id, Constants.SERVICE_ID),
+new ObjectClassColumn(Model.of(Object classes)),
+new ServiceProviderColumn(Model.of(Provider)),
+};
+
+public ImportServiceTable(String id, Bundle bundle) {
+super(id, columns, new ImportServiceDataProvider(bundle), 
Integer.MAX_VALUE);
+}
+
+}

Modified: 
karaf/webconsole/trunk/osgi/core/src/main/java/org/apache/karaf/webconsole/osgi/core/service/ServiceDetailPage.java
URL: 
http://svn.apache.org/viewvc/karaf/webconsole/trunk/osgi/core/src/main/java/org/apache/karaf/webconsole/osgi/core/service/ServiceDetailPage.java?rev=1291139r1=1291138r2=1291139view=diff
==
--- 
karaf/webconsole/trunk/osgi/core/src/main/java/org/apache/karaf/webconsole/osgi/core/service/ServiceDetailPage.java
 (original)
+++ 
karaf/webconsole/trunk/osgi/core/src/main/java/org/apache/karaf/webconsole/osgi/core/service/ServiceDetailPage.java
 Mon Feb 20 07:41:08 2012
@@ -1,5 +1,59 @@
+/*
+ * 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.core.service;
 
-public class ServiceDetailPage {
+import org.apache.karaf.webconsole.osgi.core.shared.OsgiPage;
+import org.apache.wicket.PageParameters;
+import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.repeater.RepeatingView;
+import org.osgi.framework.Constants;
+import org.osgi.framework.InvalidSyntaxException;
+import org.osgi.framework.ServiceReference;
+
+/**
+ * Service details page.
+ */
+public class ServiceDetailPage extends OsgiPage {
+
+public ServiceDetailPage(PageParameters parameters) {
+long serviceId = parameters.getLong(id);
+
+RepeatingView repeatingView = new RepeatingView(keys);
+add(repeatingView);
+
+

svn commit: r1242778 [3/3] - in /karaf/webconsole/trunk/core/src/main: java/org/apache/karaf/webconsole/core/behavior/ java/org/apache/karaf/webconsole/core/brand/ resources/org/apache/karaf/webconsol

[ldywicki]

Added: 
karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/behavior/bootstrap/js/bootstrap-button.js
URL: 
http://svn.apache.org/viewvc/karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/behavior/bootstrap/js/bootstrap-button.js?rev=1242778view=auto
==
--- 
karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/behavior/bootstrap/js/bootstrap-button.js
 (added)
+++ 
karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/behavior/bootstrap/js/bootstrap-button.js
 Fri Feb 10 14:11:48 2012
@@ -0,0 +1,98 @@
+/* 
+ * bootstrap-button.js v2.0.0
+ * http://twitter.github.com/bootstrap/javascript.html#buttons
+ * 
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed 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.
+ *  */
+
+!function( $ ){
+
+  use strict
+
+ /* BUTTON PUBLIC CLASS DEFINITION
+  * == */
+
+  var Button = function ( element, options ) {
+this.$element = $(element)
+this.options = $.extend({}, $.fn.button.defaults, options)
+  }
+
+  Button.prototype = {
+
+  constructor: Button
+
+, setState: function ( state ) {
+var d = 'disabled'
+  , $el = this.$element
+  , data = $el.data()
+  , val = $el.is('input') ? 'val' : 'html'
+
+state = state + 'Text'
+data.resetText || $el.data('resetText', $el[val]())
+
+$el[val](data[state] || this.options[state])
+
+// push to event loop to allow forms to submit
+setTimeout(function () {
+  state == 'loadingText' ?
+$el.addClass(d).attr(d, d) :
+$el.removeClass(d).removeAttr(d)
+}, 0)
+  }
+
+, toggle: function () {
+var $parent = this.$element.parent('[data-toggle=buttons-radio]')
+
+$parent  $parent
+  .find('.active')
+  .removeClass('active')
+
+this.$element.toggleClass('active')
+  }
+
+  }
+
+
+ /* BUTTON PLUGIN DEFINITION
+  *  */
+
+  $.fn.button = function ( option ) {
+return this.each(function () {
+  var $this = $(this)
+, data = $this.data('button')
+, options = typeof option == 'object'  option
+  if (!data) $this.data('button', (data = new Button(this, options)))
+  if (option == 'toggle') data.toggle()
+  else if (option) data.setState(option)
+})
+  }
+
+  $.fn.button.defaults = {
+loadingText: 'loading...'
+  }
+
+  $.fn.button.Constructor = Button
+
+
+ /* BUTTON DATA-API
+  * === */
+
+  $(function () {
+$('body').on('click.button.data-api', '[data-toggle^=button]', function ( 
e ) {
+  $(e.target).button('toggle')
+})
+  })
+
+}( window.jQuery )

Added: 
karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/behavior/bootstrap/js/bootstrap-carousel.js
URL: 
http://svn.apache.org/viewvc/karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/behavior/bootstrap/js/bootstrap-carousel.js?rev=1242778view=auto
==
--- 
karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/behavior/bootstrap/js/bootstrap-carousel.js
 (added)
+++ 
karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/behavior/bootstrap/js/bootstrap-carousel.js
 Fri Feb 10 14:11:48 2012
@@ -0,0 +1,154 @@
+/* ==
+ * bootstrap-carousel.js v2.0.0
+ * http://twitter.github.com/bootstrap/javascript.html#carousel
+ * ==
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed 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
+ 

svn commit: r1242783 - 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/widg

[ldywicki]

Author: ldywicki
Date: Fri Feb 10 14:14:47 2012
New Revision: 1242783

URL: http://svn.apache.org/viewvc?rev=1242783view=rev
Log:
Port tables to bootstrap stylesheets.

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/widget/CamelWidget.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/resources/org/apache/karaf/webconsole/karaf/admin/list/InstancesPage.html

karaf/webconsole/trunk/karaf/features/src/main/resources/org/apache/karaf/webconsole/karaf/features/feature/FeaturesPage.html

karaf/webconsole/trunk/karaf/features/src/main/resources/org/apache/karaf/webconsole/karaf/features/repository/RepositoriesPage.html

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/navigation.css

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/view/decoration.css

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/ConfigurationsPage.html

karaf/webconsole/trunk/osgi/framework/src/main/java/org/apache/karaf/webconsole/osgi/framework/internal/FrameworkPage.java

karaf/webconsole/trunk/osgi/log/src/main/resources/org/apache/karaf/webconsole/osgi/log/LogsPage.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=1242783r1=1242782r2=1242783view=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:14:47 2012
@@ -18,6 +18,6 @@
 wicket:extend 
xmlns:wicket=http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd;
 h1Deployed camel contexts/h1
 
-table wicket:id=contexts class=dataview /
+table wicket:id=contexts class=table table-striped table-condensed /
 
 /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=1242783r1=1242782r2=1242783view=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:14:47 2012
@@ -22,7 +22,7 @@
 
 ul
 li wicket:id=properties
-table wicket:id=propertyMap class=dataview /
+table wicket:id=propertyMap class=table table-striped 
table-condensed /
 /li
 /ul
 

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=1242783r1=1242782r2=1242783view=diff
==
--- 
karaf/webconsole/trunk/camel/src/main/resources/org/apache/karaf/webconsole/camel/internal/widget/CamelWidget.html
 (original)
+++ 
karaf/webconsole/trunk

svn commit: r1242785 [2/2] - in /karaf/webconsole/trunk: assembly/src/main/resources/ itest/ itest/src/test/java/org/apache/karaf/webconsole/itest/ karaf/ karaf/admin/src/main/java/org/apache/karaf/we

[ldywicki]

Added: 
karaf/webconsole/trunk/karaf/feature/src/main/java/org/apache/karaf/webconsole/karaf/feature/repository/AddRepositoryPanel.java
URL: 
http://svn.apache.org/viewvc/karaf/webconsole/trunk/karaf/feature/src/main/java/org/apache/karaf/webconsole/karaf/feature/repository/AddRepositoryPanel.java?rev=1242785view=auto
==
--- 
karaf/webconsole/trunk/karaf/feature/src/main/java/org/apache/karaf/webconsole/karaf/feature/repository/AddRepositoryPanel.java
 (added)
+++ 
karaf/webconsole/trunk/karaf/feature/src/main/java/org/apache/karaf/webconsole/karaf/feature/repository/AddRepositoryPanel.java
 Fri Feb 10 14:19:17 2012
@@ -0,0 +1,55 @@
+/*
+ * 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.karaf.feature.repository;
+
+import java.net.URI;
+
+import org.apache.karaf.features.FeaturesService;
+import org.apache.karaf.features.Repository;
+import org.apache.karaf.webconsole.core.form.LabelBorder;
+import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.markup.html.form.TextField;
+import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.model.CompoundPropertyModel;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.ResourceModel;
+import org.ops4j.pax.wicket.api.PaxWicketBean;
+
+public class AddRepositoryPanel extends Panel {
+
+private static final long serialVersionUID = 1L;
+
+@PaxWicketBean(name = featuresService)
+private FeaturesService featuresService;
+
+private TextFieldURI uri;
+
+public AddRepositoryPanel(String id, IModelRepository model) {
+super(id);
+
+FormRepository form = new FormRepository(add, new 
CompoundPropertyModelRepository(model));
+uri = new TextFieldURI(uri);
+uri.setRequired(true);
+
+LabelBorder border = new LabelBorder(border, new 
ResourceModel(feature.repository.uri), uri);
+border.setHelp(new ResourceModel(feature.repository.uri.help));
+form.add(border);
+add(form);
+}
+
+
+}

Copied: 
karaf/webconsole/trunk/karaf/feature/src/main/java/org/apache/karaf/webconsole/karaf/feature/repository/RepositoriesActionPanel.java
 (from r1242784, 
karaf/webconsole/trunk/karaf/features/src/main/java/org/apache/karaf/webconsole/karaf/features/repository/RepositoriesActionPanel.java)
URL: 
http://svn.apache.org/viewvc/karaf/webconsole/trunk/karaf/feature/src/main/java/org/apache/karaf/webconsole/karaf/feature/repository/RepositoriesActionPanel.java?p2=karaf/webconsole/trunk/karaf/feature/src/main/java/org/apache/karaf/webconsole/karaf/feature/repository/RepositoriesActionPanel.javap1=karaf/webconsole/trunk/karaf/features/src/main/java/org/apache/karaf/webconsole/karaf/features/repository/RepositoriesActionPanel.javar1=1242784r2=1242785rev=1242785view=diff
==
--- 
karaf/webconsole/trunk/karaf/features/src/main/java/org/apache/karaf/webconsole/karaf/features/repository/RepositoriesActionPanel.java
 (original)
+++ 
karaf/webconsole/trunk/karaf/feature/src/main/java/org/apache/karaf/webconsole/karaf/feature/repository/RepositoriesActionPanel.java
 Fri Feb 10 14:19:17 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.karaf.webconsole.karaf.features.repository;
+package org.apache.karaf.webconsole.karaf.feature.repository;
 
 import java.util.ArrayList;
 import java.util.List;

Copied: 
karaf/webconsole/trunk/karaf/feature/src/main/java/org/apache/karaf/webconsole/karaf/feature/repository/RepositoriesPage.java
 (from r1242784, 
karaf/webconsole/trunk/karaf/features/src/main/java/org/apache/karaf/webconsole/karaf/features/repository/RepositoriesPage.java)
URL: 

svn commit: r1242787 - in /karaf/webconsole/trunk/core/src: main/java/org/apache/karaf/webconsole/core/brand/ main/java/org/apache/karaf/webconsole/core/conventer/ main/java/org/apache/karaf/webconsol

[ldywicki]

Author: ldywicki
Date: Fri Feb 10 14:21:09 2012
New Revision: 1242787

URL: http://svn.apache.org/viewvc?rev=1242787view=rev
Log:
Change single page design, now module links are displayed as tabs. Add karaf 
logo in header, next to WebConsole text.

Added:

karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/conventer/

karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/conventer/URIConverter.java
  - copied, changed from r1242785, 
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/form/LabelBorder.java

karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/conventer/URLConverter.java
  - copied, changed from r1242785, 
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/form/LabelBorder.java

karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/conventer/WebConsoleConverterLocator.java
  - copied, changed from r1242785, 
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/form/LabelBorder.java

karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/navigation/markup/ModuleTabPanel.java

karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/images/karaf-logo-min.png

karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/navigation/markup/ModuleTabPanel.html
  - copied, changed from r1242785, 
karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/page/SinglePage.html

karaf/webconsole/trunk/core/src/test/java/org/apache/karaf/webconsole/core/page/SinglePageTest.java
  - copied, changed from r1242785, 
karaf/webconsole/trunk/core/src/test/java/org/apache/karaf/webconsole/core/page/SecuredPageTest.java
Removed:

karaf/webconsole/trunk/core/src/test/java/org/apache/karaf/webconsole/core/page/SecuredPageTest.java
Modified:

karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/brand/DefaultBrandProvider.java

karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/form/LabelBorder.java

karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/form/MapEditForm.java

karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/internal/WebConsoleApplication.java

karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/navigation/ExtendableConsoleTabProvider.java

karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/navigation/ExtendableSidebarProvider.java

karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/navigation/NavigationProvider.java

karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/navigation/markup/AnonymousTopPanel.java

karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/navigation/markup/LanguageTopPanel.java

karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/navigation/markup/NavigationTopPanel.java

karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/page/SecuredPage.java

karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/page/SinglePage.java

karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/util/LinkUtils.java

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/navigation/markup/AnonymousTopPanel.html

karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/navigation/markup/NavigationTopPanel.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/test/java/org/apache/karaf/webconsole/core/dashboard/DashboardPageTest.java

Modified: 
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/brand/DefaultBrandProvider.java
URL: 
http://svn.apache.org/viewvc/karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/brand/DefaultBrandProvider.java?rev=1242787r1=1242786r2=1242787view=diff
==
--- 
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/brand/DefaultBrandProvider.java
 (original)
+++ 
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/brand/DefaultBrandProvider.java
 Fri Feb 10 14:21:09 2012
@@ -38,9 +38,9 @@ public class DefaultBrandProvider implem
 private static final long serialVersionUID = 1L;
 
 public Image getHeaderImage(String imageId) {
-Image image = new Image(imageId, new ResourceReference(BasePage.class

svn commit: r1239538 - in /karaf/webconsole/trunk/core/src/main: java/org/apache/karaf/webconsole/core/ java/org/apache/karaf/webconsole/core/behavior/ java/org/apache/karaf/webconsole/core/brand/ res

[ldywicki]

Author: ldywicki
Date: Thu Feb  2 11:13:33 2012
New Revision: 1239538

URL: http://svn.apache.org/viewvc?rev=1239538view=rev
Log:
Remove formalize behavior, remove all styling stuff from BasePage and move it 
to brand provider.

Removed:

karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/behavior/FormalizeBehavior.java

karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/behavior/formalize/formalize.css

karaf/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/behavior/formalize/jquery.formalize-b9528e8.min.js
Modified:

karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/BasePage.java

karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/brand/DefaultBrandProvider.java

Modified: 
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/BasePage.java
URL: 
http://svn.apache.org/viewvc/karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/BasePage.java?rev=1239538r1=1239537r2=1239538view=diff
==
--- 
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/BasePage.java
 (original)
+++ 
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/BasePage.java
 Thu Feb  2 11:13:33 2012
@@ -24,7 +24,6 @@ import org.apache.karaf.webconsole.core.
 import org.apache.karaf.webconsole.core.dashboard.DashboardPage;
 import org.apache.karaf.webconsole.core.internal.LanguagePanel;
 import org.apache.wicket.behavior.IBehavior;
-import org.apache.wicket.markup.html.CSSPackageResource;
 import org.apache.wicket.markup.html.WebPage;
 import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.markup.html.link.BookmarkablePageLink;
@@ -47,12 +46,8 @@ public class BasePage extends WebPage {
 // list of supported Locales - should be replaced by resolver/detector or 
something similar
 private IModelListLocale supportedLocales = new 
ListModelLocale(Arrays.asList(Locale.FRENCH, Locale.ENGLISH));
 
-@SuppressWarnings(serial)
 public BasePage() {
-add(CSSPackageResource.getHeaderContribution(BasePage.class, 
style.css));
-add(CSSPackageResource.getHeaderContribution(BasePage.class, 
grid.css));
-
-Link homeLink = new BookmarkablePageLink(homeLink, 
DashboardPage.class);
+LinkDashboardPage homeLink = new 
BookmarkablePageLinkDashboardPage(homeLink, DashboardPage.class);
 homeLink.add(brandProvider.getHeaderImage(logo));
 add(homeLink);
 

Modified: 
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/brand/DefaultBrandProvider.java
URL: 
http://svn.apache.org/viewvc/karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/brand/DefaultBrandProvider.java?rev=1239538r1=1239537r2=1239538view=diff
==
--- 
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/brand/DefaultBrandProvider.java
 (original)
+++ 
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/brand/DefaultBrandProvider.java
 Thu Feb  2 11:13:33 2012
@@ -21,11 +21,11 @@ import java.util.Collections;
 import java.util.List;
 
 import org.apache.karaf.webconsole.core.BasePage;
-import org.apache.karaf.webconsole.core.behavior.FormalizeBehavior;
 import org.apache.wicket.Page;
 import org.apache.wicket.ResourceReference;
 import org.apache.wicket.behavior.IBehavior;
 import org.apache.wicket.behavior.SimpleAttributeModifier;
+import org.apache.wicket.markup.html.CSSPackageResource;
 import org.apache.wicket.markup.html.image.Image;
 
 public class DefaultBrandProvider implements BrandProvider, Serializable /* 
for tests mainly */ {
@@ -44,7 +44,8 @@ public class DefaultBrandProvider implem
 }
 
 public void modify(Page page) {
-page.add(new FormalizeBehavior());
+page.add(CSSPackageResource.getHeaderContribution(BasePage.class, 
style.css));
+page.add(CSSPackageResource.getHeaderContribution(BasePage.class, 
grid.css));
 }
 
 }

svn commit: r1239539 - /karaf/webconsole/trunk/pom.xml

[ldywicki]

Author: ldywicki
Date: Thu Feb  2 11:13:59 2012
New Revision: 1239539

URL: http://svn.apache.org/viewvc?rev=1239539view=rev
Log:
Correct maven module name

Modified:
karaf/webconsole/trunk/pom.xml

Modified: karaf/webconsole/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/karaf/webconsole/trunk/pom.xml?rev=1239539r1=1239538r2=1239539view=diff
==
--- karaf/webconsole/trunk/pom.xml (original)
+++ karaf/webconsole/trunk/pom.xml Thu Feb  2 11:13:59 2012
@@ -48,7 +48,7 @@
 moduleservicemix/module
 modulecamel/module
 modulecxf/module
-modulewar/module
+moduleweb/module
 
 moduleexamples/module
 modulemanual/module

svn commit: r1239114 - in /karaf/webconsole/trunk/core/src: main/java/org/apache/karaf/webconsole/core/internal/ main/java/org/apache/karaf/webconsole/core/page/ main/java/org/apache/karaf/webconsole/

[ldywicki]

Author: ldywicki
Date: Wed Feb  1 12:58:51 2012
New Revision: 1239114

URL: http://svn.apache.org/viewvc?rev=1239114view=rev
Log:
Add support for hierarchical roles.

Signed-off-by: Lukasz Dywicki l...@code-house.org

Added:

karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/security/HierarchicalRoleCheckingStrategy.java

karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/security/HierarchicalRoles.java

karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/security/SecuredPageLink.java

karaf/webconsole/trunk/core/src/test/java/org/apache/karaf/webconsole/core/security/

karaf/webconsole/trunk/core/src/test/java/org/apache/karaf/webconsole/core/security/HierarchicalRolesTest.java
Modified:

karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/internal/WebConsoleApplication.java

karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/page/SecuredPage.java

Modified: 
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/internal/WebConsoleApplication.java
URL: 
http://svn.apache.org/viewvc/karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/internal/WebConsoleApplication.java?rev=1239114r1=1239113r2=1239114view=diff
==
--- 
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/internal/WebConsoleApplication.java
 (original)
+++ 
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/internal/WebConsoleApplication.java
 Wed Feb  1 12:58:51 2012
@@ -18,9 +18,11 @@ package org.apache.karaf.webconsole.core
 
 import org.apache.karaf.webconsole.core.dashboard.DashboardPage;
 import org.apache.karaf.webconsole.core.page.LoginPage;
+import 
org.apache.karaf.webconsole.core.security.HierarchicalRoleCheckingStrategy;
 import org.apache.karaf.webconsole.core.security.KarafJaasWebSession;
 import org.apache.wicket.authentication.AuthenticatedWebApplication;
 import org.apache.wicket.authentication.AuthenticatedWebSession;
+import 
org.apache.wicket.authorization.strategies.role.RoleAuthorizationStrategy;
 import org.apache.wicket.markup.html.WebPage;
 import org.apache.wicket.markup.html.pages.AccessDeniedPage;
 import org.apache.wicket.markup.html.pages.PageExpiredErrorPage;
@@ -44,6 +46,8 @@ public class WebConsoleApplication exten
 
 getApplicationSettings().setAccessDeniedPage(AccessDeniedPage.class);
 
getApplicationSettings().setPageExpiredErrorPage(PageExpiredErrorPage.class);
+
+getSecuritySettings().setAuthorizationStrategy(new 
RoleAuthorizationStrategy(new HierarchicalRoleCheckingStrategy()));
 }
 
 /**

Modified: 
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/page/SecuredPage.java
URL: 
http://svn.apache.org/viewvc/karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/page/SecuredPage.java?rev=1239114r1=1239113r2=1239114view=diff
==
--- 
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/page/SecuredPage.java
 (original)
+++ 
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/page/SecuredPage.java
 Wed Feb  1 12:58:51 2012
@@ -22,10 +22,10 @@ import org.apache.karaf.webconsole.core.
 import org.apache.karaf.webconsole.core.navigation.ConsoleTabProvider;
 import org.apache.karaf.webconsole.core.navigation.markup.NavigationPanel;
 import org.apache.karaf.webconsole.core.preferences.PreferencesPage;
+import org.apache.karaf.webconsole.core.security.SecuredPageLink;
 import org.apache.karaf.webconsole.core.security.WebConsoleSession;
 import 
org.apache.wicket.authorization.strategies.role.annotations.AuthorizeInstantiation;
 import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.link.BookmarkablePageLink;
 import org.apache.wicket.markup.html.link.Link;
 import org.apache.wicket.model.LoadableDetachableModel;
 import org.apache.wicket.model.StringResourceModel;
@@ -56,7 +56,7 @@ public class SecuredPage extends BasePag
 add(new AvatarImage(avatar, 
preferences.getUserPreferences(username)));
 
 add(new Label(username, username));
-add(new BookmarkablePageLinkPreferencesPage(preferencesLink, 
PreferencesPage.class));
+add(new SecuredPageLinkPreferencesPage(preferencesLink, 
PreferencesPage.class));
 
 LinkVoid aLink = new LinkVoid(logoutLink) {
 @Override

Added: 
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/security/HierarchicalRoleCheckingStrategy.java
URL: 
http://svn.apache.org/viewvc/karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/security/HierarchicalRoleCheckingStrategy.java?rev=1239114view=auto

svn commit: r1239115 - in /karaf/webconsole/trunk: ./ web/ web/src/ web/src/main/ web/src/main/java/ web/src/main/java/org/ web/src/main/java/org/apache/ web/src/main/java/org/apache/karaf/ web/src/ma

[ldywicki]

Author: ldywicki
Date: Wed Feb  1 12:59:32 2012
New Revision: 1239115

URL: http://svn.apache.org/viewvc?rev=1239115view=rev
Log:
Added war distribution of webconsole. It requires correct set up of jaas realm 
in container.

Signed-off-by: Lukasz Dywicki l...@code-house.org

Added:
karaf/webconsole/trunk/web/
karaf/webconsole/trunk/web/pom.xml
karaf/webconsole/trunk/web/src/
karaf/webconsole/trunk/web/src/main/
karaf/webconsole/trunk/web/src/main/java/
karaf/webconsole/trunk/web/src/main/java/org/
karaf/webconsole/trunk/web/src/main/java/org/apache/
karaf/webconsole/trunk/web/src/main/java/org/apache/karaf/
karaf/webconsole/trunk/web/src/main/java/org/apache/karaf/webconsole/
karaf/webconsole/trunk/web/src/main/java/org/apache/karaf/webconsole/web/

karaf/webconsole/trunk/web/src/main/java/org/apache/karaf/webconsole/web/FrameworkService.java

karaf/webconsole/trunk/web/src/main/java/org/apache/karaf/webconsole/web/ProvisionActivator.java

karaf/webconsole/trunk/web/src/main/java/org/apache/karaf/webconsole/web/StartupListener.java
karaf/webconsole/trunk/web/src/main/resources/
karaf/webconsole/trunk/web/src/main/resources/framework.properties
karaf/webconsole/trunk/web/src/main/webapp/
karaf/webconsole/trunk/web/src/main/webapp/WEB-INF/
karaf/webconsole/trunk/web/src/main/webapp/WEB-INF/web.xml
Modified:
karaf/webconsole/trunk/pom.xml

Modified: karaf/webconsole/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/karaf/webconsole/trunk/pom.xml?rev=1239115r1=1239114r2=1239115view=diff
==
--- karaf/webconsole/trunk/pom.xml (original)
+++ karaf/webconsole/trunk/pom.xml Wed Feb  1 12:59:32 2012
@@ -48,6 +48,7 @@
 moduleservicemix/module
 modulecamel/module
 modulecxf/module
+modulewar/module
 
 moduleexamples/module
 modulemanual/module

Added: karaf/webconsole/trunk/web/pom.xml
URL: 
http://svn.apache.org/viewvc/karaf/webconsole/trunk/web/pom.xml?rev=1239115view=auto
==
--- karaf/webconsole/trunk/web/pom.xml (added)
+++ karaf/webconsole/trunk/web/pom.xml Wed Feb  1 12:59:32 2012
@@ -0,0 +1,168 @@
+?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 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. --
+project xmlns=http://maven.apache.org/POM/4.0.0; 
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
+xsi:schemaLocation=http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd;
+modelVersion4.0.0/modelVersion
+
+parent
+groupIdorg.apache.karaf/groupId
+artifactIdwebconsole/artifactId
+version0.3.0-SNAPSHOT/version
+/parent
+
+groupIdorg.apache.karaf.webconsole/groupId
+artifactIdorg.apache.karaf.webconsole.web/artifactId
+nameApache Karaf :: WebConsole :: Web Support/name
+packagingwar/packaging
+
+properties
+bundlesDirectory${project.build.directory}/bundles/bundlesDirectory
+slf4j.version1.6.1/slf4j.version
+/properties
+
+dependencies
+dependency
+groupIdorg.apache.karaf.webconsole/groupId
+artifactIdorg.apache.karaf.webconsole.core/artifactId
+version${project.version}/version
+scopeprovided/scope
+/dependency
+
+dependency
+groupIdorg.apache.felix/groupId
+artifactIdorg.apache.felix.http.bridge/artifactId
+version2.2.0/version
+scopeprovided/scope
+/dependency
+
+dependency
+groupIdorg.apache.felix/groupId
+artifactIdorg.apache.felix.framework/artifactId
+version4.0.2/version
+/dependency
+
+dependency
+groupIdorg.apache.felix/groupId
+artifactIdorg.apache.felix.http.proxy/artifactId
+version2.2.0/version
+/dependency
+
+dependency
+groupIdjavax.servlet/groupId
+artifactIdservlet-api/artifactId
+version2.5/version
+scopeprovided/scope
+/dependency
+
+dependency
+groupIdorg.osgi/groupId

svn commit: r1226999 - /karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/brand/DefaultBrandProvider.java

[ldywicki]

Author: ldywicki
Date: Wed Jan  4 00:15:01 2012
New Revision: 1226999

URL: http://svn.apache.org/viewvc?rev=1226999view=rev
Log:
Fix build after reverting local changes. Sorry

Signed-off-by: Lukasz Dywicki l...@code-house.org

Modified:

karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/brand/DefaultBrandProvider.java

Modified: 
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/brand/DefaultBrandProvider.java
URL: 
http://svn.apache.org/viewvc/karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/brand/DefaultBrandProvider.java?rev=1226999r1=1226998r2=1226999view=diff
==
--- 
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/brand/DefaultBrandProvider.java
 (original)
+++ 
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/brand/DefaultBrandProvider.java
 Wed Jan  4 00:15:01 2012
@@ -22,7 +22,6 @@ import java.util.List;
 
 import org.apache.karaf.webconsole.core.BasePage;
 import org.apache.karaf.webconsole.core.behavior.FormalizeBehavior;
-import org.apache.karaf.webconsole.core.behavior.JQueryUiThemeBehavior;
 import org.apache.wicket.Page;
 import org.apache.wicket.ResourceReference;
 import org.apache.wicket.behavior.IBehavior;
@@ -46,7 +45,6 @@ public class DefaultBrandProvider implem
 
 public void modify(Page page) {
 page.add(new FormalizeBehavior());
-page.add(new JQueryUiThemeBehavior());
 }
 
 }

svn commit: r1226435 - in /karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core: BasePage.java brand/DefaultBrandProvider.java

[ldywicki]

Author: ldywicki
Date: Mon Jan  2 14:29:48 2012
New Revision: 1226435

URL: http://svn.apache.org/viewvc?rev=1226435view=rev
Log:
Call BrandProvider earlier. This change lets given brand provider to add new 
components or use visitors to modify component structure. Overriding is still 
possible through addOrReplace method

Signed-off-by: Lukasz Dywicki l...@code-house.org

Modified:

karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/BasePage.java

karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/brand/DefaultBrandProvider.java

Modified: 
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/BasePage.java
URL: 
http://svn.apache.org/viewvc/karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/BasePage.java?rev=1226435r1=1226434r2=1226435view=diff
==
--- 
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/BasePage.java
 (original)
+++ 
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/BasePage.java
 Mon Jan  2 14:29:48 2012
@@ -66,9 +66,10 @@ public class BasePage extends WebPage {
 }
 
 @Override
-protected void onBeforeRender() {
-super.onBeforeRender();
-
+protected void onConfigure() {
 brandProvider.modify(this);
+
+super.onConfigure();
 }
+
 }

Modified: 
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/brand/DefaultBrandProvider.java
URL: 
http://svn.apache.org/viewvc/karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/brand/DefaultBrandProvider.java?rev=1226435r1=1226434r2=1226435view=diff
==
--- 
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/brand/DefaultBrandProvider.java
 (original)
+++ 
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/brand/DefaultBrandProvider.java
 Mon Jan  2 14:29:48 2012
@@ -21,6 +21,7 @@ import java.util.Collections;
 import java.util.List;
 
 import org.apache.karaf.webconsole.core.BasePage;
+import org.apache.karaf.webconsole.core.behavior.FormalizeBehavior;
 import org.apache.wicket.Page;
 import org.apache.wicket.ResourceReference;
 import org.apache.wicket.behavior.IBehavior;
@@ -43,7 +44,7 @@ public class DefaultBrandProvider implem
 }
 
 public void modify(Page page) {
-// we don't modify page by default
+page.add(new FormalizeBehavior());
 }
 
 }

svn commit: r1225157 [3/3] - in /karaf/webconsole/trunk: blueprint/ blueprint/src/main/java/org/apache/karaf/webconsole/blueprint/internal/ blueprint/src/main/java/org/apache/karaf/webconsole/blueprin

[ldywicki]

Copied: 
karaf/webconsole/trunk/osgi/framework/src/main/java/org/apache/karaf/webconsole/osgi/framework/internal/FrameworkPage.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/framework/src/main/java/org/apache/karaf/webconsole/osgi/framework/internal/FrameworkPage.java?p2=karaf/webconsole/trunk/osgi/framework/src/main/java/org/apache/karaf/webconsole/osgi/framework/internal/FrameworkPage.javap1=karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/configuration/ConfigurationsPage.javar1=1225156r2=1225157rev=1225157view=diff
==
--- 
karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/configuration/ConfigurationsPage.java
 (original)
+++ 
karaf/webconsole/trunk/osgi/framework/src/main/java/org/apache/karaf/webconsole/osgi/framework/internal/FrameworkPage.java
 Wed Dec 28 10:39:46 2011
@@ -14,26 +14,28 @@
  * 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.framework.internal;
 
-import org.apache.karaf.webconsole.osgi.internal.OsgiPage;
-import 
org.apache.karaf.webconsole.osgi.internal.configuration.view.ConfigurationsDataTable;
-import org.apache.wicket.markup.html.CSSPackageResource;
-import org.ops4j.pax.wicket.api.PaxWicketBean;
+import org.apache.karaf.webconsole.osgi.framework.OsgiPage;
+import org.apache.karaf.webconsole.osgi.framework.SystemBundleModel;
+import 
org.apache.wicket.authorization.strategies.role.annotations.AuthorizeInstantiation;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.model.CompoundPropertyModel;
 import org.ops4j.pax.wicket.api.PaxWicketMountPoint;
-import org.osgi.service.cm.ConfigurationAdmin;
+import org.osgi.framework.Bundle;
 
-@PaxWicketMountPoint(mountPoint = /osgi/configuration)
-public class ConfigurationsPage extends OsgiPage {
-
-@PaxWicketBean(name = configurationAdmin)
-private ConfigurationAdmin configurationAdmin;
-
-public ConfigurationsPage() {
-add(CSSPackageResource.getHeaderContribution(ConfigurationsPage.class, 
configurations.css));
+/**
+ * Initial page for OSGi module.
+ */
+@PaxWicketMountPoint(mountPoint = /osgi/framework)
+@AuthorizeInstantiation({admin, osgi-user, osgi-developer})
+public class FrameworkPage extends OsgiPage {
 
-add(new ConfigurationsDataTable(configurations, new 
ConfigurationProvider(configurationAdmin), 20));
+public FrameworkPage() {
+setDefaultModel(new CompoundPropertyModelBundle(new 
SystemBundleModel(context)));
 
+add(new Label(symbolicName));
+add(new Label(version));
 }
 
 }

Copied: 
karaf/webconsole/trunk/osgi/framework/src/main/java/org/apache/karaf/webconsole/osgi/framework/internal/OsgiWidgetPanel.java
 (from r1225156, 
karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/widget/OsgiWidgetPanel.java)
URL: 
http://svn.apache.org/viewvc/karaf/webconsole/trunk/osgi/framework/src/main/java/org/apache/karaf/webconsole/osgi/framework/internal/OsgiWidgetPanel.java?p2=karaf/webconsole/trunk/osgi/framework/src/main/java/org/apache/karaf/webconsole/osgi/framework/internal/OsgiWidgetPanel.javap1=karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/widget/OsgiWidgetPanel.javar1=1225156r2=1225157rev=1225157view=diff
==
--- 
karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/widget/OsgiWidgetPanel.java
 (original)
+++ 
karaf/webconsole/trunk/osgi/framework/src/main/java/org/apache/karaf/webconsole/osgi/framework/internal/OsgiWidgetPanel.java
 Wed Dec 28 10:39:46 2011
@@ -14,26 +14,26 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.karaf.webconsole.osgi.internal.widget;
+package org.apache.karaf.webconsole.osgi.framework.internal;
 
-import org.apache.karaf.webconsole.osgi.internal.OsgiPage;
-import org.apache.karaf.webconsole.osgi.internal.bundle.BundlesPage;
+import org.apache.karaf.webconsole.osgi.framework.SystemBundleModel;
 import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.link.BookmarkablePageLink;
 import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.model.CompoundPropertyModel;
+import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 
+/**
+ * Very basic osgi widget to display framework and it's version on dashboard.
+ */
 public class OsgiWidgetPanel extends Panel {
 
 public OsgiWidgetPanel(String id, BundleContext context) {
-

svn commit: r1225172 - /karaf/webconsole/trunk/osgi/blueprint/src/main/resources/org/apache/karaf/webconsole/osgi/blueprint/bundle/blueprint.gif

[ldywicki]

Author: ldywicki
Date: Wed Dec 28 12:46:44 2011
New Revision: 1225172

URL: http://svn.apache.org/viewvc?rev=1225172view=rev
Log:
Override blueprint icon to be different than default one.

Signed-off-by: Lukasz Dywicki l...@code-house.org

Modified:

karaf/webconsole/trunk/osgi/blueprint/src/main/resources/org/apache/karaf/webconsole/osgi/blueprint/bundle/blueprint.gif

Modified: 
karaf/webconsole/trunk/osgi/blueprint/src/main/resources/org/apache/karaf/webconsole/osgi/blueprint/bundle/blueprint.gif
URL: 
http://svn.apache.org/viewvc/karaf/webconsole/trunk/osgi/blueprint/src/main/resources/org/apache/karaf/webconsole/osgi/blueprint/bundle/blueprint.gif?rev=1225172r1=1225171r2=1225172view=diff
==
Files 
karaf/webconsole/trunk/osgi/blueprint/src/main/resources/org/apache/karaf/webconsole/osgi/blueprint/bundle/blueprint.gif
 (original) and 
karaf/webconsole/trunk/osgi/blueprint/src/main/resources/org/apache/karaf/webconsole/osgi/blueprint/bundle/blueprint.gif
 Wed Dec 28 12:46:44 2011 differ

svn commit: r1225174 - in /karaf/webconsole/trunk/osgi/scr: ./ src/ src/main/ src/main/java/ src/main/java/org/ src/main/java/org/apache/ src/main/java/org/apache/karaf/ src/main/java/org/apache/karaf

[ldywicki]

Author: ldywicki
Date: Wed Dec 28 12:47:41 2011
New Revision: 1225174

URL: http://svn.apache.org/viewvc?rev=1225174view=rev
Log:
Scr plugin for webconsole, decorates bundle list

Signed-off-by: Lukasz Dywicki l...@code-house.org

Added:
karaf/webconsole/trunk/osgi/scr/
karaf/webconsole/trunk/osgi/scr/pom.xml
karaf/webconsole/trunk/osgi/scr/src/
karaf/webconsole/trunk/osgi/scr/src/main/
karaf/webconsole/trunk/osgi/scr/src/main/java/
karaf/webconsole/trunk/osgi/scr/src/main/java/org/
karaf/webconsole/trunk/osgi/scr/src/main/java/org/apache/
karaf/webconsole/trunk/osgi/scr/src/main/java/org/apache/karaf/
karaf/webconsole/trunk/osgi/scr/src/main/java/org/apache/karaf/webconsole/

karaf/webconsole/trunk/osgi/scr/src/main/java/org/apache/karaf/webconsole/osgi/

karaf/webconsole/trunk/osgi/scr/src/main/java/org/apache/karaf/webconsole/osgi/scr/

karaf/webconsole/trunk/osgi/scr/src/main/java/org/apache/karaf/webconsole/osgi/scr/ScrColumn.java

karaf/webconsole/trunk/osgi/scr/src/main/java/org/apache/karaf/webconsole/osgi/scr/ScrColumnPanel.java

karaf/webconsole/trunk/osgi/scr/src/main/java/org/apache/karaf/webconsole/osgi/scr/ScrColumnProvider.java

karaf/webconsole/trunk/osgi/scr/src/main/java/org/apache/karaf/webconsole/osgi/scr/ScrComponent.java

karaf/webconsole/trunk/osgi/scr/src/main/java/org/apache/karaf/webconsole/osgi/scr/ScrDecorationProvider.java

karaf/webconsole/trunk/osgi/scr/src/main/java/org/apache/karaf/webconsole/osgi/scr/ScrUtils.java
karaf/webconsole/trunk/osgi/scr/src/main/resources/
karaf/webconsole/trunk/osgi/scr/src/main/resources/OSGI-INF/
karaf/webconsole/trunk/osgi/scr/src/main/resources/OSGI-INF/column.xml
karaf/webconsole/trunk/osgi/scr/src/main/resources/OSGI-INF/decoration.xml
karaf/webconsole/trunk/osgi/scr/src/main/resources/org/
karaf/webconsole/trunk/osgi/scr/src/main/resources/org/apache/
karaf/webconsole/trunk/osgi/scr/src/main/resources/org/apache/karaf/

karaf/webconsole/trunk/osgi/scr/src/main/resources/org/apache/karaf/webconsole/

karaf/webconsole/trunk/osgi/scr/src/main/resources/org/apache/karaf/webconsole/osgi/

karaf/webconsole/trunk/osgi/scr/src/main/resources/org/apache/karaf/webconsole/osgi/scr/

karaf/webconsole/trunk/osgi/scr/src/main/resources/org/apache/karaf/webconsole/osgi/scr/ScrColumnPanel.html

karaf/webconsole/trunk/osgi/scr/src/main/resources/org/apache/karaf/webconsole/osgi/scr/decorator.css

karaf/webconsole/trunk/osgi/scr/src/main/resources/org/apache/karaf/webconsole/osgi/scr/scr.gif

Added: karaf/webconsole/trunk/osgi/scr/pom.xml
URL: 
http://svn.apache.org/viewvc/karaf/webconsole/trunk/osgi/scr/pom.xml?rev=1225174view=auto
==
--- karaf/webconsole/trunk/osgi/scr/pom.xml (added)
+++ karaf/webconsole/trunk/osgi/scr/pom.xml Wed Dec 28 12:47:41 2011
@@ -0,0 +1,73 @@
+?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
+   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.
+--
+project xmlns=http://maven.apache.org/POM/4.0.0; 
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
+xsi:schemaLocation=http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd;
+modelVersion4.0.0/modelVersion
+
+parent
+groupIdorg.apache.karaf.webconsole/groupId
+artifactIdosgi/artifactId
+version0.3.0-SNAPSHOT/version
+/parent
+
+groupIdorg.apache.karaf.webconsole.osgi/groupId
+artifactIdorg.apache.karaf.webconsole.osgi.scr/artifactId
+nameApache Karaf :: WebConsole :: OSGi :: Scr/name
+packagingbundle/packaging
+
+dependencies
+dependency
+groupIdorg.apache.karaf.webconsole.osgi/groupId
+artifactIdorg.apache.karaf.webconsole.osgi.bundle/artifactId
+version${project.version}/version
+/dependency
+
+dependency
+groupIdorg.apache.felix/groupId
+artifactIdorg.apache.felix.scr/artifactId
+version1.6.0/version
+/dependency
+/dependencies
+
+build
+plugins
+plugin
+groupIdorg.apache.felix/groupId
+artifactIdmaven-bundle-plugin

svn commit: r1225175 - in /karaf/webconsole/trunk/examples: ./ scr/ scr/src/ scr/src/main/ scr/src/main/java/ scr/src/main/java/org/ scr/src/main/java/org/apache/ scr/src/main/java/org/apache/karaf/ s

[ldywicki]

Author: ldywicki
Date: Wed Dec 28 12:48:21 2011
New Revision: 1225175

URL: http://svn.apache.org/viewvc?rev=1225175view=rev
Log:
Example scr module to let webconsole display component state

Signed-off-by: Lukasz Dywicki l...@code-house.org

Added:
karaf/webconsole/trunk/examples/scr/
karaf/webconsole/trunk/examples/scr/pom.xml
karaf/webconsole/trunk/examples/scr/src/
karaf/webconsole/trunk/examples/scr/src/main/
karaf/webconsole/trunk/examples/scr/src/main/java/
karaf/webconsole/trunk/examples/scr/src/main/java/org/
karaf/webconsole/trunk/examples/scr/src/main/java/org/apache/
karaf/webconsole/trunk/examples/scr/src/main/java/org/apache/karaf/

karaf/webconsole/trunk/examples/scr/src/main/java/org/apache/karaf/webconsole/

karaf/webconsole/trunk/examples/scr/src/main/java/org/apache/karaf/webconsole/examples/

karaf/webconsole/trunk/examples/scr/src/main/java/org/apache/karaf/webconsole/examples/scr/

karaf/webconsole/trunk/examples/scr/src/main/java/org/apache/karaf/webconsole/examples/scr/ExampleComparator.java
karaf/webconsole/trunk/examples/scr/src/main/resources/
karaf/webconsole/trunk/examples/scr/src/main/resources/OSGI-INF/

karaf/webconsole/trunk/examples/scr/src/main/resources/OSGI-INF/comparator.xml
  - copied, changed from r1225174, karaf/webconsole/trunk/examples/pom.xml
Modified:
karaf/webconsole/trunk/examples/pom.xml

Modified: karaf/webconsole/trunk/examples/pom.xml
URL: 
http://svn.apache.org/viewvc/karaf/webconsole/trunk/examples/pom.xml?rev=1225175r1=1225174r2=1225175view=diff
==
--- karaf/webconsole/trunk/examples/pom.xml (original)
+++ karaf/webconsole/trunk/examples/pom.xml Wed Dec 28 12:48:21 2011
@@ -33,6 +33,7 @@
 modules
 modulebranding/module
 moduleevents/module
+modulescr/module
 /modules
 
 /project

Added: karaf/webconsole/trunk/examples/scr/pom.xml
URL: 
http://svn.apache.org/viewvc/karaf/webconsole/trunk/examples/scr/pom.xml?rev=1225175view=auto
==
--- karaf/webconsole/trunk/examples/scr/pom.xml (added)
+++ karaf/webconsole/trunk/examples/scr/pom.xml Wed Dec 28 12:48:21 2011
@@ -0,0 +1,61 @@
+?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
+   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.
+--
+project xmlns=http://maven.apache.org/POM/4.0.0; 
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
+xsi:schemaLocation=http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd;
+modelVersion4.0.0/modelVersion
+
+parent
+groupIdorg.apache.karaf.webconsole/groupId
+artifactIdexamples/artifactId
+version0.3.0-SNAPSHOT/version
+/parent
+
+groupIdorg.apache.karaf.webconsole.examples/groupId
+artifactIdorg.apache.karaf.webconsole.examples.scr/artifactId
+nameApache Karaf :: WebConsole :: Examples :: Scr/name
+packagingbundle/packaging
+
+
+!-- dependencies --
+!-- dependency --
+!-- groupIdorg.osgi/groupId --
+!-- artifactIdorg.osgi.compendium/artifactId --
+!-- /dependency --
+!-- /dependencies --
+
+build
+plugins
+plugin
+groupIdorg.apache.felix/groupId
+artifactIdmaven-bundle-plugin/artifactId
+version2.3.5/version
+extensionstrue/extensions
+configuration
+instructions
+
Bundle-SymbolicName${project.artifactId}/Bundle-SymbolicName
+
Service-ComponentOSGI-INF/comparator.xml/Service-Component
+Import-Package
+*
+/Import-Package
+/instructions
+/configuration
+/plugin
+/plugins
+/build
+
+/project

Added: 
karaf/webconsole/trunk/examples/scr/src/main/java/org/apache/karaf/webconsole/examples/scr/ExampleComparator.java
URL: 
http://svn.apache.org/viewvc/karaf/webconsole/trunk/examples/scr/src/main/java/org/apache/karaf/webconsole/examples/scr/ExampleComparator.java?rev=1225175view=auto

svn commit: r1225181 - /karaf/webconsole/trunk/examples/branding/src/main/java/org/apache/karaf/webconsole/examples/branding/ExampleBrandProvider.java

[ldywicki]

Author: ldywicki
Date: Wed Dec 28 13:29:36 2011
New Revision: 1225181

URL: http://svn.apache.org/viewvc?rev=1225181view=rev
Log:
Line up example brand provider with changes in API.

Signed-off-by: Lukasz Dywicki l...@code-house.org

Modified:

karaf/webconsole/trunk/examples/branding/src/main/java/org/apache/karaf/webconsole/examples/branding/ExampleBrandProvider.java

Modified: 
karaf/webconsole/trunk/examples/branding/src/main/java/org/apache/karaf/webconsole/examples/branding/ExampleBrandProvider.java
URL: 
http://svn.apache.org/viewvc/karaf/webconsole/trunk/examples/branding/src/main/java/org/apache/karaf/webconsole/examples/branding/ExampleBrandProvider.java?rev=1225181r1=1225180r2=1225181view=diff
==
--- 
karaf/webconsole/trunk/examples/branding/src/main/java/org/apache/karaf/webconsole/examples/branding/ExampleBrandProvider.java
 (original)
+++ 
karaf/webconsole/trunk/examples/branding/src/main/java/org/apache/karaf/webconsole/examples/branding/ExampleBrandProvider.java
 Wed Dec 28 13:29:36 2011
@@ -20,6 +20,8 @@ import java.util.LinkedList;
 import java.util.List;
 
 import org.apache.karaf.webconsole.core.brand.BrandProvider;
+import org.apache.wicket.Page;
+import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.ResourceReference;
 import org.apache.wicket.behavior.IBehavior;
 import org.apache.wicket.markup.html.CSSPackageResource;
@@ -40,4 +42,7 @@ public class ExampleBrandProvider implem
 return behaviors;
 }
 
+public void modify(Page page) {
+page.addOrReplace(new Label(footer, Branded WebConsole));
+}
 }
\ No newline at end of file

svn commit: r1225182 - in /karaf/webconsole/trunk: features/src/main/filtered-resources/features.xml itest/src/test/java/org/apache/karaf/webconsole/itest/FeaturesIntegrationTest.java osgi/pom.xml osg

[ldywicki]

Author: ldywicki
Date: Wed Dec 28 13:29:58 2011
New Revision: 1225182

URL: http://svn.apache.org/viewvc?rev=1225182view=rev
Log:
Clean up versions, make features deployable again. Integration test update

Signed-off-by: Lukasz Dywicki l...@code-house.org

Modified:
karaf/webconsole/trunk/features/src/main/filtered-resources/features.xml

karaf/webconsole/trunk/itest/src/test/java/org/apache/karaf/webconsole/itest/FeaturesIntegrationTest.java
karaf/webconsole/trunk/osgi/pom.xml
karaf/webconsole/trunk/osgi/scr/pom.xml
karaf/webconsole/trunk/pom.xml

Modified: 
karaf/webconsole/trunk/features/src/main/filtered-resources/features.xml
URL: 
http://svn.apache.org/viewvc/karaf/webconsole/trunk/features/src/main/filtered-resources/features.xml?rev=1225182r1=1225181r2=1225182view=diff
==
--- karaf/webconsole/trunk/features/src/main/filtered-resources/features.xml 
(original)
+++ karaf/webconsole/trunk/features/src/main/filtered-resources/features.xml 
Wed Dec 28 13:29:58 2011
@@ -21,35 +21,66 @@
 
   feature name=webconsole-wicket version=${project.version} 
description=Karaf Wicket Webconsole
 featurewebconsole-core/feature
+featurewebconsole-karaf/feature
 featurewebconsole-osgi/feature
+featurewebconsole-config/feature
+featurewebconsole-log/feature
+featurewebconsole-event/feature
 featurewebconsole-blueprint/feature
-featurewebconsole-karaf/feature
+featurewebconsole-scr/feature
   /feature
+
   !-- Pax-Wicket Core Feature; loading all required features. Do a 
feature:install paxwicket and you're ready to go --
-  feature name=webconsole-core version=${project.version} 
description=Karaf Webconsole Core
+  feature name=webconsole-core version=${project.version} 
description=Karaf WebConsole Core
 detailsThe Webconsole core package provides the base view required for 
all bundles/details
 featurewicket-spring/feature
 
bundlemvn:org.apache.felix/org.apache.felix.prefs/${felix-prefs.version}/bundle
 
bundlemvn:org.apache.karaf.webconsole/org.apache.karaf.webconsole.core/${project.version}/bundle
   /feature
 
-  feature name=webconsole-osgi version=${project.version} 
description=Karaf Webconsole OSGi
+  feature name=webconsole-osgi version=${project.version} 
description=Karaf WebConsole OSGi Core
 detailsAdds support for osgi packages to the webconsole./details
 featurewebconsole-core/feature
+
bundlemvn:org.apache.karaf.webconsole.osgi/org.apache.karaf.webconsole.osgi.framework/${project.version}/bundle
+
bundlemvn:org.apache.karaf.webconsole.osgi/org.apache.karaf.webconsole.osgi.bundle/${project.version}/bundle
+  /feature
+
+  feature name=webconsole-config version=${project.version} 
description=Karaf WebConsole OSGi ConfigurationAdmin
+detailsAdds support for osgi configuration admin./details
+featurewebconsole-osgi/feature
 
bundlemvn:org.apache.felix/org.apache.felix.metatype/${felix-metatype.version}/bundle
-
bundlemvn:org.apache.karaf.webconsole/org.apache.karaf.webconsole.osgi/${project.version}/bundle
+
bundlemvn:org.apache.karaf.webconsole.osgi/org.apache.karaf.webconsole.osgi.config/${project.version}/bundle
+  /feature
+
+  feature name=webconsole-log version=${project.version} 
description=Karaf WebConsole OSGi LogService
+detailsAdds support for osgi log service./details
+featurewebconsole-osgi/feature
+
bundlemvn:org.apache.karaf.webconsole.osgi/org.apache.karaf.webconsole.osgi.log/${project.version}/bundle
   /feature
 
-  feature name=webconsole-karaf version=${project.version} 
description=Karaf Webconsole Features
+  feature name=webconsole-event version=${project.version} 
description=Karaf WebConsole OSGi EventAdmin
+detailsAdds support for osgi event admin service./details
+featurewebconsole-osgi/feature
+
bundlemvn:org.apache.karaf.webconsole.osgi/org.apache.karaf.webconsole.osgi.event/${project.version}/bundle
+  /feature
+
+  feature name=webconsole-karaf version=${project.version} 
description=Karaf WebConsole Features
 detailsKaraf bundle will contain all the pages and java classes about 
content specific to Karaf like features,repositories and obr./details
 featurewebconsole-core/feature
 
bundlemvn:org.apache.karaf.webconsole/org.apache.karaf.webconsole.karaf/${project.version}/bundle
   /feature
 
-  feature name=webconsole-blueprint version=${project.version} 
description=Karaf Webconsole Blueprint
+  feature name=webconsole-blueprint version=${project.version} 
description=Karaf WebConsole Blueprint
 detailsAdds support for blueprint specific features to the 
webconsole./details
-featurewebconsole-core/feature
-
bundlemvn:org.apache.karaf.webconsole/org.apache.karaf.webconsole.blueprint/${project.version}/bundle
+featurewebconsole-osgi/feature
+
bundlemvn:org.apache.karaf.webconsole.osgi/org.apache.karaf.webconsole.osgi.blueprint

svn commit: r1214512 - in /karaf/webconsole/trunk: core/pom.xml pom.xml

[ldywicki]

Author: ldywicki
Date: Wed Dec 14 22:36:30 2011
New Revision: 1214512

URL: http://svn.apache.org/viewvc?rev=1214512view=rev
Log:
Introduce dependency management for OSGi core artifacts

Signed-off-by: Lukasz Dywicki l...@code-house.org

Modified:
karaf/webconsole/trunk/core/pom.xml
karaf/webconsole/trunk/pom.xml

Modified: karaf/webconsole/trunk/core/pom.xml
URL: 
http://svn.apache.org/viewvc/karaf/webconsole/trunk/core/pom.xml?rev=1214512r1=1214511r2=1214512view=diff
==
--- karaf/webconsole/trunk/core/pom.xml (original)
+++ karaf/webconsole/trunk/core/pom.xml Wed Dec 14 22:36:30 2011
@@ -34,12 +34,10 @@
 dependency
 groupIdorg.osgi/groupId
 artifactIdorg.osgi.core/artifactId
-version4.2.0/version
 /dependency
 dependency
 groupIdorg.osgi/groupId
 artifactIdorg.osgi.compendium/artifactId
-version4.2.0/version
 /dependency
 
 !-- WICKET DEPENDENCIES --

Modified: karaf/webconsole/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/karaf/webconsole/trunk/pom.xml?rev=1214512r1=1214511r2=1214512view=diff
==
--- karaf/webconsole/trunk/pom.xml (original)
+++ karaf/webconsole/trunk/pom.xml Wed Dec 14 22:36:30 2011
@@ -27,6 +27,7 @@
 packagingpom/packaging
 
 properties
+osgi.version4.2.0/osgi.version
 jetty.version6.1.25/jetty.version
 felix-metatype.version1.0.4/felix-metatype.version
 felix-prefs.version1.0.4/felix-prefs.version
@@ -122,6 +123,17 @@
 artifactIdorg.apache.felix.prefs/artifactId
 version${felix-prefs.version}/version
 /dependency
+
+dependency
+groupIdorg.osgi/groupId
+artifactIdorg.osgi.core/artifactId
+version${osgi.version}/version
+/dependency
+dependency
+groupIdorg.osgi/groupId
+artifactIdorg.osgi.compendium/artifactId
+version${osgi.version}/version
+/dependency
 /dependencies
 /dependencyManagement
 

svn commit: r1214513 - in /karaf/webconsole/trunk/osgi/src/main: java/org/apache/karaf/webconsole/osgi/internal/event/ java/org/apache/karaf/webconsole/osgi/internal/event/model/ resources/org/apache/

[ldywicki]

Author: ldywicki
Date: Wed Dec 14 22:36:54 2011
New Revision: 1214513

URL: http://svn.apache.org/viewvc?rev=1214513view=rev
Log:
Added basic page which shows list of topics which have at least one consumer 
attached

Signed-off-by: Lukasz Dywicki l...@code-house.org

Added:

karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/event/model/

karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/event/model/EventTopicInfo.java

karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/event/model/EventTopicsProvider.java
Modified:

karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/event/EventsPage.java

karaf/webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/event/EventsPage.html

Modified: 
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/src/main/java/org/apache/karaf/webconsole/osgi/internal/event/EventsPage.java?rev=1214513r1=1214512r2=1214513view=diff
==
--- 
karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/event/EventsPage.java
 (original)
+++ 
karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/event/EventsPage.java
 Wed Dec 14 22:36:54 2011
@@ -16,10 +16,28 @@
  */
 package org.apache.karaf.webconsole.osgi.internal.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.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;
 
 @PaxWicketMountPoint(mountPoint = /osgi/event)
 public class EventsPage extends OsgiPage {
 
+public EventsPage() {
+ListIColumnEventTopicInfo columns = new 
ArrayListIColumnEventTopicInfo();
+columns.add(new OrdinalColumnEventTopicInfo());
+columns.add(new PropertyColumnExtEventTopicInfo(Topic, topic));
+columns.add(new PropertyColumnExtEventTopicInfo(Number of 
consumers, consumers));
+
+add(new DefaultDataTableEventTopicInfo(topics, columns, new 
EventTopicsProvider(context), 100));
+}
+
 }

Added: 
karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/event/model/EventTopicInfo.java
URL: 
http://svn.apache.org/viewvc/karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/event/model/EventTopicInfo.java?rev=1214513view=auto
==
--- 
karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/event/model/EventTopicInfo.java
 (added)
+++ 
karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/event/model/EventTopicInfo.java
 Wed Dec 14 22:36:54 2011
@@ -0,0 +1,26 @@
+package org.apache.karaf.webconsole.osgi.internal.event.model;
+
+import java.io.Serializable;
+
+public class EventTopicInfo implements Serializable {
+
+private String topic;
+private int consumers;
+
+public EventTopicInfo(String topic, int consumers) {
+this.topic = topic;
+this.consumers = consumers;
+}
+
+public String getTopic() {
+return topic;
+}
+
+public int getConsumers() {
+return consumers;
+}
+
+public void addConsumer() {
+consumers++;
+}
+}

Added: 
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/src/main/java/org/apache/karaf/webconsole/osgi/internal/event/model/EventTopicsProvider.java?rev=1214513view=auto
==
--- 
karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/event/model/EventTopicsProvider.java
 (added)
+++ 
karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/event/model/EventTopicsProvider.java
 Wed Dec 14 22:36:54 2011
@@ -0,0 +1,63 @@
+package org.apache.karaf.webconsole.osgi.internal.event.model;
+
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+import 
org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
+import

svn commit: r1181724 - in /karaf/webconsole/trunk/itest: pom.xml src/test/java/org/apache/karaf/webconsole/itest/FeaturesIntegrationTest.java

[ldywicki]

Author: ldywicki
Date: Tue Oct 11 11:39:06 2011
New Revision: 1181724

URL: http://svn.apache.org/viewvc?rev=1181724view=rev
Log:
Hard coded versions fixed

Signed-off-by: Lukasz Dywicki l...@code-house.org

Modified:
karaf/webconsole/trunk/itest/pom.xml

karaf/webconsole/trunk/itest/src/test/java/org/apache/karaf/webconsole/itest/FeaturesIntegrationTest.java

Modified: karaf/webconsole/trunk/itest/pom.xml
URL: 
http://svn.apache.org/viewvc/karaf/webconsole/trunk/itest/pom.xml?rev=1181724r1=1181723r2=1181724view=diff
==
--- karaf/webconsole/trunk/itest/pom.xml (original)
+++ karaf/webconsole/trunk/itest/pom.xml Tue Oct 11 11:39:06 2011
@@ -60,12 +60,37 @@
 /dependency
 
 dependency
+groupIdorg.apache.karaf/groupId
+artifactIdkaraf/artifactId
+version${karaf.version}/version
+typepom/type
+scopetest/scope
+/dependency
+
+dependency
 groupIdorg.apache.karaf.features/groupId
 artifactIdorg.apache.karaf.features.core/artifactId
-version2.2.0/version
+version${karaf.version}/version
 scopetest/scope
 /dependency
+
 /dependencies
 
+build
+plugins
+  plugin
+groupIdorg.apache.servicemix.tooling/groupId
+artifactIddepends-maven-plugin/artifactId
+executions
+  execution
+idgenerate-depends-file/id
+goals
+  goalgenerate-depends-file/goal
+/goals
+  /execution
+/executions
+  /plugin
+/plugins
+/build
 /project
 

Modified: 
karaf/webconsole/trunk/itest/src/test/java/org/apache/karaf/webconsole/itest/FeaturesIntegrationTest.java
URL: 
http://svn.apache.org/viewvc/karaf/webconsole/trunk/itest/src/test/java/org/apache/karaf/webconsole/itest/FeaturesIntegrationTest.java?rev=1181724r1=1181723r2=1181724view=diff
==
--- 
karaf/webconsole/trunk/itest/src/test/java/org/apache/karaf/webconsole/itest/FeaturesIntegrationTest.java
 (original)
+++ 
karaf/webconsole/trunk/itest/src/test/java/org/apache/karaf/webconsole/itest/FeaturesIntegrationTest.java
 Tue Oct 11 11:39:06 2011
@@ -1,8 +1,25 @@
+/*
+ * 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.itest;
 
 import static junit.framework.Assert.assertTrue;
 import static 
org.openengsb.labs.paxexam.karaf.options.KarafDistributionOption.karafDistributionConfiguration;
 import static org.ops4j.pax.exam.CoreOptions.maven;
+import static org.ops4j.pax.exam.CoreOptions.systemProperty;
 
 import java.net.URI;
 import java.util.ArrayList;
@@ -12,8 +29,10 @@ import javax.inject.Inject;
 
 import org.apache.karaf.features.Feature;
 import org.apache.karaf.features.FeaturesService;
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.MavenUtils;
 import org.ops4j.pax.exam.Option;
 import org.ops4j.pax.exam.junit.Configuration;
 import org.ops4j.pax.exam.junit.JUnit4TestRunner;
@@ -24,18 +43,32 @@ public class FeaturesIntegrationTest {
 @Inject
 private FeaturesService features;
 
+private String featuresVersion;
+
 @Configuration
 public Option[] config() {
+String karafVersion = 
MavenUtils.getArtifactVersion(org.apache.karaf, karaf);
+String webconsoleVersion = 
MavenUtils.getArtifactVersion(org.apache.karaf.webconsole, features);
 return new Option[] {
 karafDistributionConfiguration().frameworkUrl(
-
maven().groupId(org.apache.karaf).artifactId(apache-karaf).type(zip).version(2.2.0)
+
maven().groupId(org.apache.karaf).artifactId(apache-karaf).version(karafVersion).type(zip)
 ),
+
+// use system property to provide project version for tests
+systemProperty(webconsole-version).value(webconsoleVersion)
 };
 }
 
+@Before
+public void setUp() {
+featuresVersion = System.getProperty(webconsole-version);
+}
+
 @Test
 public void someTest() throws

svn commit: r1181062 - in /karaf/webconsole/trunk: ./ itest/ itest/src/ itest/src/test/ itest/src/test/java/ itest/src/test/java/org/ itest/src/test/java/org/apache/ itest/src/test/java/org/apache/kar

[ldywicki]

Author: ldywicki
Date: Mon Oct 10 16:42:26 2011
New Revision: 1181062

URL: http://svn.apache.org/viewvc?rev=1181062view=rev
Log:
First integration test. It covers feature installation.

Added:
karaf/webconsole/trunk/itest/
karaf/webconsole/trunk/itest/pom.xml
karaf/webconsole/trunk/itest/src/
karaf/webconsole/trunk/itest/src/test/
karaf/webconsole/trunk/itest/src/test/java/
karaf/webconsole/trunk/itest/src/test/java/org/
karaf/webconsole/trunk/itest/src/test/java/org/apache/
karaf/webconsole/trunk/itest/src/test/java/org/apache/karaf/
karaf/webconsole/trunk/itest/src/test/java/org/apache/karaf/webconsole/

karaf/webconsole/trunk/itest/src/test/java/org/apache/karaf/webconsole/itest/

karaf/webconsole/trunk/itest/src/test/java/org/apache/karaf/webconsole/itest/FeaturesIntegrationTest.java
karaf/webconsole/trunk/itest/src/test/resources/
karaf/webconsole/trunk/itest/src/test/resources/log4j.properties
Modified:
karaf/webconsole/trunk/pom.xml

Added: karaf/webconsole/trunk/itest/pom.xml
URL: 
http://svn.apache.org/viewvc/karaf/webconsole/trunk/itest/pom.xml?rev=1181062view=auto
==
--- karaf/webconsole/trunk/itest/pom.xml (added)
+++ karaf/webconsole/trunk/itest/pom.xml Mon Oct 10 16:42:26 2011
@@ -0,0 +1,71 @@
+?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
+   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.
+--
+project xmlns=http://maven.apache.org/POM/4.0.0; 
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
+xsi:schemaLocation=http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd;
+
+parent
+groupIdorg.apache.karaf/groupId
+artifactIdwebconsole/artifactId
+version0.3.0-SNAPSHOT/version
+/parent
+
+modelVersion4.0.0/modelVersion
+
+groupIdorg.apache.karaf.webconsole/groupId
+artifactIditest/artifactId
+nameApache Karaf :: WebConsole :: Integration tests/name
+
+dependencies
+dependency
+groupIdorg.apache.karaf.webconsole/groupId
+artifactIdfeatures/artifactId
+version${project.version}/version
+classifierfeatures/classifier
+typexml/type
+/dependency
+
+dependency
+groupIdorg.openengsb.labs.paxexam.karaf/groupId
+artifactIdpaxexam-karaf-container/artifactId
+version0.2.0/version
+scopetest/scope
+/dependency
+dependency
+groupIdorg.ops4j.pax.exam/groupId
+artifactIdpax-exam-junit4/artifactId
+version2.3.0.M1/version
+scopetest/scope
+/dependency
+
+dependency
+groupIdorg.slf4j/groupId
+artifactIdslf4j-log4j12/artifactId
+version${slf4j.version}/version
+scopetest/scope
+/dependency
+
+dependency
+groupIdorg.apache.karaf.features/groupId
+artifactIdorg.apache.karaf.features.core/artifactId
+version2.2.0/version
+scopetest/scope
+/dependency
+/dependencies
+
+/project
+

Added: 
karaf/webconsole/trunk/itest/src/test/java/org/apache/karaf/webconsole/itest/FeaturesIntegrationTest.java
URL: 
http://svn.apache.org/viewvc/karaf/webconsole/trunk/itest/src/test/java/org/apache/karaf/webconsole/itest/FeaturesIntegrationTest.java?rev=1181062view=auto
==
--- 
karaf/webconsole/trunk/itest/src/test/java/org/apache/karaf/webconsole/itest/FeaturesIntegrationTest.java
 (added)
+++ 
karaf/webconsole/trunk/itest/src/test/java/org/apache/karaf/webconsole/itest/FeaturesIntegrationTest.java
 Mon Oct 10 16:42:26 2011
@@ -0,0 +1,49 @@
+package org.apache.karaf.webconsole.itest;
+
+import static junit.framework.Assert.assertTrue;
+import static 
org.openengsb.labs.paxexam.karaf.options.KarafDistributionOption.karafDistributionConfiguration;
+import static org.ops4j.pax.exam.CoreOptions.maven;
+
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.inject.Inject;
+
+import org.apache.karaf.features.Feature;
+import org.apache.karaf.features.FeaturesService

svn commit: r1167227 - in /karaf/webconsole/trunk/core/src: main/java/org/apache/karaf/webconsole/core/page/ test/java/org/apache/karaf/webconsole/core/ test/java/org/apache/karaf/webconsole/core/page

[ldywicki]

Author: ldywicki
Date: Fri Sep  9 14:44:53 2011
New Revision: 1167227

URL: http://svn.apache.org/viewvc?rev=1167227view=rev
Log:
Sidebar tests

Signed-off-by: Lukasz Dywicki l...@code-house.org

Added:

karaf/webconsole/trunk/core/src/test/java/org/apache/karaf/webconsole/core/page/SidebarPageTest.java
Modified:

karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/page/SidebarPage.java

karaf/webconsole/trunk/core/src/test/java/org/apache/karaf/webconsole/core/WebConsoleTest.java

karaf/webconsole/trunk/core/src/test/java/org/apache/karaf/webconsole/core/page/SecuredPageTest.java

Modified: 
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/page/SidebarPage.java
URL: 
http://svn.apache.org/viewvc/karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/page/SidebarPage.java?rev=1167227r1=1167226r2=1167227view=diff
==
--- 
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/page/SidebarPage.java
 (original)
+++ 
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/page/SidebarPage.java
 Fri Sep  9 14:44:53 2011
@@ -34,10 +34,7 @@ public class SidebarPage extends Secured
 }
 
 protected void setSidebarProvider(SidebarProvider provider) {
-if (sidebar == null) {
-sidebar = new SidebarPanel(sidebar, provider);
-add(sidebar);
-}
+addOrReplace(sidebar = new SidebarPanel(sidebar, provider));
 }
 
 /**

Modified: 
karaf/webconsole/trunk/core/src/test/java/org/apache/karaf/webconsole/core/WebConsoleTest.java
URL: 
http://svn.apache.org/viewvc/karaf/webconsole/trunk/core/src/test/java/org/apache/karaf/webconsole/core/WebConsoleTest.java?rev=1167227r1=1167226r2=1167227view=diff
==
--- 
karaf/webconsole/trunk/core/src/test/java/org/apache/karaf/webconsole/core/WebConsoleTest.java
 (original)
+++ 
karaf/webconsole/trunk/core/src/test/java/org/apache/karaf/webconsole/core/WebConsoleTest.java
 Fri Sep  9 14:44:53 2011
@@ -1,12 +1,18 @@
 package org.apache.karaf.webconsole.core;
 
+import static org.easymock.EasyMock.anyObject;
+
+import java.util.Collections;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 import org.apache.karaf.webconsole.core.brand.DefaultBrandProvider;
 import org.apache.karaf.webconsole.core.internal.WebConsoleApplication;
 import org.apache.karaf.webconsole.core.security.KarafJaasWebSession;
+import org.apache.wicket.Page;
 import org.apache.wicket.authentication.AuthenticatedWebSession;
+import org.apache.wicket.markup.html.link.Link;
 import org.apache.wicket.protocol.http.WebApplication;
 import org.junit.Before;
 
@@ -45,4 +51,20 @@ public class WebConsoleTest {
 protected Class? extends AuthenticatedWebSession getWebSessionClass() {
 return KarafJaasWebSession.class;
 }
+
+// utility methods for easy mock
+
+/**
+ * Easy mock argument matcher.
+ */
+protected final static String anyString() {
+return anyObject();
+}
+
+/**
+ * Empty list stub.
+ */
+protected final static ListLinkPage emptyLinkList() {
+return Collections.LinkPageemptyList();
+}
 }
\ No newline at end of file

Modified: 
karaf/webconsole/trunk/core/src/test/java/org/apache/karaf/webconsole/core/page/SecuredPageTest.java
URL: 
http://svn.apache.org/viewvc/karaf/webconsole/trunk/core/src/test/java/org/apache/karaf/webconsole/core/page/SecuredPageTest.java?rev=1167227r1=1167226r2=1167227view=diff
==
--- 
karaf/webconsole/trunk/core/src/test/java/org/apache/karaf/webconsole/core/page/SecuredPageTest.java
 (original)
+++ 
karaf/webconsole/trunk/core/src/test/java/org/apache/karaf/webconsole/core/page/SecuredPageTest.java
 Fri Sep  9 14:44:53 2011
@@ -200,20 +200,6 @@ public class SecuredPageTest extends Web
 return AlwaysAuthenticatedWebSession.class;
 }
 
-/**
- * Easy mock argument matcher.
- */
-private static String anyString() {
-return anyObject();
-}
-
-/**
- * Empty list stub.
- */
-private static ListLinkPage emptyLinkList() {
-return Collections.LinkPageemptyList();
-}
-
 // Marker interface for tests, normally serialization is controlled by 
paxwicket
 // as ConsoleTabProviders are OSGi services.
 interface SerializableConsoleTabProvider extends Serializable, 
ConsoleTabProvider {}

Added: 
karaf/webconsole/trunk/core/src/test/java/org/apache/karaf/webconsole/core/page/SidebarPageTest.java
URL: 
http://svn.apache.org/viewvc/karaf/webconsole/trunk/core/src/test/java/org/apache/karaf/webconsole/core/page/SidebarPageTest.java?rev=1167227view=auto

svn commit: r1166605 - in /karaf/webconsole/trunk: ./ cxf/ cxf/src/ cxf/src/main/ cxf/src/main/java/ cxf/src/main/java/org/ cxf/src/main/java/org/apache/ cxf/src/main/java/org/apache/karaf/ cxf/src/ma

[ldywicki]

Author: ldywicki
Date: Thu Sep  8 10:15:32 2011
New Revision: 1166605

URL: http://svn.apache.org/viewvc?rev=1166605view=rev
Log:
CXF extension. Requires 2.4.3-SNAPSHOT or 2.5.0-SNAPSHOT version to discover 
cxf bus instances. Tracing is not possible right now, details page shows only 
some basic informations from bus/ServerRegistry instances.

Signed-off-by: Lukasz Dywicki l...@code-house.org

Added:
karaf/webconsole/trunk/cxf/
karaf/webconsole/trunk/cxf/pom.xml
karaf/webconsole/trunk/cxf/src/
karaf/webconsole/trunk/cxf/src/main/
karaf/webconsole/trunk/cxf/src/main/java/
karaf/webconsole/trunk/cxf/src/main/java/org/
karaf/webconsole/trunk/cxf/src/main/java/org/apache/
karaf/webconsole/trunk/cxf/src/main/java/org/apache/karaf/
karaf/webconsole/trunk/cxf/src/main/java/org/apache/karaf/webconsole/
karaf/webconsole/trunk/cxf/src/main/java/org/apache/karaf/webconsole/cxf/

karaf/webconsole/trunk/cxf/src/main/java/org/apache/karaf/webconsole/cxf/internal/

karaf/webconsole/trunk/cxf/src/main/java/org/apache/karaf/webconsole/cxf/internal/BusFinder.java

karaf/webconsole/trunk/cxf/src/main/java/org/apache/karaf/webconsole/cxf/internal/DefaultBusFinder.java

karaf/webconsole/trunk/cxf/src/main/java/org/apache/karaf/webconsole/cxf/internal/navigation/

karaf/webconsole/trunk/cxf/src/main/java/org/apache/karaf/webconsole/cxf/internal/navigation/CxfConsoleTabProvider.java

karaf/webconsole/trunk/cxf/src/main/java/org/apache/karaf/webconsole/cxf/internal/services/

karaf/webconsole/trunk/cxf/src/main/java/org/apache/karaf/webconsole/cxf/internal/services/BusModel.java

karaf/webconsole/trunk/cxf/src/main/java/org/apache/karaf/webconsole/cxf/internal/services/CxfBusesActionPanel.java

karaf/webconsole/trunk/cxf/src/main/java/org/apache/karaf/webconsole/cxf/internal/services/CxfServicesPage.java

karaf/webconsole/trunk/cxf/src/main/java/org/apache/karaf/webconsole/cxf/internal/services/DetailsPage.java

karaf/webconsole/trunk/cxf/src/main/java/org/apache/karaf/webconsole/cxf/internal/services/InterceptorView.java

karaf/webconsole/trunk/cxf/src/main/java/org/apache/karaf/webconsole/cxf/internal/trace/

karaf/webconsole/trunk/cxf/src/main/java/org/apache/karaf/webconsole/cxf/internal/trace/TraceInterceptor.java
karaf/webconsole/trunk/cxf/src/main/resources/
karaf/webconsole/trunk/cxf/src/main/resources/OSGI-INF/
karaf/webconsole/trunk/cxf/src/main/resources/OSGI-INF/blueprint/
karaf/webconsole/trunk/cxf/src/main/resources/OSGI-INF/blueprint/cxf.xml
karaf/webconsole/trunk/cxf/src/main/resources/org/
karaf/webconsole/trunk/cxf/src/main/resources/org/apache/
karaf/webconsole/trunk/cxf/src/main/resources/org/apache/karaf/
karaf/webconsole/trunk/cxf/src/main/resources/org/apache/karaf/webconsole/

karaf/webconsole/trunk/cxf/src/main/resources/org/apache/karaf/webconsole/cxf/

karaf/webconsole/trunk/cxf/src/main/resources/org/apache/karaf/webconsole/cxf/internal/

karaf/webconsole/trunk/cxf/src/main/resources/org/apache/karaf/webconsole/cxf/internal/services/

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
Modified:
karaf/webconsole/trunk/pom.xml

Added: karaf/webconsole/trunk/cxf/pom.xml
URL: 
http://svn.apache.org/viewvc/karaf/webconsole/trunk/cxf/pom.xml?rev=1166605view=auto
==
--- karaf/webconsole/trunk/cxf/pom.xml (added)
+++ karaf/webconsole/trunk/cxf/pom.xml Thu Sep  8 10:15:32 2011
@@ -0,0 +1,77 @@
+?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
+   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.
+--
+project xmlns=http://maven.apache.org/POM/4.0.0; 
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
+xsi:schemaLocation=http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd;
+modelVersion4.0.0/modelVersion
+
+parent
+groupIdorg.apache.karaf/groupId
+artifactIdwebconsole/artifactId
+version1.0.0-SNAPSHOT/version
+/parent

svn commit: r1166781 - in /karaf/webconsole/trunk/osgi/src/main: java/org/apache/karaf/webconsole/osgi/internal/log/ java/org/apache/karaf/webconsole/osgi/internal/log/search/ java/org/apache/karaf/we

[ldywicki]

Author: ldywicki
Date: Thu Sep  8 16:34:55 2011
New Revision: 1166781

URL: http://svn.apache.org/viewvc?rev=1166781view=rev
Log:
Log browser based on osgi LogService

Signed-off-by: Lukasz Dywicki l...@code-house.org

Added:

karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/log/

karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/log/LogEntriesDataProvider.java

karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/log/LogEntryModel.java

karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/log/LogsPage.java

karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/log/Options.java

karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/log/OptionsForm.java

karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/log/Priority.java

karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/log/search/

karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/log/search/BundleMatcher.java

karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/log/search/DateFromMatcher.java

karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/log/search/DateToMatcher.java

karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/log/search/Matcher.java

karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/log/search/MessageMatcher.java

karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/log/search/PriorityMatcher.java

karaf/webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/log/

karaf/webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/log/LogsPage.html
Modified:

karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/sidebar/OsgiSidebar.java
karaf/webconsole/trunk/osgi/src/main/resources/OSGI-INF/blueprint/osgi.xml

Added: 
karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/log/LogEntriesDataProvider.java
URL: 
http://svn.apache.org/viewvc/karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/log/LogEntriesDataProvider.java?rev=1166781view=auto
==
--- 
karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/log/LogEntriesDataProvider.java
 (added)
+++ 
karaf/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/log/LogEntriesDataProvider.java
 Thu Sep  8 16:34:55 2011
@@ -0,0 +1,72 @@
+package org.apache.karaf.webconsole.osgi.internal.log;
+
+import java.util.Enumeration;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+
+import org.apache.karaf.webconsole.osgi.internal.log.search.Matcher;
+import 
org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;
+import org.apache.wicket.model.IModel;
+import org.osgi.service.log.LogEntry;
+import org.osgi.service.log.LogReaderService;
+
+final class LogEntriesDataProvider extends SortableDataProviderLogEntry {
+
+private LogReaderService logReader;
+
+private ListLogEntry entries;
+
+private Options options;
+
+private transient ListMatcher matchers;
+
+public LogEntriesDataProvider(LogReaderService logReader, Options options, 
ListMatcher matchers) {
+this.logReader = logReader;
+this.options = options;
+this.matchers = matchers;
+}
+
+public Iterator? extends LogEntry iterator(int first, int count) {
+return getEntries().subList(first, first + count).iterator();
+}
+
+private ListLogEntry getEntries() {
+if (entries == null) {
+entries = new LinkedListLogEntry();
+@SuppressWarnings(unchecked)
+EnumerationLogEntry logEntries = logReader.getLog();
+while (logEntries.hasMoreElements()) {
+LogEntry entry = logEntries.nextElement();
+
+boolean matchesAll = true;
+for (Matcher matcher : matchers) {
+if (!matcher.matches(entry, options)) {
+matchesAll = false;
+break;
+}
+}
+
+if (matchesAll) entries.add(entry);
+}
+}
+return entries;
+}
+
+public IModelLogEntry model(LogEntry object) {
+return new LogEntryModel(this.logReader, object);
+}
+
+public int size() {
+return getEntries().size();
+}
+
+public void setOptions(Options options) {
+this.options = options;
+}
+
+@Override
+public void detach

svn commit: r1165582 - in /karaf/sandbox/webconsole/trunk/manual/src/main/webapp: WEB-INF/scalate/layouts/headers.jade css/style.css developers-guide/branding.conf developers-guide/extending.conf deve

[ldywicki]

Author: ldywicki
Date: Tue Sep  6 09:59:50 2011
New Revision: 1165582

URL: http://svn.apache.org/viewvc?rev=1165582view=rev
Log:
Added more informations to manual

Added:

karaf/sandbox/webconsole/trunk/manual/src/main/webapp/developers-guide/branding.conf

karaf/sandbox/webconsole/trunk/manual/src/main/webapp/developers-guide/extending.conf

karaf/sandbox/webconsole/trunk/manual/src/main/webapp/developers-guide/security.conf
Modified:

karaf/sandbox/webconsole/trunk/manual/src/main/webapp/WEB-INF/scalate/layouts/headers.jade
karaf/sandbox/webconsole/trunk/manual/src/main/webapp/css/style.css

karaf/sandbox/webconsole/trunk/manual/src/main/webapp/developers-guide/index.conf

Modified: 
karaf/sandbox/webconsole/trunk/manual/src/main/webapp/WEB-INF/scalate/layouts/headers.jade
URL: 
http://svn.apache.org/viewvc/karaf/sandbox/webconsole/trunk/manual/src/main/webapp/WEB-INF/scalate/layouts/headers.jade?rev=1165582r1=1165581r2=1165582view=diff
==
--- 
karaf/sandbox/webconsole/trunk/manual/src/main/webapp/WEB-INF/scalate/layouts/headers.jade
 (original)
+++ 
karaf/sandbox/webconsole/trunk/manual/src/main/webapp/WEB-INF/scalate/layouts/headers.jade
 Tue Sep  6 09:59:50 2011
@@ -15,9 +15,9 @@ html(lang=en)
   = include(/org/fusesource/scalate/console/console_head.scaml)
   link(href={uri(/css/scalate/console.css)} rel=stylesheet 
type=text/css)
 
+link(href={uri(/css/reset.css)} rel=stylesheet type=text/css)
 link(href={uri(/css/grid.css)} rel=stylesheet type=text/css)
 link(href={uri(/css/style.css)} rel=stylesheet type=text/css)
-link(href={uri(/css/reset.css)} rel=stylesheet type=text/css)
 
 link(href={uri(/css/sh/shCore.css)} rel=stylesheet type=text/css)
 link(href={uri(/css/sh/shThemeDefault.css)} rel=stylesheet 
type=text/css)

Modified: karaf/sandbox/webconsole/trunk/manual/src/main/webapp/css/style.css
URL: 
http://svn.apache.org/viewvc/karaf/sandbox/webconsole/trunk/manual/src/main/webapp/css/style.css?rev=1165582r1=1165581r2=1165582view=diff
==
--- karaf/sandbox/webconsole/trunk/manual/src/main/webapp/css/style.css 
(original)
+++ karaf/sandbox/webconsole/trunk/manual/src/main/webapp/css/style.css Tue Sep 
 6 09:59:50 2011
@@ -45,4 +45,20 @@ a:link, a:active, a:visited {
 
 pre {
 font-family: monospace;
+}
+
+h1, h2, h3 {
+margin-top: 15px;
+}
+
+h1 {
+font-size: 24px;
+}
+
+h2 {
+font-size: 20px;
+}
+
+h3 {
+font-size: 16px;
 }
\ No newline at end of file

Added: 
karaf/sandbox/webconsole/trunk/manual/src/main/webapp/developers-guide/branding.conf
URL: 
http://svn.apache.org/viewvc/karaf/sandbox/webconsole/trunk/manual/src/main/webapp/developers-guide/branding.conf?rev=1165582view=auto
==
--- 
karaf/sandbox/webconsole/trunk/manual/src/main/webapp/developers-guide/branding.conf
 (added)
+++ 
karaf/sandbox/webconsole/trunk/manual/src/main/webapp/developers-guide/branding.conf
 Tue Sep  6 09:59:50 2011
@@ -0,0 +1,17 @@
+h1. Branding
+
+Every product requires sometimes more or less fancy look and feel. We try to 
provide working project which may be customized by vendors in many different 
ways - first of all by building extensions, but also by changing webconsole 
layout easily.
+
+h2. Brand provider
+
+Brand provider is an interface which is used by default in core and other 
modules. Every page which extends *org.apache.karaf.webconsole.core.BasePage* 
will use it. An instance of this interface is looked up in OSGi service 
registry. Brand provider is asked for header image and list of behaviors to add 
in every page. These behaviors may add own CSS and JavaScript files.
+
+You can use only one brand provider in webconsole, so if you will have 
multiple brand providers please use *service.ranking* when you register your 
OSGi service.
+
+h2. Shipping new translations
+
+New translations should be attached to modules as a fragments. That's easiest 
way to extend module classpath and add new resources.
+
+h2. Security customization
+
+TODO
\ No newline at end of file

Added: 
karaf/sandbox/webconsole/trunk/manual/src/main/webapp/developers-guide/extending.conf
URL: 
http://svn.apache.org/viewvc/karaf/sandbox/webconsole/trunk/manual/src/main/webapp/developers-guide/extending.conf?rev=1165582view=auto
==
--- 
karaf/sandbox/webconsole/trunk/manual/src/main/webapp/developers-guide/extending.conf
 (added)
+++ 
karaf/sandbox/webconsole/trunk/manual/src/main/webapp/developers-guide/extending.conf
 Tue Sep  6 09:59:50 2011
@@ -0,0 +1,51 @@
+h1. Extending Webconsole
+
+Webconsole extensions may be done by different ways. In this section we going 
to cover followin topic - new pages, new navigation elements and new widgets.
+
+h2. New

svn commit: r1165625 - /karaf/sandbox/webconsole/trunk/core/src/test/java/org/apache/karaf/webconsole/core/test/LinksAnswer.java

[ldywicki]

Author: ldywicki
Date: Tue Sep  6 12:03:40 2011
New Revision: 1165625

URL: http://svn.apache.org/viewvc?rev=1165625view=rev
Log:
Fix missing method. Sorry

Modified:

karaf/sandbox/webconsole/trunk/core/src/test/java/org/apache/karaf/webconsole/core/test/LinksAnswer.java

Modified: 
karaf/sandbox/webconsole/trunk/core/src/test/java/org/apache/karaf/webconsole/core/test/LinksAnswer.java
URL: 
http://svn.apache.org/viewvc/karaf/sandbox/webconsole/trunk/core/src/test/java/org/apache/karaf/webconsole/core/test/LinksAnswer.java?rev=1165625r1=1165624r2=1165625view=diff
==
--- 
karaf/sandbox/webconsole/trunk/core/src/test/java/org/apache/karaf/webconsole/core/test/LinksAnswer.java
 (original)
+++ 
karaf/sandbox/webconsole/trunk/core/src/test/java/org/apache/karaf/webconsole/core/test/LinksAnswer.java
 Tue Sep  6 12:03:40 2011
@@ -49,4 +49,8 @@ public class LinksAnswer extends BaseLin
 return pageLinks;
 }
 
+public ListLinkPage getPageLinks() {
+return pageLinks;
+}
+
 }

svn commit: r1165853 - /karaf/sandbox/webconsole/trunk/core/x

[ldywicki]

Author: ldywicki
Date: Tue Sep  6 21:19:20 2011
New Revision: 1165853

URL: http://svn.apache.org/viewvc?rev=1165853view=rev
Log:
itest

Added:
karaf/sandbox/webconsole/trunk/core/x

Added: karaf/sandbox/webconsole/trunk/core/x
URL: 
http://svn.apache.org/viewvc/karaf/sandbox/webconsole/trunk/core/x?rev=1165853view=auto
==
(empty)

svn commit: r1165242 - in /karaf/sandbox/webconsole/trunk: blueprint/src/main/java/org/apache/karaf/webconsole/blueprint/internal/details/ core/src/main/java/org/apache/karaf/webconsole/core/ core/src

[ldywicki]

Author: ldywicki
Date: Mon Sep  5 11:07:16 2011
New Revision: 1165242

URL: http://svn.apache.org/viewvc?rev=1165242view=rev
Log:
Update headers and remove few warnings

Added:

karaf/sandbox/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/configuration/view/ConfigurationsDataTable.java
  - copied, changed from r1165239, 
karaf/sandbox/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/configuration/view/ConfigurationstDataTable.java
Modified:

karaf/sandbox/webconsole/trunk/blueprint/src/main/java/org/apache/karaf/webconsole/blueprint/internal/details/DetailsPage.java

karaf/sandbox/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/BasePage.java

karaf/sandbox/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/navigation/ExtendableSidebarProvider.java

karaf/sandbox/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/navigation/SidebarProvider.java

karaf/sandbox/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/page/LoginPage.java

karaf/sandbox/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/page/SecuredPage.java

karaf/sandbox/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/page/SinglePage.java

karaf/sandbox/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/util/LinkUtils.java

karaf/sandbox/webconsole/trunk/examples/branding/src/main/java/org/apache/karaf/webconsole/examples/branding/ExampleBrandProvider.java

karaf/sandbox/webconsole/trunk/karaf/src/main/java/org/apache/karaf/webconsole/karaf/internal/sidebar/KarafFeaturesSidebar.java

karaf/sandbox/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/bundle/view/BundleActionsPanel.java

karaf/sandbox/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/configuration/ConfigurationsPage.java

karaf/sandbox/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/configuration/view/ConfigurationstDataTable.java

karaf/sandbox/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/sidebar/OsgiSidebar.java

karaf/sandbox/webconsole/trunk/servicemix/src/main/java/org/apache/karaf/webconsole/servicemix/internal/ServiceMixPage.java

karaf/sandbox/webconsole/trunk/servicemix/src/main/java/org/apache/karaf/webconsole/servicemix/internal/sidebar/ServicemixSidebar.java

Modified: 
karaf/sandbox/webconsole/trunk/blueprint/src/main/java/org/apache/karaf/webconsole/blueprint/internal/details/DetailsPage.java
URL: 
http://svn.apache.org/viewvc/karaf/sandbox/webconsole/trunk/blueprint/src/main/java/org/apache/karaf/webconsole/blueprint/internal/details/DetailsPage.java?rev=1165242r1=1165241r2=1165242view=diff
==
--- 
karaf/sandbox/webconsole/trunk/blueprint/src/main/java/org/apache/karaf/webconsole/blueprint/internal/details/DetailsPage.java
 (original)
+++ 
karaf/sandbox/webconsole/trunk/blueprint/src/main/java/org/apache/karaf/webconsole/blueprint/internal/details/DetailsPage.java
 Mon Sep  5 11:07:16 2011
@@ -37,6 +37,9 @@ import org.osgi.framework.ServiceReferen
 import org.osgi.service.blueprint.container.BlueprintContainer;
 import org.osgi.service.blueprint.reflect.ComponentMetadata;
 
+/**
+ * Page with blueprint container details.
+ */
 @PaxWicketMountPoint(mountPoint = /osgi/blueprint/details)
 public class DetailsPage extends SinglePage {
 

Modified: 
karaf/sandbox/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/BasePage.java
URL: 
http://svn.apache.org/viewvc/karaf/sandbox/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/BasePage.java?rev=1165242r1=1165241r2=1165242view=diff
==
--- 
karaf/sandbox/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/BasePage.java
 (original)
+++ 
karaf/sandbox/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/BasePage.java
 Mon Sep  5 11:07:16 2011
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the License); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations

svn commit: r1165243 - in /karaf/sandbox/webconsole/trunk/core: ./ src/test/ src/test/java/ src/test/java/org/ src/test/java/org/apache/ src/test/java/org/apache/karaf/ src/test/java/org/apache/karaf/

[ldywicki]

Author: ldywicki
Date: Mon Sep  5 11:07:55 2011
New Revision: 1165243

URL: http://svn.apache.org/viewvc?rev=1165243view=rev
Log:
Login operation test. Works only from maven

Added:
karaf/sandbox/webconsole/trunk/core/src/test/
karaf/sandbox/webconsole/trunk/core/src/test/java/
karaf/sandbox/webconsole/trunk/core/src/test/java/org/
karaf/sandbox/webconsole/trunk/core/src/test/java/org/apache/
karaf/sandbox/webconsole/trunk/core/src/test/java/org/apache/karaf/

karaf/sandbox/webconsole/trunk/core/src/test/java/org/apache/karaf/webconsole/

karaf/sandbox/webconsole/trunk/core/src/test/java/org/apache/karaf/webconsole/core/

karaf/sandbox/webconsole/trunk/core/src/test/java/org/apache/karaf/webconsole/core/LoginTest.java

karaf/sandbox/webconsole/trunk/core/src/test/java/org/apache/karaf/webconsole/core/TestInjector.java
karaf/sandbox/webconsole/trunk/core/src/test/resources/
karaf/sandbox/webconsole/trunk/core/src/test/resources/jaas.conf
karaf/sandbox/webconsole/trunk/core/src/test/resources/users.properties
Modified:
karaf/sandbox/webconsole/trunk/core/pom.xml

Modified: karaf/sandbox/webconsole/trunk/core/pom.xml
URL: 
http://svn.apache.org/viewvc/karaf/sandbox/webconsole/trunk/core/pom.xml?rev=1165243r1=1165242r2=1165243view=diff
==
--- karaf/sandbox/webconsole/trunk/core/pom.xml (original)
+++ karaf/sandbox/webconsole/trunk/core/pom.xml Mon Sep  5 11:07:55 2011
@@ -61,6 +61,26 @@
 artifactIdorg.apache.karaf.jaas.modules/artifactId
 version${karaf.version}/version
 /dependency
+
+dependency
+groupIdjavax.servlet/groupId
+artifactIdservlet-api/artifactId
+version2.5/version
+scopeprovided/scope
+/dependency
+
+dependency
+groupIdjunit/groupId
+artifactIdjunit/artifactId
+version4.8.2/version
+scopetest/scope
+/dependency
+dependency
+groupIdorg.slf4j/groupId
+artifactIdslf4j-log4j12/artifactId
+version${slf4j.version}/version
+scopetest/scope
+/dependency
 /dependencies
 
 build
@@ -105,6 +125,19 @@
 /instructions
 /configuration
 /plugin
+plugin
+groupIdorg.apache.maven.plugins/groupId
+artifactIdmaven-surefire-plugin/artifactId
+version2.9/version
+configuration
+systemProperties
+property
+namejava.security.auth.login.config/name
+
value${basedir}/src/test/resources/jaas.conf/value
+/property
+/systemProperties
+/configuration
+/plugin
 /plugins
 /build
 /project

Added: 
karaf/sandbox/webconsole/trunk/core/src/test/java/org/apache/karaf/webconsole/core/LoginTest.java
URL: 
http://svn.apache.org/viewvc/karaf/sandbox/webconsole/trunk/core/src/test/java/org/apache/karaf/webconsole/core/LoginTest.java?rev=1165243view=auto
==
--- 
karaf/sandbox/webconsole/trunk/core/src/test/java/org/apache/karaf/webconsole/core/LoginTest.java
 (added)
+++ 
karaf/sandbox/webconsole/trunk/core/src/test/java/org/apache/karaf/webconsole/core/LoginTest.java
 Mon Sep  5 11:07:55 2011
@@ -0,0 +1,83 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the License); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.karaf.webconsole.core;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.karaf.webconsole.core.brand.DefaultBrandProvider;
+import org.apache.karaf.webconsole.core.dashboard.DashboardPage;
+import org.apache.karaf.webconsole.core.internal.WebConsoleApplication;
+import org.apache.karaf.webconsole.core.page.LoginPage;
+import org.apache.wicket.authorization.UnauthorizedInstantiationException;
+import org.apache.wicket.protocol.http.WebApplication;
+import org.apache.wicket.util.tester.FormTester;
+import org.apache.wicket.util.tester.WicketTester;
+import

svn commit: r1165401 - in /karaf/sandbox/webconsole/trunk/core: ./ src/test/java/org/apache/karaf/webconsole/core/ src/test/java/org/apache/karaf/webconsole/core/dashboard/ src/test/java/org/apache/ka

[ldywicki]

Author: ldywicki
Date: Mon Sep  5 19:19:39 2011
New Revision: 1165401

URL: http://svn.apache.org/viewvc?rev=1165401view=rev
Log:
Tests for dashboard page. Small changes in test injector code.

Added:

karaf/sandbox/webconsole/trunk/core/src/test/java/org/apache/karaf/webconsole/core/BasePageTest.java

karaf/sandbox/webconsole/trunk/core/src/test/java/org/apache/karaf/webconsole/core/TestTargetLocator.java

karaf/sandbox/webconsole/trunk/core/src/test/java/org/apache/karaf/webconsole/core/WebConsoleTest.java

karaf/sandbox/webconsole/trunk/core/src/test/java/org/apache/karaf/webconsole/core/dashboard/

karaf/sandbox/webconsole/trunk/core/src/test/java/org/apache/karaf/webconsole/core/dashboard/DashboardPageTest.java

karaf/sandbox/webconsole/trunk/core/src/test/java/org/apache/karaf/webconsole/core/test/

karaf/sandbox/webconsole/trunk/core/src/test/java/org/apache/karaf/webconsole/core/test/AlwaysAuthenticatedWebSession.java
karaf/sandbox/webconsole/trunk/core/src/test/resources/log4j.properties
Modified:
karaf/sandbox/webconsole/trunk/core/pom.xml

karaf/sandbox/webconsole/trunk/core/src/test/java/org/apache/karaf/webconsole/core/LoginTest.java

karaf/sandbox/webconsole/trunk/core/src/test/java/org/apache/karaf/webconsole/core/TestInjector.java

Modified: karaf/sandbox/webconsole/trunk/core/pom.xml
URL: 
http://svn.apache.org/viewvc/karaf/sandbox/webconsole/trunk/core/pom.xml?rev=1165401r1=1165400r2=1165401view=diff
==
--- karaf/sandbox/webconsole/trunk/core/pom.xml (original)
+++ karaf/sandbox/webconsole/trunk/core/pom.xml Mon Sep  5 19:19:39 2011
@@ -81,6 +81,12 @@
 version${slf4j.version}/version
 scopetest/scope
 /dependency
+dependency
+groupIdorg.easymock/groupId
+artifactIdeasymock/artifactId
+version3.0/version
+scopetest/scope
+/dependency
 /dependencies
 
 build
@@ -135,6 +141,10 @@
 namejava.security.auth.login.config/name
 
value${basedir}/src/test/resources/jaas.conf/value
 /property
+property
+namesun.io.serialization.extendedDebugInfo/name
+valuetrue/value
+/property
 /systemProperties
 /configuration
 /plugin

Added: 
karaf/sandbox/webconsole/trunk/core/src/test/java/org/apache/karaf/webconsole/core/BasePageTest.java
URL: 
http://svn.apache.org/viewvc/karaf/sandbox/webconsole/trunk/core/src/test/java/org/apache/karaf/webconsole/core/BasePageTest.java?rev=1165401view=auto
==
--- 
karaf/sandbox/webconsole/trunk/core/src/test/java/org/apache/karaf/webconsole/core/BasePageTest.java
 (added)
+++ 
karaf/sandbox/webconsole/trunk/core/src/test/java/org/apache/karaf/webconsole/core/BasePageTest.java
 Mon Sep  5 19:19:39 2011
@@ -0,0 +1,69 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the License); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.karaf.webconsole.core;
+
+import static org.easymock.EasyMock.*;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.karaf.webconsole.core.brand.BrandProvider;
+import org.apache.karaf.webconsole.core.brand.DefaultBrandProvider;
+import org.apache.wicket.behavior.IBehavior;
+import org.apache.wicket.markup.html.image.Image;
+import org.apache.wicket.util.tester.WicketTester;
+import org.easymock.IAnswer;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.BlockJUnit4ClassRunner;
+
+/**
+ * Test which checks usage of {@link BrandProvider} inside {@link BasePage}.
+ */
+@RunWith(BlockJUnit4ClassRunner.class)
+public class BasePageTest extends WebConsoleTest {
+
+private String imageId;
+
+@Test
+public void testBrandProvider() {
+BrandProvider brandProvider = createMock(DefaultBrandProvider.class);
+expect(brandProvider.getHeaderImage((String) 
anyObject())).andAnswer(new IAnswerImage() {
+public

svn commit: r1164838 - in /karaf/sandbox/webconsole/trunk: core/src/main/java/org/apache/karaf/webconsole/core/internal/ core/src/main/java/org/apache/karaf/webconsole/core/navigation/ core/src/main/j

[ldywicki]

Author: ldywicki
Date: Sat Sep  3 09:10:29 2011
New Revision: 1164838

URL: http://svn.apache.org/viewvc?rev=1164838view=rev
Log:
Refactor sidebar, now it uses SidebarProvider which may be injected and use 
dynamic resources from other bundles.

Added:

karaf/sandbox/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/navigation/ExtendableSidebarProvider.java

karaf/sandbox/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/navigation/SidebarProvider.java

karaf/sandbox/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/util/LinkUtils.java

karaf/sandbox/webconsole/trunk/karaf/src/main/java/org/apache/karaf/webconsole/karaf/internal/KarafFeaturesPage.java

karaf/sandbox/webconsole/trunk/karaf/src/main/java/org/apache/karaf/webconsole/karaf/internal/sidebar/

karaf/sandbox/webconsole/trunk/karaf/src/main/java/org/apache/karaf/webconsole/karaf/internal/sidebar/KarafFeaturesSidebar.java

karaf/sandbox/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/sidebar/

karaf/sandbox/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/sidebar/OsgiSidebar.java

karaf/sandbox/webconsole/trunk/servicemix/src/main/java/org/apache/karaf/webconsole/servicemix/internal/EndpointsPage.java
  - copied, changed from r1164539, 
karaf/sandbox/webconsole/trunk/servicemix/src/main/java/org/apache/karaf/webconsole/servicemix/internal/ServiceMixPage.java

karaf/sandbox/webconsole/trunk/servicemix/src/main/java/org/apache/karaf/webconsole/servicemix/internal/sidebar/

karaf/sandbox/webconsole/trunk/servicemix/src/main/java/org/apache/karaf/webconsole/servicemix/internal/sidebar/ServicemixSidebar.java
Modified:

karaf/sandbox/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/internal/SidebarPanel.java

karaf/sandbox/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/page/SidebarPage.java

karaf/sandbox/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/security/JaasWebSession.java

karaf/sandbox/webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/internal/SidebarPanel.html

karaf/sandbox/webconsole/trunk/karaf/src/main/java/org/apache/karaf/webconsole/karaf/internal/feature/FeaturesPage.java

karaf/sandbox/webconsole/trunk/karaf/src/main/java/org/apache/karaf/webconsole/karaf/internal/repository/AddRepositoryPage.java

karaf/sandbox/webconsole/trunk/karaf/src/main/java/org/apache/karaf/webconsole/karaf/internal/repository/RepositoriesPage.java

karaf/sandbox/webconsole/trunk/karaf/src/main/resources/OSGI-INF/blueprint/karaf.xml

karaf/sandbox/webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/OsgiPage.java

karaf/sandbox/webconsole/trunk/osgi/src/main/resources/OSGI-INF/blueprint/osgi.xml

karaf/sandbox/webconsole/trunk/servicemix/src/main/java/org/apache/karaf/webconsole/servicemix/internal/ServiceMixPage.java

karaf/sandbox/webconsole/trunk/servicemix/src/main/java/org/apache/karaf/webconsole/servicemix/internal/TrackNmrPage.java

karaf/sandbox/webconsole/trunk/servicemix/src/main/java/org/apache/karaf/webconsole/servicemix/internal/navigation/ServiceMixConsoleTabProvider.java

karaf/sandbox/webconsole/trunk/servicemix/src/main/resources/OSGI-INF/blueprint/servicemix.xml

Modified: 
karaf/sandbox/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/internal/SidebarPanel.java
URL: 
http://svn.apache.org/viewvc/karaf/sandbox/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/internal/SidebarPanel.java?rev=1164838r1=1164837r2=1164838view=diff
==
--- 
karaf/sandbox/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/internal/SidebarPanel.java
 (original)
+++ 
karaf/sandbox/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/internal/SidebarPanel.java
 Sat Sep  3 09:10:29 2011
@@ -16,28 +16,32 @@
  */
 package org.apache.karaf.webconsole.core.internal;
 
+import org.apache.karaf.webconsole.core.navigation.SidebarProvider;
+import org.apache.karaf.webconsole.core.widget.WidgetProvider;
 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;
 import org.apache.wicket.markup.html.list.ListItem;
 import org.apache.wicket.markup.html.list.ListView;
 import org.apache.wicket.markup.html.panel.Panel;
-import org.apache.wicket.model.util.ListModel;
 
 public class SidebarPanel extends Panel {
 
-public SidebarPanel(String id, Class? extends Page basePage, 
ListModelClass? extends Page listModel) {
-super(id, listModel);
+public SidebarPanel(String id, SidebarProvider provider) {
+super(id);
 
-add(new BookmarkablePageLinkPage

svn commit: r1164539 - in /karaf/sandbox/webconsole/trunk/servicemix/src/main: java/org/apache/karaf/webconsole/servicemix/internal/ java/org/apache/karaf/webconsole/servicemix/internal/navigation/ re

[ldywicki]

Author: ldywicki
Date: Fri Sep  2 14:09:14 2011
New Revision: 1164539

URL: http://svn.apache.org/viewvc?rev=1164539view=rev
Log:
Support for tracking NMR exchanges in ServiceMix plugin. Details page for 
Exchanges

Added:

karaf/sandbox/webconsole/trunk/servicemix/src/main/java/org/apache/karaf/webconsole/servicemix/internal/DetailsPage.java

karaf/sandbox/webconsole/trunk/servicemix/src/main/java/org/apache/karaf/webconsole/servicemix/internal/ExchangeActionsPanel.java

karaf/sandbox/webconsole/trunk/servicemix/src/main/java/org/apache/karaf/webconsole/servicemix/internal/ExchangeModel.java

karaf/sandbox/webconsole/trunk/servicemix/src/main/java/org/apache/karaf/webconsole/servicemix/internal/ITrackingExchangeListener.java

karaf/sandbox/webconsole/trunk/servicemix/src/main/java/org/apache/karaf/webconsole/servicemix/internal/TrackNmrPage.java

karaf/sandbox/webconsole/trunk/servicemix/src/main/java/org/apache/karaf/webconsole/servicemix/internal/TrackingExchangeListener.java

karaf/sandbox/webconsole/trunk/servicemix/src/main/resources/org/apache/karaf/webconsole/servicemix/internal/DetailsPage.html

karaf/sandbox/webconsole/trunk/servicemix/src/main/resources/org/apache/karaf/webconsole/servicemix/internal/TrackNmrPage.html

karaf/sandbox/webconsole/trunk/servicemix/src/main/resources/org/apache/karaf/webconsole/servicemix/internal/message.css
Modified:

karaf/sandbox/webconsole/trunk/servicemix/src/main/java/org/apache/karaf/webconsole/servicemix/internal/ServiceMixPage.java

karaf/sandbox/webconsole/trunk/servicemix/src/main/java/org/apache/karaf/webconsole/servicemix/internal/navigation/ServiceMixConsoleTabProvider.java

karaf/sandbox/webconsole/trunk/servicemix/src/main/resources/OSGI-INF/blueprint/servicemix.xml

Added: 
karaf/sandbox/webconsole/trunk/servicemix/src/main/java/org/apache/karaf/webconsole/servicemix/internal/DetailsPage.java
URL: 
http://svn.apache.org/viewvc/karaf/sandbox/webconsole/trunk/servicemix/src/main/java/org/apache/karaf/webconsole/servicemix/internal/DetailsPage.java?rev=1164539view=auto
==
--- 
karaf/sandbox/webconsole/trunk/servicemix/src/main/java/org/apache/karaf/webconsole/servicemix/internal/DetailsPage.java
 (added)
+++ 
karaf/sandbox/webconsole/trunk/servicemix/src/main/java/org/apache/karaf/webconsole/servicemix/internal/DetailsPage.java
 Fri Sep  2 14:09:14 2011
@@ -0,0 +1,142 @@
+/*
+ * 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.servicemix.internal;
+
+import java.io.InputStream;
+import java.io.StringWriter;
+import java.util.Arrays;
+import java.util.Map;
+
+import javax.xml.transform.OutputKeys;
+import javax.xml.transform.Source;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.stream.StreamResult;
+
+import org.apache.karaf.webconsole.core.page.SinglePage;
+import org.apache.karaf.webconsole.core.table.map.MapDataProvider;
+import org.apache.karaf.webconsole.core.table.map.MapDataTable;
+import org.apache.servicemix.nmr.api.Exchange;
+import org.apache.servicemix.nmr.api.Message;
+import org.apache.wicket.markup.html.CSSPackageResource;
+import org.apache.wicket.markup.html.basic.Label;
+
+/**
+ * Exchange details page.
+ */
+public class DetailsPage extends SinglePage {
+
+public DetailsPage(Exchange object) {
+add(CSSPackageResource.getHeaderContribution(DetailsPage.class, 
message.css));
+
+MapString, Object properties = object.getProperties();
+
+class ExLabel extends Label {
+public ExLabel(String id, Message m) {
+super(id, display(m));
+}
+}
+
+add(new Label(id, object.getId()));
+add(new MapDataTableString, Object(properties, new 
MapDataProviderString, Object(properties), 20));
+
+Message in = object.getIn(false);
+if (in != null) {
+add(new ExLabel(inBody, in));
+add(new MapDataTableString, Object(inHeaders, new 
MapDataProviderString, Object(in.getHeaders()), 20));
+} else {
+add(new Label(inBody, Input message

svn commit: r1162137 - in /karaf/sandbox/pieber/karaf-webconsole/trunk: ./ servicemix/ servicemix/src/ servicemix/src/main/ servicemix/src/main/java/ servicemix/src/main/java/org/ servicemix/src/main/

[ldywicki]

Author: ldywicki
Date: Fri Aug 26 15:17:36 2011
New Revision: 1162137

URL: http://svn.apache.org/viewvc?rev=1162137view=rev
Log:
Dummy ServiceMix plugin which shows NMR endpoints. Tried to do same with scala, 
without luck.

Added:
karaf/sandbox/pieber/karaf-webconsole/trunk/servicemix/
karaf/sandbox/pieber/karaf-webconsole/trunk/servicemix/pom.xml
karaf/sandbox/pieber/karaf-webconsole/trunk/servicemix/src/
karaf/sandbox/pieber/karaf-webconsole/trunk/servicemix/src/main/
karaf/sandbox/pieber/karaf-webconsole/trunk/servicemix/src/main/java/
karaf/sandbox/pieber/karaf-webconsole/trunk/servicemix/src/main/java/org/

karaf/sandbox/pieber/karaf-webconsole/trunk/servicemix/src/main/java/org/apache/

karaf/sandbox/pieber/karaf-webconsole/trunk/servicemix/src/main/java/org/apache/karaf/

karaf/sandbox/pieber/karaf-webconsole/trunk/servicemix/src/main/java/org/apache/karaf/webconsole/

karaf/sandbox/pieber/karaf-webconsole/trunk/servicemix/src/main/java/org/apache/karaf/webconsole/servicemix/

karaf/sandbox/pieber/karaf-webconsole/trunk/servicemix/src/main/java/org/apache/karaf/webconsole/servicemix/internal/

karaf/sandbox/pieber/karaf-webconsole/trunk/servicemix/src/main/java/org/apache/karaf/webconsole/servicemix/internal/ServiceMixPage.java

karaf/sandbox/pieber/karaf-webconsole/trunk/servicemix/src/main/java/org/apache/karaf/webconsole/servicemix/internal/navigation/

karaf/sandbox/pieber/karaf-webconsole/trunk/servicemix/src/main/java/org/apache/karaf/webconsole/servicemix/internal/navigation/ServiceMixConsoleTab.java
karaf/sandbox/pieber/karaf-webconsole/trunk/servicemix/src/main/resources/

karaf/sandbox/pieber/karaf-webconsole/trunk/servicemix/src/main/resources/OSGI-INF/

karaf/sandbox/pieber/karaf-webconsole/trunk/servicemix/src/main/resources/OSGI-INF/blueprint/

karaf/sandbox/pieber/karaf-webconsole/trunk/servicemix/src/main/resources/OSGI-INF/blueprint/servicemix.xml

karaf/sandbox/pieber/karaf-webconsole/trunk/servicemix/src/main/resources/org/

karaf/sandbox/pieber/karaf-webconsole/trunk/servicemix/src/main/resources/org/apache/

karaf/sandbox/pieber/karaf-webconsole/trunk/servicemix/src/main/resources/org/apache/karaf/

karaf/sandbox/pieber/karaf-webconsole/trunk/servicemix/src/main/resources/org/apache/karaf/webconsole/

karaf/sandbox/pieber/karaf-webconsole/trunk/servicemix/src/main/resources/org/apache/karaf/webconsole/servicemix/

karaf/sandbox/pieber/karaf-webconsole/trunk/servicemix/src/main/resources/org/apache/karaf/webconsole/servicemix/internal/

karaf/sandbox/pieber/karaf-webconsole/trunk/servicemix/src/main/resources/org/apache/karaf/webconsole/servicemix/internal/ServiceMixPage.html
karaf/sandbox/pieber/karaf-webconsole/trunk/servicemix/src/main/scala/
karaf/sandbox/pieber/karaf-webconsole/trunk/servicemix/src/main/scala/org/

karaf/sandbox/pieber/karaf-webconsole/trunk/servicemix/src/main/scala/org/apache/

karaf/sandbox/pieber/karaf-webconsole/trunk/servicemix/src/main/scala/org/apache/karaf/

karaf/sandbox/pieber/karaf-webconsole/trunk/servicemix/src/main/scala/org/apache/karaf/webconsole/

karaf/sandbox/pieber/karaf-webconsole/trunk/servicemix/src/main/scala/org/apache/karaf/webconsole/servicemix/

karaf/sandbox/pieber/karaf-webconsole/trunk/servicemix/src/main/scala/org/apache/karaf/webconsole/servicemix/internal/

karaf/sandbox/pieber/karaf-webconsole/trunk/servicemix/src/main/scala/org/apache/karaf/webconsole/servicemix/internal/ServiceMixPage.scala

karaf/sandbox/pieber/karaf-webconsole/trunk/servicemix/src/main/scala/org/apache/karaf/webconsole/servicemix/internal/ServiceMixWidgetProvider.scala
Modified:
karaf/sandbox/pieber/karaf-webconsole/trunk/pom.xml

Modified: karaf/sandbox/pieber/karaf-webconsole/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/pom.xml?rev=1162137r1=1162136r2=1162137view=diff
==
--- karaf/sandbox/pieber/karaf-webconsole/trunk/pom.xml (original)
+++ karaf/sandbox/pieber/karaf-webconsole/trunk/pom.xml Fri Aug 26 15:17:36 2011
@@ -32,6 +32,7 @@
 log4j.version1.2.14/log4j.version
 ops4j.paxwicket.version0.8.0-SNAPSHOT/ops4j.paxwicket.version
 karaf.version2.2.2/karaf.version
+nmr.version1.4.0/nmr.version
 /properties
 
 modules
@@ -40,6 +41,7 @@
 moduleblueprint/module
 modulekaraf/module
 modulefeatures/module
+moduleservicemix/module
 
 moduleexamples/module
 modulemanual/module

Added: karaf/sandbox/pieber/karaf-webconsole/trunk/servicemix/pom.xml
URL: 
http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/servicemix/pom.xml?rev=1162137view=auto
==
--- karaf/sandbox/pieber/karaf-webconsole/trunk/servicemix/pom.xml

svn commit: r1161511 - in /karaf/sandbox/pieber/karaf-webconsole/trunk: core/src/main/java/org/apache/karaf/webconsole/core/form/ core/src/main/java/org/apache/karaf/webconsole/core/table/ core/src/ma

[ldywicki]

Author: ldywicki
Date: Thu Aug 25 11:27:47 2011
New Revision: 1161511

URL: http://svn.apache.org/viewvc?rev=1161511view=rev
Log:
Add configuration edit posibility, first try

Added:

karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/form/

karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/form/LabelBorder.java

karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/form/MapEditForm.java

karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/table/OrdinalColumn.java

karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/table/map/

karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/table/map/EntryModel.java

karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/table/map/MapDataProvider.java

karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/table/map/MapDataTable.java

karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/util/

karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/util/DictionaryUtils.java

karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/form/

karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/form/LabelBorder.html

karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/configuration/ConfigurationFilterUtil.java
Removed:

karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/configuration/DictionaryDataProvider.java

karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/configuration/model/AbstractConfigurationModel.java
Modified:

karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/configuration/ConfigurationEditPage.java

karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/configuration/ConfigurationProvider.java

karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/configuration/model/ConfigurationModel.java

karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/configuration/model/ConfigurationsModel.java

karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/resources/OSGI-INF/blueprint/osgi.xml

karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/configuration/ConfigurationEditPage.html

Added: 
karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/form/LabelBorder.java
URL: 
http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/form/LabelBorder.java?rev=1161511view=auto
==
--- 
karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/form/LabelBorder.java
 (added)
+++ 
karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/form/LabelBorder.java
 Thu Aug 25 11:27:47 2011
@@ -0,0 +1,16 @@
+package org.apache.karaf.webconsole.core.form;
+
+import org.apache.wicket.markup.html.border.Border;
+import org.apache.wicket.model.IModel;
+
+public class LabelBorder extends Border {
+
+public LabelBorder(String id, IModel? model) {
+super(id, model);
+}
+
+public LabelBorder(String id) {
+super(id);
+}
+
+}

Added: 
karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/form/MapEditForm.java
URL: 
http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/form/MapEditForm.java?rev=1161511view=auto
==
--- 
karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/form/MapEditForm.java
 (added)
+++ 
karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/form/MapEditForm.java
 Thu Aug 25 11:27:47 2011
@@ -0,0 +1,34 @@
+package org.apache.karaf.webconsole.core.form;
+
+import java.util.Map;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.markup.html.form.TextField;
+import

svn commit: r1161512 - in /karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main: java/org/apache/karaf/webconsole/karaf/internal/repository/ resources/org/apache/karaf/webconsole/karaf/internal/

[ldywicki]

Author: ldywicki
Date: Thu Aug 25 11:29:06 2011
New Revision: 1161512

URL: http://svn.apache.org/viewvc?rev=1161512view=rev
Log:
Repository add operation for karaf

Added:

karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/java/org/apache/karaf/webconsole/karaf/internal/repository/AddRepositoryForm.java

karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/java/org/apache/karaf/webconsole/karaf/internal/repository/AddRepositoryPage.java

karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/java/org/apache/karaf/webconsole/karaf/internal/repository/RepositoriesActionPanel.java

karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/resources/org/apache/karaf/webconsole/karaf/internal/repository/AddRepositoryPage.html
Modified:

karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/java/org/apache/karaf/webconsole/karaf/internal/repository/RepositoriesPage.java

Added: 
karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/java/org/apache/karaf/webconsole/karaf/internal/repository/AddRepositoryForm.java
URL: 
http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/java/org/apache/karaf/webconsole/karaf/internal/repository/AddRepositoryForm.java?rev=1161512view=auto
==
--- 
karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/java/org/apache/karaf/webconsole/karaf/internal/repository/AddRepositoryForm.java
 (added)
+++ 
karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/java/org/apache/karaf/webconsole/karaf/internal/repository/AddRepositoryForm.java
 Thu Aug 25 11:29:06 2011
@@ -0,0 +1,58 @@
+package org.apache.karaf.webconsole.karaf.internal.repository;
+
+import java.net.URI;
+import java.net.URISyntaxException;
+
+import org.apache.karaf.features.FeaturesService;
+import org.apache.karaf.features.Repository;
+import org.apache.karaf.webconsole.core.form.LabelBorder;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.markup.html.form.SubmitLink;
+import org.apache.wicket.markup.html.form.TextField;
+import org.apache.wicket.model.Model;
+import org.ops4j.pax.wicket.api.PaxWicketBean;
+
+public class AddRepositoryForm extends FormRepository {
+
+@PaxWicketBean(name = featuresService)
+private FeaturesService featuresService;
+
+private TextFieldString uri;
+
+public AddRepositoryForm(String id) {
+super(id);
+
+uri = new TextFieldString(uri, Model.of(mvn:)) {
+@Override
+public boolean isRequired() {
+return true;
+}
+};
+
+LabelBorder border = new LabelBorder(border);
+border.add(new Label(label, Repository URI));
+border.add(uri);
+
+add(border);
+
+add(new SubmitLink(submit));
+}
+
+@Override
+protected void onSubmit() {
+String add = uri.getModelObject();
+try {
+URI uri = new URI(add);
+featuresService.addRepository(uri);
+
+getSession().info(New repository with uri  + uri +  added);
+getRequestCycle().setResponsePage(RepositoriesPage.class);
+} catch (URISyntaxException e) {
+error(Cannot parse give uri  + e.getMessage());
+} catch (Exception e) {
+error(FeaturesService reported an error  + e.getMessage());
+}
+}
+
+}

Added: 
karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/java/org/apache/karaf/webconsole/karaf/internal/repository/AddRepositoryPage.java
URL: 
http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/java/org/apache/karaf/webconsole/karaf/internal/repository/AddRepositoryPage.java?rev=1161512view=auto
==
--- 
karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/java/org/apache/karaf/webconsole/karaf/internal/repository/AddRepositoryPage.java
 (added)
+++ 
karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/java/org/apache/karaf/webconsole/karaf/internal/repository/AddRepositoryPage.java
 Thu Aug 25 11:29:06 2011
@@ -0,0 +1,15 @@
+package org.apache.karaf.webconsole.karaf.internal.repository;
+
+import org.apache.karaf.webconsole.core.SidebarPage;
+import org.ops4j.pax.wicket.api.PaxWicketMountPoint;
+
+@PaxWicketMountPoint(mountPoint = /karaf/repositories/add)
+public class AddRepositoryPage extends SidebarPage {
+
+public AddRepositoryPage() {
+
+add(new AddRepositoryForm(add));
+
+}
+
+}

Added: 
karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/java/org/apache/karaf/webconsole/karaf/internal/repository/RepositoriesActionPanel.java
URL: 
http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/java/org/apache/karaf/webconsole/karaf/internal/repository/RepositoriesActionPanel.java?rev=1161512view

svn commit: r1161948 [1/3] - in /karaf/sandbox/pieber/karaf-webconsole/trunk/manual/src/main/webapp: ./ WEB-INF/scalate/layouts/ css/ css/sh/ developers-guide/ js/ js/sh/

[ldywicki]

Author: ldywicki
Date: Fri Aug 26 00:40:39 2011
New Revision: 1161948

URL: http://svn.apache.org/viewvc?rev=1161948view=rev
Log:
Added notes about tables and serialization in documentation. Added support for 
fancy code listings.

Added:

karaf/sandbox/pieber/karaf-webconsole/trunk/manual/src/main/webapp/_navigation.conf
karaf/sandbox/pieber/karaf-webconsole/trunk/manual/src/main/webapp/css/sh/

karaf/sandbox/pieber/karaf-webconsole/trunk/manual/src/main/webapp/css/sh/shCore.css

karaf/sandbox/pieber/karaf-webconsole/trunk/manual/src/main/webapp/css/sh/shThemeDefault.css

karaf/sandbox/pieber/karaf-webconsole/trunk/manual/src/main/webapp/css/sh/shThemeEclipse.css

karaf/sandbox/pieber/karaf-webconsole/trunk/manual/src/main/webapp/developers-guide/

karaf/sandbox/pieber/karaf-webconsole/trunk/manual/src/main/webapp/developers-guide/index.conf

karaf/sandbox/pieber/karaf-webconsole/trunk/manual/src/main/webapp/developers-guide/serialization.conf

karaf/sandbox/pieber/karaf-webconsole/trunk/manual/src/main/webapp/developers-guide/tables.conf
karaf/sandbox/pieber/karaf-webconsole/trunk/manual/src/main/webapp/js/

karaf/sandbox/pieber/karaf-webconsole/trunk/manual/src/main/webapp/js/jquery.js
karaf/sandbox/pieber/karaf-webconsole/trunk/manual/src/main/webapp/js/sh/

karaf/sandbox/pieber/karaf-webconsole/trunk/manual/src/main/webapp/js/sh/XRegExp.js

karaf/sandbox/pieber/karaf-webconsole/trunk/manual/src/main/webapp/js/sh/shBrushJava.js

karaf/sandbox/pieber/karaf-webconsole/trunk/manual/src/main/webapp/js/sh/shBrushPlain.js

karaf/sandbox/pieber/karaf-webconsole/trunk/manual/src/main/webapp/js/sh/shBrushXml.js

karaf/sandbox/pieber/karaf-webconsole/trunk/manual/src/main/webapp/js/sh/shCore.js
Modified:

karaf/sandbox/pieber/karaf-webconsole/trunk/manual/src/main/webapp/WEB-INF/scalate/layouts/default.jade

karaf/sandbox/pieber/karaf-webconsole/trunk/manual/src/main/webapp/WEB-INF/scalate/layouts/headers.jade

karaf/sandbox/pieber/karaf-webconsole/trunk/manual/src/main/webapp/_navigation.jade

karaf/sandbox/pieber/karaf-webconsole/trunk/manual/src/main/webapp/css/style.css

Modified: 
karaf/sandbox/pieber/karaf-webconsole/trunk/manual/src/main/webapp/WEB-INF/scalate/layouts/default.jade
URL: 
http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/manual/src/main/webapp/WEB-INF/scalate/layouts/default.jade?rev=1161948r1=1161947r2=1161948view=diff
==
--- 
karaf/sandbox/pieber/karaf-webconsole/trunk/manual/src/main/webapp/WEB-INF/scalate/layouts/default.jade
 (original)
+++ 
karaf/sandbox/pieber/karaf-webconsole/trunk/manual/src/main/webapp/WEB-INF/scalate/layouts/default.jade
 Fri Aug 26 00:40:39 2011
@@ -6,7 +6,7 @@
 .container_12
   .grid_12
 .grid_4
-  img(src={uri(images/karaf-logo.png)})
+  img(src={uri(/images/karaf-logo.png)})
 
 .grid_8
   h1 Apache Karaf WebConsole
@@ -16,7 +16,7 @@
   .clear
 
   .grid_3.sidebar
-= include(_navigation.jade)
+= include(_navigation.conf)
 
   .grid_9
 !~~ body

Modified: 
karaf/sandbox/pieber/karaf-webconsole/trunk/manual/src/main/webapp/WEB-INF/scalate/layouts/headers.jade
URL: 
http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/manual/src/main/webapp/WEB-INF/scalate/layouts/headers.jade?rev=1161948r1=1161947r2=1161948view=diff
==
--- 
karaf/sandbox/pieber/karaf-webconsole/trunk/manual/src/main/webapp/WEB-INF/scalate/layouts/headers.jade
 (original)
+++ 
karaf/sandbox/pieber/karaf-webconsole/trunk/manual/src/main/webapp/WEB-INF/scalate/layouts/headers.jade
 Fri Aug 26 00:40:39 2011
@@ -19,6 +19,28 @@ html(lang=en)
 link(href={uri(/css/style.css)} rel=stylesheet type=text/css)
 link(href={uri(/css/reset.css)} rel=stylesheet type=text/css)
 
+link(href={uri(/css/sh/shCore.css)} rel=stylesheet type=text/css)
+link(href={uri(/css/sh/shThemeDefault.css)} rel=stylesheet 
type=text/css)
+link(href={uri(/css/sh/shThemeEclipse.css)} rel=stylesheet 
type=text/css)
+
+script(type=text/javascript src={uri(/js/jquery.js)})
+script(type=text/javascript src={uri(/js/sh/XRegExp.js)})
+script(type=text/javascript src={uri(/js/sh/shCore.js)})
+script(type=text/javascript src={uri(/js/sh/shBrushJava.js)})
+script(type=text/javascript src={uri(/js/sh/shBrushPlain.js)})
+script(type=text/javascript src={uri(/js/sh/shBrushXml.js)})
+:javascript
+  $(function() {
+// find all pre elements and add brush: java/xml to class attribute
+$('pre').each(function(key, value) {
+  attrs = $(value).attr('class'); // old value
+  arr = attrs.split(' ');
+  $(value).attr('class', attrs + '; brush: ' + arr[0]); // just append 
brush

svn commit: r1160606 - in /karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main: java/org/apache/karaf/webconsole/blueprint/internal/ java/org/apache/karaf/webconsole/blueprint/internal/bund

[ldywicki]

Author: ldywicki
Date: Tue Aug 23 10:19:23 2011
New Revision: 1160606

URL: http://svn.apache.org/viewvc?rev=1160606view=rev
Log:
Refactor blueprint view to use datatable instead of list view. Move details page

Added:

karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/java/org/apache/karaf/webconsole/blueprint/internal/BlueprintDataProvider.java

karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/java/org/apache/karaf/webconsole/blueprint/internal/details/

karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/java/org/apache/karaf/webconsole/blueprint/internal/details/DetailsPage.java
  - copied, changed from r1160495, 
karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/java/org/apache/karaf/webconsole/blueprint/internal/DetailsPage.java

karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/java/org/apache/karaf/webconsole/blueprint/internal/model/

karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/java/org/apache/karaf/webconsole/blueprint/internal/model/MissingServiceReferenceException.java

karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/java/org/apache/karaf/webconsole/blueprint/internal/model/ServiceReferenceModel.java

karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/java/org/apache/karaf/webconsole/blueprint/internal/view/

karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/java/org/apache/karaf/webconsole/blueprint/internal/view/BlueprintActionsPanel.java

karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/java/org/apache/karaf/webconsole/blueprint/internal/view/BlueprintDataTable.java

karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/java/org/apache/karaf/webconsole/blueprint/internal/view/DefaultServiceReferencePropertyColumn.java

karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/java/org/apache/karaf/webconsole/blueprint/internal/view/ServiceReferencePropertyColumn.java

karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/resources/org/apache/karaf/webconsole/blueprint/internal/details/

karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/resources/org/apache/karaf/webconsole/blueprint/internal/details/DetailsPage.html
  - copied, changed from r1160495, 
karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/resources/org/apache/karaf/webconsole/blueprint/internal/DetailsPage.html
Removed:

karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/java/org/apache/karaf/webconsole/blueprint/internal/BlueprintProvider.java

karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/java/org/apache/karaf/webconsole/blueprint/internal/ConsoleBlueprintContainer.java

karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/java/org/apache/karaf/webconsole/blueprint/internal/DetailsPage.java

karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/java/org/apache/karaf/webconsole/blueprint/internal/SerializableComponentMetadata.java

karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/resources/org/apache/karaf/webconsole/blueprint/internal/DetailsPage.html
Modified:

karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/java/org/apache/karaf/webconsole/blueprint/internal/BlueprintPage.java

karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/java/org/apache/karaf/webconsole/blueprint/internal/bundle/BlueprintActionProvider.java

karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/resources/org/apache/karaf/webconsole/blueprint/internal/BlueprintPage.html

Added: 
karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/java/org/apache/karaf/webconsole/blueprint/internal/BlueprintDataProvider.java
URL: 
http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/java/org/apache/karaf/webconsole/blueprint/internal/BlueprintDataProvider.java?rev=1160606view=auto
==
--- 
karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/java/org/apache/karaf/webconsole/blueprint/internal/BlueprintDataProvider.java
 (added)
+++ 
karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/java/org/apache/karaf/webconsole/blueprint/internal/BlueprintDataProvider.java
 Tue Aug 23 10:19:23 2011
@@ -0,0 +1,32 @@
+package org.apache.karaf.webconsole.blueprint.internal;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import 
org.apache.karaf.webconsole.blueprint.internal.model.ServiceReferenceModel;
+import 
org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;
+import org.apache.wicket.model.IModel;
+import org.osgi.framework.ServiceReference;
+
+public class BlueprintDataProvider extends 
SortableDataProviderServiceReference {
+
+private final ListServiceReference containers;
+
+public

svn commit: r1160742 - in /karaf/sandbox/pieber/karaf-webconsole/trunk: ./ manual/ manual/src/ manual/src/main/ manual/src/main/webapp/ manual/src/main/webapp/WEB-INF/ manual/src/main/webapp/WEB-INF/s

[ldywicki]

Author: ldywicki
Date: Tue Aug 23 15:30:09 2011
New Revision: 1160742

URL: http://svn.apache.org/viewvc?rev=1160742view=rev
Log:
Manual sketch with minimalistic layout

Added:
karaf/sandbox/pieber/karaf-webconsole/trunk/manual/
karaf/sandbox/pieber/karaf-webconsole/trunk/manual/pom.xml
karaf/sandbox/pieber/karaf-webconsole/trunk/manual/src/
karaf/sandbox/pieber/karaf-webconsole/trunk/manual/src/.livereload
karaf/sandbox/pieber/karaf-webconsole/trunk/manual/src/main/
karaf/sandbox/pieber/karaf-webconsole/trunk/manual/src/main/webapp/
karaf/sandbox/pieber/karaf-webconsole/trunk/manual/src/main/webapp/WEB-INF/

karaf/sandbox/pieber/karaf-webconsole/trunk/manual/src/main/webapp/WEB-INF/scalate/

karaf/sandbox/pieber/karaf-webconsole/trunk/manual/src/main/webapp/WEB-INF/scalate/layouts/

karaf/sandbox/pieber/karaf-webconsole/trunk/manual/src/main/webapp/WEB-INF/scalate/layouts/default.jade

karaf/sandbox/pieber/karaf-webconsole/trunk/manual/src/main/webapp/WEB-INF/scalate/layouts/headers.jade

karaf/sandbox/pieber/karaf-webconsole/trunk/manual/src/main/webapp/WEB-INF/scalate/layouts/print.jade

karaf/sandbox/pieber/karaf-webconsole/trunk/manual/src/main/webapp/WEB-INF/web.xml

karaf/sandbox/pieber/karaf-webconsole/trunk/manual/src/main/webapp/_navigation.jade
karaf/sandbox/pieber/karaf-webconsole/trunk/manual/src/main/webapp/css/

karaf/sandbox/pieber/karaf-webconsole/trunk/manual/src/main/webapp/css/grid.css

karaf/sandbox/pieber/karaf-webconsole/trunk/manual/src/main/webapp/css/print.css

karaf/sandbox/pieber/karaf-webconsole/trunk/manual/src/main/webapp/css/reset.css

karaf/sandbox/pieber/karaf-webconsole/trunk/manual/src/main/webapp/css/style.css
karaf/sandbox/pieber/karaf-webconsole/trunk/manual/src/main/webapp/images/

karaf/sandbox/pieber/karaf-webconsole/trunk/manual/src/main/webapp/images/karaf-logo.png

karaf/sandbox/pieber/karaf-webconsole/trunk/manual/src/main/webapp/index.conf

karaf/sandbox/pieber/karaf-webconsole/trunk/manual/src/main/webapp/manual.conf

karaf/sandbox/pieber/karaf-webconsole/trunk/manual/src/main/webapp/overview.conf
Modified:
karaf/sandbox/pieber/karaf-webconsole/trunk/pom.xml

Added: karaf/sandbox/pieber/karaf-webconsole/trunk/manual/pom.xml
URL: 
http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/manual/pom.xml?rev=1160742view=auto
==
--- karaf/sandbox/pieber/karaf-webconsole/trunk/manual/pom.xml (added)
+++ karaf/sandbox/pieber/karaf-webconsole/trunk/manual/pom.xml Tue Aug 23 
15:30:09 2011
@@ -0,0 +1,255 @@
+?xml version=1.0 encoding=UTF-8?
+project xmlns=http://maven.apache.org/POM/4.0.0; 
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; 
xsi:schemaLocation=http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;
+
+!--
+
+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.
+--
+
+modelVersion4.0.0/modelVersion
+
+parent
+groupIdorg.apache.karaf/groupId
+artifactIdwebconsole/artifactId
+version1.0.0-SNAPSHOT/version
+/parent
+
+groupIdorg.apache.karaf.webconsole/groupId
+artifactIdmanual/artifactId
+nameApache Karaf :: Karaf Webconsole Prototype :: Manual/name
+packagingwar/packaging
+
+properties
+manual.dir${project.build.directory}/manual/manual.dir
+manual${manual.dir}/webconsole-manual-${project.version}/manual
+scala.version2.9.0-1/scala.version
+scalate.version1.5.1/scalate.version
+webconsole.version${project.version}/webconsole.version
+/properties
+
+dependencies
+dependency
+groupIdorg.fusesource.scalate/groupId
+artifactIdscalate-wikitext/artifactId
+version${scalate.version}/version
+/dependency
+dependency
+groupIdorg.slf4j/groupId
+artifactIdslf4j-api/artifactId
+version1.6.1/version
+/dependency
+dependency
+groupIdorg.scala-lang/groupId
+artifactIdscala-library/artifactId
+version

svn commit: r1160301 - in /karaf/sandbox/pieber/karaf-webconsole/trunk: core/src/main/java/org/apache/karaf/webconsole/core/ core/src/main/resources/org/apache/karaf/webconsole/core/ osgi/src/main/jav

[ldywicki]

Author: ldywicki
Date: Mon Aug 22 15:24:28 2011
New Revision: 1160301

URL: http://svn.apache.org/viewvc?rev=1160301view=rev
Log:
Refactor configurations subpage. Added remove operation support for 
configurations

Added:

karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/configuration/ConfigurationRemovePage.java

karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/configuration/model/

karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/configuration/model/AbstractConfigurationModel.java

karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/configuration/model/ConfigurationModel.java

karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/configuration/model/ConfigurationNotFoundException.java

karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/configuration/model/ConfigurationsModel.java

karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/configuration/view/

karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/configuration/view/ConfigurationRemoveForm.java

karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/configuration/view/ConfigurationsActionPanel.java
  - copied, changed from r1160300, 
karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/configuration/ConfigurationsActionPanel.java

karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/configuration/view/ConfigurationstDataTable.java

karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/configuration/view/FactoryPidItem.java

karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/configuration/ConfigurationRemovePage.html
  - copied, changed from r1160300, 
karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/configuration/ConfigurationsPage.html
Removed:

karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/configuration/ConfigurationsActionPanel.java
Modified:

karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/BasePage.java

karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/BasePage.html

karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/SidebarPage.html

karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/configuration/ConfigurationEditPage.java

karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/configuration/ConfigurationProvider.java

karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/configuration/ConfigurationsPage.java

karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/configuration/ConfigurationEditPage.html

karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/configuration/ConfigurationsPage.html

karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/configuration/configurations.css

Modified: 
karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/BasePage.java
URL: 
http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/BasePage.java?rev=1160301r1=1160300r2=1160301view=diff
==
--- 
karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/BasePage.java
 (original)
+++ 
karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/BasePage.java
 Mon Aug 22 15:24:28 2011
@@ -8,12 +8,11 @@ import org.apache.karaf.webconsole.core.
 import org.apache.karaf.webconsole.core.internal.LanguagePanel;
 import org.apache.karaf.webconsole.core.navigation.ConsoleTab;
 import org.apache.karaf.webconsole.core.navigation.markup.NavigationPanel;
-import org.apache.wicket.ResourceReference;
 import org.apache.wicket.behavior.IBehavior;
 import org.apache.wicket.markup.html.CSSPackageResource;
 import org.apache.wicket.markup.html.WebPage;
 import

svn commit: r1160306 - in /karaf/sandbox/pieber/karaf-webconsole/trunk: blueprint/src/main/java/org/apache/karaf/webconsole/blueprint/internal/ karaf/src/main/java/org/apache/karaf/webconsole/karaf/in

[ldywicki]

Author: ldywicki
Date: Mon Aug 22 15:34:16 2011
New Revision: 1160306

URL: http://svn.apache.org/viewvc?rev=1160306view=rev
Log:
Add @PaxWicketMountPoint - in other words support for nicer urls

Modified:

karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/java/org/apache/karaf/webconsole/blueprint/internal/BlueprintPage.java

karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/java/org/apache/karaf/webconsole/blueprint/internal/DetailsPage.java

karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/java/org/apache/karaf/webconsole/karaf/internal/feature/FeaturesPage.java

karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/java/org/apache/karaf/webconsole/karaf/internal/repository/RepositoriesPage.java

karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/bundle/BundlesPage.java

karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/bundle/DetailsPage.java

karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/configuration/ConfigurationEditPage.java

karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/configuration/ConfigurationsPage.java

karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/event/EventsPage.java

Modified: 
karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/java/org/apache/karaf/webconsole/blueprint/internal/BlueprintPage.java
URL: 
http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/java/org/apache/karaf/webconsole/blueprint/internal/BlueprintPage.java?rev=1160306r1=1160305r2=1160306view=diff
==
--- 
karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/java/org/apache/karaf/webconsole/blueprint/internal/BlueprintPage.java
 (original)
+++ 
karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/java/org/apache/karaf/webconsole/blueprint/internal/BlueprintPage.java
 Mon Aug 22 15:34:16 2011
@@ -10,9 +10,11 @@ import org.apache.wicket.markup.html.lis
 import org.apache.wicket.markup.html.list.ListView;
 import org.apache.wicket.model.util.ListModel;
 import org.ops4j.pax.wicket.api.PaxWicketBean;
+import org.ops4j.pax.wicket.api.PaxWicketMountPoint;
 import org.osgi.framework.ServiceReference;
 import org.osgi.framework.Version;
 
+@PaxWicketMountPoint(mountPoint = /osgi/blueprint)
 public class BlueprintPage extends BasePage {
 
 @PaxWicketBean(name = containers)

Modified: 
karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/java/org/apache/karaf/webconsole/blueprint/internal/DetailsPage.java
URL: 
http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/java/org/apache/karaf/webconsole/blueprint/internal/DetailsPage.java?rev=1160306r1=1160305r2=1160306view=diff
==
--- 
karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/java/org/apache/karaf/webconsole/blueprint/internal/DetailsPage.java
 (original)
+++ 
karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/java/org/apache/karaf/webconsole/blueprint/internal/DetailsPage.java
 Mon Aug 22 15:34:16 2011
@@ -11,12 +11,14 @@ import org.apache.wicket.markup.html.lis
 import org.apache.wicket.markup.html.list.ListView;
 import org.apache.wicket.model.LoadableDetachableModel;
 import org.ops4j.pax.wicket.api.PaxWicketBean;
+import org.ops4j.pax.wicket.api.PaxWicketMountPoint;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceReference;
 import org.osgi.service.blueprint.container.BlueprintContainer;
 import org.osgi.service.blueprint.reflect.ComponentMetadata;
 
+@PaxWicketMountPoint(mountPoint = /osgi/blueprint/details)
 public class DetailsPage extends BasePage {
 
 @PaxWicketBean(name = blueprintBundleContext)

Modified: 
karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/java/org/apache/karaf/webconsole/karaf/internal/feature/FeaturesPage.java
URL: 
http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/java/org/apache/karaf/webconsole/karaf/internal/feature/FeaturesPage.java?rev=1160306r1=1160305r2=1160306view=diff
==
--- 
karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/java/org/apache/karaf/webconsole/karaf/internal/feature/FeaturesPage.java
 (original)
+++ 
karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/java/org/apache/karaf/webconsole/karaf/internal/feature/FeaturesPage.java
 Mon Aug 22 15:34:16 2011
@@ -24,10 +24,12 @@ import org.apache.wicket.model.Model;
 import org.apache.wicket.model.ResourceModel;
 import

svn commit: r1160483 - in /karaf/sandbox/pieber/karaf-webconsole/trunk: core/src/main/java/org/apache/karaf/webconsole/core/panel/ core/src/main/java/org/apache/karaf/webconsole/core/table/ core/src/m

[ldywicki]

Author: ldywicki
Date: Mon Aug 22 22:54:21 2011
New Revision: 1160483

URL: http://svn.apache.org/viewvc?rev=1160483view=rev
Log:
Refactor bundles view

Added:

karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/panel/

karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/panel/AbstractImagePanel.java

karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/panel/CssImagePanel.java

karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/panel/StaticImagePanel.java

karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/table/PropertyColumnExt.java

karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/panel/

karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/panel/AbstractImagePanel.html

karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/panel/CssImagePanel.html

karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/panel/StaticImagePanel.html

karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/bundle/

karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/bundle/IActionProvider.java

karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/bundle/IColumnProvider.java

karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/bundle/IDecorationProvider.java

karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/bundle/BundlesDataProvider.java

karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/bundle/model/

karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/bundle/model/BundleModel.java

karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/bundle/model/BundlesModel.java

karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/bundle/view/

karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/bundle/view/BundleActionsPanel.java

karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/bundle/view/BundlesDataTable.java

karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/bundle/view/DecorationPanel.java

karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/bundle/view/SystemBundleDecorationProvider.java

karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/bundle/view/

karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/bundle/view/DecorationPanel.html

karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/bundle/view/decoration.css

karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/bundle/view/system.gif
Removed:

karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/bundle/ItemClassModifier.java

karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/bundle/decorator/SystemBundleClassModifier.java
Modified:
karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/pom.xml

karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/bundle/BundlesPage.java

karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/resources/OSGI-INF/blueprint/osgi.xml

karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/bundle/BundlesPage.html

Added: 
karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/panel/AbstractImagePanel.java
URL: 
http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/panel/AbstractImagePanel.java?rev=1160483view=auto
==
--- 
karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/panel/AbstractImagePanel.java
 (added)
+++ 
karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole

svn commit: r1160495 - in /karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main: java/org/apache/karaf/webconsole/blueprint/internal/ java/org/apache/karaf/webconsole/blueprint/internal/bund

[ldywicki]

Author: ldywicki
Date: Mon Aug 22 23:23:25 2011
New Revision: 1160495

URL: http://svn.apache.org/viewvc?rev=1160495view=rev
Log:
Clean up blueprint code - introduce IBlueprintBundleStateTracker which is 
responsible for providing blueprint container states

Added:

karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/java/org/apache/karaf/webconsole/blueprint/internal/BlueprintBundleStateTracker.java
  - copied, changed from r1160487, 
karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/java/org/apache/karaf/webconsole/blueprint/internal/bundle/BlueprintDecorationProvider.java

karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/java/org/apache/karaf/webconsole/blueprint/internal/BlueprintState.java
  - copied, changed from r1160487, 
karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/java/org/apache/karaf/webconsole/blueprint/internal/bundle/BlueprintState.java

karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/java/org/apache/karaf/webconsole/blueprint/internal/IBlueprintBundleStateTracker.java
Removed:

karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/java/org/apache/karaf/webconsole/blueprint/internal/bundle/BlueprintState.java
Modified:

karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/java/org/apache/karaf/webconsole/blueprint/internal/bundle/BlueprintActionProvider.java

karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/java/org/apache/karaf/webconsole/blueprint/internal/bundle/BlueprintColumnProvider.java

karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/java/org/apache/karaf/webconsole/blueprint/internal/bundle/BlueprintDecorationProvider.java

karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/resources/OSGI-INF/blueprint/blueprint.xml

Copied: 
karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/java/org/apache/karaf/webconsole/blueprint/internal/BlueprintBundleStateTracker.java
 (from r1160487, 
karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/java/org/apache/karaf/webconsole/blueprint/internal/bundle/BlueprintDecorationProvider.java)
URL: 
http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/java/org/apache/karaf/webconsole/blueprint/internal/BlueprintBundleStateTracker.java?p2=karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/java/org/apache/karaf/webconsole/blueprint/internal/BlueprintBundleStateTracker.javap1=karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/java/org/apache/karaf/webconsole/blueprint/internal/bundle/BlueprintDecorationProvider.javar1=1160487r2=1160495rev=1160495view=diff
==
--- 
karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/java/org/apache/karaf/webconsole/blueprint/internal/bundle/BlueprintDecorationProvider.java
 (original)
+++ 
karaf/sandbox/pieber/karaf-webconsole/trunk/blueprint/src/main/java/org/apache/karaf/webconsole/blueprint/internal/BlueprintBundleStateTracker.java
 Mon Aug 22 23:23:25 2011
@@ -1,25 +1,33 @@
-package org.apache.karaf.webconsole.blueprint.internal.bundle;
+package org.apache.karaf.webconsole.blueprint.internal;
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-import org.apache.karaf.webconsole.core.panel.StaticImagePanel;
-import org.apache.karaf.webconsole.osgi.bundle.IDecorationProvider;
-import org.apache.wicket.ResourceReference;
-import org.apache.wicket.markup.html.panel.Panel;
-import org.apache.wicket.model.IModel;
 import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleEvent;
+import org.osgi.framework.BundleListener;
 import org.osgi.service.blueprint.container.BlueprintEvent;
 import org.osgi.service.blueprint.container.BlueprintListener;
 
-public class BlueprintDecorationProvider implements IDecorationProvider, 
BlueprintListener {
+public class BlueprintBundleStateTracker implements 
IBlueprintBundleStateTracker,
+BundleListener, BlueprintListener {
 
 private MapLong, BlueprintState states = new ConcurrentHashMapLong, 
BlueprintState();
 
+public BlueprintState getState(Bundle bundle) {
+return states.get(bundle.getBundleId());
+}
+
 public void blueprintEvent(BlueprintEvent event) {
 states.put(event.getBundle().getBundleId(), getState(event));
 }
 
+public void bundleChanged(BundleEvent event) {
+if (event.getType() == BundleEvent.UNINSTALLED) {
+states.remove(event.getBundle().getBundleId());
+}
+}
+
 private BlueprintState getState(BlueprintEvent blueprintEvent) {
 switch (blueprintEvent.getType()) {
 case BlueprintEvent.CREATING:
@@ -40,11 +48,4 @@ public class BlueprintDecorationProvider
 return BlueprintState.Unknown;
 }
 }
-
-public Panel getDecoration(final String componentId, IModelBundle model

svn commit: r1159239 - /karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/SidebarPage.java

[ldywicki]

Author: ldywicki
Date: Thu Aug 18 14:21:40 2011
New Revision: 1159239

URL: http://svn.apache.org/viewvc?rev=1159239view=rev
Log:
Make sidebar accessible for extensions

Modified:

karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/SidebarPage.java

Modified: 
karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/SidebarPage.java
URL: 
http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/SidebarPage.java?rev=1159239r1=1159238r2=1159239view=diff
==
--- 
karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/SidebarPage.java
 (original)
+++ 
karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/SidebarPage.java
 Thu Aug 18 14:21:40 2011
@@ -5,14 +5,22 @@ import java.util.List;
 
 import org.apache.karaf.webconsole.core.internal.SidebarPanel;
 import org.apache.wicket.Page;
+import org.apache.wicket.markup.html.panel.Panel;
 import org.apache.wicket.model.util.ListModel;
 
 public class SidebarPage extends BasePage {
 
+private Panel sidebar;
+
 public SidebarPage() {
 ListModelClass? extends Page listModel = new ListModelClass? 
extends Page(getSubPages());
 
-add(new SidebarPanel(sidebar, getClass(), listModel));
+sidebar = new SidebarPanel(sidebar, getClass(), listModel);
+add(sidebar);
+}
+
+public Panel getSidebar() {
+return sidebar;
 }
 
 protected ListClass? extends Page getSubPages() {

svn commit: r1159246 - in /karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main: java/org/apache/karaf/webconsole/osgi/internal/configuration/ resources/org/apache/karaf/webconsole/osgi/internal/

[ldywicki]

Author: ldywicki
Date: Thu Aug 18 14:31:33 2011
New Revision: 1159246

URL: http://svn.apache.org/viewvc?rev=1159246view=rev
Log:
Extension of configuration page (in progress)

Modified:

karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/configuration/ConfigurationsPage.java

karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/configuration/ConfigurationsPage.html

Modified: 
karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/configuration/ConfigurationsPage.java
URL: 
http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/configuration/ConfigurationsPage.java?rev=1159246r1=1159245r2=1159246view=diff
==
--- 
karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/configuration/ConfigurationsPage.java
 (original)
+++ 
karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/configuration/ConfigurationsPage.java
 Thu Aug 18 14:31:33 2011
@@ -5,9 +5,13 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.karaf.webconsole.osgi.internal.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.DefaultDataTable;
 import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
 import 
org.apache.wicket.extensions.markup.html.repeater.data.table.PropertyColumn;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.repeater.Item;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.Model;
 import org.ops4j.pax.wicket.api.PaxWicketBean;
@@ -26,20 +30,29 @@ public class ConfigurationsPage extends 
 try {
 configurations = configurationAdmin.listConfigurations(null);
 } catch (IOException e) {
-// TODO Auto-generated catch block
-e.printStackTrace();
 } catch (InvalidSyntaxException e) {
-// TODO Auto-generated catch block
 e.printStackTrace();
 }
+final boolean empty = configurations.length == 0;
 
 IModelString pid = Model.of(pid);
 
 ListIColumnConfiguration columns = new 
ArrayListIColumnConfiguration();
 columns.add(new PropertyColumnConfiguration(pid, pid));
+columns.add(new AbstractColumnConfiguration(Model.of(operations)) {
+public void populateItem(ItemICellPopulatorConfiguration 
cellItem, String componentId, IModelConfiguration model) {
+cellItem.add(new Label(info, operation));
+}
+});
 
 add(new DefaultDataTableConfiguration(configurations, columns, new 
ConfigurationProvider(configurations), 20));
 
+add(new Label(noData, No configuration found.  + 
(configurationAdmin == null ? Configuration Admin not found : )) {
+@Override
+public boolean isVisible() {
+return empty;
+}
+});
 }
 
 }

Modified: 
karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/configuration/ConfigurationsPage.html
URL: 
http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/configuration/ConfigurationsPage.html?rev=1159246r1=1159245r2=1159246view=diff
==
--- 
karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/configuration/ConfigurationsPage.html
 (original)
+++ 
karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/configuration/ConfigurationsPage.html
 Thu Aug 18 14:31:33 2011
@@ -10,6 +10,10 @@
 h1Configurations/h1
 
 table wicket:id=configurations class=dataview /
+
+wicket:enclosure
+span wicket:id=noDataInfo goes here/span
+/wicket:enclosure
 /wicket:extend
 /body
 /html

svn commit: r1159393 - /karaf/sandbox/pieber/karaf-webconsole/trunk/.gitignore

[ldywicki]

Author: ldywicki
Date: Thu Aug 18 20:10:23 2011
New Revision: 1159393

URL: http://svn.apache.org/viewvc?rev=1159393view=rev
Log:
Added some additional files to ignore

Modified:
karaf/sandbox/pieber/karaf-webconsole/trunk/.gitignore

Modified: karaf/sandbox/pieber/karaf-webconsole/trunk/.gitignore
URL: 
http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/.gitignore?rev=1159393r1=1159392r2=1159393view=diff
==
--- karaf/sandbox/pieber/karaf-webconsole/trunk/.gitignore (original)
+++ karaf/sandbox/pieber/karaf-webconsole/trunk/.gitignore Thu Aug 18 20:10:23 
2011
@@ -2,4 +2,5 @@
 *.project
 *.settings
 *target
-
+.DS_Store
+bin

svn commit: r1159395 - in /karaf/sandbox/pieber/karaf-webconsole/trunk: ./ examples/ examples/branding/ examples/branding/src/ examples/branding/src/main/ examples/branding/src/main/resources/ example

[ldywicki]

Author: ldywicki
Date: Thu Aug 18 20:11:09 2011
New Revision: 1159395

URL: http://svn.apache.org/viewvc?rev=1159395view=rev
Log:
Remove unecessary files

Removed:
karaf/sandbox/pieber/karaf-webconsole/trunk/.DS_Store
karaf/sandbox/pieber/karaf-webconsole/trunk/examples/.DS_Store
karaf/sandbox/pieber/karaf-webconsole/trunk/examples/branding/.DS_Store
karaf/sandbox/pieber/karaf-webconsole/trunk/examples/branding/src/.DS_Store

karaf/sandbox/pieber/karaf-webconsole/trunk/examples/branding/src/main/.DS_Store

karaf/sandbox/pieber/karaf-webconsole/trunk/examples/branding/src/main/resources/.DS_Store

karaf/sandbox/pieber/karaf-webconsole/trunk/examples/branding/src/main/resources/org/.DS_Store

karaf/sandbox/pieber/karaf-webconsole/trunk/examples/branding/src/main/resources/org/apache/.DS_Store

karaf/sandbox/pieber/karaf-webconsole/trunk/examples/branding/src/main/resources/org/apache/karaf/.DS_Store

karaf/sandbox/pieber/karaf-webconsole/trunk/examples/branding/src/main/resources/org/apache/karaf/webconsole/.DS_Store

karaf/sandbox/pieber/karaf-webconsole/trunk/examples/branding/src/main/resources/org/apache/karaf/webconsole/examples/.DS_Store

svn commit: r1159398 - in /karaf/sandbox/pieber/karaf-webconsole/trunk: ./ examples/ examples/branding/ examples/branding/src/ examples/branding/src/main/ examples/branding/src/main/resources/ example

[ldywicki]

Author: ldywicki
Date: Thu Aug 18 20:14:32 2011
New Revision: 1159398

URL: http://svn.apache.org/viewvc?rev=1159398view=rev
Log:
Merge with trunk.

Added:
karaf/sandbox/pieber/karaf-webconsole/trunk/.DS_Store
karaf/sandbox/pieber/karaf-webconsole/trunk/examples/.DS_Store
karaf/sandbox/pieber/karaf-webconsole/trunk/examples/branding/.DS_Store
karaf/sandbox/pieber/karaf-webconsole/trunk/examples/branding/src/.DS_Store

karaf/sandbox/pieber/karaf-webconsole/trunk/examples/branding/src/main/.DS_Store

karaf/sandbox/pieber/karaf-webconsole/trunk/examples/branding/src/main/resources/.DS_Store

karaf/sandbox/pieber/karaf-webconsole/trunk/examples/branding/src/main/resources/org/.DS_Store

karaf/sandbox/pieber/karaf-webconsole/trunk/examples/branding/src/main/resources/org/apache/.DS_Store

karaf/sandbox/pieber/karaf-webconsole/trunk/examples/branding/src/main/resources/org/apache/karaf/.DS_Store

karaf/sandbox/pieber/karaf-webconsole/trunk/examples/branding/src/main/resources/org/apache/karaf/webconsole/.DS_Store

karaf/sandbox/pieber/karaf-webconsole/trunk/examples/branding/src/main/resources/org/apache/karaf/webconsole/examples/.DS_Store

Added: karaf/sandbox/pieber/karaf-webconsole/trunk/.DS_Store
URL: 
http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/.DS_Store?rev=1159398view=auto
==
Files karaf/sandbox/pieber/karaf-webconsole/trunk/.DS_Store (added) and 
karaf/sandbox/pieber/karaf-webconsole/trunk/.DS_Store Thu Aug 18 20:14:32 2011 
differ

Added: karaf/sandbox/pieber/karaf-webconsole/trunk/examples/.DS_Store
URL: 
http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/examples/.DS_Store?rev=1159398view=auto
==
Files karaf/sandbox/pieber/karaf-webconsole/trunk/examples/.DS_Store (added) 
and karaf/sandbox/pieber/karaf-webconsole/trunk/examples/.DS_Store Thu Aug 18 
20:14:32 2011 differ

Added: karaf/sandbox/pieber/karaf-webconsole/trunk/examples/branding/.DS_Store
URL: 
http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/examples/branding/.DS_Store?rev=1159398view=auto
==
Files karaf/sandbox/pieber/karaf-webconsole/trunk/examples/branding/.DS_Store 
(added) and 
karaf/sandbox/pieber/karaf-webconsole/trunk/examples/branding/.DS_Store Thu Aug 
18 20:14:32 2011 differ

Added: 
karaf/sandbox/pieber/karaf-webconsole/trunk/examples/branding/src/.DS_Store
URL: 
http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/examples/branding/src/.DS_Store?rev=1159398view=auto
==
Files 
karaf/sandbox/pieber/karaf-webconsole/trunk/examples/branding/src/.DS_Store 
(added) and 
karaf/sandbox/pieber/karaf-webconsole/trunk/examples/branding/src/.DS_Store Thu 
Aug 18 20:14:32 2011 differ

Added: 
karaf/sandbox/pieber/karaf-webconsole/trunk/examples/branding/src/main/.DS_Store
URL: 
http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/examples/branding/src/main/.DS_Store?rev=1159398view=auto
==
Files 
karaf/sandbox/pieber/karaf-webconsole/trunk/examples/branding/src/main/.DS_Store
 (added) and 
karaf/sandbox/pieber/karaf-webconsole/trunk/examples/branding/src/main/.DS_Store
 Thu Aug 18 20:14:32 2011 differ

Added: 
karaf/sandbox/pieber/karaf-webconsole/trunk/examples/branding/src/main/resources/.DS_Store
URL: 
http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/examples/branding/src/main/resources/.DS_Store?rev=1159398view=auto
==
Files 
karaf/sandbox/pieber/karaf-webconsole/trunk/examples/branding/src/main/resources/.DS_Store
 (added) and 
karaf/sandbox/pieber/karaf-webconsole/trunk/examples/branding/src/main/resources/.DS_Store
 Thu Aug 18 20:14:32 2011 differ

Added: 
karaf/sandbox/pieber/karaf-webconsole/trunk/examples/branding/src/main/resources/org/.DS_Store
URL: 
http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/examples/branding/src/main/resources/org/.DS_Store?rev=1159398view=auto
==
Files 
karaf/sandbox/pieber/karaf-webconsole/trunk/examples/branding/src/main/resources/org/.DS_Store
 (added) and 
karaf/sandbox/pieber/karaf-webconsole/trunk/examples/branding/src/main/resources/org/.DS_Store
 Thu Aug 18 20:14:32 2011 differ

Added: 
karaf/sandbox/pieber/karaf-webconsole/trunk/examples/branding/src/main/resources/org/apache/.DS_Store
URL: 
http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/examples/branding/src/main/resources/org/apache/.DS_Store?rev=1159398view=auto

svn commit: r1159402 - in /karaf/sandbox/pieber/karaf-webconsole/trunk: ./ examples/ examples/branding/ examples/branding/src/ examples/branding/src/main/ examples/branding/src/main/resources/ example

[ldywicki]

Author: ldywicki
Date: Thu Aug 18 20:20:30 2011
New Revision: 1159402

URL: http://svn.apache.org/viewvc?rev=1159402view=rev
Log:
Remove .DS_Store again :|

Removed:
karaf/sandbox/pieber/karaf-webconsole/trunk/.DS_Store
karaf/sandbox/pieber/karaf-webconsole/trunk/examples/.DS_Store
karaf/sandbox/pieber/karaf-webconsole/trunk/examples/branding/.DS_Store
karaf/sandbox/pieber/karaf-webconsole/trunk/examples/branding/src/.DS_Store

karaf/sandbox/pieber/karaf-webconsole/trunk/examples/branding/src/main/.DS_Store

karaf/sandbox/pieber/karaf-webconsole/trunk/examples/branding/src/main/resources/.DS_Store

karaf/sandbox/pieber/karaf-webconsole/trunk/examples/branding/src/main/resources/org/.DS_Store

karaf/sandbox/pieber/karaf-webconsole/trunk/examples/branding/src/main/resources/org/apache/.DS_Store

karaf/sandbox/pieber/karaf-webconsole/trunk/examples/branding/src/main/resources/org/apache/karaf/.DS_Store

karaf/sandbox/pieber/karaf-webconsole/trunk/examples/branding/src/main/resources/org/apache/karaf/webconsole/.DS_Store

karaf/sandbox/pieber/karaf-webconsole/trunk/examples/branding/src/main/resources/org/apache/karaf/webconsole/examples/.DS_Store

svn commit: r1159404 - in /karaf/sandbox/pieber/karaf-webconsole/trunk/examples/branding/bin: pom.xml src/main/java/org/apache/karaf/webconsole/examples/branding/ExampleBrandProvider.class src/main/re

[ldywicki]

Author: ldywicki
Date: Thu Aug 18 20:22:34 2011
New Revision: 1159404

URL: http://svn.apache.org/viewvc?rev=1159404view=rev
Log:
Remove binary files added by eclipse

Removed:
karaf/sandbox/pieber/karaf-webconsole/trunk/examples/branding/bin/pom.xml

karaf/sandbox/pieber/karaf-webconsole/trunk/examples/branding/bin/src/main/java/org/apache/karaf/webconsole/examples/branding/ExampleBrandProvider.class

karaf/sandbox/pieber/karaf-webconsole/trunk/examples/branding/bin/src/main/resources/OSGI-INF/blueprint/branding.xml

svn commit: r1158621 - in /karaf/sandbox/pieber/karaf-webconsole/trunk: core/src/main/java/org/apache/karaf/webconsole/core/ core/src/main/java/org/apache/karaf/webconsole/core/internal/ core/src/main

[ldywicki]

Author: ldywicki
Date: Wed Aug 17 10:58:41 2011
New Revision: 1158621

URL: http://svn.apache.org/viewvc?rev=1158621view=rev
Log:
Implementation of dashboard widgets

Added:

karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/ApplicationReference.java

karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/ApplicationSetter.java

karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/internal/Initializer.java

karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/internal/dashboard.css

karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/wicket.properties

karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/KarafFeaturesWidget.java

karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/widget/

karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/widget/FeaturesWidgetPanel.java

karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/widget/OsgiWidgetPanel.java
  - copied, changed from r1158443, 
karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/OsgiWidget.java

karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/widget/

karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/widget/FeaturesWidgetPanel.html

karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/widget/OsgiWidgetPanel.html
Removed:

karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/OsgiWidget.html
Modified:

karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/DashboardWidget.java

karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/internal/DashboardPage.java

karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/internal/WicketApplication.java

karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/internal/DashboardPage.html

karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/OsgiWidget.java

karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/resources/OSGI-INF/blueprint/wicket.xml

Added: 
karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/ApplicationReference.java
URL: 
http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/ApplicationReference.java?rev=1158621view=auto
==
--- 
karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/ApplicationReference.java
 (added)
+++ 
karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/ApplicationReference.java
 Wed Aug 17 10:58:41 2011
@@ -0,0 +1,15 @@
+package org.apache.karaf.webconsole.core;
+
+import org.apache.wicket.Application;
+import org.apache.wicket.RequestCycle;
+import org.apache.wicket.Session;
+
+public interface ApplicationReference {
+
+Application getApplication();
+
+Session getSession();
+
+RequestCycle getRequestCycle();
+
+}

Added: 
karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/ApplicationSetter.java
URL: 
http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/ApplicationSetter.java?rev=1158621view=auto
==
--- 
karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/ApplicationSetter.java
 (added)
+++ 
karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/ApplicationSetter.java
 Wed Aug 17 10:58:41 2011
@@ -0,0 +1,28 @@
+package org.apache.karaf.webconsole.core;
+
+import org.apache.wicket.Application;
+import org.apache.wicket.Session;
+
+/**
+ * Helper class which calls {@link Application#set(Application)} with given
+ * instance.
+ */
+public class ApplicationSetter {
+
+private ApplicationReference reference;
+
+public ApplicationSetter(ApplicationReference reference) {
+this.reference = reference;
+}
+
+public void initialize() {
+Application.set(reference.getApplication());
+Session.set

svn commit: r1158994 [2/2] - in /karaf/sandbox/pieber/karaf-webconsole/trunk: ./ blueprint/ blueprint/src/ blueprint/src/main/ blueprint/src/main/java/ blueprint/src/main/java/org/ blueprint/src/main/

[ldywicki]

Copied: 
karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/resources/org/apache/karaf/webconsole/karaf/internal/feature/FeaturesPage.properties
 (from r1158621, 
karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/FeaturesPage.properties)
URL: 
http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/resources/org/apache/karaf/webconsole/karaf/internal/feature/FeaturesPage.properties?p2=karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/resources/org/apache/karaf/webconsole/karaf/internal/feature/FeaturesPage.propertiesp1=karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/FeaturesPage.propertiesr1=1158621r2=1158994rev=1158994view=diff
==
(empty)

Copied: 
karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/resources/org/apache/karaf/webconsole/karaf/internal/feature/FeaturesPage_de.properties
 (from r1158621, 
karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/FeaturesPage_de.properties)
URL: 
http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/resources/org/apache/karaf/webconsole/karaf/internal/feature/FeaturesPage_de.properties?p2=karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/resources/org/apache/karaf/webconsole/karaf/internal/feature/FeaturesPage_de.propertiesp1=karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/FeaturesPage_de.propertiesr1=1158621r2=1158994rev=1158994view=diff
==
(empty)

Copied: 
karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/resources/org/apache/karaf/webconsole/karaf/internal/feature/FeaturesPage_fr.properties
 (from r1158621, 
karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/FeaturesPage_fr.properties)
URL: 
http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/resources/org/apache/karaf/webconsole/karaf/internal/feature/FeaturesPage_fr.properties?p2=karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/resources/org/apache/karaf/webconsole/karaf/internal/feature/FeaturesPage_fr.propertiesp1=karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/FeaturesPage_fr.propertiesr1=1158621r2=1158994rev=1158994view=diff
==
(empty)

Copied: 
karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/resources/org/apache/karaf/webconsole/karaf/internal/repository/RepositoriesPage.html
 (from r1158621, 
karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/RepositoriesPage.html)
URL: 
http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/resources/org/apache/karaf/webconsole/karaf/internal/repository/RepositoriesPage.html?p2=karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/resources/org/apache/karaf/webconsole/karaf/internal/repository/RepositoriesPage.htmlp1=karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/RepositoriesPage.htmlr1=1158621r2=1158994rev=1158994view=diff
==
--- 
karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/RepositoriesPage.html
 (original)
+++ 
karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/resources/org/apache/karaf/webconsole/karaf/internal/repository/RepositoriesPage.html
 Thu Aug 18 02:08:08 2011
@@ -10,4 +10,5 @@
 table wicket:id=repositories class=dataview/
 /wicket:extend
 /body
+
 /html

Copied: 
karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/resources/org/apache/karaf/webconsole/karaf/internal/widget/FeaturesWidgetPanel.html
 (from r1158621, 
karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/widget/FeaturesWidgetPanel.html)
URL: 
http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/resources/org/apache/karaf/webconsole/karaf/internal/widget/FeaturesWidgetPanel.html?p2=karaf/sandbox/pieber/karaf-webconsole/trunk/karaf/src/main/resources/org/apache/karaf/webconsole/karaf/internal/widget/FeaturesWidgetPanel.htmlp1=karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/widget/FeaturesWidgetPanel.htmlr1=1158621r2=1158994rev=1158994view=diff
==
(empty)

Modified: 

svn commit: r1157990 - /karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/HomePage.java

[ldywicki]

Author: ldywicki
Date: Mon Aug 15 20:29:42 2011
New Revision: 1157990

URL: http://svn.apache.org/viewvc?rev=1157990view=rev
Log:
Sidebar links in osgi home page. Updated details link - now it is bookmarkable

Modified:

karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/HomePage.java

Modified: 
karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/HomePage.java
URL: 
http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/HomePage.java?rev=1157990r1=1157989r2=1157990view=diff
==
--- 
karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/HomePage.java
 (original)
+++ 
karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/HomePage.java
 Mon Aug 15 20:29:42 2011
@@ -9,6 +9,7 @@ import org.apache.karaf.webconsole.core.
 import org.apache.wicket.PageParameters;
 import org.apache.wicket.behavior.SimpleAttributeModifier;
 import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.link.BookmarkablePageLink;
 import org.apache.wicket.markup.html.link.Link;
 import org.apache.wicket.markup.html.list.ListItem;
 import org.apache.wicket.markup.html.list.ListView;
@@ -140,20 +141,17 @@ public class HomePage extends BasePage {
 }
 
 item.add(new SimpleAttributeModifier(class, 
classes.toString()));
-item.add(new Link(link) {
-@Override
-public void onClick() {
-PageParameters params = new PageParameters();
-params.put(bundleId, bundle.getBundleId());
-setResponsePage(new DetailsPage(params));
-}
-});
+
+
+PageParameters params = new PageParameters();
+params.put(bundleId, bundle.getBundleId());
+
+item.add(new BookmarkablePageLinkDetailsPage(link, 
DetailsPage.class, params));
 }
 });
 
 }
 
-/*
 @Override
 protected ListClass getSubPages() {
 ListClass subpages = new LinkedListClass();
@@ -161,5 +159,5 @@ public class HomePage extends BasePage {
 subpages.add(EventsPage.class);
 return subpages;
 }
-*/
+
 }

svn commit: r1157052 - /karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/BasePage.java

[ldywicki]

Author: ldywicki
Date: Fri Aug 12 11:22:33 2011
New Revision: 1157052

URL: http://svn.apache.org/viewvc?rev=1157052view=rev
Log:
Fix problem with serialization of @PaxWicketBean annotated field

Modified:

karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/BasePage.java

Modified: 
karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/BasePage.java
URL: 
http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/BasePage.java?rev=1157052r1=1157051r2=1157052view=diff
==
--- 
karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/BasePage.java
 (original)
+++ 
karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/BasePage.java
 Fri Aug 12 11:22:33 2011
@@ -5,6 +5,7 @@ import org.apache.wicket.extensions.mark
 import org.apache.wicket.markup.html.CSSPackageResource;
 import org.apache.wicket.markup.html.WebPage;
 import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.link.BookmarkablePageLink;
 import org.apache.wicket.markup.html.link.PageLink;
 import org.apache.wicket.markup.html.list.ListItem;
 import org.apache.wicket.markup.html.list.ListView;
@@ -19,7 +20,7 @@ import java.util.List;
 public class BasePage extends WebPage {
 
 @PaxWicketBean(name = tabs)
-private ListConsoleTab tabs;
+private transient ListConsoleTab tabs;
 
 public BasePage() {
 add(CSSPackageResource.getHeaderContribution(BasePage.class, 
style.css));
@@ -30,14 +31,14 @@ public class BasePage extends WebPage {
 @Override
 protected void populateItem(ListItemConsoleTab item) {
 final ConsoleTab tab = item.getModelObject();
-item.add(new PageLink(moduleLink, 
tab.getModuleHomePage()).add(new Label(moduleLabel, tab.getLabel(;
+item.add(new BookmarkablePageLink(moduleLink, 
tab.getModuleHomePage()).add(new Label(moduleLabel, tab.getLabel(;
 
 ListString subItems = new 
LinkedListString(tab.getItems().keySet());
 item.add(new ListViewString(topLinks, subItems) {
 @Override
 protected void populateItem(ListItemString item) {
 String subItem = item.getModelObject();
-item.add(new PageLink(topLink, 
tab.getItems().get(subItem)).add(new Label(linkLabel, subItem)));
+item.add(new BookmarkablePageLink(topLink, 
tab.getItems().get(subItem)).add(new Label(linkLabel, subItem)));
 }
 });
 }

svn commit: r1157071 - in /karaf/sandbox/pieber/karaf-webconsole/trunk: core/src/main/java/org/apache/karaf/webconsole/core/ core/src/main/resources/org/apache/karaf/webconsole/core/ core/src/main/res

[ldywicki]

Author: ldywicki
Date: Fri Aug 12 12:27:30 2011
New Revision: 1157071

URL: http://svn.apache.org/viewvc?rev=1157071view=rev
Log:
Split parts of base page to navigation and sidebar panels

Added:

karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/NavigationPanel.java
  - copied, changed from r1157052, 
karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/BasePage.java

karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/SidebarPanel.java

karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/NavigationPanel.html

karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/SidebarPanel.html

karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/ConfigurationsPage.java

karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/EventsPage.java

karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/ConfigurationsPage.html

karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/resources/org/apache/karaf/webconsole/osgi/internal/EventsPage.html
Modified:

karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/BasePage.java

karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/BasePage.html

karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/internal/DashboardPage.html

karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/HomePage.java

Modified: 
karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/BasePage.java
URL: 
http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/BasePage.java?rev=1157071r1=1157070r2=1157071view=diff
==
--- 
karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/BasePage.java
 (original)
+++ 
karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/BasePage.java
 Fri Aug 12 12:27:30 2011
@@ -1,64 +1,47 @@
 package org.apache.karaf.webconsole.core;
 
-import org.apache.wicket.extensions.markup.html.tabs.AbstractTab;
-import org.apache.wicket.extensions.markup.html.tabs.TabbedPanel;
+import java.util.Collections;
+import java.util.List;
+
 import org.apache.wicket.markup.html.CSSPackageResource;
 import org.apache.wicket.markup.html.WebPage;
 import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.link.BookmarkablePageLink;
-import org.apache.wicket.markup.html.link.PageLink;
-import org.apache.wicket.markup.html.list.ListItem;
-import org.apache.wicket.markup.html.list.ListView;
-import org.apache.wicket.markup.html.panel.Panel;
-import org.apache.wicket.model.Model;
+import org.apache.wicket.model.util.ListModel;
 import org.ops4j.pax.wicket.api.PaxWicketBean;
 
-import java.util.ArrayList;
-import java.util.LinkedList;
-import java.util.List;
-
 public class BasePage extends WebPage {
 
 @PaxWicketBean(name = tabs)
-private transient ListConsoleTab tabs;
+private ListConsoleTab tabs;
 
 public BasePage() {
 add(CSSPackageResource.getHeaderContribution(BasePage.class, 
style.css));
 
 add(new Label(footer, Apache Karaf Console));
+add(new NavigationPanel(navigationPanel, new 
ListModelConsoleTab(tabs)));
 
-add(new ListViewConsoleTab(tabs, tabs) {
-@Override
-protected void populateItem(ListItemConsoleTab item) {
-final ConsoleTab tab = item.getModelObject();
-item.add(new BookmarkablePageLink(moduleLink, 
tab.getModuleHomePage()).add(new Label(moduleLabel, tab.getLabel(;
-
-ListString subItems = new 
LinkedListString(tab.getItems().keySet());
-item.add(new ListViewString(topLinks, subItems) {
-@Override
-protected void populateItem(ListItemString item) {
-String subItem = item.getModelObject();
-item.add(new BookmarkablePageLink(topLink, 
tab.getItems().get(subItem)).add(new Label(linkLabel, subItem)));
-}
-});
-}
-});
-
-List tabPanels = new ArrayList();
-tabPanels.add(new AbstractTab(new Model(first tab)) {
-public Panel getPanel(String panelId) {
-return new TabPanel1(panelId);
-}
-});
-
-add(new TabbedPanel(tabPanels

svn commit: r1157084 - /karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/BasePage.java

[ldywicki]

Author: ldywicki
Date: Fri Aug 12 13:01:51 2011
New Revision: 1157084

URL: http://svn.apache.org/viewvc?rev=1157084view=rev
Log:
Fix missing sidebar component when Page don't have subpages

Modified:

karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/BasePage.java

Modified: 
karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/BasePage.java
URL: 
http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/BasePage.java?rev=1157084r1=1157083r2=1157084view=diff
==
--- 
karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/BasePage.java
 (original)
+++ 
karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/BasePage.java
 Fri Aug 12 13:01:51 2011
@@ -23,6 +23,8 @@ public class BasePage extends WebPage {
 ListClass subPages = getSubPages();
 if (subPages != null  subPages.size()  0) {
 add(new SidebarPanel(sidebar, getClass(), subPages));
+} else {
+add(new Label(sidebar).setRenderBodyOnly(true));
 }
 
 //List tabPanels = new ArrayList();