Author: cziegeler
Date: Wed Mar 31 14:04:41 2010
New Revision: 929543
URL: http://svn.apache.org/viewvc?rev=929543&view=rev
Log:
Clean up code a little bit
Modified:
sling/trunk/bundles/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/impl/security/PluggableDefaultAccessManager.java
sling/trunk/bundles/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/impl/security/PluggableDefaultLoginModule.java
sling/trunk/bundles/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/impl/security/TrustedCredentials.java
Modified:
sling/trunk/bundles/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/impl/security/PluggableDefaultAccessManager.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/impl/security/PluggableDefaultAccessManager.java?rev=929543&r1=929542&r2=929543&view=diff
==============================================================================
---
sling/trunk/bundles/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/impl/security/PluggableDefaultAccessManager.java
(original)
+++
sling/trunk/bundles/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/impl/security/PluggableDefaultAccessManager.java
Wed Mar 31 14:04:41 2010
@@ -23,7 +23,6 @@ import javax.jcr.RepositoryException;
import javax.jcr.Session;
import javax.security.auth.Subject;
-import org.apache.jackrabbit.core.HierarchyManager;
import org.apache.jackrabbit.core.id.ItemId;
import org.apache.jackrabbit.core.security.AMContext;
import org.apache.jackrabbit.core.security.DefaultAccessManager;
@@ -56,7 +55,7 @@ import org.slf4j.LoggerFactory;
*/
public class PluggableDefaultAccessManager extends DefaultAccessManager {
- /** @scr.reference */
+ /** @scr.reference */
private AccessManagerPlugin accessManagerPlugin;
private NamePathResolver namePathResolver;
private static final Logger log =
LoggerFactory.getLogger(PluggableDefaultAccessManager.class);
Modified:
sling/trunk/bundles/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/impl/security/PluggableDefaultLoginModule.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/impl/security/PluggableDefaultLoginModule.java?rev=929543&r1=929542&r2=929543&view=diff
==============================================================================
---
sling/trunk/bundles/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/impl/security/PluggableDefaultLoginModule.java
(original)
+++
sling/trunk/bundles/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/impl/security/PluggableDefaultLoginModule.java
Wed Mar 31 14:04:41 2010
@@ -71,16 +71,16 @@ public class PluggableDefaultLoginModule
super.doInit(callbackHandler, session, options);
this.pluggableCallackHander = callbackHandler;
}
-
+
/**
* {...@inheritdoc}
* @see
org.apache.jackrabbit.core.security.authentication.AbstractLoginModule#initialize(javax.security.auth.Subject,
javax.security.auth.callback.CallbackHandler, java.util.Map, java.util.Map)
*/
@Override
public void initialize(Subject subject, CallbackHandler callbackHandler,
- Map sharedState, Map options) {
+ Map<String, ?> sharedState, Map<String, ?> options) {
CallbackHandlerWrapper wrappedCallbackHandler = new
CallbackHandlerWrapper(subject, callbackHandler);
-
+
super.initialize(subject, wrappedCallbackHandler, sharedState,
options);
}
@@ -103,7 +103,7 @@ public class PluggableDefaultLoginModule
return super.getPrincipal(creds);
}
-
+
/**
* @see
org.apache.jackrabbit.core.security.authentication.AbstractLoginModule#getPrincipals
*/
@@ -164,8 +164,8 @@ public class PluggableDefaultLoginModule
return super.impersonate(principal, creds);
}
-
-
+
+
/**
* Since the AbstractLoginModule getCredentials does not know anything
about TrustedCredentials we have to re-try here.
*/
@@ -184,7 +184,7 @@ public class PluggableDefaultLoginModule
log.warn("Credentials-Callback not supported try
Name-Callback");
} catch (IOException e) {
log.error("Credentials-Callback failed: " + e.getMessage() +
": try Name-Callback");
- }
+ }
}
return creds;
}
Modified:
sling/trunk/bundles/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/impl/security/TrustedCredentials.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/impl/security/TrustedCredentials.java?rev=929543&r1=929542&r2=929543&view=diff
==============================================================================
---
sling/trunk/bundles/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/impl/security/TrustedCredentials.java
(original)
+++
sling/trunk/bundles/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/impl/security/TrustedCredentials.java
Wed Mar 31 14:04:41 2010
@@ -17,29 +17,29 @@
package org.apache.sling.jcr.jackrabbit.server.impl.security;
-import org.apache.jackrabbit.core.security.authentication.Authentication;
-
import java.security.Principal;
import javax.jcr.Credentials;
import javax.jcr.RepositoryException;
+import org.apache.jackrabbit.core.security.authentication.Authentication;
+
/**
*
*/
public abstract class TrustedCredentials implements Credentials {
/**
- *
+ *
*/
private static final long serialVersionUID = 5153578149776402602L;
private Principal principal;
-
+
private Authentication authentication;
/**
- * @param adminUser
+ * @param userId
*/
public TrustedCredentials(final String userId) {
principal = getPrincipal(userId);
@@ -59,14 +59,15 @@ public abstract class TrustedCredentials
}
/**
- * @param userId
+ * @param userId
* @return
*/
protected abstract Principal getPrincipal(String userId);
-
+
public Principal getPrincipal() {
return principal;
}
+
/**
* @return
*/
@@ -75,7 +76,7 @@ public abstract class TrustedCredentials
}
/**
- * @return
+ * @return null
*/
public Object getImpersonator() {
return null;
