You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by an...@apache.org on 2012/09/13 01:12:14 UTC
svn commit: r1384156 - in /karaf/branches/karaf-2.2.x:
assemblies/apache-karaf/src/main/filtered-resources/etc/
jaas/boot/src/main/java/org/apache/karaf/jaas/boot/principal/
jaas/command/src/main/java/org/apache/karaf/jaas/command/
jaas/modules/src/mai...
Author: anierbeck
Date: Wed Sep 12 23:12:13 2012
New Revision: 1384156
URL: http://svn.apache.org/viewvc?rev=1384156&view=rev
Log:
[KARAF-1305] - Error with Basic HTTP Authentication when using karaf realm
backported from trunk
Added:
karaf/branches/karaf-2.2.x/jaas/boot/src/main/java/org/apache/karaf/jaas/boot/principal/
karaf/branches/karaf-2.2.x/jaas/boot/src/main/java/org/apache/karaf/jaas/boot/principal/GroupPrincipal.java
- copied, changed from r1374865, karaf/branches/karaf-2.2.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/GroupPrincipal.java
karaf/branches/karaf-2.2.x/jaas/boot/src/main/java/org/apache/karaf/jaas/boot/principal/RolePolicy.java
- copied, changed from r1374865, karaf/branches/karaf-2.2.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/RolePolicy.java
karaf/branches/karaf-2.2.x/jaas/boot/src/main/java/org/apache/karaf/jaas/boot/principal/RolePrincipal.java
- copied, changed from r1374865, karaf/branches/karaf-2.2.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/RolePrincipal.java
karaf/branches/karaf-2.2.x/jaas/boot/src/main/java/org/apache/karaf/jaas/boot/principal/UserPrincipal.java
- copied, changed from r1374865, karaf/branches/karaf-2.2.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/UserPrincipal.java
Removed:
karaf/branches/karaf-2.2.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/GroupPrincipal.java
karaf/branches/karaf-2.2.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/RolePolicy.java
karaf/branches/karaf-2.2.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/RolePrincipal.java
karaf/branches/karaf-2.2.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/UserPrincipal.java
Modified:
karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/etc/config.properties
karaf/branches/karaf-2.2.x/jaas/command/src/main/java/org/apache/karaf/jaas/command/ListUsersCommand.java
karaf/branches/karaf-2.2.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/AbstractKarafLoginModule.java
karaf/branches/karaf-2.2.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/BackingEngine.java
karaf/branches/karaf-2.2.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/jdbc/JDBCBackingEngine.java
karaf/branches/karaf-2.2.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/jdbc/JDBCLoginModule.java
karaf/branches/karaf-2.2.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/LDAPLoginModule.java
karaf/branches/karaf-2.2.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/osgi/OsgiConfigLoginModule.java
karaf/branches/karaf-2.2.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesBackingEngine.java
karaf/branches/karaf-2.2.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesLoginModule.java
karaf/branches/karaf-2.2.x/management/server/src/main/java/org/apache/karaf/management/JaasAuthenticator.java
karaf/branches/karaf-2.2.x/shell/console/pom.xml
karaf/branches/karaf-2.2.x/shell/console/src/main/java/org/apache/karaf/shell/console/jline/ConsoleFactory.java
karaf/branches/karaf-2.2.x/webconsole/branding/src/main/java/org/apache/karaf/webconsole/JaasSecurityProvider.java
Modified: karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/etc/config.properties
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/etc/config.properties?rev=1384156&r1=1384155&r2=1384156&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/etc/config.properties (original)
+++ karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/etc/config.properties Wed Sep 12 23:12:13 2012
@@ -65,6 +65,7 @@ org.osgi.framework.system.packages=org.o
org.osgi.service.url; version=1.0.0, \
org.osgi.util.tracker; version=1.4.0, \
org.apache.karaf.jaas.boot; version=${karaf.osgi.version}, \
+ org.apache.karaf.jaas.boot.principal; version=${karaf.osgi.version}, \
org.apache.karaf.version; version=${karaf.osgi.version}, \
${jre-${java.specification.version}}
Copied: karaf/branches/karaf-2.2.x/jaas/boot/src/main/java/org/apache/karaf/jaas/boot/principal/GroupPrincipal.java (from r1374865, karaf/branches/karaf-2.2.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/GroupPrincipal.java)
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/jaas/boot/src/main/java/org/apache/karaf/jaas/boot/principal/GroupPrincipal.java?p2=karaf/branches/karaf-2.2.x/jaas/boot/src/main/java/org/apache/karaf/jaas/boot/principal/GroupPrincipal.java&p1=karaf/branches/karaf-2.2.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/GroupPrincipal.java&r1=1374865&r2=1384156&rev=1384156&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/GroupPrincipal.java (original)
+++ karaf/branches/karaf-2.2.x/jaas/boot/src/main/java/org/apache/karaf/jaas/boot/principal/GroupPrincipal.java Wed Sep 12 23:12:13 2012
@@ -12,7 +12,7 @@
* limitations under the License.
* under the License.
*/
-package org.apache.karaf.jaas.modules;
+package org.apache.karaf.jaas.boot.principal;
import java.security.Principal;
import java.security.acl.Group;
Copied: karaf/branches/karaf-2.2.x/jaas/boot/src/main/java/org/apache/karaf/jaas/boot/principal/RolePolicy.java (from r1374865, karaf/branches/karaf-2.2.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/RolePolicy.java)
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/jaas/boot/src/main/java/org/apache/karaf/jaas/boot/principal/RolePolicy.java?p2=karaf/branches/karaf-2.2.x/jaas/boot/src/main/java/org/apache/karaf/jaas/boot/principal/RolePolicy.java&p1=karaf/branches/karaf-2.2.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/RolePolicy.java&r1=1374865&r2=1384156&rev=1384156&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/RolePolicy.java (original)
+++ karaf/branches/karaf-2.2.x/jaas/boot/src/main/java/org/apache/karaf/jaas/boot/principal/RolePolicy.java Wed Sep 12 23:12:13 2012
@@ -12,7 +12,7 @@
* limitations under the License.
* under the License.
*/
-package org.apache.karaf.jaas.modules;
+package org.apache.karaf.jaas.boot.principal;
import java.security.Principal;
import java.security.acl.Group;
Copied: karaf/branches/karaf-2.2.x/jaas/boot/src/main/java/org/apache/karaf/jaas/boot/principal/RolePrincipal.java (from r1374865, karaf/branches/karaf-2.2.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/RolePrincipal.java)
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/jaas/boot/src/main/java/org/apache/karaf/jaas/boot/principal/RolePrincipal.java?p2=karaf/branches/karaf-2.2.x/jaas/boot/src/main/java/org/apache/karaf/jaas/boot/principal/RolePrincipal.java&p1=karaf/branches/karaf-2.2.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/RolePrincipal.java&r1=1374865&r2=1384156&rev=1384156&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/RolePrincipal.java (original)
+++ karaf/branches/karaf-2.2.x/jaas/boot/src/main/java/org/apache/karaf/jaas/boot/principal/RolePrincipal.java Wed Sep 12 23:12:13 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.jaas.modules;
+package org.apache.karaf.jaas.boot.principal;
import java.security.Principal;
Copied: karaf/branches/karaf-2.2.x/jaas/boot/src/main/java/org/apache/karaf/jaas/boot/principal/UserPrincipal.java (from r1374865, karaf/branches/karaf-2.2.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/UserPrincipal.java)
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/jaas/boot/src/main/java/org/apache/karaf/jaas/boot/principal/UserPrincipal.java?p2=karaf/branches/karaf-2.2.x/jaas/boot/src/main/java/org/apache/karaf/jaas/boot/principal/UserPrincipal.java&p1=karaf/branches/karaf-2.2.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/UserPrincipal.java&r1=1374865&r2=1384156&rev=1384156&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/UserPrincipal.java (original)
+++ karaf/branches/karaf-2.2.x/jaas/boot/src/main/java/org/apache/karaf/jaas/boot/principal/UserPrincipal.java Wed Sep 12 23:12:13 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.jaas.modules;
+package org.apache.karaf.jaas.boot.principal;
import java.security.Principal;
Modified: karaf/branches/karaf-2.2.x/jaas/command/src/main/java/org/apache/karaf/jaas/command/ListUsersCommand.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/jaas/command/src/main/java/org/apache/karaf/jaas/command/ListUsersCommand.java?rev=1384156&r1=1384155&r2=1384156&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/jaas/command/src/main/java/org/apache/karaf/jaas/command/ListUsersCommand.java (original)
+++ karaf/branches/karaf-2.2.x/jaas/command/src/main/java/org/apache/karaf/jaas/command/ListUsersCommand.java Wed Sep 12 23:12:13 2012
@@ -19,10 +19,10 @@ import java.util.List;
import javax.security.auth.login.AppConfigurationEntry;
import org.apache.felix.gogo.commands.Command;
+import org.apache.karaf.jaas.boot.principal.RolePrincipal;
+import org.apache.karaf.jaas.boot.principal.UserPrincipal;
import org.apache.karaf.jaas.config.JaasRealm;
import org.apache.karaf.jaas.modules.BackingEngine;
-import org.apache.karaf.jaas.modules.RolePrincipal;
-import org.apache.karaf.jaas.modules.UserPrincipal;
@Command(scope = "jaas", name = "users", description = "List the users of the active realm/module")
public class ListUsersCommand extends JaasCommandSupport {
Modified: karaf/branches/karaf-2.2.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/AbstractKarafLoginModule.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/AbstractKarafLoginModule.java?rev=1384156&r1=1384155&r2=1384156&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/AbstractKarafLoginModule.java (original)
+++ karaf/branches/karaf-2.2.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/AbstractKarafLoginModule.java Wed Sep 12 23:12:13 2012
@@ -14,6 +14,7 @@
*/
package org.apache.karaf.jaas.modules;
+import org.apache.karaf.jaas.boot.principal.RolePolicy;
import org.apache.karaf.jaas.modules.encryption.EncryptionSupport;
import org.osgi.framework.BundleContext;
Modified: karaf/branches/karaf-2.2.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/BackingEngine.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/BackingEngine.java?rev=1384156&r1=1384155&r2=1384156&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/BackingEngine.java (original)
+++ karaf/branches/karaf-2.2.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/BackingEngine.java Wed Sep 12 23:12:13 2012
@@ -16,6 +16,9 @@ package org.apache.karaf.jaas.modules;
import java.util.List;
+import org.apache.karaf.jaas.boot.principal.RolePrincipal;
+import org.apache.karaf.jaas.boot.principal.UserPrincipal;
+
public interface BackingEngine {
/**
Modified: karaf/branches/karaf-2.2.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/jdbc/JDBCBackingEngine.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/jdbc/JDBCBackingEngine.java?rev=1384156&r1=1384155&r2=1384156&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/jdbc/JDBCBackingEngine.java (original)
+++ karaf/branches/karaf-2.2.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/jdbc/JDBCBackingEngine.java Wed Sep 12 23:12:13 2012
@@ -15,9 +15,9 @@
*/
package org.apache.karaf.jaas.modules.jdbc;
+import org.apache.karaf.jaas.boot.principal.RolePrincipal;
+import org.apache.karaf.jaas.boot.principal.UserPrincipal;
import org.apache.karaf.jaas.modules.BackingEngine;
-import org.apache.karaf.jaas.modules.RolePrincipal;
-import org.apache.karaf.jaas.modules.UserPrincipal;
import org.apache.karaf.jaas.modules.encryption.EncryptionSupport;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: karaf/branches/karaf-2.2.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/jdbc/JDBCLoginModule.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/jdbc/JDBCLoginModule.java?rev=1384156&r1=1384155&r2=1384156&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/jdbc/JDBCLoginModule.java (original)
+++ karaf/branches/karaf-2.2.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/jdbc/JDBCLoginModule.java Wed Sep 12 23:12:13 2012
@@ -15,9 +15,9 @@
*/
package org.apache.karaf.jaas.modules.jdbc;
+import org.apache.karaf.jaas.boot.principal.RolePrincipal;
+import org.apache.karaf.jaas.boot.principal.UserPrincipal;
import org.apache.karaf.jaas.modules.AbstractKarafLoginModule;
-import org.apache.karaf.jaas.modules.RolePrincipal;
-import org.apache.karaf.jaas.modules.UserPrincipal;
import org.apache.karaf.jaas.modules.properties.PropertiesLoginModule;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: karaf/branches/karaf-2.2.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/LDAPLoginModule.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/LDAPLoginModule.java?rev=1384156&r1=1384155&r2=1384156&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/LDAPLoginModule.java (original)
+++ karaf/branches/karaf-2.2.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/LDAPLoginModule.java Wed Sep 12 23:12:13 2012
@@ -15,10 +15,10 @@
*/
package org.apache.karaf.jaas.modules.ldap;
+import org.apache.karaf.jaas.boot.principal.RolePrincipal;
+import org.apache.karaf.jaas.boot.principal.UserPrincipal;
import org.apache.karaf.jaas.config.KeystoreManager;
import org.apache.karaf.jaas.modules.AbstractKarafLoginModule;
-import org.apache.karaf.jaas.modules.RolePrincipal;
-import org.apache.karaf.jaas.modules.UserPrincipal;
import org.osgi.framework.ServiceReference;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: karaf/branches/karaf-2.2.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/osgi/OsgiConfigLoginModule.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/osgi/OsgiConfigLoginModule.java?rev=1384156&r1=1384155&r2=1384156&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/osgi/OsgiConfigLoginModule.java (original)
+++ karaf/branches/karaf-2.2.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/osgi/OsgiConfigLoginModule.java Wed Sep 12 23:12:13 2012
@@ -31,10 +31,10 @@ import javax.security.auth.callback.Unsu
import javax.security.auth.login.FailedLoginException;
import javax.security.auth.login.LoginException;
+import org.apache.karaf.jaas.boot.principal.RolePrincipal;
+import org.apache.karaf.jaas.boot.principal.UserPrincipal;
import org.apache.karaf.jaas.modules.AbstractKarafLoginModule;
-import org.apache.karaf.jaas.modules.RolePrincipal;
-import org.apache.karaf.jaas.modules.UserPrincipal;
import org.osgi.service.cm.Configuration;
public class OsgiConfigLoginModule extends AbstractKarafLoginModule {
Modified: karaf/branches/karaf-2.2.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesBackingEngine.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesBackingEngine.java?rev=1384156&r1=1384155&r2=1384156&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesBackingEngine.java (original)
+++ karaf/branches/karaf-2.2.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesBackingEngine.java Wed Sep 12 23:12:13 2012
@@ -15,9 +15,9 @@
*/
package org.apache.karaf.jaas.modules.properties;
+import org.apache.karaf.jaas.boot.principal.RolePrincipal;
+import org.apache.karaf.jaas.boot.principal.UserPrincipal;
import org.apache.karaf.jaas.modules.BackingEngine;
-import org.apache.karaf.jaas.modules.RolePrincipal;
-import org.apache.karaf.jaas.modules.UserPrincipal;
import org.apache.karaf.jaas.modules.encryption.EncryptionSupport;
import org.apache.karaf.util.Properties;
import org.slf4j.Logger;
Modified: karaf/branches/karaf-2.2.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesLoginModule.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesLoginModule.java?rev=1384156&r1=1384155&r2=1384156&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesLoginModule.java (original)
+++ karaf/branches/karaf-2.2.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesLoginModule.java Wed Sep 12 23:12:13 2012
@@ -30,9 +30,9 @@ import javax.security.auth.callback.Unsu
import javax.security.auth.login.FailedLoginException;
import javax.security.auth.login.LoginException;
+import org.apache.karaf.jaas.boot.principal.RolePrincipal;
+import org.apache.karaf.jaas.boot.principal.UserPrincipal;
import org.apache.karaf.jaas.modules.AbstractKarafLoginModule;
-import org.apache.karaf.jaas.modules.RolePrincipal;
-import org.apache.karaf.jaas.modules.UserPrincipal;
import org.apache.karaf.util.Properties;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: karaf/branches/karaf-2.2.x/management/server/src/main/java/org/apache/karaf/management/JaasAuthenticator.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/management/server/src/main/java/org/apache/karaf/management/JaasAuthenticator.java?rev=1384156&r1=1384155&r2=1384156&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/management/server/src/main/java/org/apache/karaf/management/JaasAuthenticator.java (original)
+++ karaf/branches/karaf-2.2.x/management/server/src/main/java/org/apache/karaf/management/JaasAuthenticator.java Wed Sep 12 23:12:13 2012
@@ -77,7 +77,7 @@ public class JaasAuthenticator implement
});
loginContext.login();
if (role != null && role.length() > 0) {
- String clazz = "org.apache.karaf.jaas.modules.RolePrincipal";
+ String clazz = "org.apache.karaf.jaas.boot.principal.RolePrincipal";
String name = role;
int idx = role.indexOf(':');
if (idx > 0) {
Modified: karaf/branches/karaf-2.2.x/shell/console/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/shell/console/pom.xml?rev=1384156&r1=1384155&r2=1384156&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/shell/console/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/shell/console/pom.xml Wed Sep 12 23:12:13 2012
@@ -1,23 +1,17 @@
<?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">
+<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.
- -->
+ <!-- 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. -->
<modelVersion>4.0.0</modelVersion>
@@ -61,6 +55,10 @@
</dependency>
<dependency>
<groupId>org.apache.karaf.jaas</groupId>
+ <artifactId>org.apache.karaf.jaas.boot</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.karaf.jaas</groupId>
<artifactId>org.apache.karaf.jaas.modules</artifactId>
</dependency>
<dependency>
Modified: karaf/branches/karaf-2.2.x/shell/console/src/main/java/org/apache/karaf/shell/console/jline/ConsoleFactory.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/shell/console/src/main/java/org/apache/karaf/shell/console/jline/ConsoleFactory.java?rev=1384156&r1=1384155&r2=1384156&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/shell/console/src/main/java/org/apache/karaf/shell/console/jline/ConsoleFactory.java (original)
+++ karaf/branches/karaf-2.2.x/shell/console/src/main/java/org/apache/karaf/shell/console/jline/ConsoleFactory.java Wed Sep 12 23:12:13 2012
@@ -30,7 +30,7 @@ import jline.Terminal;
import org.apache.felix.service.command.CommandProcessor;
import org.apache.felix.service.command.CommandSession;
import org.apache.felix.service.command.Function;
-import org.apache.karaf.jaas.modules.UserPrincipal;
+import org.apache.karaf.jaas.boot.principal.UserPrincipal;
import org.fusesource.jansi.AnsiConsole;
import org.osgi.framework.BundleContext;
Modified: karaf/branches/karaf-2.2.x/webconsole/branding/src/main/java/org/apache/karaf/webconsole/JaasSecurityProvider.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/webconsole/branding/src/main/java/org/apache/karaf/webconsole/JaasSecurityProvider.java?rev=1384156&r1=1384155&r2=1384156&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/webconsole/branding/src/main/java/org/apache/karaf/webconsole/JaasSecurityProvider.java (original)
+++ karaf/branches/karaf-2.2.x/webconsole/branding/src/main/java/org/apache/karaf/webconsole/JaasSecurityProvider.java Wed Sep 12 23:12:13 2012
@@ -90,7 +90,7 @@ public class JaasSecurityProvider implem
});
loginContext.login();
if (role != null && role.length() > 0) {
- String clazz = "org.apache.karaf.jaas.modules.RolePrincipal";
+ String clazz = "org.apache.karaf.jaas.boot.principal.RolePrincipal";
String name = role;
int idx = role.indexOf(':');
if (idx > 0) {