Author: cziegeler
Date: Tue Nov 3 23:42:06 2009
New Revision: 832610
URL: http://svn.apache.org/viewvc?rev=832610&view=rev
Log:
Clean up code
Modified:
sling/trunk/bundles/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/impl/RmiRegistrationSupport.java
sling/trunk/bundles/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/security/AuthenticationPlugin.java
sling/trunk/bundles/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/security/LoginModulePlugin.java
Modified:
sling/trunk/bundles/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/impl/RmiRegistrationSupport.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/impl/RmiRegistrationSupport.java?rev=832610&r1=832609&r2=832610&view=diff
==============================================================================
---
sling/trunk/bundles/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/impl/RmiRegistrationSupport.java
(original)
+++
sling/trunk/bundles/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/impl/RmiRegistrationSupport.java
Tue Nov 3 23:42:06 2009
@@ -38,7 +38,7 @@
* <p>
* Note: Currently only registries in this Java VM are supported. In the future
* support for external registries may be added.
- *
+ *
* @scr.component immediate="true" label="%rmi.name"
* description="%rmi.description"
*
name="org.apache.sling.jcr.jackrabbit.server.RmiRegistrationSupport"
@@ -205,10 +205,6 @@
return this.rmiName;
}
- public Remote getRmiRepository() {
- return this.rmiRepository;
- }
-
public String getRmiURL() {
String host;
try {
Modified:
sling/trunk/bundles/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/security/AuthenticationPlugin.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/security/AuthenticationPlugin.java?rev=832610&r1=832609&r2=832610&view=diff
==============================================================================
---
sling/trunk/bundles/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/security/AuthenticationPlugin.java
(original)
+++
sling/trunk/bundles/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/security/AuthenticationPlugin.java
Tue Nov 3 23:42:06 2009
@@ -27,8 +27,7 @@
public interface AuthenticationPlugin {
/**
- * {...@see
org.apache.jackrabbit.core.security.authentication.Authentication#
- * authenticate}
+ * @see
org.apache.jackrabbit.core.security.authentication.Authentication#authenticate
*/
public abstract boolean authenticate(Credentials credentials)
throws RepositoryException;
Modified:
sling/trunk/bundles/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/security/LoginModulePlugin.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/security/LoginModulePlugin.java?rev=832610&r1=832609&r2=832610&view=diff
==============================================================================
---
sling/trunk/bundles/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/security/LoginModulePlugin.java
(original)
+++
sling/trunk/bundles/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/security/LoginModulePlugin.java
Tue Nov 3 23:42:06 2009
@@ -31,7 +31,7 @@
/**
* Provide login module functionality that extends
* {...@link
org.apache.jackrabbit.core.security.authentication.DefaultLoginModule}
- * for a specific type of {...@link java.jcr.Credentials}. Does not rely
explicitly
+ * for a specific type of {...@link javax.jcr.Credentials}. Does not rely
explicitly
* on any classes from org.apache.jackrabbit.core.*
*/
public interface LoginModulePlugin {
@@ -49,9 +49,8 @@
* {...@link org.apache.sling.engine.auth.AuthenticationHandler} object
can set
* properties on these credentials at creation time that this class can use
* to make this determination
- *
+ *
* @param credentials
- * @return
*/
public abstract boolean canHandle(Credentials credentials);
@@ -67,28 +66,28 @@
* PluggableLoginModule that can handle these Credentials can provide a
* Principal, the Principal will be provided by
* {...@link
org.apache.jackrabbit.core.security.authentication.DefaultLoginModule#getPrincipal}
- *
+ *
* @return an instance of the Principal associated with these Credentials
* @see
org.apache.jackrabbit.core.security.authentication.DefaultLoginModule#getPrincipal
*/
public Principal getPrincipal(Credentials credentials);
-
+
/**
- * Enables to add additional {...@link Principal} objects, such as groups
or
- * roles, to the {...@link Subject}.
- *
+ * Enables to add additional {...@link Principal} objects, such as groups
or
+ * roles, to the {...@link Subject}.
+ *
* @param principals original collection of principals
*/
@SuppressWarnings("unchecked")
public void addPrincipals(Set principals);
-
+
/**
* Return a PluggableAuthentication object that can authenticate the give
* Principal and Credentials. If null is returned, and no other
* PluggableLoginModule that can handle these Credentials can provide a
* PluggableAuthentication instance, the authentication will be handled by
* {...@link
org.apache.jackrabbit.core.security.authentication.DefaultLoginModule#getAuthentication}
- *
+ *
* @see
org.apache.jackrabbit.core.security.authentication.DefaultLoginModule#getAuthentication
* @return An instance of PluggableAuthentication, or null
*/
@@ -97,14 +96,14 @@
/**
* Returns a code indicating either the status of the impersonation
attempt,
- * or {...@link IMPERSONATION_DEFAULT} if the impersonation should be
handled
+ * or {...@link #IMPERSONATION_DEFAULT} if the impersonation should be
handled
* by
* {...@link
org.apache.jackrabbit.core.security.authentication.DefaultLoginModule#impersonate}
* .
- *
+ *
* @see
org.apache.jackrabbit.core.security.authentication.DefaultLoginModule#impersonate
- * @return one of {...@link IMPERSONATION_DEFAULT},
- * {...@link IMPERSONATION_SUCCESS} or {...@link
IMPERSONATION_FAILED}
+ * @return one of {...@link #IMPERSONATION_DEFAULT},
+ * {...@link #IMPERSONATION_SUCCESS} or {...@link
#IMPERSONATION_FAILED}
*/
public int impersonate(Principal principal, Credentials credentials)
throws RepositoryException, FailedLoginException;
