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 2018/06/11 07:13:30 UTC
[1/4] syncope git commit: Upgrading maven-war-plugin
Repository: syncope
Updated Branches:
refs/heads/2_0_X 413963f99 -> df5c7fe4d
refs/heads/master f57cb3105 -> 26e2b9dd3
Upgrading maven-war-plugin
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/36d06f8f
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/36d06f8f
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/36d06f8f
Branch: refs/heads/2_0_X
Commit: 36d06f8f66b873b33a4be53f8c2a142067d4b37a
Parents: 413963f
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Mon Jun 11 08:23:57 2018 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Mon Jun 11 08:23:57 2018 +0200
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/36d06f8f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index eba86d9..c697e83 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1897,7 +1897,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
- <version>3.2.1</version>
+ <version>3.2.2</version>
<configuration>
<webResources>
<resource>
[4/4] syncope git commit: [SYNCOPE-1318] The actual fix: in case of
uncontrolled error, do proper logout
Posted by il...@apache.org.
[SYNCOPE-1318] The actual fix: in case of uncontrolled error, do proper logout
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/26e2b9dd
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/26e2b9dd
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/26e2b9dd
Branch: refs/heads/master
Commit: 26e2b9dd3c7f01eb0572883ae0877d29fbdf53fa
Parents: a846feb
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Mon Jun 11 09:13:06 2018 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Mon Jun 11 09:13:18 2018 +0200
----------------------------------------------------------------------
.../console/SyncopeConsoleRequestCycleListener.java | 3 +--
.../syncope/client/console/SyncopeConsoleSession.java | 12 ------------
2 files changed, 1 insertion(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/26e2b9dd/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleRequestCycleListener.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleRequestCycleListener.java b/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleRequestCycleListener.java
index 91e55e6..50c5748 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleRequestCycleListener.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleRequestCycleListener.java
@@ -99,8 +99,7 @@ public class SyncopeConsoleRequestCycleListener extends AbstractRequestCycleList
if (errorPage instanceof Login) {
try {
- SyncopeConsoleSession.get().cleanup();
- SyncopeConsoleSession.get().invalidateNow();
+ SyncopeConsoleSession.get().invalidate();
} catch (Throwable t) {
// ignore
LOG.debug("Unexpected error while forcing logout after error", t);
http://git-wip-us.apache.org/repos/asf/syncope/blob/26e2b9dd/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleSession.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleSession.java b/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleSession.java
index fbc5628..568148c 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleSession.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleSession.java
@@ -197,18 +197,6 @@ public class SyncopeConsoleSession extends AuthenticatedWebSession {
super.invalidate();
}
- @Override
- public void invalidateNow() {
- if (getJWT() != null) {
- if (client != null) {
- client.logout();
- }
- cleanup();
- }
- executor.shutdown();
- super.invalidateNow();
- }
-
public UserTO getSelfTO() {
return selfTO;
}
[3/4] syncope git commit: [SYNCOPE-1318] The actual fix: in case of
uncontrolled error, do proper logout
Posted by il...@apache.org.
[SYNCOPE-1318] The actual fix: in case of uncontrolled error, do proper logout
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/df5c7fe4
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/df5c7fe4
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/df5c7fe4
Branch: refs/heads/2_0_X
Commit: df5c7fe4df54e40b33ab252370d578d9b99dfcb5
Parents: 36d06f8
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Mon Jun 11 09:13:06 2018 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Mon Jun 11 09:13:06 2018 +0200
----------------------------------------------------------------------
.../console/SyncopeConsoleRequestCycleListener.java | 3 +--
.../syncope/client/console/SyncopeConsoleSession.java | 12 ------------
2 files changed, 1 insertion(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/df5c7fe4/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleRequestCycleListener.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleRequestCycleListener.java b/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleRequestCycleListener.java
index 91e55e6..50c5748 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleRequestCycleListener.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleRequestCycleListener.java
@@ -99,8 +99,7 @@ public class SyncopeConsoleRequestCycleListener extends AbstractRequestCycleList
if (errorPage instanceof Login) {
try {
- SyncopeConsoleSession.get().cleanup();
- SyncopeConsoleSession.get().invalidateNow();
+ SyncopeConsoleSession.get().invalidate();
} catch (Throwable t) {
// ignore
LOG.debug("Unexpected error while forcing logout after error", t);
http://git-wip-us.apache.org/repos/asf/syncope/blob/df5c7fe4/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleSession.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleSession.java b/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleSession.java
index 74b1db0..aa8a28c 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleSession.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleSession.java
@@ -199,18 +199,6 @@ public class SyncopeConsoleSession extends AuthenticatedWebSession {
super.invalidate();
}
- @Override
- public void invalidateNow() {
- if (getJWT() != null) {
- if (client != null) {
- client.logout();
- }
- cleanup();
- }
- executor.shutdown();
- super.invalidateNow();
- }
-
public UserTO getSelfTO() {
return selfTO;
}
[2/4] syncope git commit: Upgrading maven-war-plugin
Posted by il...@apache.org.
Upgrading maven-war-plugin
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/a846feb2
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/a846feb2
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/a846feb2
Branch: refs/heads/master
Commit: a846feb2246f8c4e6dc3400ea32d6925dcdfb3c9
Parents: f57cb31
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Mon Jun 11 08:23:57 2018 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Mon Jun 11 08:24:06 2018 +0200
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/a846feb2/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 1b44e3c..e330b51 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1802,7 +1802,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
- <version>3.2.1</version>
+ <version>3.2.2</version>
<configuration>
<webResources>
<resource>