You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by mg...@apache.org on 2014/12/23 17:10:44 UTC
isis git commit: Minor non-functional improvement
Repository: isis
Updated Branches:
refs/heads/master e6f875883 -> bbef04819
Minor non-functional improvement
Fix warnings in IDE
Fix Javadoc errors
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/bbef0481
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/bbef0481
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/bbef0481
Branch: refs/heads/master
Commit: bbef048192f1fa6e732bca53e886ead7368087b4
Parents: e6f8758
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Tue Dec 23 18:09:54 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Tue Dec 23 18:09:54 2014 +0200
----------------------------------------------------------------------
.../wicket/AuthenticatedWebSessionForIsis.java | 7 ++-----
.../AuthenticationManagerStandardForDfltRuntime.java | 12 ++++++------
2 files changed, 8 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/bbef0481/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/AuthenticatedWebSessionForIsis.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/AuthenticatedWebSessionForIsis.java b/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/AuthenticatedWebSessionForIsis.java
index 185a15a..03dcac7 100644
--- a/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/AuthenticatedWebSessionForIsis.java
+++ b/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/AuthenticatedWebSessionForIsis.java
@@ -29,7 +29,6 @@ import java.util.List;
import org.apache.wicket.Session;
import org.apache.wicket.authroles.authentication.AuthenticatedWebSession;
import org.apache.wicket.authroles.authorization.strategies.role.Roles;
-import org.apache.wicket.protocol.http.request.WebClientInfo;
import org.apache.wicket.request.Request;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
@@ -72,8 +71,7 @@ public class AuthenticatedWebSessionForIsis extends AuthenticatedWebSession impl
@Override
public boolean authenticate(final String username, final String password) {
- AuthenticationRequest authenticationRequest;
- authenticationRequest = new AuthenticationRequestPassword(username, password);
+ AuthenticationRequest authenticationRequest = new AuthenticationRequestPassword(username, password);
authenticationRequest.setRoles(Arrays.asList(USER_ROLE));
authenticationSession = getAuthenticationManager().authenticate(authenticationRequest);
return authenticationSession != null;
@@ -90,7 +88,7 @@ public class AuthenticatedWebSessionForIsis extends AuthenticatedWebSession impl
return null;
}
final List<String> roles = authenticationSession.getRoles();
- return new Roles(roles.toArray(new String[] {}));
+ return new Roles(roles.toArray(new String[roles.size()]));
}
// /////////////////////////////////////////////////
@@ -127,6 +125,5 @@ public class AuthenticatedWebSessionForIsis extends AuthenticatedWebSession impl
cast.setAuthenticationSessionProvider(this);
}
}
-
}
http://git-wip-us.apache.org/repos/asf/isis/blob/bbef0481/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/AuthenticationManagerStandardForDfltRuntime.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/AuthenticationManagerStandardForDfltRuntime.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/AuthenticationManagerStandardForDfltRuntime.java
index 5e4d1ab..1d9a39c 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/AuthenticationManagerStandardForDfltRuntime.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/AuthenticationManagerStandardForDfltRuntime.java
@@ -31,20 +31,20 @@ import org.apache.isis.core.runtime.system.context.IsisContext;
/**
* A refinement of the {@link AuthenticationManagerStandard}, which adds support
- * to make it easier without the palava of logging in when running in either
- * {@link DeploymentType#EXPLORATION exploration} mode or in
- * {@link DeploymentType#PROTOTYPE prototype} mode.
+ * to make it easier without the need of logging in when running in either
+ * {@link DeploymentType#SERVER_EXPLORATION exploration} mode or in
+ * {@link DeploymentType#SERVER_PROTOTYPE prototype} mode.
*
* <p>
* Specifically:
* <ul>
* <li>the {@link ExplorationAuthenticator} will always provide a special
* {@link ExplorationSession} if running in the {@link DeploymentType} of
- * {@link DeploymentType#EXPLORATION exploration}.
+ * {@link DeploymentType#SERVER_EXPLORATION exploration}.
* <li>the {@link LogonFixtureAuthenticator} will set up a session using the
* login provided by a {@link LogonFixture}, provided that the
- * {@link DeploymentType} is {@link DeploymentType#EXPLORATION exploration} or
- * {@link DeploymentType#PROTOTYPE prototyping}
+ * {@link DeploymentType} is {@link DeploymentType#SERVER_EXPLORATION exploration} or
+ * {@link DeploymentType#SERVER_PROTOTYPE prototyping}
* </ul>
*/
public class AuthenticationManagerStandardForDfltRuntime extends AuthenticationManagerStandard {