You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2015/03/13 09:22:48 UTC
[1/3] syncope git commit: Allow overriding of updateLoginAttributes
Repository: syncope
Updated Branches:
refs/heads/1_2_X 247d883da -> b63021933
refs/heads/master 5378fb4e1 -> 28aef6c78
Allow overriding of updateLoginAttributes
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/b6302193
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/b6302193
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/b6302193
Branch: refs/heads/1_2_X
Commit: b63021933370edd834ba47ff095d7c86cb677404
Parents: 247d883
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Fri Mar 13 09:21:59 2015 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Fri Mar 13 09:21:59 2015 +0100
----------------------------------------------------------------------
.../syncope/core/security/SyncopeAuthenticationProvider.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/b6302193/core/src/main/java/org/apache/syncope/core/security/SyncopeAuthenticationProvider.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/security/SyncopeAuthenticationProvider.java b/core/src/main/java/org/apache/syncope/core/security/SyncopeAuthenticationProvider.java
index 75124c9..4992148 100644
--- a/core/src/main/java/org/apache/syncope/core/security/SyncopeAuthenticationProvider.java
+++ b/core/src/main/java/org/apache/syncope/core/security/SyncopeAuthenticationProvider.java
@@ -194,7 +194,7 @@ public class SyncopeAuthenticationProvider implements AuthenticationProvider {
return token;
}
- private void updateLoginAttributes(SyncopeUser user, boolean authenticated) {
+ protected void updateLoginAttributes(SyncopeUser user, boolean authenticated) {
boolean userModified = false;
if (authenticated) {
[3/3] syncope git commit: Merge branch '1_2_X'
Posted by il...@apache.org.
Merge branch '1_2_X'
Conflicts:
core/src/main/java/org/apache/syncope/core/security/SyncopeAuthenticationProvider.java
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/28aef6c7
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/28aef6c7
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/28aef6c7
Branch: refs/heads/master
Commit: 28aef6c78c81304c5c5e64f9ca8210898ec8b653
Parents: 5378fb4 b630219
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Fri Mar 13 09:22:39 2015 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Fri Mar 13 09:22:39 2015 +0100
----------------------------------------------------------------------
----------------------------------------------------------------------
[2/3] syncope git commit: Allow overriding of updateLoginAttributes
Posted by il...@apache.org.
Allow overriding of updateLoginAttributes
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/b6302193
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/b6302193
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/b6302193
Branch: refs/heads/master
Commit: b63021933370edd834ba47ff095d7c86cb677404
Parents: 247d883
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Fri Mar 13 09:21:59 2015 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Fri Mar 13 09:21:59 2015 +0100
----------------------------------------------------------------------
.../syncope/core/security/SyncopeAuthenticationProvider.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/b6302193/core/src/main/java/org/apache/syncope/core/security/SyncopeAuthenticationProvider.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/security/SyncopeAuthenticationProvider.java b/core/src/main/java/org/apache/syncope/core/security/SyncopeAuthenticationProvider.java
index 75124c9..4992148 100644
--- a/core/src/main/java/org/apache/syncope/core/security/SyncopeAuthenticationProvider.java
+++ b/core/src/main/java/org/apache/syncope/core/security/SyncopeAuthenticationProvider.java
@@ -194,7 +194,7 @@ public class SyncopeAuthenticationProvider implements AuthenticationProvider {
return token;
}
- private void updateLoginAttributes(SyncopeUser user, boolean authenticated) {
+ protected void updateLoginAttributes(SyncopeUser user, boolean authenticated) {
boolean userModified = false;
if (authenticated) {