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/04/02 23:36:31 UTC
svn commit: r1308585 - in /karaf/trunk:
assemblies/apache-karaf/src/main/resources/extra/
assemblies/features/framework/src/main/filtered-resources/resources/etc/
jaas/boot/src/main/java/org/apache/karaf/jaas/boot/principal/
jaas/command/src/main/java/...
Author: anierbeck
Date: Mon Apr 2 21:36:30 2012
New Revision: 1308585
URL: http://svn.apache.org/viewvc?rev=1308585&view=rev
Log:
[KARAF-1305] - Error with Basic HTTP Authentication when using karaf realm
Added:
karaf/trunk/jaas/boot/src/main/java/org/apache/karaf/jaas/boot/principal/
karaf/trunk/jaas/boot/src/main/java/org/apache/karaf/jaas/boot/principal/GroupPrincipal.java
- copied, changed from r1307593, karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/GroupPrincipal.java
karaf/trunk/jaas/boot/src/main/java/org/apache/karaf/jaas/boot/principal/RolePolicy.java
- copied, changed from r1307593, karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/RolePolicy.java
karaf/trunk/jaas/boot/src/main/java/org/apache/karaf/jaas/boot/principal/RolePrincipal.java
- copied, changed from r1307593, karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/RolePrincipal.java
karaf/trunk/jaas/boot/src/main/java/org/apache/karaf/jaas/boot/principal/UserPrincipal.java
- copied, changed from r1307593, karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/UserPrincipal.java
Removed:
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/GroupPrincipal.java
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/RolePolicy.java
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/RolePrincipal.java
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/UserPrincipal.java
Modified:
karaf/trunk/assemblies/apache-karaf/src/main/resources/extra/jetty.xml
karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/etc/config.properties
karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/ListUsersCommand.java
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/AbstractKarafLoginModule.java
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/BackingEngine.java
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/jdbc/JDBCBackingEngine.java
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/jdbc/JDBCLoginModule.java
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/LDAPLoginModule.java
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/osgi/OsgiConfigLoginModule.java
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesBackingEngine.java
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesLoginModule.java
karaf/trunk/management/server/src/main/java/org/apache/karaf/management/JaasAuthenticator.java
karaf/trunk/shell/console/pom.xml
karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/jline/ConsoleFactory.java
karaf/trunk/webconsole/branding/src/main/java/org/apache/karaf/webconsole/JaasSecurityProvider.java
Modified: karaf/trunk/assemblies/apache-karaf/src/main/resources/extra/jetty.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/apache-karaf/src/main/resources/extra/jetty.xml?rev=1308585&r1=1308584&r2=1308585&view=diff
==============================================================================
--- karaf/trunk/assemblies/apache-karaf/src/main/resources/extra/jetty.xml (original)
+++ karaf/trunk/assemblies/apache-karaf/src/main/resources/extra/jetty.xml Mon Apr 2 21:36:30 2012
@@ -5,61 +5,66 @@ DTD Configure//EN" "http://jetty.mortbay
<Configure class="org.eclipse.jetty.server.Server">
<!-- =========================================================== -->
- <!-- Set connectors -->
+ <!-- Set connectors -->
<!-- =========================================================== -->
- <!-- One of each type! -->
+ <!-- One of each type! -->
<!-- =========================================================== -->
- <!-- Use this connector for many frequently idle connections
- and for threadless continuations.
- -->
+ <!-- Use this connector for many frequently idle connections and for
+ threadless continuations. -->
<Call name="addConnector">
- <Arg>
- <New class="org.eclipse.jetty.server.nio.SelectChannelConnector">
- <Set name="host"><Property name="jetty.host" /></Set>
- <Set name="port"><Property name="jetty.port" default="8181"/></Set>
- <Set name="maxIdleTime">300000</Set>
- <Set name="Acceptors">2</Set>
- <Set name="statsOn">false</Set>
- <Set name="confidentialPort">8443</Set>
- <Set name="lowResourcesConnections">20000</Set>
- <Set name="lowResourcesMaxIdleTime">5000</Set>
- </New>
- </Arg>
+ <Arg>
+ <New class="org.eclipse.jetty.server.nio.SelectChannelConnector">
+ <Set name="host">
+ <Property name="jetty.host" />
+ </Set>
+ <Set name="port">
+ <Property name="jetty.port" default="8181" />
+ </Set>
+ <Set name="maxIdleTime">300000</Set>
+ <Set name="Acceptors">2</Set>
+ <Set name="statsOn">false</Set>
+ <Set name="confidentialPort">8443</Set>
+ <Set name="lowResourcesConnections">20000</Set>
+ <Set name="lowResourcesMaxIdleTime">5000</Set>
+ </New>
+ </Arg>
</Call>
- <!-- =========================================================== -->
- <!-- Configure Authentication Realms -->
- <!-- Realms may be configured for the entire server here, or -->
- <!-- they can be configured for a specific web app in a context -->
- <!-- configuration (see $(jetty.home)/contexts/test.xml for an -->
- <!-- example). -->
+ <!-- =========================================================== -->
+ <!-- Configure Authentication Realms -->
+ <!-- Realms may be configured for the entire server here, or -->
+ <!-- they can be configured for a specific web app in a context -->
+ <!-- configuration (see $(jetty.home)/contexts/test.xml for an -->
+ <!-- example). -->
<!-- =========================================================== -->
<Call name="addBean">
- <Arg>
- <New class="org.eclipse.jetty.plus.jaas.JAASLoginService">
- <Set name="name">karaf</Set>
- <Set name="loginModuleName">karaf</Set>
- <Set name="roleClassNames">
- <Array type="java.lang.String">
- <Item>org.apache.karaf.jaas.modules.RolePrincipal</Item>
- </Array>
- </Set>
- </New>
- </Arg>
+ <Arg>
+ <New class="org.eclipse.jetty.plus.jaas.JAASLoginService">
+ <Set name="name">karaf</Set>
+ <Set name="loginModuleName">karaf</Set>
+ <Set name="roleClassNames">
+ <Array type="java.lang.String">
+ <Item>org.apache.karaf.jaas.boot.principal.RolePrincipal
+ </Item>
+ </Array>
+ </Set>
+ </New>
+ </Arg>
</Call>
<Call name="addBean">
- <Arg>
- <New class="org.eclipse.jetty.plus.jaas.JAASLoginService">
- <Set name="name">default</Set>
- <Set name="loginModuleName">karaf</Set>
- <Set name="roleClassNames">
- <Array type="java.lang.String">
- <Item>org.apache.karaf.jaas.modules.RolePrincipal</Item>
- </Array>
- </Set>
- </New>
- </Arg>
+ <Arg>
+ <New class="org.eclipse.jetty.plus.jaas.JAASLoginService">
+ <Set name="name">default</Set>
+ <Set name="loginModuleName">karaf</Set>
+ <Set name="roleClassNames">
+ <Array type="java.lang.String">
+ <Item>org.apache.karaf.jaas.boot.principal.RolePrincipal
+ </Item>
+ </Array>
+ </Set>
+ </New>
+ </Arg>
</Call>
</Configure>
Modified: karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/etc/config.properties
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/etc/config.properties?rev=1308585&r1=1308584&r2=1308585&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/etc/config.properties (original)
+++ karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/etc/config.properties Mon Apr 2 21:36:30 2012
@@ -69,6 +69,7 @@ org.osgi.framework.system.packages= \
org.osgi.service.startlevel;uses:="org.osgi.framework";version="1.1", \
org.osgi.util.tracker;uses:="org.osgi.framework";version="1.5", \
org.apache.karaf.jaas.boot;version="${karaf.osgi.version}", \
+ org.apache.karaf.jaas.boot.principal="${karaf.osgi.version}", \
org.apache.karaf.version;version="${karaf.osgi.version}", \
org.apache.karaf.info;version="${karaf.osgi.version}", \
${jre-${java.specification.version}}
@@ -77,7 +78,7 @@ org.osgi.framework.system.packages= \
# org.osgi.framework.system.packages.extra=
# javax.transaction is needed to avoid class loader constraint violation when using javax.sql
-org.osgi.framework.bootdelegation=org.apache.karaf.jaas.boot,sun.*,com.sun.*,javax.transaction,javax.transaction.*
+org.osgi.framework.bootdelegation=org.apache.karaf.jaas.boot,org.apache.karaf.jaas.boot.principal,sun.*,com.sun.*,javax.transaction,javax.transaction.*
# OSGi Execution Environment
org.osgi.framework.executionenvironment=J2SE-1.7,JavaSE-1.7,J2SE-1.6,JavaSE-1.6,J2SE-1.5,JavaSE-1.5,J2SE-1.4,JavaSE-1.4,J2SE-1.3,JavaSE-1.3,J2SE-1.2,,JavaSE-1.2,CDC-1.1/Foundation-1.1,CDC-1.0/Foundation-1.0,J2ME,OSGi/Minimum-1.1,OSGi/Minimum-1.0
Copied: karaf/trunk/jaas/boot/src/main/java/org/apache/karaf/jaas/boot/principal/GroupPrincipal.java (from r1307593, karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/GroupPrincipal.java)
URL: http://svn.apache.org/viewvc/karaf/trunk/jaas/boot/src/main/java/org/apache/karaf/jaas/boot/principal/GroupPrincipal.java?p2=karaf/trunk/jaas/boot/src/main/java/org/apache/karaf/jaas/boot/principal/GroupPrincipal.java&p1=karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/GroupPrincipal.java&r1=1307593&r2=1308585&rev=1308585&view=diff
==============================================================================
--- karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/GroupPrincipal.java (original)
+++ karaf/trunk/jaas/boot/src/main/java/org/apache/karaf/jaas/boot/principal/GroupPrincipal.java Mon Apr 2 21:36:30 2012
@@ -13,7 +13,7 @@
* 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/trunk/jaas/boot/src/main/java/org/apache/karaf/jaas/boot/principal/RolePolicy.java (from r1307593, karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/RolePolicy.java)
URL: http://svn.apache.org/viewvc/karaf/trunk/jaas/boot/src/main/java/org/apache/karaf/jaas/boot/principal/RolePolicy.java?p2=karaf/trunk/jaas/boot/src/main/java/org/apache/karaf/jaas/boot/principal/RolePolicy.java&p1=karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/RolePolicy.java&r1=1307593&r2=1308585&rev=1308585&view=diff
==============================================================================
--- karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/RolePolicy.java (original)
+++ karaf/trunk/jaas/boot/src/main/java/org/apache/karaf/jaas/boot/principal/RolePolicy.java Mon Apr 2 21:36:30 2012
@@ -13,7 +13,7 @@
* 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/trunk/jaas/boot/src/main/java/org/apache/karaf/jaas/boot/principal/RolePrincipal.java (from r1307593, karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/RolePrincipal.java)
URL: http://svn.apache.org/viewvc/karaf/trunk/jaas/boot/src/main/java/org/apache/karaf/jaas/boot/principal/RolePrincipal.java?p2=karaf/trunk/jaas/boot/src/main/java/org/apache/karaf/jaas/boot/principal/RolePrincipal.java&p1=karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/RolePrincipal.java&r1=1307593&r2=1308585&rev=1308585&view=diff
==============================================================================
--- karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/RolePrincipal.java (original)
+++ karaf/trunk/jaas/boot/src/main/java/org/apache/karaf/jaas/boot/principal/RolePrincipal.java Mon Apr 2 21:36:30 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/trunk/jaas/boot/src/main/java/org/apache/karaf/jaas/boot/principal/UserPrincipal.java (from r1307593, karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/UserPrincipal.java)
URL: http://svn.apache.org/viewvc/karaf/trunk/jaas/boot/src/main/java/org/apache/karaf/jaas/boot/principal/UserPrincipal.java?p2=karaf/trunk/jaas/boot/src/main/java/org/apache/karaf/jaas/boot/principal/UserPrincipal.java&p1=karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/UserPrincipal.java&r1=1307593&r2=1308585&rev=1308585&view=diff
==============================================================================
--- karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/UserPrincipal.java (original)
+++ karaf/trunk/jaas/boot/src/main/java/org/apache/karaf/jaas/boot/principal/UserPrincipal.java Mon Apr 2 21:36:30 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/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/ListUsersCommand.java
URL: http://svn.apache.org/viewvc/karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/ListUsersCommand.java?rev=1308585&r1=1308584&r2=1308585&view=diff
==============================================================================
--- karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/ListUsersCommand.java (original)
+++ karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/ListUsersCommand.java Mon Apr 2 21:36:30 2012
@@ -16,10 +16,10 @@
package org.apache.karaf.jaas.command;
import org.apache.karaf.shell.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;
import javax.security.auth.login.AppConfigurationEntry;
import java.util.List;
Modified: karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/AbstractKarafLoginModule.java
URL: http://svn.apache.org/viewvc/karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/AbstractKarafLoginModule.java?rev=1308585&r1=1308584&r2=1308585&view=diff
==============================================================================
--- karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/AbstractKarafLoginModule.java (original)
+++ karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/AbstractKarafLoginModule.java Mon Apr 2 21:36:30 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/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/BackingEngine.java
URL: http://svn.apache.org/viewvc/karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/BackingEngine.java?rev=1308585&r1=1308584&r2=1308585&view=diff
==============================================================================
--- karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/BackingEngine.java (original)
+++ karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/BackingEngine.java Mon Apr 2 21:36:30 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/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/jdbc/JDBCBackingEngine.java
URL: http://svn.apache.org/viewvc/karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/jdbc/JDBCBackingEngine.java?rev=1308585&r1=1308584&r2=1308585&view=diff
==============================================================================
--- karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/jdbc/JDBCBackingEngine.java (original)
+++ karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/jdbc/JDBCBackingEngine.java Mon Apr 2 21:36:30 2012
@@ -16,9 +16,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/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/jdbc/JDBCLoginModule.java
URL: http://svn.apache.org/viewvc/karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/jdbc/JDBCLoginModule.java?rev=1308585&r1=1308584&r2=1308585&view=diff
==============================================================================
--- karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/jdbc/JDBCLoginModule.java (original)
+++ karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/jdbc/JDBCLoginModule.java Mon Apr 2 21:36:30 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/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/LDAPLoginModule.java
URL: http://svn.apache.org/viewvc/karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/LDAPLoginModule.java?rev=1308585&r1=1308584&r2=1308585&view=diff
==============================================================================
--- karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/LDAPLoginModule.java (original)
+++ karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/LDAPLoginModule.java Mon Apr 2 21:36:30 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/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/osgi/OsgiConfigLoginModule.java
URL: http://svn.apache.org/viewvc/karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/osgi/OsgiConfigLoginModule.java?rev=1308585&r1=1308584&r2=1308585&view=diff
==============================================================================
--- karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/osgi/OsgiConfigLoginModule.java (original)
+++ karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/osgi/OsgiConfigLoginModule.java Mon Apr 2 21:36:30 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/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesBackingEngine.java
URL: http://svn.apache.org/viewvc/karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesBackingEngine.java?rev=1308585&r1=1308584&r2=1308585&view=diff
==============================================================================
--- karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesBackingEngine.java (original)
+++ karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesBackingEngine.java Mon Apr 2 21:36:30 2012
@@ -17,9 +17,9 @@
package org.apache.karaf.jaas.modules.properties;
import org.apache.felix.utils.properties.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.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesLoginModule.java
URL: http://svn.apache.org/viewvc/karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesLoginModule.java?rev=1308585&r1=1308584&r2=1308585&view=diff
==============================================================================
--- karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesLoginModule.java (original)
+++ karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesLoginModule.java Mon Apr 2 21:36:30 2012
@@ -31,9 +31,9 @@ import javax.security.auth.login.FailedL
import javax.security.auth.login.LoginException;
import org.apache.felix.utils.properties.Properties;
+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.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: karaf/trunk/management/server/src/main/java/org/apache/karaf/management/JaasAuthenticator.java
URL: http://svn.apache.org/viewvc/karaf/trunk/management/server/src/main/java/org/apache/karaf/management/JaasAuthenticator.java?rev=1308585&r1=1308584&r2=1308585&view=diff
==============================================================================
--- karaf/trunk/management/server/src/main/java/org/apache/karaf/management/JaasAuthenticator.java (original)
+++ karaf/trunk/management/server/src/main/java/org/apache/karaf/management/JaasAuthenticator.java Mon Apr 2 21:36:30 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/trunk/shell/console/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/console/pom.xml?rev=1308585&r1=1308584&r2=1308585&view=diff
==============================================================================
--- karaf/trunk/shell/console/pom.xml (original)
+++ karaf/trunk/shell/console/pom.xml Mon Apr 2 21:36:30 2012
@@ -74,6 +74,10 @@
<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.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.api</artifactId>
<scope>provided</scope>
Modified: karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/jline/ConsoleFactory.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/jline/ConsoleFactory.java?rev=1308585&r1=1308584&r2=1308585&view=diff
==============================================================================
--- karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/jline/ConsoleFactory.java (original)
+++ karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/jline/ConsoleFactory.java Mon Apr 2 21:36:30 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/trunk/webconsole/branding/src/main/java/org/apache/karaf/webconsole/JaasSecurityProvider.java
URL: http://svn.apache.org/viewvc/karaf/trunk/webconsole/branding/src/main/java/org/apache/karaf/webconsole/JaasSecurityProvider.java?rev=1308585&r1=1308584&r2=1308585&view=diff
==============================================================================
--- karaf/trunk/webconsole/branding/src/main/java/org/apache/karaf/webconsole/JaasSecurityProvider.java (original)
+++ karaf/trunk/webconsole/branding/src/main/java/org/apache/karaf/webconsole/JaasSecurityProvider.java Mon Apr 2 21:36:30 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) {