You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2011/11/29 09:00:55 UTC
svn commit: r1207775 [1/4] - in /incubator/isis/trunk/framework:
core/commons/src/main/java/org/apache/isis/core/commons/matchers/
core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/ignore/javalang/
core/runtime/src/main/java/org...
Author: danhaywood
Date: Tue Nov 29 08:00:38 2011
New Revision: 1207775
URL: http://svn.apache.org/viewvc?rev=1207775&view=rev
Log:
ISIS-137/ISIS-138/ISIS-139/ISIS-140: enhancing the Registrar API (and making the existing Authenticator API consistent with it), with corresponding updates to IsisSessionFilter to allow access to RegisterServlet; facetFactory to ignore Comparable#compareTo(Object); adding latest version of jQuery; improving HTML viewer's message pane
Added:
incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/ignore/javalang/AbstractRemoveMethodsFacetFactory.java
incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/ignore/javalang/RemoveJavaLangComparableMethodsFacetFactory.java
incubator/isis/trunk/framework/core/webapp/src/main/resources/jquery-1.7.1.js
incubator/isis/trunk/framework/core/webapp/src/main/resources/jquery-1.7.1.min.js
incubator/isis/trunk/framework/viewer/html/src/main/resources/htmlviewer.js
Removed:
incubator/isis/trunk/framework/security/dflt/src/main/java/org/apache/isis/security/dflt/authentication/inmemory/
Modified:
incubator/isis/trunk/framework/core/commons/src/main/java/org/apache/isis/core/commons/matchers/IsisMatchers.java
incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/ignore/javalang/RemoveJavaLangObjectMethodsFacetFactory.java
incubator/isis/trunk/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/AuthenticationManager.java
incubator/isis/trunk/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/standard/AuthenticationManagerStandard.java
incubator/isis/trunk/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/standard/AuthenticationManagerStandardInstallerAbstract.java
incubator/isis/trunk/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/standard/Authenticator.java
incubator/isis/trunk/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/standard/PasswordRequestAuthenticatorAbstract.java
incubator/isis/trunk/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/standard/Registrar.java
incubator/isis/trunk/framework/progmodels/dflt/src/main/java/org/apache/isis/progmodels/dflt/ProgrammingModelFacetsJava5.java
incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/authentication/exploration/ExplorationAuthenticator.java
incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/authentication/fixture/LogonFixtureAuthenticator.java
incubator/isis/trunk/framework/runtimes/dflt/runtime/src/test/java/org/apache/isis/runtimes/dflt/runtime/authentication/standard/AuthenticatorAbstractForDfltRuntimeTest.java
incubator/isis/trunk/framework/runtimes/dflt/runtime/src/test/java/org/apache/isis/runtimes/dflt/runtime/authentication/standard/StandardAuthenticationManager_AuthenticationTest.java
incubator/isis/trunk/framework/runtimes/dflt/runtime/src/test/java/org/apache/isis/runtimes/dflt/runtime/authentication/standard/exploration/ExplorationAuthenticatorTest.java
incubator/isis/trunk/framework/runtimes/dflt/runtime/src/test/java/org/apache/isis/runtimes/dflt/runtime/authentication/standard/fixture/LogonFixtureAuthenticatorTest.java
incubator/isis/trunk/framework/runtimes/dflt/runtime/src/test/java/org/apache/isis/runtimes/dflt/runtime/testsystem/AuthenticationManagerNoop.java
incubator/isis/trunk/framework/runtimes/dflt/webapp/src/main/java/org/apache/isis/runtimes/dflt/webapp/IsisSessionFilter.java
incubator/isis/trunk/framework/security/dflt/src/main/java/org/apache/isis/security/dflt/authentication/AuthenticatorNoop.java
incubator/isis/trunk/framework/security/dflt/src/main/java/org/apache/isis/security/dflt/authentication/NoopAuthenticationManagerInstaller.java
incubator/isis/trunk/framework/security/file/src/main/java/org/apache/isis/security/file/authentication/FileAuthenticationManagerInstaller.java
incubator/isis/trunk/framework/security/ldap/src/main/java/org/apache/isis/security/ldap/authentication/LdapAuthenticationManagerInstaller.java
incubator/isis/trunk/framework/security/ldap/src/main/java/org/apache/isis/security/ldap/authentication/LdapAuthenticator.java
incubator/isis/trunk/framework/security/sql/src/main/java/org/apache/isis/security/sql/authentication/SqlAuthenticationManagerInstaller.java
incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/components/BddAuthenticationManagerInstaller.java
incubator/isis/trunk/framework/viewer/html/src/docbkx/guide/isis-html-viewer.xml
incubator/isis/trunk/framework/viewer/html/src/main/java/org/apache/isis/viewer/html/action/view/ObjectView.java
incubator/isis/trunk/framework/viewer/html/src/main/java/org/apache/isis/viewer/html/action/view/ObjectViewAbstract.java
incubator/isis/trunk/framework/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/AbstractHtmlPage.java
incubator/isis/trunk/framework/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/HtmlComponentFactory.java
incubator/isis/trunk/framework/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/LogonFormPage.java
incubator/isis/trunk/framework/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/RegisterFormPage.java
incubator/isis/trunk/framework/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/ViewDiv.java
incubator/isis/trunk/framework/viewer/html/src/main/java/org/apache/isis/viewer/html/servlet/LogonServlet.java
incubator/isis/trunk/framework/viewer/html/src/main/java/org/apache/isis/viewer/html/servlet/RegisterServlet.java
incubator/isis/trunk/framework/viewer/html/src/main/resources/default.css
incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketUnsecuredApplication.java
Modified: incubator/isis/trunk/framework/core/commons/src/main/java/org/apache/isis/core/commons/matchers/IsisMatchers.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/commons/src/main/java/org/apache/isis/core/commons/matchers/IsisMatchers.java?rev=1207775&r1=1207774&r2=1207775&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/commons/src/main/java/org/apache/isis/core/commons/matchers/IsisMatchers.java (original)
+++ incubator/isis/trunk/framework/core/commons/src/main/java/org/apache/isis/core/commons/matchers/IsisMatchers.java Tue Nov 29 08:00:38 2011
@@ -225,4 +225,19 @@ public final class IsisMatchers {
};
}
+ public static <X> Matcher<Class<X>> anySubclassOf(final Class<X> cls) {
+ return new TypeSafeMatcher<Class<X>>() {
+
+ @Override
+ public void describeTo(Description arg0) {
+ arg0.appendText("is subclass of ").appendText(cls.getName());
+ }
+
+ @Override
+ public boolean matchesSafely(Class<X> item) {
+ return cls.isAssignableFrom(item);
+ }
+ };
+ }
+
}
Added: incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/ignore/javalang/AbstractRemoveMethodsFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/ignore/javalang/AbstractRemoveMethodsFacetFactory.java?rev=1207775&view=auto
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/ignore/javalang/AbstractRemoveMethodsFacetFactory.java (added)
+++ incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/ignore/javalang/AbstractRemoveMethodsFacetFactory.java Tue Nov 29 08:00:38 2011
@@ -0,0 +1,66 @@
+/*
+ * 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.isis.core.progmodel.facets.object.ignore.javalang;
+
+import java.lang.reflect.Method;
+import java.util.List;
+
+import org.apache.isis.core.metamodel.facetapi.FeatureType;
+import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
+import org.apache.isis.core.metamodel.methodutils.MethodScope;
+
+import com.google.common.collect.Lists;
+
+/**
+ * Removes all methods inherited specified class.
+ */
+public abstract class AbstractRemoveMethodsFacetFactory extends FacetFactoryAbstract {
+
+ private static class MethodAndParameterTypes {
+ private final String methodName;
+ private final Class<?>[] methodParameters;
+ public MethodAndParameterTypes(String methodName, Class<?>[] methodParameters) {
+ this.methodName = methodName;
+ this.methodParameters = methodParameters;
+ }
+ }
+
+ private final List<MethodAndParameterTypes> methodList = Lists.newArrayList();
+ private final Class<?> typeToIgnore;
+
+ public AbstractRemoveMethodsFacetFactory(final Class<?> typeToIgnore) {
+ super(FeatureType.OBJECTS_ONLY);
+ this.typeToIgnore = typeToIgnore;
+ final Method[] methods = typeToIgnore.getMethods();
+ for (int i = 0; i < methods.length; i++) {
+ final Method method = methods[i];
+ methodList.add(new MethodAndParameterTypes(method.getName(), method.getParameterTypes()));
+ }
+ }
+
+
+ @Override
+ public void process(final ProcessClassContext processClassContext) {
+ for(MethodAndParameterTypes mapt: methodList) {
+ processClassContext.removeMethod(MethodScope.OBJECT, mapt.methodName, null, mapt.methodParameters);
+ }
+ }
+
+}
Added: incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/ignore/javalang/RemoveJavaLangComparableMethodsFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/ignore/javalang/RemoveJavaLangComparableMethodsFacetFactory.java?rev=1207775&view=auto
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/ignore/javalang/RemoveJavaLangComparableMethodsFacetFactory.java (added)
+++ incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/ignore/javalang/RemoveJavaLangComparableMethodsFacetFactory.java Tue Nov 29 08:00:38 2011
@@ -0,0 +1,33 @@
+/*
+ * 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.isis.core.progmodel.facets.object.ignore.javalang;
+
+
+/**
+ * Removes all methods inherited from {@link Object}.
+ */
+public class RemoveJavaLangComparableMethodsFacetFactory extends AbstractRemoveMethodsFacetFactory {
+
+ public RemoveJavaLangComparableMethodsFacetFactory() {
+ super(Comparable.class);
+ }
+
+
+}
Modified: incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/ignore/javalang/RemoveJavaLangObjectMethodsFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/ignore/javalang/RemoveJavaLangObjectMethodsFacetFactory.java?rev=1207775&r1=1207774&r2=1207775&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/ignore/javalang/RemoveJavaLangObjectMethodsFacetFactory.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/ignore/javalang/RemoveJavaLangObjectMethodsFacetFactory.java Tue Nov 29 08:00:38 2011
@@ -19,45 +19,15 @@
package org.apache.isis.core.progmodel.facets.object.ignore.javalang;
-import java.lang.reflect.Method;
-
-import org.apache.isis.core.metamodel.facetapi.FeatureType;
-import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
-import org.apache.isis.core.metamodel.methodutils.MethodScope;
/**
* Removes all methods inherited from {@link Object}.
*/
-public class RemoveJavaLangObjectMethodsFacetFactory extends FacetFactoryAbstract {
+public class RemoveJavaLangObjectMethodsFacetFactory extends AbstractRemoveMethodsFacetFactory {
public RemoveJavaLangObjectMethodsFacetFactory() {
- super(FeatureType.OBJECTS_ONLY);
- }
-
- private static final String[] objectMethodNames;
- private static final Class<?>[] objectMethodReturnTypes;
- private static final Class<?>[][] objectMethodParameters;
-
- static {
- final Method[] methods = Object.class.getMethods();
- final int size = methods.length;
- objectMethodNames = new String[size];
- objectMethodReturnTypes = new Class[size];
- objectMethodParameters = new Class[size][];
- for (int i = 0; i < methods.length; i++) {
- final Method method = methods[i];
- objectMethodNames[i] = method.getName();
- objectMethodReturnTypes[i] = method.getReturnType();
- objectMethodParameters[i] = method.getParameterTypes();
- }
+ super(Object.class);
}
- @Override
- public void process(final ProcessClassContext processClassContext) {
- final Method[] methods = Object.class.getMethods();
- for (int i = 0; i < methods.length; i++) {
- processClassContext.removeMethod(MethodScope.OBJECT, objectMethodNames[i], null, objectMethodParameters[i]);
- }
- }
}
Modified: incubator/isis/trunk/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/AuthenticationManager.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/AuthenticationManager.java?rev=1207775&r1=1207774&r2=1207775&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/AuthenticationManager.java (original)
+++ incubator/isis/trunk/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/AuthenticationManager.java Tue Nov 29 08:00:38 2011
@@ -35,6 +35,8 @@ public interface AuthenticationManager e
*/
AuthenticationSession authenticate(AuthenticationRequest request);
+ boolean supportsRegistration(Class<? extends RegistrationDetails> registrationDetailsClass);
+
boolean register(RegistrationDetails registrationDetails);
/**
Modified: incubator/isis/trunk/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/standard/AuthenticationManagerStandard.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/standard/AuthenticationManagerStandard.java?rev=1207775&r1=1207774&r2=1207775&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/standard/AuthenticationManagerStandard.java (original)
+++ incubator/isis/trunk/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/standard/AuthenticationManagerStandard.java Tue Nov 29 08:00:38 2011
@@ -114,13 +114,13 @@ public class AuthenticationManagerStanda
}
for (Authenticator authenticator : authenticators) {
- if (authenticator.canAuthenticate(request)) {
+ if (authenticator.canAuthenticate(request.getClass())) {
AuthenticationSession authSession = null;
authSession = authenticator.authenticate(request, getUnusedRandomCode());
if (authSession != null) {
userByValidationCode.put(authSession.getValidationCode(), authSession.getUserName());
+ return authSession;
}
- return authSession;
}
}
throw new NoAuthenticatorException("No authenticator available for processing " + request.getClass().getName());
@@ -189,13 +189,23 @@ public class AuthenticationManagerStanda
@Override
public boolean register(RegistrationDetails registrationDetails) {
for(final Registrar registrar: getRegistrars()) {
- if(registrar.canRegister(registrationDetails)) {
+ if(registrar.canRegister(registrationDetails.getClass())) {
return registrar.register(registrationDetails);
}
}
return false;
}
+ @Override
+ public boolean supportsRegistration(Class<? extends RegistrationDetails> registrationDetailsClass) {
+ for(final Registrar registrar: getRegistrars()) {
+ if(registrar.canRegister(registrationDetailsClass)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
public List<Registrar> getRegistrars() {
return asAuthenticators(getAuthenticators());
}
@@ -266,6 +276,5 @@ public class AuthenticationManagerStanda
}
-
}
Modified: incubator/isis/trunk/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/standard/AuthenticationManagerStandardInstallerAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/standard/AuthenticationManagerStandardInstallerAbstract.java?rev=1207775&r1=1207774&r2=1207775&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/standard/AuthenticationManagerStandardInstallerAbstract.java (original)
+++ incubator/isis/trunk/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/standard/AuthenticationManagerStandardInstallerAbstract.java Tue Nov 29 08:00:38 2011
@@ -20,8 +20,8 @@
package org.apache.isis.core.runtime.authentication.standard;
-import java.util.List;
-
+import java.util.List;
+
import org.apache.isis.core.commons.config.InstallerAbstract;
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.runtime.authentication.AuthenticationManager;
@@ -37,8 +37,9 @@ public abstract class AuthenticationMana
public final AuthenticationManager createAuthenticationManager() {
final AuthenticationManagerStandard authenticationManager = createAuthenticationManagerStandard();
- final Authenticator authenticator = createAuthenticator(getConfiguration());
- authenticationManager.addAuthenticator(authenticator);
+ for(final Authenticator authenticator: createAuthenticators(getConfiguration())) {
+ authenticationManager.addAuthenticator(authenticator);
+ }
return authenticationManager;
}
@@ -51,7 +52,7 @@ public abstract class AuthenticationMana
*
* @return
*/
- protected abstract Authenticator createAuthenticator(final IsisConfiguration configuration);
+ protected abstract List<Authenticator> createAuthenticators(final IsisConfiguration configuration);
@Override
public List<Class<?>> getTypes() {
Modified: incubator/isis/trunk/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/standard/Authenticator.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/standard/Authenticator.java?rev=1207775&r1=1207774&r2=1207775&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/standard/Authenticator.java (original)
+++ incubator/isis/trunk/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/standard/Authenticator.java Tue Nov 29 08:00:38 2011
@@ -28,7 +28,7 @@ public interface Authenticator extends A
/**
* Whether the provided {@link AuthenticationRequest} is recognized by this {@link Authenticator}.
*/
- boolean canAuthenticate(AuthenticationRequest request);
+ boolean canAuthenticate(Class<? extends AuthenticationRequest> authenticationRequestClass);
/**
* Whether this {@link Authenticator} is valid in the running context (and
Modified: incubator/isis/trunk/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/standard/PasswordRequestAuthenticatorAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/standard/PasswordRequestAuthenticatorAbstract.java?rev=1207775&r1=1207774&r2=1207775&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/standard/PasswordRequestAuthenticatorAbstract.java (original)
+++ incubator/isis/trunk/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/standard/PasswordRequestAuthenticatorAbstract.java Tue Nov 29 08:00:38 2011
@@ -30,10 +30,13 @@ public abstract class PasswordRequestAut
super(configuration);
}
- public final boolean canAuthenticate(final AuthenticationRequest request) {
- return request instanceof AuthenticationRequestPassword;
+ @Override
+ public final boolean canAuthenticate(final Class<? extends AuthenticationRequest> authenticationRequestClass) {
+ return AuthenticationRequestPassword.class.isAssignableFrom(authenticationRequestClass);
}
+
+
}
Modified: incubator/isis/trunk/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/standard/Registrar.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/standard/Registrar.java?rev=1207775&r1=1207774&r2=1207775&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/standard/Registrar.java (original)
+++ incubator/isis/trunk/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/standard/Registrar.java Tue Nov 29 08:00:38 2011
@@ -25,7 +25,7 @@ import org.apache.isis.core.runtime.auth
import com.google.common.base.Function;
import com.google.common.base.Predicate;
-public interface Registrar extends ApplicationScopedComponent {
+public interface Registrar extends Authenticator, ApplicationScopedComponent {
static Predicate<Registrar> NON_NULL = new Predicate<Registrar>() {
@Override
@@ -47,7 +47,7 @@ public interface Registrar extends Appli
/**
* Whether the provided {@link RegistrationDetails} is recognized by this {@link Registrar}.
*/
- boolean canRegister(RegistrationDetails registrationDetails);
+ boolean canRegister(Class<? extends RegistrationDetails> registrationDetailsClass);
boolean register(RegistrationDetails registrationDetails);