From fd14ac77906e9bf4e4900d21a6023b33607dbb74 Mon Sep 17 00:00:00 2001
From: Krzysztof Sobkowiak <Krzys.Sobkowiak@gmail.com>
Date: Tue, 15 Jan 2013 22:10:21 +0100
Subject: [PATCH] Upgrade to Karaf 2.3.0 from 2.2.8

---
 core/pom.xml                                       |    4 ++++
 .../core/security/KarafJaasWebSession.java         |    2 +-
 .../repository/RepositoriesActionPanel.java        |   12 +++++++-----
 pom.xml                                            |    7 ++++++-
 4 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/core/pom.xml b/core/pom.xml
index cc44239..b7b6ae7 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -49,6 +49,10 @@
             <groupId>org.apache.karaf.jaas</groupId>
             <artifactId>org.apache.karaf.jaas.modules</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.jaas</groupId>
+            <artifactId>org.apache.karaf.jaas.boot</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
diff --git a/core/src/main/java/org/apache/karaf/webconsole/core/security/KarafJaasWebSession.java b/core/src/main/java/org/apache/karaf/webconsole/core/security/KarafJaasWebSession.java
index b62ef75..dcba10e 100644
--- a/core/src/main/java/org/apache/karaf/webconsole/core/security/KarafJaasWebSession.java
+++ b/core/src/main/java/org/apache/karaf/webconsole/core/security/KarafJaasWebSession.java
@@ -18,7 +18,7 @@ package org.apache.karaf.webconsole.core.security;
 
 import java.security.Principal;
 
-import org.apache.karaf.jaas.modules.RolePrincipal;
+import org.apache.karaf.jaas.boot.principal.RolePrincipal;
 import org.apache.wicket.request.Request;
 
 /**
diff --git a/karaf/feature/src/main/java/org/apache/karaf/webconsole/karaf/feature/repository/RepositoriesActionPanel.java b/karaf/feature/src/main/java/org/apache/karaf/webconsole/karaf/feature/repository/RepositoriesActionPanel.java
index 297baea..cfe390f 100644
--- a/karaf/feature/src/main/java/org/apache/karaf/webconsole/karaf/feature/repository/RepositoriesActionPanel.java
+++ b/karaf/feature/src/main/java/org/apache/karaf/webconsole/karaf/feature/repository/RepositoriesActionPanel.java
@@ -50,11 +50,13 @@ public class RepositoriesActionPanel extends ActionsPanel<Repository> {
         Link remove = new Link(linkId) {
             @Override
             public void onClick() {
-                Repository object = (Repository) RepositoriesActionPanel.this.getDefaultModelObject();
-
-                featuresService.removeRepository(object.getURI());
-
-                Session.get().info("Repository " + object.getURI() + " was removed");
+                Repository object = (Repository)RepositoriesActionPanel.this.getDefaultModelObject();
+                try {
+                    featuresService.removeRepository(object.getURI());
+                    Session.get().info("Repository " + object.getURI() + " was removed");
+                } catch (Exception e) {
+                    Session.get().error("Cannot remove repository " + object.getURI());
+                }
             }
         };
         remove.add(new Label(labelId, "Remove"));
diff --git a/pom.xml b/pom.xml
index 73312ba..7a5df6a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,7 +56,7 @@
         <felix-http.version>2.2.0</felix-http.version>
         <jetty-plugin.version>7.5.4.v20111024</jetty-plugin.version>
         <junit.version>4.8.2</junit.version>
-        <karaf.version>2.2.8</karaf.version>
+        <karaf.version>2.3.0</karaf.version>
         <log4j.version>1.2.14</log4j.version>
         <maven-bundle.version>2.3.7</maven-bundle.version>
         <osgi.version>4.2.0</osgi.version>
@@ -363,6 +363,11 @@
                 <version>${karaf.version}</version>
             </dependency>
             <dependency>
+                <groupId>org.apache.karaf.jaas</groupId>
+                <artifactId>org.apache.karaf.jaas.boot</artifactId>
+                <version>${karaf.version}</version>
+            </dependency>
+            <dependency>
                 <groupId>org.apache.karaf</groupId>
                 <artifactId>karaf</artifactId>
                 <version>${karaf.version}</version>
-- 
1.7.9.5