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/04/03 09:50:07 UTC
[1/5] syncope git commit: In coherence with SYNCOPE-1287,
replace approvals' icon
Repository: syncope
Updated Branches:
refs/heads/2_0_X 3da89479b -> 82ffa80d4
refs/heads/master 44c9d6ce5 -> a8eff1cc2
In coherence with SYNCOPE-1287, replace approvals' icon
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/598ebbd9
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/598ebbd9
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/598ebbd9
Branch: refs/heads/2_0_X
Commit: 598ebbd9e790eba0980e3ac7baaa5c74702716bb
Parents: 3da8947
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Fri Mar 30 14:11:20 2018 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Fri Mar 30 14:11:20 2018 +0200
----------------------------------------------------------------------
.../apache/syncope/client/console/widgets/AlertWidget.java | 6 +-----
.../syncope/client/console/widgets/ApprovalsWidget.java | 8 ++++++++
.../client/console/widgets/ItemTransformerWidget.java | 4 ++--
.../client/console/widgets/JEXLTransformerWidget.java | 4 ++--
4 files changed, 13 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/598ebbd9/client/console/src/main/java/org/apache/syncope/client/console/widgets/AlertWidget.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/widgets/AlertWidget.java b/client/console/src/main/java/org/apache/syncope/client/console/widgets/AlertWidget.java
index 668daf0..ac32d17 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/widgets/AlertWidget.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/widgets/AlertWidget.java
@@ -19,8 +19,6 @@
package org.apache.syncope.client.console.widgets;
import de.agilecoders.wicket.core.markup.html.bootstrap.image.Icon;
-import de.agilecoders.wicket.extensions.markup.html.bootstrap.icon.FontAwesomeIconTypeBuilder;
-import de.agilecoders.wicket.extensions.markup.html.bootstrap.icon.FontAwesomeIconTypeBuilder.FontAwesomeGraphic;
import java.io.Serializable;
import java.util.List;
import org.apache.wicket.markup.ComponentTag;
@@ -126,9 +124,7 @@ public abstract class AlertWidget<T extends Serializable> extends Panel {
protected abstract AbstractLink getEventsLink(final String linkid);
- protected Icon getIcon(final String iconid) {
- return new Icon(iconid, FontAwesomeIconTypeBuilder.on(FontAwesomeGraphic.flag_o).build());
- }
+ protected abstract Icon getIcon(String iconid);
public static class AlertLink<T> extends Panel {
http://git-wip-us.apache.org/repos/asf/syncope/blob/598ebbd9/client/console/src/main/java/org/apache/syncope/client/console/widgets/ApprovalsWidget.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/widgets/ApprovalsWidget.java b/client/console/src/main/java/org/apache/syncope/client/console/widgets/ApprovalsWidget.java
index ef147f3..cc41e84 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/widgets/ApprovalsWidget.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/widgets/ApprovalsWidget.java
@@ -18,6 +18,8 @@
*/
package org.apache.syncope.client.console.widgets;
+import de.agilecoders.wicket.core.markup.html.bootstrap.image.Icon;
+import de.agilecoders.wicket.extensions.markup.html.bootstrap.icon.FontAwesomeIconTypeBuilder;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collections;
@@ -124,6 +126,12 @@ public class ApprovalsWidget extends AlertWidget<WorkflowFormTO> {
return approvals;
}
+ @Override
+ protected Icon getIcon(final String iconid) {
+ return new Icon(iconid,
+ FontAwesomeIconTypeBuilder.on(FontAwesomeIconTypeBuilder.FontAwesomeGraphic.handshake_o).build());
+ }
+
public static final class InnerPanel extends Panel {
private static final long serialVersionUID = 3829642687027801451L;
http://git-wip-us.apache.org/repos/asf/syncope/blob/598ebbd9/client/console/src/main/java/org/apache/syncope/client/console/widgets/ItemTransformerWidget.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/widgets/ItemTransformerWidget.java b/client/console/src/main/java/org/apache/syncope/client/console/widgets/ItemTransformerWidget.java
index 9aa4142..95a6e68 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/widgets/ItemTransformerWidget.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/widgets/ItemTransformerWidget.java
@@ -77,7 +77,7 @@ public class ItemTransformerWidget extends AlertWidget<String> {
@Override
protected Icon getIcon(final String iconid) {
- return new Icon(
- iconid, FontAwesomeIconTypeBuilder.on(FontAwesomeIconTypeBuilder.FontAwesomeGraphic.magic).build());
+ return new Icon(iconid,
+ FontAwesomeIconTypeBuilder.on(FontAwesomeIconTypeBuilder.FontAwesomeGraphic.magic).build());
}
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/598ebbd9/client/console/src/main/java/org/apache/syncope/client/console/widgets/JEXLTransformerWidget.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/widgets/JEXLTransformerWidget.java b/client/console/src/main/java/org/apache/syncope/client/console/widgets/JEXLTransformerWidget.java
index 6c4dd7b..1e2fd80 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/widgets/JEXLTransformerWidget.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/widgets/JEXLTransformerWidget.java
@@ -89,7 +89,7 @@ public class JEXLTransformerWidget extends AlertWidget<String> {
@Override
protected Icon getIcon(final String iconid) {
- return new Icon(
- iconid, FontAwesomeIconTypeBuilder.on(FontAwesomeIconTypeBuilder.FontAwesomeGraphic.repeat).build());
+ return new Icon(iconid,
+ FontAwesomeIconTypeBuilder.on(FontAwesomeIconTypeBuilder.FontAwesomeGraphic.repeat).build());
}
}
[4/5] syncope git commit: [SYNCOPE-1291] Clean up cached services in
case of session invalidation
Posted by il...@apache.org.
[SYNCOPE-1291] Clean up cached services in case of session invalidation
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/82ffa80d
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/82ffa80d
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/82ffa80d
Branch: refs/heads/2_0_X
Commit: 82ffa80d4b80a1ed2e591017ace2919d91d84249
Parents: f920f07
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Tue Apr 3 11:49:48 2018 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Tue Apr 3 11:49:48 2018 +0200
----------------------------------------------------------------------
.../client/console/SyncopeConsoleSession.java | 15 ++++-----------
.../syncope/client/console/panels/AnyTypesPanel.java | 2 +-
2 files changed, 5 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/82ffa80d/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 9f7c634..627f508 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
@@ -148,10 +148,6 @@ public class SyncopeConsoleSession extends AuthenticatedWebSession {
return client == null ? null : client.getJWT();
}
- private void afterAuthentication() {
- refreshAuthorization();
- }
-
@Override
public boolean authenticate(final String username, final String password) {
boolean authenticated = false;
@@ -159,7 +155,7 @@ public class SyncopeConsoleSession extends AuthenticatedWebSession {
try {
client = clientFactory.setDomain(getDomain()).create(username, password);
- afterAuthentication();
+ refreshAuth();
authenticated = true;
} catch (Exception e) {
@@ -175,7 +171,7 @@ public class SyncopeConsoleSession extends AuthenticatedWebSession {
try {
client = clientFactory.setDomain(getDomain()).create(jwt);
- afterAuthentication();
+ refreshAuth();
authenticated = true;
} catch (Exception e) {
@@ -194,6 +190,7 @@ public class SyncopeConsoleSession extends AuthenticatedWebSession {
client = null;
auth = null;
selfTO = null;
+ services.clear();
}
@Override
@@ -270,14 +267,10 @@ public class SyncopeConsoleSession extends AuthenticatedWebSession {
}
public void refreshAuth() {
- client.refresh();
- roles = null;
- }
-
- public void refreshAuthorization() {
Pair<Map<String, Set<String>>, UserTO> self = client.self();
auth = self.getLeft();
selfTO = self.getRight();
+ roles = null;
}
@SuppressWarnings("unchecked")
http://git-wip-us.apache.org/repos/asf/syncope/blob/82ffa80d/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyTypesPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyTypesPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyTypesPanel.java
index 1d0e1d8..07b0fbf 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyTypesPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyTypesPanel.java
@@ -80,8 +80,8 @@ public class AnyTypesPanel extends TypesDirectoryPanel<AnyTypeTO, AnyTypesPanel.
} else {
restClient.update(modelObject);
}
+
SyncopeConsoleSession.get().info(getString(Constants.OPERATION_SUCCEEDED));
- SyncopeConsoleSession.get().refreshAuthorization();
AnyTypesPanel.this.updateResultTable(target);
modal.close(target);
} catch (Exception e) {
[5/5] syncope git commit: [SYNCOPE-1291] Clean up cached services in
case of session invalidation
Posted by il...@apache.org.
[SYNCOPE-1291] Clean up cached services in case of session invalidation
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/a8eff1cc
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/a8eff1cc
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/a8eff1cc
Branch: refs/heads/master
Commit: a8eff1cc21d4dd6768472dde169836793080f7a1
Parents: 0a53225
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Tue Apr 3 11:49:48 2018 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Tue Apr 3 11:49:58 2018 +0200
----------------------------------------------------------------------
.../client/console/SyncopeConsoleSession.java | 15 ++++-----------
.../syncope/client/console/panels/AnyTypesPanel.java | 2 +-
2 files changed, 5 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/a8eff1cc/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 8df6ae2..faf75a4 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
@@ -146,10 +146,6 @@ public class SyncopeConsoleSession extends AuthenticatedWebSession {
return client == null ? null : client.getJWT();
}
- private void afterAuthentication() {
- refreshAuthorization();
- }
-
@Override
public boolean authenticate(final String username, final String password) {
boolean authenticated = false;
@@ -157,7 +153,7 @@ public class SyncopeConsoleSession extends AuthenticatedWebSession {
try {
client = clientFactory.setDomain(getDomain()).create(username, password);
- afterAuthentication();
+ refreshAuth();
authenticated = true;
} catch (Exception e) {
@@ -173,7 +169,7 @@ public class SyncopeConsoleSession extends AuthenticatedWebSession {
try {
client = clientFactory.setDomain(getDomain()).create(jwt);
- afterAuthentication();
+ refreshAuth();
authenticated = true;
} catch (Exception e) {
@@ -192,6 +188,7 @@ public class SyncopeConsoleSession extends AuthenticatedWebSession {
client = null;
auth = null;
selfTO = null;
+ services.clear();
}
@Override
@@ -262,14 +259,10 @@ public class SyncopeConsoleSession extends AuthenticatedWebSession {
}
public void refreshAuth() {
- client.refresh();
- roles = null;
- }
-
- public void refreshAuthorization() {
Pair<Map<String, Set<String>>, UserTO> self = client.self();
auth = self.getLeft();
selfTO = self.getRight();
+ roles = null;
}
@SuppressWarnings("unchecked")
http://git-wip-us.apache.org/repos/asf/syncope/blob/a8eff1cc/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyTypesPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyTypesPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyTypesPanel.java
index 736bb7d..030be02 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyTypesPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyTypesPanel.java
@@ -80,8 +80,8 @@ public class AnyTypesPanel extends TypesDirectoryPanel<AnyTypeTO, AnyTypesPanel.
} else {
restClient.update(modelObject);
}
+
SyncopeConsoleSession.get().info(getString(Constants.OPERATION_SUCCEEDED));
- SyncopeConsoleSession.get().refreshAuthorization();
AnyTypesPanel.this.updateResultTable(target);
modal.close(target);
} catch (Exception e) {
[3/5] syncope git commit: Upgrading Spring Security
Posted by il...@apache.org.
Upgrading Spring Security
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/f920f071
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/f920f071
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/f920f071
Branch: refs/heads/2_0_X
Commit: f920f071e4bc8ed7ce4f8870b987bda944c65e8d
Parents: 598ebbd
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Sat Mar 31 15:40:23 2018 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Sat Mar 31 15:40:23 2018 +0200
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/f920f071/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 2eebd79..2ea39fb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -371,7 +371,7 @@ under the License.
<jackson.version>2.9.5</jackson.version>
<spring.version>4.3.14.RELEASE</spring.version>
- <spring-security.version>4.2.4.RELEASE</spring-security.version>
+ <spring-security.version>4.2.5.RELEASE</spring-security.version>
<openjpa.version>2.4.2</openjpa.version>
<hikaricp.version>2.4.13</hikaricp.version>
[2/5] syncope git commit: In coherence with SYNCOPE-1287,
replace approvals' icon
Posted by il...@apache.org.
In coherence with SYNCOPE-1287, replace approvals' icon
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/0a532255
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/0a532255
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/0a532255
Branch: refs/heads/master
Commit: 0a5322552e70ffb0bb69c231f20c4ee130110a46
Parents: 44c9d6c
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Fri Mar 30 14:11:20 2018 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Fri Mar 30 14:11:30 2018 +0200
----------------------------------------------------------------------
.../apache/syncope/client/console/widgets/AlertWidget.java | 6 +-----
.../syncope/client/console/widgets/ApprovalsWidget.java | 8 ++++++++
.../client/console/widgets/ItemTransformerWidget.java | 4 ++--
.../client/console/widgets/JEXLTransformerWidget.java | 4 ++--
4 files changed, 13 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/0a532255/client/console/src/main/java/org/apache/syncope/client/console/widgets/AlertWidget.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/widgets/AlertWidget.java b/client/console/src/main/java/org/apache/syncope/client/console/widgets/AlertWidget.java
index 668daf0..ac32d17 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/widgets/AlertWidget.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/widgets/AlertWidget.java
@@ -19,8 +19,6 @@
package org.apache.syncope.client.console.widgets;
import de.agilecoders.wicket.core.markup.html.bootstrap.image.Icon;
-import de.agilecoders.wicket.extensions.markup.html.bootstrap.icon.FontAwesomeIconTypeBuilder;
-import de.agilecoders.wicket.extensions.markup.html.bootstrap.icon.FontAwesomeIconTypeBuilder.FontAwesomeGraphic;
import java.io.Serializable;
import java.util.List;
import org.apache.wicket.markup.ComponentTag;
@@ -126,9 +124,7 @@ public abstract class AlertWidget<T extends Serializable> extends Panel {
protected abstract AbstractLink getEventsLink(final String linkid);
- protected Icon getIcon(final String iconid) {
- return new Icon(iconid, FontAwesomeIconTypeBuilder.on(FontAwesomeGraphic.flag_o).build());
- }
+ protected abstract Icon getIcon(String iconid);
public static class AlertLink<T> extends Panel {
http://git-wip-us.apache.org/repos/asf/syncope/blob/0a532255/client/console/src/main/java/org/apache/syncope/client/console/widgets/ApprovalsWidget.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/widgets/ApprovalsWidget.java b/client/console/src/main/java/org/apache/syncope/client/console/widgets/ApprovalsWidget.java
index ef147f3..cc41e84 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/widgets/ApprovalsWidget.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/widgets/ApprovalsWidget.java
@@ -18,6 +18,8 @@
*/
package org.apache.syncope.client.console.widgets;
+import de.agilecoders.wicket.core.markup.html.bootstrap.image.Icon;
+import de.agilecoders.wicket.extensions.markup.html.bootstrap.icon.FontAwesomeIconTypeBuilder;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collections;
@@ -124,6 +126,12 @@ public class ApprovalsWidget extends AlertWidget<WorkflowFormTO> {
return approvals;
}
+ @Override
+ protected Icon getIcon(final String iconid) {
+ return new Icon(iconid,
+ FontAwesomeIconTypeBuilder.on(FontAwesomeIconTypeBuilder.FontAwesomeGraphic.handshake_o).build());
+ }
+
public static final class InnerPanel extends Panel {
private static final long serialVersionUID = 3829642687027801451L;
http://git-wip-us.apache.org/repos/asf/syncope/blob/0a532255/client/console/src/main/java/org/apache/syncope/client/console/widgets/ItemTransformerWidget.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/widgets/ItemTransformerWidget.java b/client/console/src/main/java/org/apache/syncope/client/console/widgets/ItemTransformerWidget.java
index fcdfebc..690538c 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/widgets/ItemTransformerWidget.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/widgets/ItemTransformerWidget.java
@@ -77,7 +77,7 @@ public class ItemTransformerWidget extends AlertWidget<String> {
@Override
protected Icon getIcon(final String iconid) {
- return new Icon(
- iconid, FontAwesomeIconTypeBuilder.on(FontAwesomeIconTypeBuilder.FontAwesomeGraphic.magic).build());
+ return new Icon(iconid,
+ FontAwesomeIconTypeBuilder.on(FontAwesomeIconTypeBuilder.FontAwesomeGraphic.magic).build());
}
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/0a532255/client/console/src/main/java/org/apache/syncope/client/console/widgets/JEXLTransformerWidget.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/widgets/JEXLTransformerWidget.java b/client/console/src/main/java/org/apache/syncope/client/console/widgets/JEXLTransformerWidget.java
index 6c4dd7b..1e2fd80 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/widgets/JEXLTransformerWidget.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/widgets/JEXLTransformerWidget.java
@@ -89,7 +89,7 @@ public class JEXLTransformerWidget extends AlertWidget<String> {
@Override
protected Icon getIcon(final String iconid) {
- return new Icon(
- iconid, FontAwesomeIconTypeBuilder.on(FontAwesomeIconTypeBuilder.FontAwesomeGraphic.repeat).build());
+ return new Icon(iconid,
+ FontAwesomeIconTypeBuilder.on(FontAwesomeIconTypeBuilder.FontAwesomeGraphic.repeat).build());
}
}