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 2013/01/17 00:15:55 UTC
svn commit: r1434477 - 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 Jan 16 23:15:55 2013
New Revision: 1434477
URL: http://svn.apache.org/viewvc?rev=1434477&view=rev
Log:
[KARAF-2120] - revert changes of KARAF-1305 for 2.2.x
Added:
karaf/branches/karaf-2.2.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/GroupPrincipal.java (with props)
karaf/branches/karaf-2.2.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/RolePolicy.java (with props)
karaf/branches/karaf-2.2.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/RolePrincipal.java (with props)
karaf/branches/karaf-2.2.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/UserPrincipal.java (with props)
Removed:
karaf/branches/karaf-2.2.x/jaas/boot/src/main/java/org/apache/karaf/jaas/boot/principal/GroupPrincipal.java
karaf/branches/karaf-2.2.x/jaas/boot/src/main/java/org/apache/karaf/jaas/boot/principal/RolePolicy.java
karaf/branches/karaf-2.2.x/jaas/boot/src/main/java/org/apache/karaf/jaas/boot/principal/RolePrincipal.java
karaf/branches/karaf-2.2.x/jaas/boot/src/main/java/org/apache/karaf/jaas/boot/principal/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/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/KarafJaasPasswordAuthenticator.java
karaf/branches/karaf-2.2.x/tooling/features-maven-plugin/NOTICE
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=1434477&r1=1434476&r2=1434477&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 Jan 16 23:15:55 2013
@@ -65,7 +65,6 @@ 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}}
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=1434477&r1=1434476&r2=1434477&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 Jan 16 23:15:55 2013
@@ -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=1434477&r1=1434476&r2=1434477&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 Jan 16 23:15:55 2013
@@ -14,7 +14,6 @@
*/
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=1434477&r1=1434476&r2=1434477&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 Jan 16 23:15:55 2013
@@ -16,9 +16,6 @@ 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 {
/**
Added: 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/modules/src/main/java/org/apache/karaf/jaas/modules/GroupPrincipal.java?rev=1434477&view=auto
==============================================================================
--- karaf/branches/karaf-2.2.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/GroupPrincipal.java (added)
+++ karaf/branches/karaf-2.2.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/GroupPrincipal.java Wed Jan 16 23:15:55 2013
@@ -0,0 +1,52 @@
+/*
+ * 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.
+ * under the License.
+ */
+package org.apache.karaf.jaas.modules;
+
+import java.security.Principal;
+import java.security.acl.Group;
+import java.util.Enumeration;
+import java.util.Hashtable;
+
+public class GroupPrincipal implements Group {
+
+ private String name;
+ private Hashtable<String,Principal> members = new Hashtable<String, Principal>();
+
+ public GroupPrincipal(String name) {
+ this.name = name;
+ }
+
+ public boolean addMember(Principal user) {
+ members.put(user.getName(), user);
+ return true;
+ }
+
+ public boolean removeMember(Principal user) {
+ members.remove(user.getName());
+ return true;
+ }
+
+ public boolean isMember(Principal member) {
+ return members.contains(member.getName());
+ }
+
+ public Enumeration<? extends Principal> members() {
+ return members.elements();
+ }
+
+ public String getName() {
+ return name;
+ }
+}
Propchange: karaf/branches/karaf-2.2.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/GroupPrincipal.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: 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/modules/src/main/java/org/apache/karaf/jaas/modules/RolePolicy.java?rev=1434477&view=auto
==============================================================================
--- karaf/branches/karaf-2.2.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/RolePolicy.java (added)
+++ karaf/branches/karaf-2.2.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/RolePolicy.java Wed Jan 16 23:15:55 2013
@@ -0,0 +1,75 @@
+/*
+ * 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.
+ * under the License.
+ */
+package org.apache.karaf.jaas.modules;
+
+import java.security.Principal;
+import java.security.acl.Group;
+import java.util.EnumSet;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+import javax.security.auth.Subject;
+
+public enum RolePolicy {
+
+ PREFIXED_ROLES("prefix") {
+ public void handleRoles(Subject subject,Set<Principal> principals,String discriminator) {
+ for(Principal p:principals) {
+ if(p instanceof RolePrincipal){
+ RolePrincipal rolePrincipal = new RolePrincipal(discriminator+p.getName());
+ subject.getPrincipals().add(rolePrincipal);
+ } else {
+ subject.getPrincipals().add(p);
+ }
+ }
+ }
+ },
+ GROUP_ROLES("group") {
+ public void handleRoles(Subject subject,Set<Principal> principals,String discriminator) {
+ Group group = new GroupPrincipal(discriminator);
+ for(Principal p:principals) {
+ if(p instanceof RolePrincipal) {
+ group.addMember(p);
+ } else {
+ subject.getPrincipals().add(p);
+ }
+ }
+ subject.getPrincipals().add(group);
+ }
+ };
+
+ private String value;
+
+ private static final Map<String, RolePolicy> policies = new HashMap<String, RolePolicy>();
+
+ static {
+ for (RolePolicy s : EnumSet.allOf(RolePolicy.class)) {
+ policies.put(s.getValue(), s);
+ }
+ }
+
+ private RolePolicy(String value) {
+ this.value = value;
+ }
+
+ public String getValue() {
+ return value;
+ }
+ public static RolePolicy getPolicy(String code) {
+ return policies.get(code);
+ }
+
+ public abstract void handleRoles(Subject subject,Set<Principal> principals,String discriminator);
+}
Propchange: karaf/branches/karaf-2.2.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/RolePolicy.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: 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/modules/src/main/java/org/apache/karaf/jaas/modules/RolePrincipal.java?rev=1434477&view=auto
==============================================================================
--- karaf/branches/karaf-2.2.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/RolePrincipal.java (added)
+++ karaf/branches/karaf-2.2.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/RolePrincipal.java Wed Jan 16 23:15:55 2013
@@ -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.jaas.modules;
+
+import java.security.Principal;
+
+public class RolePrincipal implements Principal {
+
+ private final String name;
+
+ public RolePrincipal(String name) {
+ assert name != null;
+ this.name = name;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (!(o instanceof RolePrincipal)) return false;
+
+ RolePrincipal that = (RolePrincipal) o;
+
+ if (name != null ? !name.equals(that.name) : that.name != null) return false;
+
+ return true;
+ }
+
+ @Override
+ public int hashCode() {
+ return name != null ? name.hashCode() : 0;
+ }
+
+ @Override
+ public String toString() {
+ return "RolePrincipal[" + name + "]";
+ }
+}
Propchange: karaf/branches/karaf-2.2.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/RolePrincipal.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: 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/modules/src/main/java/org/apache/karaf/jaas/modules/UserPrincipal.java?rev=1434477&view=auto
==============================================================================
--- karaf/branches/karaf-2.2.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/UserPrincipal.java (added)
+++ karaf/branches/karaf-2.2.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/UserPrincipal.java Wed Jan 16 23:15:55 2013
@@ -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.jaas.modules;
+
+import java.security.Principal;
+
+public class UserPrincipal implements Principal {
+
+ private final String name;
+
+ public UserPrincipal(String name) {
+ assert name != null;
+ this.name = name;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (!(o instanceof UserPrincipal)) return false;
+
+ UserPrincipal that = (UserPrincipal) o;
+
+ if (name != null ? !name.equals(that.name) : that.name != null) return false;
+
+ return true;
+ }
+
+ @Override
+ public int hashCode() {
+ return name != null ? name.hashCode() : 0;
+ }
+
+ @Override
+ public String toString() {
+ return "UserPrincipal[" + name + "]";
+ }
+}
Propchange: karaf/branches/karaf-2.2.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/UserPrincipal.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
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=1434477&r1=1434476&r2=1434477&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 Jan 16 23:15:55 2013
@@ -15,8 +15,8 @@
*/
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.RolePrincipal;
+import org.apache.karaf.jaas.modules.UserPrincipal;
import org.apache.karaf.jaas.modules.BackingEngine;
import org.apache.karaf.jaas.modules.encryption.EncryptionSupport;
import org.slf4j.Logger;
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=1434477&r1=1434476&r2=1434477&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 Jan 16 23:15:55 2013
@@ -15,8 +15,8 @@
*/
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.RolePrincipal;
+import org.apache.karaf.jaas.modules.UserPrincipal;
import org.apache.karaf.jaas.modules.AbstractKarafLoginModule;
import org.apache.karaf.jaas.modules.properties.PropertiesLoginModule;
import org.slf4j.Logger;
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=1434477&r1=1434476&r2=1434477&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 Jan 16 23:15:55 2013
@@ -15,8 +15,8 @@
*/
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.modules.RolePrincipal;
+import org.apache.karaf.jaas.modules.UserPrincipal;
import org.apache.karaf.jaas.config.KeystoreManager;
import org.apache.karaf.jaas.modules.AbstractKarafLoginModule;
import org.osgi.framework.ServiceReference;
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=1434477&r1=1434476&r2=1434477&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 Jan 16 23:15:55 2013
@@ -31,8 +31,8 @@ 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.RolePrincipal;
+import org.apache.karaf.jaas.modules.UserPrincipal;
import org.apache.karaf.jaas.modules.AbstractKarafLoginModule;
import org.osgi.service.cm.Configuration;
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=1434477&r1=1434476&r2=1434477&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 Jan 16 23:15:55 2013
@@ -15,8 +15,8 @@
*/
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.RolePrincipal;
+import org.apache.karaf.jaas.modules.UserPrincipal;
import org.apache.karaf.jaas.modules.BackingEngine;
import org.apache.karaf.jaas.modules.encryption.EncryptionSupport;
import org.apache.karaf.util.Properties;
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=1434477&r1=1434476&r2=1434477&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 Jan 16 23:15:55 2013
@@ -30,8 +30,8 @@ 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.RolePrincipal;
+import org.apache.karaf.jaas.modules.UserPrincipal;
import org.apache.karaf.jaas.modules.AbstractKarafLoginModule;
import org.apache.karaf.util.Properties;
import org.slf4j.Logger;
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=1434477&r1=1434476&r2=1434477&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 Jan 16 23:15:55 2013
@@ -77,7 +77,7 @@ public class JaasAuthenticator implement
});
loginContext.login();
if (role != null && role.length() > 0) {
- String clazz = "org.apache.karaf.jaas.boot.principal.RolePrincipal";
+ String clazz = "org.apache.karaf.jaas.modules.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=1434477&r1=1434476&r2=1434477&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/shell/console/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/shell/console/pom.xml Wed Jan 16 23:15:55 2013
@@ -54,10 +54,6 @@
</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=1434477&r1=1434476&r2=1434477&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 Jan 16 23:15:55 2013
@@ -31,7 +31,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.boot.principal.UserPrincipal;
+import org.apache.karaf.jaas.modules.UserPrincipal;
import org.fusesource.jansi.AnsiConsole;
import org.osgi.framework.BundleContext;
Modified: karaf/branches/karaf-2.2.x/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/KarafJaasPasswordAuthenticator.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/KarafJaasPasswordAuthenticator.java?rev=1434477&r1=1434476&r2=1434477&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/KarafJaasPasswordAuthenticator.java (original)
+++ karaf/branches/karaf-2.2.x/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/KarafJaasPasswordAuthenticator.java Wed Jan 16 23:15:55 2013
@@ -78,7 +78,7 @@ public class KarafJaasPasswordAuthentica
});
loginContext.login();
if (role != null && role.length() > 0) {
- String clazz = "org.apache.karaf.jaas.boot.principal.RolePrincipal";
+ String clazz = "org.apache.karaf.jaas.modules.RolePrincipal";
String name = role;
int idx = role.indexOf(':');
if (idx > 0) {
Modified: karaf/branches/karaf-2.2.x/tooling/features-maven-plugin/NOTICE
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/tooling/features-maven-plugin/NOTICE?rev=1434477&r1=1434476&r2=1434477&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/tooling/features-maven-plugin/NOTICE (original)
+++ karaf/branches/karaf-2.2.x/tooling/features-maven-plugin/NOTICE Wed Jan 16 23:15:55 2013
@@ -1,48 +1,48 @@
-Apache Karaf
-Copyright 2010-2012 The Apache Software Foundation
-
-
-I. Included Software
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-Licensed under the Apache License 2.0.
-
-This product includes software written by
-Antony Lesuisse.
-Licensed under Public Domain.
-
-
-II. Used Software
-
-This product uses software developed at
-The OSGi Alliance (http://www.osgi.org/).
-Copyright (c) OSGi Alliance (2000, 2010).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-OPS4J (http://www.ops4j.org/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-FUSE Source (http://www.fusesource.org/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-Tanuki Software (http://www.tanukisoftware.com/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-JLine (http://jline.sourceforge.net).
-Licensed under the BSD License.
-
-This product uses software developed at
-SLF4J (http://www.slf4j.org/).
-Licensed under the MIT License.
-
-This product includes software from http://www.json.org.
-Copyright (c) 2002 JSON.org
-
-
-III. License Summary
-- Apache License 2.0
+Apache Karaf
+Copyright 2010-2012 The Apache Software Foundation
+
+
+I. Included Software
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
+
+This product includes software written by
+Antony Lesuisse.
+Licensed under Public Domain.
+
+
+II. Used Software
+
+This product uses software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2010).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+OPS4J (http://www.ops4j.org/).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+FUSE Source (http://www.fusesource.org/).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+Tanuki Software (http://www.tanukisoftware.com/).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+JLine (http://jline.sourceforge.net).
+Licensed under the BSD License.
+
+This product uses software developed at
+SLF4J (http://www.slf4j.org/).
+Licensed under the MIT License.
+
+This product includes software from http://www.json.org.
+Copyright (c) 2002 JSON.org
+
+
+III. License Summary
+- Apache License 2.0
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=1434477&r1=1434476&r2=1434477&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 Jan 16 23:15:55 2013
@@ -90,7 +90,7 @@ public class JaasSecurityProvider implem
});
loginContext.login();
if (role != null && role.length() > 0) {
- String clazz = "org.apache.karaf.jaas.boot.principal.RolePrincipal";
+ String clazz = "org.apache.karaf.jaas.modules.RolePrincipal";
String name = role;
int idx = role.indexOf(':');
if (idx > 0) {