Syncope-2_0_X - Build # 65 - Still Failing

[Apache Jenkins Server]

The Apache Jenkins build system has built Syncope-2_0_X (build #65)

Status: Still Failing

Check console output at https://builds.apache.org/job/Syncope-2_0_X/65/ to view 
the results.

syncope git commit: Trivial formatting change

[coheigea]

Repository: syncope
Updated Branches:
  refs/heads/2_0_X c522ac058 -> 0819aec66


Trivial formatting change


Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/0819aec6
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/0819aec6
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/0819aec6

Branch: refs/heads/2_0_X
Commit: 0819aec664ef220a0251c3b418e1f864109a9daf
Parents: c522ac0
Author: Colm O hEigeartaigh 
Authored: Fri Jul 28 15:28:15 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Fri Jul 28 15:28:32 2017 +0100

--
 .../workingwithapachesyncope/customization.adoc | 16 
 1 file changed, 8 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/syncope/blob/0819aec6/src/main/asciidoc/reference-guide/workingwithapachesyncope/customization.adoc
--
diff --git 
a/src/main/asciidoc/reference-guide/workingwithapachesyncope/customization.adoc 
b/src/main/asciidoc/reference-guide/workingwithapachesyncope/customization.adoc
index eb0db34..50977ac 100644
--- 
a/src/main/asciidoc/reference-guide/workingwithapachesyncope/customization.adoc
+++ 
b/src/main/asciidoc/reference-guide/workingwithapachesyncope/customization.adoc
@@ -410,14 +410,14 @@ classpath*:/workflow*Context.xml
 with
 
 
-  classpath*:/coreContext.xml
-  classpath*:/elasticsearchClientContext.xml
-  classpath*:/securityContext.xml
-  classpath*:/logicContext.xml
-  classpath*:/restCXFContext.xml
-  classpath*:/persistenceContext.xml
-  classpath*:/provisioning*Context.xml
-  classpath*:/workflow*Context.xml
+classpath*:/coreContext.xml
+classpath*:/elasticsearchClientContext.xml
+classpath*:/securityContext.xml
+classpath*:/logicContext.xml
+classpath*:/restCXFContext.xml
+classpath*:/persistenceContext.xml
+classpath*:/provisioning*Context.xml
+classpath*:/workflow*Context.xml
 
 
 [[customization-console]]

syncope git commit: Trivial formatting change

[coheigea]

Repository: syncope
Updated Branches:
  refs/heads/master 2b4053df1 -> a9cc9e760


Trivial formatting change


Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/a9cc9e76
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/a9cc9e76
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/a9cc9e76

Branch: refs/heads/master
Commit: a9cc9e76005a10fc75dec63665951e042aef72bc
Parents: 2b4053d
Author: Colm O hEigeartaigh 
Authored: Fri Jul 28 15:28:15 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Fri Jul 28 15:28:15 2017 +0100

--
 .../workingwithapachesyncope/customization.adoc | 16 
 1 file changed, 8 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/syncope/blob/a9cc9e76/src/main/asciidoc/reference-guide/workingwithapachesyncope/customization.adoc
--
diff --git 
a/src/main/asciidoc/reference-guide/workingwithapachesyncope/customization.adoc 
b/src/main/asciidoc/reference-guide/workingwithapachesyncope/customization.adoc
index 5a115e4..07c4384 100644
--- 
a/src/main/asciidoc/reference-guide/workingwithapachesyncope/customization.adoc
+++ 
b/src/main/asciidoc/reference-guide/workingwithapachesyncope/customization.adoc
@@ -407,14 +407,14 @@ classpath*:/workflow*Context.xml
 with
 
 
-  classpath*:/coreContext.xml
-  classpath*:/elasticsearchClientContext.xml
-  classpath*:/securityContext.xml
-  classpath*:/logicContext.xml
-  classpath*:/restCXFContext.xml
-  classpath*:/persistenceContext.xml
-  classpath*:/provisioning*Context.xml
-  classpath*:/workflow*Context.xml
+classpath*:/coreContext.xml
+classpath*:/elasticsearchClientContext.xml
+classpath*:/securityContext.xml
+classpath*:/logicContext.xml
+classpath*:/restCXFContext.xml
+classpath*:/persistenceContext.xml
+classpath*:/provisioning*Context.xml
+classpath*:/workflow*Context.xml
 
 
 [[customization-console]]

syncope git commit: SYNCOPE-1179 - JWT "Date" claims are interpreted using milliseconds instead of seconds

[coheigea]

Repository: syncope
Updated Branches:
  refs/heads/2_0_X 98ab61e06 -> c522ac058


SYNCOPE-1179 - JWT "Date" claims are interpreted using milliseconds instead of 
seconds


Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/c522ac05
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/c522ac05
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/c522ac05

Branch: refs/heads/2_0_X
Commit: c522ac05821dd23e3326c01525ebdd233ad66dd2
Parents: 98ab61e
Author: Colm O hEigeartaigh 
Authored: Fri Jul 28 14:50:03 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Fri Jul 28 14:50:27 2017 +0100

--
 .../java/data/AccessTokenDataBinderImpl.java| 24 
 .../security/JWTAuthenticationProvider.java |  4 +-
 .../org/apache/syncope/fit/core/JWTITCase.java  | 58 +++-
 3 files changed, 48 insertions(+), 38 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/syncope/blob/c522ac05/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/AccessTokenDataBinderImpl.java
--
diff --git 
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/AccessTokenDataBinderImpl.java
 
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/AccessTokenDataBinderImpl.java
index f30562d..d886db6 100644
--- 
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/AccessTokenDataBinderImpl.java
+++ 
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/AccessTokenDataBinderImpl.java
@@ -87,16 +87,16 @@ public class AccessTokenDataBinderImpl implements 
AccessTokenDataBinder {
 
 credentialChecker.checkIsDefaultJWSKeyInUse();
 
-Date now = new Date();
-Date expiry = new Date(now.getTime() + 60L * 1000L * duration);
+long currentTime = new Date().getTime() / 1000L;
+long expiryTime = currentTime + 60L * duration;
 
 JwtClaims jwtClaims = new JwtClaims();
 jwtClaims.setTokenId(UUID_GENERATOR.generate().toString());
 jwtClaims.setSubject(subject);
-jwtClaims.setIssuedAt(now.getTime());
+jwtClaims.setIssuedAt(currentTime);
 jwtClaims.setIssuer(jwtIssuer);
-jwtClaims.setExpiryTime(expiry.getTime());
-jwtClaims.setNotBefore(now.getTime());
+jwtClaims.setExpiryTime(expiryTime);
+jwtClaims.setNotBefore(currentTime);
 for (Map.Entry entry : claims.entrySet()) {
 jwtClaims.setClaim(entry.getKey(), entry.getValue());
 }
@@ -107,7 +107,7 @@ public class AccessTokenDataBinderImpl implements 
AccessTokenDataBinder {
 
 String signed = producer.signWith(jwsSignatureProvider);
 
-return Triple.of(jwtClaims.getTokenId(), signed, expiry);
+return Triple.of(jwtClaims.getTokenId(), signed, new Date(expiryTime * 
1000L));
 }
 
 @Override
@@ -164,10 +164,11 @@ public class AccessTokenDataBinderImpl implements 
AccessTokenDataBinder {
 
 credentialChecker.checkIsDefaultJWSKeyInUse();
 
-Date now = new Date();
 long duration = confDAO.find("jwt.lifetime.minutes", 120L);
-Date expiry = new Date(now.getTime() + 60L * 1000L * duration);
-consumer.getJwtClaims().setExpiryTime(expiry.getTime());
+long currentTime = new Date().getTime() / 1000L;
+long expiry = currentTime + 60L * duration;
+consumer.getJwtClaims().setExpiryTime(expiry);
+Date expiryDate = new Date(expiry * 1000L);
 
 JwsHeaders jwsHeaders = new JwsHeaders(JoseType.JWT, 
jwsSignatureProvider.getAlgorithm());
 JwtToken token = new JwtToken(jwsHeaders, consumer.getJwtClaims());
@@ -176,7 +177,8 @@ public class AccessTokenDataBinderImpl implements 
AccessTokenDataBinder {
 String body = producer.signWith(jwsSignatureProvider);
 
 accessToken.setBody(body);
-accessToken.setExpiryTime(expiry);
+// AccessToken stores expiry time in milliseconds, as opposed to 
seconds for the JWT tokens.
+accessToken.setExpiryTime(expiryDate);
 
 if (!adminUser.equals(accessToken.getOwner())) {
 try {
@@ -190,7 +192,7 @@ public class AccessTokenDataBinderImpl implements 
AccessTokenDataBinder {
 
 accessTokenDAO.save(accessToken);
 
-return Pair.of(body, expiry);
+return Pair.of(body, expiryDate);
 }
 
 @Override

http://git-wip-us.apache.org/repos/asf/syncope/blob/c522ac05/core/spring/src/main/java/org/apache/syncope/core/spring/security/JWTAuthenticationProvider.java
--
diff --git 

syncope git commit: SYNCOPE-1179 - JWT "Date" claims are interpreted using milliseconds instead of seconds

[coheigea]

Repository: syncope
Updated Branches:
  refs/heads/master b41675a33 -> 2b4053df1


SYNCOPE-1179 - JWT "Date" claims are interpreted using milliseconds instead of 
seconds


Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/2b4053df
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/2b4053df
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/2b4053df

Branch: refs/heads/master
Commit: 2b4053df14d74e47c55ced76b713fc1baba0abda
Parents: b41675a
Author: Colm O hEigeartaigh 
Authored: Fri Jul 28 14:50:03 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Fri Jul 28 14:50:03 2017 +0100

--
 .../java/data/AccessTokenDataBinderImpl.java| 24 
 .../security/JWTAuthenticationProvider.java |  4 +-
 .../org/apache/syncope/fit/core/JWTITCase.java  | 58 +++-
 3 files changed, 48 insertions(+), 38 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/syncope/blob/2b4053df/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/AccessTokenDataBinderImpl.java
--
diff --git 
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/AccessTokenDataBinderImpl.java
 
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/AccessTokenDataBinderImpl.java
index f30562d..d886db6 100644
--- 
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/AccessTokenDataBinderImpl.java
+++ 
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/AccessTokenDataBinderImpl.java
@@ -87,16 +87,16 @@ public class AccessTokenDataBinderImpl implements 
AccessTokenDataBinder {
 
 credentialChecker.checkIsDefaultJWSKeyInUse();
 
-Date now = new Date();
-Date expiry = new Date(now.getTime() + 60L * 1000L * duration);
+long currentTime = new Date().getTime() / 1000L;
+long expiryTime = currentTime + 60L * duration;
 
 JwtClaims jwtClaims = new JwtClaims();
 jwtClaims.setTokenId(UUID_GENERATOR.generate().toString());
 jwtClaims.setSubject(subject);
-jwtClaims.setIssuedAt(now.getTime());
+jwtClaims.setIssuedAt(currentTime);
 jwtClaims.setIssuer(jwtIssuer);
-jwtClaims.setExpiryTime(expiry.getTime());
-jwtClaims.setNotBefore(now.getTime());
+jwtClaims.setExpiryTime(expiryTime);
+jwtClaims.setNotBefore(currentTime);
 for (Map.Entry entry : claims.entrySet()) {
 jwtClaims.setClaim(entry.getKey(), entry.getValue());
 }
@@ -107,7 +107,7 @@ public class AccessTokenDataBinderImpl implements 
AccessTokenDataBinder {
 
 String signed = producer.signWith(jwsSignatureProvider);
 
-return Triple.of(jwtClaims.getTokenId(), signed, expiry);
+return Triple.of(jwtClaims.getTokenId(), signed, new Date(expiryTime * 
1000L));
 }
 
 @Override
@@ -164,10 +164,11 @@ public class AccessTokenDataBinderImpl implements 
AccessTokenDataBinder {
 
 credentialChecker.checkIsDefaultJWSKeyInUse();
 
-Date now = new Date();
 long duration = confDAO.find("jwt.lifetime.minutes", 120L);
-Date expiry = new Date(now.getTime() + 60L * 1000L * duration);
-consumer.getJwtClaims().setExpiryTime(expiry.getTime());
+long currentTime = new Date().getTime() / 1000L;
+long expiry = currentTime + 60L * duration;
+consumer.getJwtClaims().setExpiryTime(expiry);
+Date expiryDate = new Date(expiry * 1000L);
 
 JwsHeaders jwsHeaders = new JwsHeaders(JoseType.JWT, 
jwsSignatureProvider.getAlgorithm());
 JwtToken token = new JwtToken(jwsHeaders, consumer.getJwtClaims());
@@ -176,7 +177,8 @@ public class AccessTokenDataBinderImpl implements 
AccessTokenDataBinder {
 String body = producer.signWith(jwsSignatureProvider);
 
 accessToken.setBody(body);
-accessToken.setExpiryTime(expiry);
+// AccessToken stores expiry time in milliseconds, as opposed to 
seconds for the JWT tokens.
+accessToken.setExpiryTime(expiryDate);
 
 if (!adminUser.equals(accessToken.getOwner())) {
 try {
@@ -190,7 +192,7 @@ public class AccessTokenDataBinderImpl implements 
AccessTokenDataBinder {
 
 accessTokenDAO.save(accessToken);
 
-return Pair.of(body, expiry);
+return Pair.of(body, expiryDate);
 }
 
 @Override

http://git-wip-us.apache.org/repos/asf/syncope/blob/2b4053df/core/spring/src/main/java/org/apache/syncope/core/spring/security/JWTAuthenticationProvider.java
--
diff --git 

Syncope-2_0_X - Build # 62 - Still Failing

[Apache Jenkins Server]

The Apache Jenkins build system has built Syncope-2_0_X (build #62)

Status: Still Failing

Check console output at https://builds.apache.org/job/Syncope-2_0_X/62/ to view 
the results.

svn commit: r1803268 - /syncope/site/team-list.html

[ilgrosso]

Author: ilgrosso
Date: Fri Jul 28 11:39:52 2017
New Revision: 1803268

URL: http://svn.apache.org/viewvc?rev=1803268=rev
Log:
Publishing updated team list

Modified:
syncope/site/team-list.html

Modified: syncope/site/team-list.html
URL: 
http://svn.apache.org/viewvc/syncope/site/team-list.html?rev=1803268=1803267=1803268=diff
==
--- syncope/site/team-list.html (original)
+++ syncope/site/team-list.html Fri Jul 28 11:39:52 2017
@@ -7,7 +7,7 @@
   
 
 
-
+
 
 Apache Syncope  Project Team
 
@@ -428,6 +428,15 @@
 http://people.apache.org/~matteodc/;>http://people.apache.org/~matteodc/
 Tirasa
 http://www.tirasa.net/;>http://www.tirasa.net/
+committer
+
+http://www.gravatar.com/avatar/6bb18752cda03617975cedacb4716737?d=mms=60;
 alt="" />
+skylark17
+Matteo Alessandroni
+mailto:skylar...@apache.org;>skylar...@apache.org
+http://people.apache.org/~skylark17/;>http://people.apache.org/~skylark17/
+Tirasa
+http://www.tirasa.net/;>http://www.tirasa.net/
 committer
 
 Contributors

[4/4] syncope git commit: [SYNCOPE-1175] Fixing token generation

[ilgrosso]

[SYNCOPE-1175] Fixing token generation


Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/98ab61e0
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/98ab61e0
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/98ab61e0

Branch: refs/heads/2_0_X
Commit: 98ab61e060a4045720b6d09e1392404ac461b7df
Parents: 0c9f958
Author: Francesco Chicchiriccò 
Authored: Fri Jul 28 13:21:55 2017 +0200
Committer: Francesco Chicchiriccò 
Committed: Fri Jul 28 13:22:58 2017 +0200

--
 .../resources/UserSelfConfirmPasswordReset.java | 20 +++--
 .../resources/UserSelfPasswordReset.java| 31 +---
 .../app/js/controllers/UserController.js| 14 -
 .../app/js/services/userSelfService.js  |  5 ++--
 .../resources/app/languages/en/static.json  |  6 ++--
 .../resources/app/languages/it/static.json  |  2 +-
 .../core/spring/security/SecureRandomUtils.java |  7 +
 .../src/test/resources/tests/create.js  |  2 +-
 .../src/test/resources/tests/edit.js|  1 -
 9 files changed, 32 insertions(+), 56 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/syncope/blob/98ab61e0/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/UserSelfConfirmPasswordReset.java
--
diff --git 
a/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/UserSelfConfirmPasswordReset.java
 
b/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/UserSelfConfirmPasswordReset.java
index 343ed64..8bb15c2 100644
--- 
a/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/UserSelfConfirmPasswordReset.java
+++ 
b/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/UserSelfConfirmPasswordReset.java
@@ -18,8 +18,6 @@
  */
 package org.apache.syncope.client.enduser.resources;
 
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
 import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 import javax.ws.rs.core.MediaType;
@@ -31,14 +29,14 @@ import org.apache.wicket.request.resource.AbstractResource;
 import org.apache.wicket.request.resource.IResource;
 
 @Resource(key = "userSelfConfirmPasswordReset", path = 
"/api/self/confirmPasswordReset")
-public class UserSelfConfirmPasswordReset extends BaseResource {
+public class UserSelfConfirmPasswordReset extends BaseUserSelfResource {
 
 private static final long serialVersionUID = -2721621682300247583L;
 
 @Override
 protected ResourceResponse newResourceResponse(final IResource.Attributes 
attributes) {
 ResourceResponse response = new AbstractResource.ResourceResponse();
-response.setContentType(MediaType.APPLICATION_JSON);
+response.setContentType(MediaType.TEXT_PLAIN);
 try {
 HttpServletRequest request = (HttpServletRequest) 
attributes.getRequest().getContainerRequest();
 if (!xsrfCheck(request)) {
@@ -61,18 +59,8 @@ public class UserSelfConfirmPasswordReset extends 
BaseResource {
 SyncopeEnduserSession.get().getService(UserSelfService.class).
 confirmPasswordReset(token, 
parameters.get("newPassword")[0]);
 
-final String responseMessage = new 
StringBuilder().append("Password changed correctly").toString();
-
-response.setTextEncoding(StandardCharsets.UTF_8.name());
-response.setWriteCallback(new WriteCallback() {
-
-@Override
-public void writeData(final Attributes attributes) throws 
IOException {
-attributes.getResponse().write(responseMessage);
-}
-});
-
-response.setStatusCode(Response.Status.OK.getStatusCode());
+buildResponse(response, Response.Status.OK.getStatusCode(),
+"Password successfully updated");
 } catch (final Exception e) {
 LOG.error("Error while updating user", e);
 response.setError(Response.Status.BAD_REQUEST.getStatusCode(), new 
StringBuilder()

http://git-wip-us.apache.org/repos/asf/syncope/blob/98ab61e0/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/UserSelfPasswordReset.java
--
diff --git 
a/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/UserSelfPasswordReset.java
 
b/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/UserSelfPasswordReset.java
index f97d348..77408a6 100644
--- 
a/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/UserSelfPasswordReset.java
+++ 

[3/4] syncope git commit: [SYNCOPE-1174] More robust conf params' default value management

[ilgrosso]

[SYNCOPE-1174] More robust conf params' default value management

This reverts commit 6634daaeebbe95fea9e1c104bc64d7b2e0d45e4b.


Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/0c9f9585
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/0c9f9585
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/0c9f9585

Branch: refs/heads/2_0_X
Commit: 0c9f9585ba7a0c0c17eef4be511e8c372f808757
Parents: 6fecdc2
Author: Francesco Chicchiriccò 
Authored: Fri Jul 28 10:02:10 2017 +0200
Committer: Francesco Chicchiriccò 
Committed: Fri Jul 28 13:22:58 2017 +0200

--
 .../apache/syncope/core/logic/GroupLogic.java   |  2 +-
 .../apache/syncope/core/logic/ReportLogic.java  |  6 +--
 .../apache/syncope/core/logic/SyncopeLogic.java |  6 +--
 .../apache/syncope/core/logic/TaskLogic.java|  6 +--
 .../core/persistence/api/dao/ConfDAO.java   |  2 +-
 .../core/persistence/jpa/dao/JPAConfDAO.java| 44 
 .../api/data/AccessTokenDataBinder.java |  2 +-
 .../java/data/AccessTokenDataBinderImpl.java| 15 ++-
 .../java/data/ConnInstanceDataBinderImpl.java   |  2 +-
 .../java/data/ResourceDataBinderImpl.java   |  2 +-
 .../java/data/UserDataBinderImpl.java   |  9 ++--
 .../provisioning/java/job/JobManagerImpl.java   | 13 +++---
 .../notification/NotificationManagerImpl.java   |  2 +-
 .../core/spring/security/AuthDataAccessor.java  |  2 +-
 .../workflow/activiti/task/GenerateToken.java   |  4 +-
 .../workflow/flowable/task/GenerateToken.java   |  4 +-
 .../java/DefaultUserWorkflowAdapter.java|  4 +-
 .../apache/syncope/core/logic/SAML2SPLogic.java |  2 +-
 18 files changed, 43 insertions(+), 84 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/syncope/blob/0c9f9585/core/logic/src/main/java/org/apache/syncope/core/logic/GroupLogic.java
--
diff --git 
a/core/logic/src/main/java/org/apache/syncope/core/logic/GroupLogic.java 
b/core/logic/src/main/java/org/apache/syncope/core/logic/GroupLogic.java
index 52946a6..8098de0 100644
--- a/core/logic/src/main/java/org/apache/syncope/core/logic/GroupLogic.java
+++ b/core/logic/src/main/java/org/apache/syncope/core/logic/GroupLogic.java
@@ -431,7 +431,7 @@ public class GroupLogic extends AbstractAnyLogic {
 Map jobDataMap = jobManager.register(
 task,
 null,
-confDAO.find("tasks.interruptMaxRetries", 
"1").getValues().get(0).getLongValue());
+confDAO.find("tasks.interruptMaxRetries", 1L));
 
 jobDataMap.put(TaskJob.DRY_RUN_JOBDETAIL_KEY, false);
 
jobDataMap.put(GroupMemberProvisionTaskJobDelegate.GROUP_KEY_JOBDETAIL_KEY, 
key);

http://git-wip-us.apache.org/repos/asf/syncope/blob/0c9f9585/core/logic/src/main/java/org/apache/syncope/core/logic/ReportLogic.java
--
diff --git 
a/core/logic/src/main/java/org/apache/syncope/core/logic/ReportLogic.java 
b/core/logic/src/main/java/org/apache/syncope/core/logic/ReportLogic.java
index 1f232ad..5243277 100644
--- a/core/logic/src/main/java/org/apache/syncope/core/logic/ReportLogic.java
+++ b/core/logic/src/main/java/org/apache/syncope/core/logic/ReportLogic.java
@@ -97,7 +97,7 @@ public class ReportLogic extends 
AbstractExecutableLogic {
 jobManager.register(
 report,
 null,
-confDAO.find("tasks.interruptMaxRetries", 
"1").getValues().get(0).getLongValue());
+confDAO.find("tasks.interruptMaxRetries", 1L));
 } catch (Exception e) {
 LOG.error("While registering quartz job for report " + 
report.getKey(), e);
 
@@ -123,7 +123,7 @@ public class ReportLogic extends 
AbstractExecutableLogic {
 jobManager.register(
 report,
 null,
-confDAO.find("tasks.interruptMaxRetries", 
"1").getValues().get(0).getLongValue());
+confDAO.find("tasks.interruptMaxRetries", 1L));
 } catch (Exception e) {
 LOG.error("While registering quartz job for report " + 
report.getKey(), e);
 
@@ -173,7 +173,7 @@ public class ReportLogic extends 
AbstractExecutableLogic {
 jobManager.register(
 report,
 startAt,
-confDAO.find("tasks.interruptMaxRetries", 
"1").getValues().get(0).getLongValue());
+confDAO.find("tasks.interruptMaxRetries", 1L));
 
 scheduler.getScheduler().triggerJob(JobNamer.getJobKey(report));
 } catch (Exception e) {

[1/4] syncope git commit: [SYNCOPE-1175] Fixing token generation

[ilgrosso]

Repository: syncope
Updated Branches:
  refs/heads/2_0_X 6fecdc2bc -> 98ab61e06
  refs/heads/master c04858494 -> b41675a33


[SYNCOPE-1175] Fixing token generation


Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/0e4eed03
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/0e4eed03
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/0e4eed03

Branch: refs/heads/master
Commit: 0e4eed03e565107d7aa2801bc892aa099926fd82
Parents: c048584
Author: Francesco Chicchiriccò 
Authored: Fri Jul 28 13:21:55 2017 +0200
Committer: Francesco Chicchiriccò 
Committed: Fri Jul 28 13:22:25 2017 +0200

--
 .../resources/UserSelfConfirmPasswordReset.java | 20 +++--
 .../resources/UserSelfPasswordReset.java| 31 +---
 .../app/js/controllers/UserController.js| 14 -
 .../app/js/services/userSelfService.js  |  5 ++--
 .../resources/app/languages/en/static.json  |  6 ++--
 .../resources/app/languages/it/static.json  |  2 +-
 .../core/spring/security/SecureRandomUtils.java |  7 +
 .../src/test/resources/tests/create.js  |  2 +-
 .../src/test/resources/tests/edit.js|  1 -
 9 files changed, 32 insertions(+), 56 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/syncope/blob/0e4eed03/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/UserSelfConfirmPasswordReset.java
--
diff --git 
a/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/UserSelfConfirmPasswordReset.java
 
b/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/UserSelfConfirmPasswordReset.java
index 343ed64..8bb15c2 100644
--- 
a/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/UserSelfConfirmPasswordReset.java
+++ 
b/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/UserSelfConfirmPasswordReset.java
@@ -18,8 +18,6 @@
  */
 package org.apache.syncope.client.enduser.resources;
 
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
 import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 import javax.ws.rs.core.MediaType;
@@ -31,14 +29,14 @@ import org.apache.wicket.request.resource.AbstractResource;
 import org.apache.wicket.request.resource.IResource;
 
 @Resource(key = "userSelfConfirmPasswordReset", path = 
"/api/self/confirmPasswordReset")
-public class UserSelfConfirmPasswordReset extends BaseResource {
+public class UserSelfConfirmPasswordReset extends BaseUserSelfResource {
 
 private static final long serialVersionUID = -2721621682300247583L;
 
 @Override
 protected ResourceResponse newResourceResponse(final IResource.Attributes 
attributes) {
 ResourceResponse response = new AbstractResource.ResourceResponse();
-response.setContentType(MediaType.APPLICATION_JSON);
+response.setContentType(MediaType.TEXT_PLAIN);
 try {
 HttpServletRequest request = (HttpServletRequest) 
attributes.getRequest().getContainerRequest();
 if (!xsrfCheck(request)) {
@@ -61,18 +59,8 @@ public class UserSelfConfirmPasswordReset extends 
BaseResource {
 SyncopeEnduserSession.get().getService(UserSelfService.class).
 confirmPasswordReset(token, 
parameters.get("newPassword")[0]);
 
-final String responseMessage = new 
StringBuilder().append("Password changed correctly").toString();
-
-response.setTextEncoding(StandardCharsets.UTF_8.name());
-response.setWriteCallback(new WriteCallback() {
-
-@Override
-public void writeData(final Attributes attributes) throws 
IOException {
-attributes.getResponse().write(responseMessage);
-}
-});
-
-response.setStatusCode(Response.Status.OK.getStatusCode());
+buildResponse(response, Response.Status.OK.getStatusCode(),
+"Password successfully updated");
 } catch (final Exception e) {
 LOG.error("Error while updating user", e);
 response.setError(Response.Status.BAD_REQUEST.getStatusCode(), new 
StringBuilder()

http://git-wip-us.apache.org/repos/asf/syncope/blob/0e4eed03/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/UserSelfPasswordReset.java
--
diff --git 
a/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/UserSelfPasswordReset.java
 
b/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/UserSelfPasswordReset.java
index f97d348..77408a6 100644
--- 

[2/4] syncope git commit: [SYNCOPE-1174] More robust conf params' default value management

[ilgrosso]

[SYNCOPE-1174] More robust conf params' default value management

This reverts commit 6634daaeebbe95fea9e1c104bc64d7b2e0d45e4b.


Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/b41675a3
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/b41675a3
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/b41675a3

Branch: refs/heads/master
Commit: b41675a335a7d6b4d297f0cd332738c21a6c29ba
Parents: 0e4eed0
Author: Francesco Chicchiriccò 
Authored: Fri Jul 28 10:02:10 2017 +0200
Committer: Francesco Chicchiriccò 
Committed: Fri Jul 28 13:22:44 2017 +0200

--
 .../apache/syncope/core/logic/GroupLogic.java   |  2 +-
 .../apache/syncope/core/logic/ReportLogic.java  |  6 +--
 .../apache/syncope/core/logic/SyncopeLogic.java |  6 +--
 .../apache/syncope/core/logic/TaskLogic.java|  6 +--
 .../core/persistence/api/dao/ConfDAO.java   |  2 +-
 .../core/persistence/jpa/dao/JPAConfDAO.java| 44 
 .../api/data/AccessTokenDataBinder.java |  2 +-
 .../java/data/AccessTokenDataBinderImpl.java| 15 ++-
 .../java/data/ConnInstanceDataBinderImpl.java   |  2 +-
 .../java/data/ResourceDataBinderImpl.java   |  2 +-
 .../java/data/UserDataBinderImpl.java   |  9 ++--
 .../provisioning/java/job/JobManagerImpl.java   | 13 +++---
 .../notification/NotificationManagerImpl.java   |  2 +-
 .../core/spring/security/AuthDataAccessor.java  |  2 +-
 .../workflow/activiti/task/GenerateToken.java   |  4 +-
 .../java/DefaultUserWorkflowAdapter.java|  4 +-
 .../apache/syncope/core/logic/SAML2SPLogic.java |  2 +-
 17 files changed, 41 insertions(+), 82 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/syncope/blob/b41675a3/core/logic/src/main/java/org/apache/syncope/core/logic/GroupLogic.java
--
diff --git 
a/core/logic/src/main/java/org/apache/syncope/core/logic/GroupLogic.java 
b/core/logic/src/main/java/org/apache/syncope/core/logic/GroupLogic.java
index 52946a6..8098de0 100644
--- a/core/logic/src/main/java/org/apache/syncope/core/logic/GroupLogic.java
+++ b/core/logic/src/main/java/org/apache/syncope/core/logic/GroupLogic.java
@@ -431,7 +431,7 @@ public class GroupLogic extends AbstractAnyLogic {
 Map jobDataMap = jobManager.register(
 task,
 null,
-confDAO.find("tasks.interruptMaxRetries", 
"1").getValues().get(0).getLongValue());
+confDAO.find("tasks.interruptMaxRetries", 1L));
 
 jobDataMap.put(TaskJob.DRY_RUN_JOBDETAIL_KEY, false);
 
jobDataMap.put(GroupMemberProvisionTaskJobDelegate.GROUP_KEY_JOBDETAIL_KEY, 
key);

http://git-wip-us.apache.org/repos/asf/syncope/blob/b41675a3/core/logic/src/main/java/org/apache/syncope/core/logic/ReportLogic.java
--
diff --git 
a/core/logic/src/main/java/org/apache/syncope/core/logic/ReportLogic.java 
b/core/logic/src/main/java/org/apache/syncope/core/logic/ReportLogic.java
index 1f232ad..5243277 100644
--- a/core/logic/src/main/java/org/apache/syncope/core/logic/ReportLogic.java
+++ b/core/logic/src/main/java/org/apache/syncope/core/logic/ReportLogic.java
@@ -97,7 +97,7 @@ public class ReportLogic extends 
AbstractExecutableLogic {
 jobManager.register(
 report,
 null,
-confDAO.find("tasks.interruptMaxRetries", 
"1").getValues().get(0).getLongValue());
+confDAO.find("tasks.interruptMaxRetries", 1L));
 } catch (Exception e) {
 LOG.error("While registering quartz job for report " + 
report.getKey(), e);
 
@@ -123,7 +123,7 @@ public class ReportLogic extends 
AbstractExecutableLogic {
 jobManager.register(
 report,
 null,
-confDAO.find("tasks.interruptMaxRetries", 
"1").getValues().get(0).getLongValue());
+confDAO.find("tasks.interruptMaxRetries", 1L));
 } catch (Exception e) {
 LOG.error("While registering quartz job for report " + 
report.getKey(), e);
 
@@ -173,7 +173,7 @@ public class ReportLogic extends 
AbstractExecutableLogic {
 jobManager.register(
 report,
 startAt,
-confDAO.find("tasks.interruptMaxRetries", 
"1").getValues().get(0).getLongValue());
+confDAO.find("tasks.interruptMaxRetries", 1L));
 
 scheduler.getScheduler().triggerJob(JobNamer.getJobKey(report));
 } catch (Exception e) {

syncope git commit: Adding myself to the developers in pom.xml

[skylark17]

Repository: syncope
Updated Branches:
  refs/heads/master e06d18ae3 -> c04858494


Adding myself to the developers in pom.xml


Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/c0485849
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/c0485849
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/c0485849

Branch: refs/heads/master
Commit: c04858494ca325bee056577e98e272239fbd3e08
Parents: e06d18a
Author: Matteo Alessandroni 
Authored: Fri Jul 28 11:42:04 2017 +0200
Committer: Matteo Alessandroni 
Committed: Fri Jul 28 11:42:04 2017 +0200

--
 pom.xml | 11 +++
 1 file changed, 11 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/syncope/blob/c0485849/pom.xml
--
diff --git a/pom.xml b/pom.xml
index fef3931..6a89612 100644
--- a/pom.xml
+++ b/pom.xml
@@ -302,6 +302,17 @@ under the License.
   http://people.apache.org/~matteodc/
   matte...@apache.org
 
+
+  skylark17
+  Matteo Alessandroni
+  Tirasa
+  http://www.tirasa.net/
+  
+committer
+  
+  http://people.apache.org/~skylark17/
+  skylar...@apache.org
+
   
   
 

syncope git commit: Adding myself to the developers in pom.xml

[skylark17]

Repository: syncope
Updated Branches:
  refs/heads/2_0_X 2a2d8c836 -> 6fecdc2bc


Adding myself to the developers in pom.xml


Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/6fecdc2b
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/6fecdc2b
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/6fecdc2b

Branch: refs/heads/2_0_X
Commit: 6fecdc2bc7fcec644eb1d664ed8f557f0b333970
Parents: 2a2d8c8
Author: Matteo Alessandroni 
Authored: Fri Jul 28 11:35:39 2017 +0200
Committer: Matteo Alessandroni 
Committed: Fri Jul 28 11:35:39 2017 +0200

--
 pom.xml | 11 +++
 1 file changed, 11 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/syncope/blob/6fecdc2b/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 8cf2787..a9d8170 100644
--- a/pom.xml
+++ b/pom.xml
@@ -302,6 +302,17 @@ under the License.
   http://people.apache.org/~matteodc/
   matte...@apache.org
 
+
+  skylark17
+  Matteo Alessandroni
+  Tirasa
+  http://www.tirasa.net/
+  
+committer
+  
+  http://people.apache.org/~skylark17/
+  skylar...@apache.org
+
   
   
 

Syncope-2_0_X - Build # 60 - Still Failing

[Apache Jenkins Server]

The Apache Jenkins build system has built Syncope-2_0_X (build #60)

Status: Still Failing

Check console output at https://builds.apache.org/job/Syncope-2_0_X/60/ to view 
the results.

Syncope-master-deploy - Build # 2390 - Fixed

[Apache Jenkins Server]

The Apache Jenkins build system has built Syncope-master-deploy (build #2390)

Status: Fixed

Check console output at 
https://builds.apache.org/job/Syncope-master-deploy/2390/ to view the results.

[2/2] syncope git commit: [SYNCOPE-1167] Preliminary AnyType selection when adding new provision rule - This closes #57

[ilgrosso]

[SYNCOPE-1167] Preliminary AnyType selection when adding new provision rule - 
This closes #57


Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/e06d18ae
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/e06d18ae
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/e06d18ae

Branch: refs/heads/master
Commit: e06d18ae329547fbf42924593fd68dd2d74dcbb6
Parents: 64ef5bf
Author: Matteo Alessandroni 
Authored: Tue Jul 25 16:27:43 2017 +0200
Committer: Francesco Chicchiriccò 
Committed: Fri Jul 28 09:50:10 2017 +0200

--
 .../console/wizards/AjaxWizardBuilder.java  |  2 +-
 .../client/console/wizards/WizardMgtPanel.java  | 10 +++
 .../resources/ObjectTypeTogglePanel.java| 85 ++
 .../resources/ProvisionWizardBuilder.java   | 84 -
 .../resources/ResourceProvisionPanel.java   | 95 +++-
 .../resources/ObjectTypeTogglePanel.html| 32 +++
 .../resources/ObjectTypeTogglePanel.properties  | 22 +
 .../ObjectTypeTogglePanel_it.properties | 22 +
 .../ObjectTypeTogglePanel_pt_BR.properties  | 22 +
 .../ObjectTypeTogglePanel_ru.properties | 22 +
 .../ProvisionWizardBuilder$ObjectType.html  |  3 -
 ...ProvisionWizardBuilder$ObjectType.properties |  7 +-
 ...visionWizardBuilder$ObjectType_it.properties |  6 +-
 ...ionWizardBuilder$ObjectType_pt_BR.properties |  8 +-
 ...visionWizardBuilder$ObjectType_ru.properties |  8 +-
 .../resources/ResourceProvisionPanel.html   |  5 +-
 .../syncope/fit/console/TopologyITCase.java | 26 +-
 17 files changed, 362 insertions(+), 97 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/syncope/blob/e06d18ae/client/console/src/main/java/org/apache/syncope/client/console/wizards/AjaxWizardBuilder.java
--
diff --git 
a/client/console/src/main/java/org/apache/syncope/client/console/wizards/AjaxWizardBuilder.java
 
b/client/console/src/main/java/org/apache/syncope/client/console/wizards/AjaxWizardBuilder.java
index 9e3c6e4..32514ad 100644
--- 
a/client/console/src/main/java/org/apache/syncope/client/console/wizards/AjaxWizardBuilder.java
+++ 
b/client/console/src/main/java/org/apache/syncope/client/console/wizards/AjaxWizardBuilder.java
@@ -87,7 +87,7 @@ public abstract class AjaxWizardBuilder extends Abstract
 public AjaxWizard build(final String id, final AjaxWizard.Mode mode) {
 this.mode = mode;
 
-// ge the specified item if available
+// get the specified item if available
 final T modelObject = newModelObject();
 
 return new AjaxWizard(id, modelObject, buildModelSteps(modelObject, 
new WizardModel()), mode, this.pageRef) {

http://git-wip-us.apache.org/repos/asf/syncope/blob/e06d18ae/client/console/src/main/java/org/apache/syncope/client/console/wizards/WizardMgtPanel.java
--
diff --git 
a/client/console/src/main/java/org/apache/syncope/client/console/wizards/WizardMgtPanel.java
 
b/client/console/src/main/java/org/apache/syncope/client/console/wizards/WizardMgtPanel.java
index 0ade92c..509dd92 100644
--- 
a/client/console/src/main/java/org/apache/syncope/client/console/wizards/WizardMgtPanel.java
+++ 
b/client/console/src/main/java/org/apache/syncope/client/console/wizards/WizardMgtPanel.java
@@ -296,6 +296,16 @@ public abstract class WizardMgtPanel extends Panel imple
 public MarkupContainer addInnerObject(final Component... childs) {
 return initialFragment.add(childs);
 }
+
+/**
+ * Add or replace object inside the main container.
+ *
+ * @param childs components to be added.
+ * @return the current panel instance.
+ */
+public MarkupContainer addOrReplaceInnerObject(final Component... childs) {
+return initialFragment.addOrReplace(childs);
+}
 
 /**
  * Add object outside the main container.

http://git-wip-us.apache.org/repos/asf/syncope/blob/e06d18ae/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ObjectTypeTogglePanel.java
--
diff --git 
a/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ObjectTypeTogglePanel.java
 
b/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ObjectTypeTogglePanel.java
new file mode 100644
index 000..9e26700
--- /dev/null
+++ 
b/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ObjectTypeTogglePanel.java
@@ -0,0 +1,85 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor 

[1/2] syncope git commit: [SYNCOPE-1167] Preliminary AnyType selection when adding new provision rule

[ilgrosso]

Repository: syncope
Updated Branches:
  refs/heads/2_0_X 6634daaee -> 2a2d8c836
  refs/heads/master 64ef5bf18 -> e06d18ae3


[SYNCOPE-1167] Preliminary AnyType selection when adding new provision rule


Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/2a2d8c83
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/2a2d8c83
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/2a2d8c83

Branch: refs/heads/2_0_X
Commit: 2a2d8c836370bc23261e713405110839495cb8a1
Parents: 6634daa
Author: Matteo Alessandroni 
Authored: Tue Jul 25 16:27:43 2017 +0200
Committer: Francesco Chicchiriccò 
Committed: Fri Jul 28 09:01:55 2017 +0200

--
 .../console/wizards/AjaxWizardBuilder.java  |  2 +-
 .../client/console/wizards/WizardMgtPanel.java  | 10 +++
 .../resources/ObjectTypeTogglePanel.java| 85 ++
 .../resources/ProvisionWizardBuilder.java   | 84 -
 .../resources/ResourceProvisionPanel.java   | 95 +++-
 .../resources/ObjectTypeTogglePanel.html| 32 +++
 .../resources/ObjectTypeTogglePanel.properties  | 22 +
 .../ObjectTypeTogglePanel_it.properties | 22 +
 .../ObjectTypeTogglePanel_pt_BR.properties  | 22 +
 .../ObjectTypeTogglePanel_ru.properties | 22 +
 .../ProvisionWizardBuilder$ObjectType.html  |  3 -
 ...ProvisionWizardBuilder$ObjectType.properties |  7 +-
 ...visionWizardBuilder$ObjectType_it.properties |  6 +-
 ...ionWizardBuilder$ObjectType_pt_BR.properties |  8 +-
 ...visionWizardBuilder$ObjectType_ru.properties |  8 +-
 .../resources/ResourceProvisionPanel.html   |  5 +-
 .../syncope/fit/console/TopologyITCase.java | 26 +-
 17 files changed, 362 insertions(+), 97 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/syncope/blob/2a2d8c83/client/console/src/main/java/org/apache/syncope/client/console/wizards/AjaxWizardBuilder.java
--
diff --git 
a/client/console/src/main/java/org/apache/syncope/client/console/wizards/AjaxWizardBuilder.java
 
b/client/console/src/main/java/org/apache/syncope/client/console/wizards/AjaxWizardBuilder.java
index 9e3c6e4..32514ad 100644
--- 
a/client/console/src/main/java/org/apache/syncope/client/console/wizards/AjaxWizardBuilder.java
+++ 
b/client/console/src/main/java/org/apache/syncope/client/console/wizards/AjaxWizardBuilder.java
@@ -87,7 +87,7 @@ public abstract class AjaxWizardBuilder extends Abstract
 public AjaxWizard build(final String id, final AjaxWizard.Mode mode) {
 this.mode = mode;
 
-// ge the specified item if available
+// get the specified item if available
 final T modelObject = newModelObject();
 
 return new AjaxWizard(id, modelObject, buildModelSteps(modelObject, 
new WizardModel()), mode, this.pageRef) {

http://git-wip-us.apache.org/repos/asf/syncope/blob/2a2d8c83/client/console/src/main/java/org/apache/syncope/client/console/wizards/WizardMgtPanel.java
--
diff --git 
a/client/console/src/main/java/org/apache/syncope/client/console/wizards/WizardMgtPanel.java
 
b/client/console/src/main/java/org/apache/syncope/client/console/wizards/WizardMgtPanel.java
index 0ade92c..509dd92 100644
--- 
a/client/console/src/main/java/org/apache/syncope/client/console/wizards/WizardMgtPanel.java
+++ 
b/client/console/src/main/java/org/apache/syncope/client/console/wizards/WizardMgtPanel.java
@@ -296,6 +296,16 @@ public abstract class WizardMgtPanel extends Panel imple
 public MarkupContainer addInnerObject(final Component... childs) {
 return initialFragment.add(childs);
 }
+
+/**
+ * Add or replace object inside the main container.
+ *
+ * @param childs components to be added.
+ * @return the current panel instance.
+ */
+public MarkupContainer addOrReplaceInnerObject(final Component... childs) {
+return initialFragment.addOrReplace(childs);
+}
 
 /**
  * Add object outside the main container.

http://git-wip-us.apache.org/repos/asf/syncope/blob/2a2d8c83/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ObjectTypeTogglePanel.java
--
diff --git 
a/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ObjectTypeTogglePanel.java
 
b/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ObjectTypeTogglePanel.java
new file mode 100644
index 000..9e26700
--- /dev/null
+++ 
b/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ObjectTypeTogglePanel.java
@@ -0,0