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/01/05 14:34:25 UTC
[20/53] [abbrv] syncope git commit: Code formatting with netbeans
http://git-wip-us.apache.org/repos/asf/syncope/blob/7aa0db37/core/src/main/java/org/apache/syncope/core/sync/impl/LDAPPasswordSyncActions.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/sync/impl/LDAPPasswordSyncActions.java b/core/src/main/java/org/apache/syncope/core/sync/impl/LDAPPasswordSyncActions.java
index 65f43cc..2304fa4 100644
--- a/core/src/main/java/org/apache/syncope/core/sync/impl/LDAPPasswordSyncActions.java
+++ b/core/src/main/java/org/apache/syncope/core/sync/impl/LDAPPasswordSyncActions.java
@@ -66,7 +66,7 @@ public class LDAPPasswordSyncActions extends DefaultSyncActions {
return delta;
}
-
+
@Transactional(readOnly = true)
@Override
public <T extends AbstractAttributableTO, K extends AbstractAttributableMod> SyncDelta beforeUpdate(
@@ -74,15 +74,15 @@ public class LDAPPasswordSyncActions extends DefaultSyncActions {
final SyncDelta delta,
final T subject,
final K subjectMod) throws JobExecutionException {
-
+
if (subjectMod instanceof UserMod) {
- String modPassword = ((UserMod)subjectMod).getPassword();
+ String modPassword = ((UserMod) subjectMod).getPassword();
parseEncodedPassword(modPassword);
}
-
+
return delta;
}
-
+
private void parseEncodedPassword(String password) {
if (password != null && password.startsWith("{")) {
int closingBracketIndex = password.indexOf('}');
http://git-wip-us.apache.org/repos/asf/syncope/blob/7aa0db37/core/src/main/java/org/apache/syncope/core/sync/impl/RoleSyncResultHandler.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/sync/impl/RoleSyncResultHandler.java b/core/src/main/java/org/apache/syncope/core/sync/impl/RoleSyncResultHandler.java
index e544687..4e83e66 100644
--- a/core/src/main/java/org/apache/syncope/core/sync/impl/RoleSyncResultHandler.java
+++ b/core/src/main/java/org/apache/syncope/core/sync/impl/RoleSyncResultHandler.java
@@ -86,8 +86,8 @@ public class RoleSyncResultHandler extends AbstractSubjectSyncResultHandler {
RoleTO roleTO = RoleTO.class.cast(subjectTO);
- Map.Entry<Long, List<PropagationStatus>> created = roleProvisioningManager.createInSync
- (roleTO, roleOwnerMap, Collections.singleton(profile.getSyncTask().getResource().getName()));
+ Map.Entry<Long, List<PropagationStatus>> created = roleProvisioningManager.createInSync(roleTO, roleOwnerMap,
+ Collections.singleton(profile.getSyncTask().getResource().getName()));
roleTO = roleDataBinder.getRoleTO(created.getKey());
@@ -127,7 +127,7 @@ public class RoleSyncResultHandler extends AbstractSubjectSyncResultHandler {
RoleMod roleMod = RoleMod.class.cast(subjectMod);
Map.Entry<Long, List<PropagationStatus>> updated = roleProvisioningManager.update(roleMod);
-
+
//moved after role provisioning manager
String roleOwner = null;
for (AttributeMod attrMod : roleMod.getAttrsToUpdate()) {
@@ -140,7 +140,7 @@ public class RoleSyncResultHandler extends AbstractSubjectSyncResultHandler {
}
final RoleTO after = roleDataBinder.getRoleTO(updated.getKey());
-
+
result.setName(getName(after));
return after;
@@ -170,6 +170,6 @@ public class RoleSyncResultHandler extends AbstractSubjectSyncResultHandler {
LOG.error("Could not propagate user " + id, e);
}
- roleProvisioningManager.delete(id);
+ roleProvisioningManager.delete(id);
}
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/7aa0db37/core/src/main/java/org/apache/syncope/core/sync/impl/UserSyncResultHandler.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/sync/impl/UserSyncResultHandler.java b/core/src/main/java/org/apache/syncope/core/sync/impl/UserSyncResultHandler.java
index e5bdc06..6802726 100644
--- a/core/src/main/java/org/apache/syncope/core/sync/impl/UserSyncResultHandler.java
+++ b/core/src/main/java/org/apache/syncope/core/sync/impl/UserSyncResultHandler.java
@@ -82,8 +82,8 @@ public class UserSyncResultHandler extends AbstractSubjectSyncResultHandler {
Boolean enabled = syncUtilities.readEnabled(delta.getObject(), profile.getSyncTask());
//Delegate User Workflow Creation and its Propagation to provisioning manager
- Map.Entry<Long, List<PropagationStatus>>
- created = userProvisioningManager.create(userTO, true, true, enabled,Collections.singleton(profile.getSyncTask().getResource().getName()));
+ Map.Entry<Long, List<PropagationStatus>> created = userProvisioningManager.create(userTO, true, true, enabled,
+ Collections.singleton(profile.getSyncTask().getResource().getName()));
userTO = userDataBinder.getUserTO(created.getKey());
@@ -121,51 +121,51 @@ public class UserSyncResultHandler extends AbstractSubjectSyncResultHandler {
final UserMod userMod = UserMod.class.cast(subjectMod);
- /*WorkflowResult<Map.Entry<UserMod, Boolean>> updated;
- try {
- updated = uwfAdapter.update(userMod);
- } catch (Exception e) {
- LOG.error("Update of user {} failed, trying to sync its status anyway (if configured)", before.getId(), e);
-
- result.setStatus(SyncResult.Status.FAILURE);
- result.setMessage("Update failed, trying to sync status anyway (if configured)\n"
- + ExceptionUtils.getRootCauseMessage(e));
-
- updated = new WorkflowResult<Map.Entry<UserMod, Boolean>>(
- new AbstractMap.SimpleEntry<UserMod, Boolean>(userMod, false),
- new PropagationByResource(),
- new HashSet<String>());
- }*/
-
+ /* WorkflowResult<Map.Entry<UserMod, Boolean>> updated;
+ * try {
+ * updated = uwfAdapter.update(userMod);
+ * } catch (Exception e) {
+ * LOG.error("Update of user {} failed, trying to sync its status anyway (if configured)", before.getId(), e);
+ *
+ * result.setStatus(SyncResult.Status.FAILURE);
+ * result.setMessage("Update failed, trying to sync status anyway (if configured)\n"
+ * + ExceptionUtils.getRootCauseMessage(e));
+ *
+ * updated = new WorkflowResult<Map.Entry<UserMod, Boolean>>(
+ * new AbstractMap.SimpleEntry<UserMod, Boolean>(userMod, false),
+ * new PropagationByResource(),
+ * new HashSet<String>());
+ * } */
final Boolean enabled = syncUtilities.readEnabled(delta.getObject(), profile.getSyncTask());
- /*if (enabled != null) {
- SyncopeUser user = userDAO.find(before.getId());
-
- WorkflowResult<Long> enableUpdate = null;
- if (user.isSuspended() == null) {
- enableUpdate = uwfAdapter.activate(before.getId(), null);
- } else if (enabled && user.isSuspended()) {
- enableUpdate = uwfAdapter.reactivate(before.getId());
- } else if (!enabled && !user.isSuspended()) {
- enableUpdate = uwfAdapter.suspend(before.getId());
- }
-
- if (enableUpdate != null) {
- if (enableUpdate.getPropByRes() != null) {
- updated.getPropByRes().merge(enableUpdate.getPropByRes());
- updated.getPropByRes().purge();
- }
- updated.getPerformedTasks().addAll(enableUpdate.getPerformedTasks());
- }
- }
-
- final List<PropagationTask> tasks = propagationManager.getUserUpdateTaskIds(
- updated, updated.getResult().getKey().getPassword() != null,
- Collections.singleton(profile.getSyncTask().getResource().getName()));
-
- taskExecutor.execute(tasks);*/
-
- Map.Entry<Long, List<PropagationStatus>> updated = userProvisioningManager.updateInSync(userMod, before.getId(), result,enabled, Collections.singleton(profile.getSyncTask().getResource().getName()));
+ /* if (enabled != null) {
+ * SyncopeUser user = userDAO.find(before.getId());
+ *
+ * WorkflowResult<Long> enableUpdate = null;
+ * if (user.isSuspended() == null) {
+ * enableUpdate = uwfAdapter.activate(before.getId(), null);
+ * } else if (enabled && user.isSuspended()) {
+ * enableUpdate = uwfAdapter.reactivate(before.getId());
+ * } else if (!enabled && !user.isSuspended()) {
+ * enableUpdate = uwfAdapter.suspend(before.getId());
+ * }
+ *
+ * if (enableUpdate != null) {
+ * if (enableUpdate.getPropByRes() != null) {
+ * updated.getPropByRes().merge(enableUpdate.getPropByRes());
+ * updated.getPropByRes().purge();
+ * }
+ * updated.getPerformedTasks().addAll(enableUpdate.getPerformedTasks());
+ * }
+ * }
+ *
+ * final List<PropagationTask> tasks = propagationManager.getUserUpdateTaskIds(
+ * updated, updated.getResult().getKey().getPassword() != null,
+ * Collections.singleton(profile.getSyncTask().getResource().getName()));
+ *
+ * taskExecutor.execute(tasks); */
+
+ Map.Entry<Long, List<PropagationStatus>> updated = userProvisioningManager.updateInSync(userMod, before.getId(),
+ result, enabled, Collections.singleton(profile.getSyncTask().getResource().getName()));
return userDataBinder.getUserTO(updated.getKey());
}
@@ -189,7 +189,7 @@ public class UserSyncResultHandler extends AbstractSubjectSyncResultHandler {
protected void delete(final Long id) {
try {
userProvisioningManager.
- delete(id,Collections.<String>singleton(profile.getSyncTask().getResource().getName()));
+ delete(id, Collections.<String>singleton(profile.getSyncTask().getResource().getName()));
} catch (Exception e) {
// A propagation failure doesn't imply a synchronization failure.
// The propagation exception status will be reported into the propagation task execution.
http://git-wip-us.apache.org/repos/asf/syncope/blob/7aa0db37/core/src/main/java/org/apache/syncope/core/util/AttributeDeserializer.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/util/AttributeDeserializer.java b/core/src/main/java/org/apache/syncope/core/util/AttributeDeserializer.java
index 138b0fe..0c148b1 100644
--- a/core/src/main/java/org/apache/syncope/core/util/AttributeDeserializer.java
+++ b/core/src/main/java/org/apache/syncope/core/util/AttributeDeserializer.java
@@ -77,8 +77,8 @@ class AttributeDeserializer extends JsonDeserializer<Attribute> {
return Uid.NAME.equals(name)
? new Uid(values.isEmpty() || values.get(0) == null ? null : values.get(0).toString())
: Name.NAME.equals(name)
- ? new Name(values.isEmpty() || values.get(0) == null ? null : values.get(0).toString())
- : AttributeBuilder.build(name, values);
+ ? new Name(values.isEmpty() || values.get(0) == null ? null : values.get(0).toString())
+ : AttributeBuilder.build(name, values);
}
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/7aa0db37/core/src/main/java/org/apache/syncope/core/util/ContentLoaderHandler.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/util/ContentLoaderHandler.java b/core/src/main/java/org/apache/syncope/core/util/ContentLoaderHandler.java
index ea54a90..ccf2e86 100644
--- a/core/src/main/java/org/apache/syncope/core/util/ContentLoaderHandler.java
+++ b/core/src/main/java/org/apache/syncope/core/util/ContentLoaderHandler.java
@@ -57,16 +57,16 @@ public class ContentLoaderHandler extends DefaultHandler {
Map<String, Integer> colTypes = jdbcTemplate.query("SELECT * FROM " + tableName,
new ResultSetExtractor<Map<String, Integer>>() {
- @Override
- public Map<String, Integer> extractData(final ResultSet rs) throws SQLException, DataAccessException {
- Map<String, Integer> colTypes = new HashMap<String, Integer>();
- for (int i = 1; i <= rs.getMetaData().getColumnCount(); i++) {
- colTypes.put(rs.getMetaData().getColumnName(i).toUpperCase(),
- rs.getMetaData().getColumnType(i));
- }
- return colTypes;
- }
- });
+ @Override
+ public Map<String, Integer> extractData(final ResultSet rs) throws SQLException, DataAccessException {
+ Map<String, Integer> colTypes = new HashMap<String, Integer>();
+ for (int i = 1; i <= rs.getMetaData().getColumnCount(); i++) {
+ colTypes.put(rs.getMetaData().getColumnName(i).toUpperCase(),
+ rs.getMetaData().getColumnType(i));
+ }
+ return colTypes;
+ }
+ });
Object[] parameters = new Object[attrs.getLength()];
for (int i = 0; i < attrs.getLength(); i++) {
http://git-wip-us.apache.org/repos/asf/syncope/blob/7aa0db37/core/src/main/java/org/apache/syncope/core/util/RouteManager.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/util/RouteManager.java b/core/src/main/java/org/apache/syncope/core/util/RouteManager.java
index 67ebd82..397d7b0 100644
--- a/core/src/main/java/org/apache/syncope/core/util/RouteManager.java
+++ b/core/src/main/java/org/apache/syncope/core/util/RouteManager.java
@@ -16,24 +16,27 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.syncope.core.util;
import java.util.ArrayList;
import java.util.List;
import org.apache.syncope.core.persistence.beans.CamelRoute;
-
public class RouteManager {
+
private static List<CamelRoute> routelist;
-
- public static void addElement(CamelRoute route){
- if(routelist == null) routelist= new ArrayList<CamelRoute>();
+
+ public static void addElement(CamelRoute route) {
+ if (routelist == null) {
+ routelist = new ArrayList<CamelRoute>();
+ }
routelist.add(route);
}
-
- public static List<CamelRoute> getRoutes(){
- if(routelist == null) routelist= new ArrayList<CamelRoute>();
+
+ public static List<CamelRoute> getRoutes() {
+ if (routelist == null) {
+ routelist = new ArrayList<CamelRoute>();
+ }
return routelist;
}
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/7aa0db37/core/src/main/java/org/apache/syncope/core/util/SecureRandomUtil.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/util/SecureRandomUtil.java b/core/src/main/java/org/apache/syncope/core/util/SecureRandomUtil.java
index 860a153..b11d0a5 100644
--- a/core/src/main/java/org/apache/syncope/core/util/SecureRandomUtil.java
+++ b/core/src/main/java/org/apache/syncope/core/util/SecureRandomUtil.java
@@ -23,21 +23,21 @@ import java.security.SecureRandom;
import org.apache.commons.lang3.RandomStringUtils;
public class SecureRandomUtil {
-
+
private static final SecureRandom RANDOM = new SecureRandom();
public static String generateRandomPassword(final int tokenLength) {
return RandomStringUtils.random(tokenLength, 0, 0, true, false, null, RANDOM);
}
-
+
public static String generateRandomLetter() {
return RandomStringUtils.random(1, 0, 0, true, false, null, RANDOM);
}
-
+
public static String generateRandomNumber() {
return RandomStringUtils.random(1, 0, 0, false, true, null, RANDOM);
}
-
+
public static String generateRandomSpecialCharacter(char[] characters) {
return RandomStringUtils.random(1, 0, 0, false, false, characters, RANDOM);
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/7aa0db37/core/src/main/java/org/apache/syncope/core/util/SyncTokenDeserializer.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/util/SyncTokenDeserializer.java b/core/src/main/java/org/apache/syncope/core/util/SyncTokenDeserializer.java
index 4e82401..30a0324 100644
--- a/core/src/main/java/org/apache/syncope/core/util/SyncTokenDeserializer.java
+++ b/core/src/main/java/org/apache/syncope/core/util/SyncTokenDeserializer.java
@@ -42,19 +42,19 @@ class SyncTokenDeserializer extends JsonDeserializer<SyncToken> {
value = node.isNull()
? null
: node.isBoolean()
- ? node.asBoolean()
- : node.isDouble()
- ? node.asDouble()
- : node.isLong()
- ? node.asLong()
- : node.isInt()
- ? node.asInt()
- : node.asText();
-
+ ? node.asBoolean()
+ : node.isDouble()
+ ? node.asDouble()
+ : node.isLong()
+ ? node.asLong()
+ : node.isInt()
+ ? node.asInt()
+ : node.asText();
+
if (value instanceof String) {
- byte[] bytes = ((String)value).getBytes();
+ byte[] bytes = ((String) value).getBytes();
if (Base64.isBase64(bytes)) {
- value = Base64.decode(bytes);
+ value = Base64.decode(bytes);
}
}
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/7aa0db37/core/src/main/java/org/apache/syncope/core/util/jexl/JexlUtil.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/util/jexl/JexlUtil.java b/core/src/main/java/org/apache/syncope/core/util/jexl/JexlUtil.java
index 0e67f5e..2f033f2 100644
--- a/core/src/main/java/org/apache/syncope/core/util/jexl/JexlUtil.java
+++ b/core/src/main/java/org/apache/syncope/core/util/jexl/JexlUtil.java
@@ -134,8 +134,8 @@ public final class JexlUtil {
context.set(fieldName, fieldValue == null
? ""
: (type.equals(Date.class)
- ? DataFormat.format((Date) fieldValue, false)
- : fieldValue));
+ ? DataFormat.format((Date) fieldValue, false)
+ : fieldValue));
LOG.debug("Add field {} with value {}", fieldName, fieldValue);
http://git-wip-us.apache.org/repos/asf/syncope/blob/7aa0db37/core/src/main/java/org/apache/syncope/core/workflow/package-info.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/workflow/package-info.java b/core/src/main/java/org/apache/syncope/core/workflow/package-info.java
index 2821d3a..b459536 100644
--- a/core/src/main/java/org/apache/syncope/core/workflow/package-info.java
+++ b/core/src/main/java/org/apache/syncope/core/workflow/package-info.java
@@ -17,4 +17,3 @@
* under the License.
*/
package org.apache.syncope.core.workflow;
-
http://git-wip-us.apache.org/repos/asf/syncope/blob/7aa0db37/core/src/main/java/org/apache/syncope/core/workflow/role/AbstractRoleWorkflowAdapter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/workflow/role/AbstractRoleWorkflowAdapter.java b/core/src/main/java/org/apache/syncope/core/workflow/role/AbstractRoleWorkflowAdapter.java
index cd40429..b222100 100644
--- a/core/src/main/java/org/apache/syncope/core/workflow/role/AbstractRoleWorkflowAdapter.java
+++ b/core/src/main/java/org/apache/syncope/core/workflow/role/AbstractRoleWorkflowAdapter.java
@@ -30,7 +30,7 @@ import org.apache.syncope.core.workflow.WorkflowResult;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
-@Transactional(rollbackFor = {Throwable.class})
+@Transactional(rollbackFor = { Throwable.class })
public abstract class AbstractRoleWorkflowAdapter implements RoleWorkflowAdapter {
@Autowired
http://git-wip-us.apache.org/repos/asf/syncope/blob/7aa0db37/core/src/main/java/org/apache/syncope/core/workflow/user/AbstractUserWorkflowAdapter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/workflow/user/AbstractUserWorkflowAdapter.java b/core/src/main/java/org/apache/syncope/core/workflow/user/AbstractUserWorkflowAdapter.java
index f059a9a..8fbc25c 100644
--- a/core/src/main/java/org/apache/syncope/core/workflow/user/AbstractUserWorkflowAdapter.java
+++ b/core/src/main/java/org/apache/syncope/core/workflow/user/AbstractUserWorkflowAdapter.java
@@ -117,7 +117,7 @@ public abstract class AbstractUserWorkflowAdapter implements UserWorkflowAdapter
doRequestPasswordReset(dataBinder.getUserFromId(userId));
}
- protected abstract void doConfirmPasswordReset(SyncopeUser user, String token, String password)
+ protected abstract void doConfirmPasswordReset(SyncopeUser user, String token, String password)
throws WorkflowException;
@Override
http://git-wip-us.apache.org/repos/asf/syncope/blob/7aa0db37/core/src/main/java/org/apache/syncope/core/workflow/user/NoOpUserWorkflowAdapter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/workflow/user/NoOpUserWorkflowAdapter.java b/core/src/main/java/org/apache/syncope/core/workflow/user/NoOpUserWorkflowAdapter.java
index 8713261..2157301 100644
--- a/core/src/main/java/org/apache/syncope/core/workflow/user/NoOpUserWorkflowAdapter.java
+++ b/core/src/main/java/org/apache/syncope/core/workflow/user/NoOpUserWorkflowAdapter.java
@@ -230,7 +230,8 @@ public class NoOpUserWorkflowAdapter extends AbstractUserWorkflowAdapter {
}
@Override
- public WorkflowResult<Map.Entry<Long, Boolean>> create(UserTO userTO, boolean storePassword) throws UnauthorizedRoleException, WorkflowException {
+ public WorkflowResult<Map.Entry<Long, Boolean>> create(UserTO userTO, boolean storePassword) throws
+ UnauthorizedRoleException, WorkflowException {
return create(userTO, false, true);
}
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/7aa0db37/core/src/main/java/org/apache/syncope/core/workflow/user/UserWorkflowAdapter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/workflow/user/UserWorkflowAdapter.java b/core/src/main/java/org/apache/syncope/core/workflow/user/UserWorkflowAdapter.java
index c2844db..0d48227 100644
--- a/core/src/main/java/org/apache/syncope/core/workflow/user/UserWorkflowAdapter.java
+++ b/core/src/main/java/org/apache/syncope/core/workflow/user/UserWorkflowAdapter.java
@@ -152,7 +152,7 @@ public interface UserWorkflowAdapter extends WorkflowAdapter {
* @throws UnauthorizedRoleException authorization exception
* @throws WorkflowException workflow exception
*/
- void confirmPasswordReset(Long userId, String token, String password)
+ void confirmPasswordReset(Long userId, String token, String password)
throws UnauthorizedRoleException, WorkflowException;
/**
http://git-wip-us.apache.org/repos/asf/syncope/blob/7aa0db37/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/ActivitiUserWorkflowAdapter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/ActivitiUserWorkflowAdapter.java b/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/ActivitiUserWorkflowAdapter.java
index 460b73b..adeb9f8 100644
--- a/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/ActivitiUserWorkflowAdapter.java
+++ b/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/ActivitiUserWorkflowAdapter.java
@@ -885,7 +885,8 @@ public class ActivitiUserWorkflowAdapter extends AbstractUserWorkflowAdapter {
}
@Override
- public WorkflowResult<Map.Entry<Long, Boolean>> create(UserTO userTO, boolean storePassword) throws UnauthorizedRoleException, WorkflowException {
+ public WorkflowResult<Map.Entry<Long, Boolean>> create(UserTO userTO, boolean storePassword) throws
+ UnauthorizedRoleException, WorkflowException {
return create(userTO, false, storePassword);
}
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/7aa0db37/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/SyncopeGroupManager.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/SyncopeGroupManager.java b/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/SyncopeGroupManager.java
index c91e7e0..f670258 100644
--- a/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/SyncopeGroupManager.java
+++ b/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/SyncopeGroupManager.java
@@ -106,7 +106,7 @@ public class SyncopeGroupManager implements GroupIdentityManager, SyncopeSession
public void updateGroup(final Group updatedGroup) {
throw new UnsupportedOperationException();
}
-
+
@Override
public boolean isNewGroup(final Group group) {
throw new UnsupportedOperationException();
http://git-wip-us.apache.org/repos/asf/syncope/blob/7aa0db37/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/SyncopeUserManager.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/SyncopeUserManager.java b/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/SyncopeUserManager.java
index 42ea38c..9285ed9 100644
--- a/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/SyncopeUserManager.java
+++ b/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/SyncopeUserManager.java
@@ -121,7 +121,7 @@ public class SyncopeUserManager implements UserIdentityManager, SyncopeSession {
public void updateUser(final User updatedUser) {
throw new UnsupportedOperationException();
}
-
+
@Override
public Picture getUserPicture(final String string) {
throw new UnsupportedOperationException();
http://git-wip-us.apache.org/repos/asf/syncope/blob/7aa0db37/core/src/main/resources/persistenceContextEMFactory.xml
----------------------------------------------------------------------
diff --git a/core/src/main/resources/persistenceContextEMFactory.xml b/core/src/main/resources/persistenceContextEMFactory.xml
index 3337dd3..8fe4864 100644
--- a/core/src/main/resources/persistenceContextEMFactory.xml
+++ b/core/src/main/resources/persistenceContextEMFactory.xml
@@ -37,8 +37,8 @@ under the License.
<property name="jpaPropertyMap">
<map>
<!--<entry key="openjpa.Log" value="SQL=TRACE"/>
- <entry key="openjpa.ConnectionFactoryProperties"
- value="PrintParameters=true, PrettyPrint=true, PrettyPrintLineLength=80"/>-->
+ <entry key="openjpa.ConnectionFactoryProperties"
+ value="PrintParameters=true, PrettyPrint=true, PrettyPrintLineLength=80"/>-->
<entry key="openjpa.NontransactionalWrite" value="false"/>
<entry key="openjpa.AutoDetach" value="close, commit, nontx-read, rollback"/>
http://git-wip-us.apache.org/repos/asf/syncope/blob/7aa0db37/core/src/main/resources/report/staticReportlet2fo.xsl
----------------------------------------------------------------------
diff --git a/core/src/main/resources/report/staticReportlet2fo.xsl b/core/src/main/resources/report/staticReportlet2fo.xsl
index 2b9a971..c123d51 100644
--- a/core/src/main/resources/report/staticReportlet2fo.xsl
+++ b/core/src/main/resources/report/staticReportlet2fo.xsl
@@ -23,62 +23,62 @@ under the License.
xmlns:fo="http://www.w3.org/1999/XSL/Format"
version="1.0">
- <xsl:template match="reportlet[@class='org.apache.syncope.core.report.StaticReportlet']">
+ <xsl:template match="reportlet[@class='org.apache.syncope.core.report.StaticReportlet']">
- <fo:block font-size="14pt" font-weight="bold" space-after="0.5cm">Reportlet:
- <xsl:value-of select="@name"/>
- </fo:block>
+ <fo:block font-size="14pt" font-weight="bold" space-after="0.5cm">Reportlet:
+ <xsl:value-of select="@name"/>
+ </fo:block>
- <xsl:if test="string-length(string/text()) > 0">
- <fo:block font-size="11pt">String value:
- <xsl:value-of select="string/text()"/>
- </fo:block>
- </xsl:if>
+ <xsl:if test="string-length(string/text()) > 0">
+ <fo:block font-size="11pt">String value:
+ <xsl:value-of select="string/text()"/>
+ </fo:block>
+ </xsl:if>
- <xsl:if test="string-length(long/text()) > 0">
- <fo:block font-size="11pt">Long value:
- <xsl:value-of select="long/text()"/>
- </fo:block>
- </xsl:if>
+ <xsl:if test="string-length(long/text()) > 0">
+ <fo:block font-size="11pt">Long value:
+ <xsl:value-of select="long/text()"/>
+ </fo:block>
+ </xsl:if>
- <xsl:if test="string-length(double/text()) > 0">
- <fo:block font-size="11pt">Double value:
- <xsl:value-of select="double/text()"/>
- </fo:block>
- </xsl:if>
+ <xsl:if test="string-length(double/text()) > 0">
+ <fo:block font-size="11pt">Double value:
+ <xsl:value-of select="double/text()"/>
+ </fo:block>
+ </xsl:if>
- <xsl:if test="string-length(date/text()) > 0">
- <fo:block font-size="11pt">Date value:
- <xsl:value-of select="date/text()"/>
- </fo:block>
- </xsl:if>
+ <xsl:if test="string-length(date/text()) > 0">
+ <fo:block font-size="11pt">Date value:
+ <xsl:value-of select="date/text()"/>
+ </fo:block>
+ </xsl:if>
- <xsl:if test="string-length(enum/text()) > 0">
- <fo:block font-size="11pt">Enum value:
- <xsl:value-of select="enum/text()"/>
- </fo:block>
- </xsl:if>
+ <xsl:if test="string-length(enum/text()) > 0">
+ <fo:block font-size="11pt">Enum value:
+ <xsl:value-of select="enum/text()"/>
+ </fo:block>
+ </xsl:if>
- <xsl:if test="string-length(list) > 0">
- <fo:block font-size="11pt">List values:</fo:block>
+ <xsl:if test="string-length(list) > 0">
+ <fo:block font-size="11pt">List values:</fo:block>
- <fo:list-block provisional-label-separation="4mm" provisional-distance-between-starts="2mm">
- <xsl:for-each select="list/string">
- <xsl:if test="string-length(string/text()) > 0">
- <fo:list-item>
- <fo:list-item-label end-indent="label-end()">
- <fo:block>•</fo:block>
- </fo:list-item-label>
- <fo:list-item-body start-indent="body-start()">
- <fo:block>
- <xsl:value-of select="text()"/>
- </fo:block>
- </fo:list-item-body>
- </fo:list-item>
- </xsl:if>
- </xsl:for-each>
- </fo:list-block>
- </xsl:if>
+ <fo:list-block provisional-label-separation="4mm" provisional-distance-between-starts="2mm">
+ <xsl:for-each select="list/string">
+ <xsl:if test="string-length(string/text()) > 0">
+ <fo:list-item>
+ <fo:list-item-label end-indent="label-end()">
+ <fo:block>•</fo:block>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block>
+ <xsl:value-of select="text()"/>
+ </fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ </xsl:if>
+ </xsl:for-each>
+ </fo:list-block>
+ </xsl:if>
- </xsl:template>
+ </xsl:template>
</xsl:stylesheet>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/syncope/blob/7aa0db37/core/src/main/resources/report/staticReportlet2html.xsl
----------------------------------------------------------------------
diff --git a/core/src/main/resources/report/staticReportlet2html.xsl b/core/src/main/resources/report/staticReportlet2html.xsl
index 0fb7b28..da0ba85 100644
--- a/core/src/main/resources/report/staticReportlet2html.xsl
+++ b/core/src/main/resources/report/staticReportlet2html.xsl
@@ -22,53 +22,53 @@ under the License.
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
version="1.0">
- <xsl:template match="reportlet[@class='org.apache.syncope.core.report.StaticReportlet']">
- <h2>Reportlet:
- <xsl:value-of select="@name"/>
- </h2>
+ <xsl:template match="reportlet[@class='org.apache.syncope.core.report.StaticReportlet']">
+ <h2>Reportlet:
+ <xsl:value-of select="@name"/>
+ </h2>
- <xsl:if test="string-length(string/text()) > 0">
- <p>String value:
- <xsl:value-of select="string/text()"/>
- </p>
- </xsl:if>
+ <xsl:if test="string-length(string/text()) > 0">
+ <p>String value:
+ <xsl:value-of select="string/text()"/>
+ </p>
+ </xsl:if>
- <xsl:if test="string-length(long/text()) > 0">
- <p>Long value:
- <xsl:value-of select="long/text()"/>
- </p>
- </xsl:if>
+ <xsl:if test="string-length(long/text()) > 0">
+ <p>Long value:
+ <xsl:value-of select="long/text()"/>
+ </p>
+ </xsl:if>
- <xsl:if test="string-length(double/text()) > 0">
- <p>Double value:
- <xsl:value-of select="double/text()"/>
- </p>
- </xsl:if>
+ <xsl:if test="string-length(double/text()) > 0">
+ <p>Double value:
+ <xsl:value-of select="double/text()"/>
+ </p>
+ </xsl:if>
- <xsl:if test="string-length(date/text()) > 0">
- <p>Date value:
- <xsl:value-of select="date/text()"/>
- </p>
- </xsl:if>
+ <xsl:if test="string-length(date/text()) > 0">
+ <p>Date value:
+ <xsl:value-of select="date/text()"/>
+ </p>
+ </xsl:if>
- <xsl:if test="string-length(enum/text()) > 0">
- <p>Enum value:
- <xsl:value-of select="enum/text()"/>
- </p>
- </xsl:if>
+ <xsl:if test="string-length(enum/text()) > 0">
+ <p>Enum value:
+ <xsl:value-of select="enum/text()"/>
+ </p>
+ </xsl:if>
- <xsl:if test="string-length(list) > 0">
- <p>List values:</p>
+ <xsl:if test="string-length(list) > 0">
+ <p>List values:</p>
- <ul>
- <xsl:for-each select="list/string">
- <xsl:if test="string-length(string/text()) > 0">
- <li>
- <xsl:value-of select="text()"/>
- </li>
- </xsl:if>
- </xsl:for-each>
- </ul>
- </xsl:if>
- </xsl:template>
+ <ul>
+ <xsl:for-each select="list/string">
+ <xsl:if test="string-length(string/text()) > 0">
+ <li>
+ <xsl:value-of select="text()"/>
+ </li>
+ </xsl:if>
+ </xsl:for-each>
+ </ul>
+ </xsl:if>
+ </xsl:template>
</xsl:stylesheet>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/syncope/blob/7aa0db37/core/src/main/resources/report/userReportlet2html.xsl
----------------------------------------------------------------------
diff --git a/core/src/main/resources/report/userReportlet2html.xsl b/core/src/main/resources/report/userReportlet2html.xsl
index 3367169..751cb4c 100644
--- a/core/src/main/resources/report/userReportlet2html.xsl
+++ b/core/src/main/resources/report/userReportlet2html.xsl
@@ -157,9 +157,9 @@ under the License.
</xsl:otherwise>
</xsl:choose>
<xsl:if test="string-length(resources) > 0">
- <xsl:call-template name="resources">
- <xsl:with-param name="node" select="resources/resource"/>
- </xsl:call-template>
+ <xsl:call-template name="resources">
+ <xsl:with-param name="node" select="resources/resource"/>
+ </xsl:call-template>
</xsl:if>
<hr/>
</xsl:for-each>
http://git-wip-us.apache.org/repos/asf/syncope/blob/7aa0db37/core/src/main/resources/roleRoute.xml
----------------------------------------------------------------------
diff --git a/core/src/main/resources/roleRoute.xml b/core/src/main/resources/roleRoute.xml
index 80ff595..44cdfa4 100644
--- a/core/src/main/resources/roleRoute.xml
+++ b/core/src/main/resources/roleRoute.xml
@@ -24,151 +24,151 @@ under the License.
http://camel.apache.org/schema/spring
http://camel.apache.org/schema/spring/camel-spring.xsd">
+ <!--
+ The default routes define each task involved in user creation:
+ main operations consist in user workflow creation and its propagation.
+ -->
+ <routeContext id="defaultRoleRoutes" xmlns="http://camel.apache.org/schema/spring">
<!--
- The default routes define each task involved in user creation:
- main operations consist in user workflow creation and its propagation.
+ CREATE ROLE
-->
- <routeContext id="defaultRoleRoutes" xmlns="http://camel.apache.org/schema/spring">
-<!--
- CREATE ROLE
- -->
- <route id="createRole">
- <from uri="direct:createRole"/>
- <setProperty propertyName="subject">
- <simple>${body}</simple>
- </setProperty>
- <doTry>
- <bean ref="rwfAdapter" method="create(${body})"/>
- <process ref="defaultRoleCreatePropagation" />
- <to uri="direct:createRolePort"/>
- <doCatch>
- <exception>java.lang.RuntimeException</exception>
- <handled>
- <constant>false</constant>
- </handled>
- <to uri="direct:createRolePort"/>
- </doCatch>
- </doTry>
- </route>
+ <route id="createRole">
+ <from uri="direct:createRole"/>
+ <setProperty propertyName="subject">
+ <simple>${body}</simple>
+ </setProperty>
+ <doTry>
+ <bean ref="rwfAdapter" method="create(${body})"/>
+ <process ref="defaultRoleCreatePropagation" />
+ <to uri="direct:createRolePort"/>
+ <doCatch>
+ <exception>java.lang.RuntimeException</exception>
+ <handled>
+ <constant>false</constant>
+ </handled>
+ <to uri="direct:createRolePort"/>
+ </doCatch>
+ </doTry>
+ </route>
- <!--
- CREATE ROLE SYNC
- -->
- <route id="createRoleSync">
- <from uri="direct:createRoleSync"/>
- <setProperty propertyName="subject">
- <simple>${body}</simple>
- </setProperty>
- <doTry>
- <bean ref="rwfAdapter" method="create(${body})"/>
- <process ref="defaultRoleCreateSyncPropagation" />
- <to uri="direct:createRoleSyncPort"/>
- <doCatch>
- <exception>java.lang.RuntimeException</exception>
- <handled>
- <constant>false</constant>
- </handled>
- <to uri="direct:createRoleSyncPort"/>
- </doCatch>
- </doTry>
- </route>
+ <!--
+ CREATE ROLE SYNC
+ -->
+ <route id="createRoleSync">
+ <from uri="direct:createRoleSync"/>
+ <setProperty propertyName="subject">
+ <simple>${body}</simple>
+ </setProperty>
+ <doTry>
+ <bean ref="rwfAdapter" method="create(${body})"/>
+ <process ref="defaultRoleCreateSyncPropagation" />
+ <to uri="direct:createRoleSyncPort"/>
+ <doCatch>
+ <exception>java.lang.RuntimeException</exception>
+ <handled>
+ <constant>false</constant>
+ </handled>
+ <to uri="direct:createRoleSyncPort"/>
+ </doCatch>
+ </doTry>
+ </route>
- <!--
- UPDATE ROLE
- -->
- <route id="updateRole">
- <from uri="direct:updateRole"/>
- <setProperty propertyName="subjectMod">
- <simple>${body}</simple>
- </setProperty>
- <doTry>
- <bean ref="rwfAdapter" method="update(${body})"/>
- <process ref="defaultRoleUpdatePropagation" />
- <to uri="direct:updateRolePort"/>
- <doCatch>
- <exception>java.lang.RuntimeException</exception>
- <handled>
- <constant>false</constant>
- </handled>
- <to uri="direct:updateRolePort"/>
- </doCatch>
- </doTry>
- </route>
+ <!--
+ UPDATE ROLE
+ -->
+ <route id="updateRole">
+ <from uri="direct:updateRole"/>
+ <setProperty propertyName="subjectMod">
+ <simple>${body}</simple>
+ </setProperty>
+ <doTry>
+ <bean ref="rwfAdapter" method="update(${body})"/>
+ <process ref="defaultRoleUpdatePropagation" />
+ <to uri="direct:updateRolePort"/>
+ <doCatch>
+ <exception>java.lang.RuntimeException</exception>
+ <handled>
+ <constant>false</constant>
+ </handled>
+ <to uri="direct:updateRolePort"/>
+ </doCatch>
+ </doTry>
+ </route>
- <!--
- DELETE ROLE
- -->
- <route id="deleteRole">
- <from uri="direct:deleteRole"/>
- <doTry>
- <process ref="defaultRoleDeletePropagation" />
- <bean ref="rwfAdapter" method="delete(${body})"/>
- <setBody>
- <simple>${property.statuses}</simple>
- </setBody>
- <to uri="direct:deleteRolePort"/>
- <doCatch>
- <exception>java.lang.RuntimeException</exception>
- <handled>
- <constant>false</constant>
- </handled>
- <to uri="direct:deleteRolePort"/>
- </doCatch>
- </doTry>
- </route>
+ <!--
+ DELETE ROLE
+ -->
+ <route id="deleteRole">
+ <from uri="direct:deleteRole"/>
+ <doTry>
+ <process ref="defaultRoleDeletePropagation" />
+ <bean ref="rwfAdapter" method="delete(${body})"/>
+ <setBody>
+ <simple>${property.statuses}</simple>
+ </setBody>
+ <to uri="direct:deleteRolePort"/>
+ <doCatch>
+ <exception>java.lang.RuntimeException</exception>
+ <handled>
+ <constant>false</constant>
+ </handled>
+ <to uri="direct:deleteRolePort"/>
+ </doCatch>
+ </doTry>
+ </route>
- <!--
- UNLINK USER
- -->
- <route id="unlinkRole">
- <from uri="direct:unlinkRole"/>
- <doTry>
- <bean ref="rwfAdapter" method="update(${body})"/>
- <setBody>
- <simple>${body.getResult}</simple>
- </setBody>
- <to uri="direct:unlinkRolePort"/>
- <doCatch>
- <exception>java.lang.RuntimeException</exception>
- <handled>
- <constant>false</constant>
- </handled>
- <to uri="direct:unlinkRolePort"/>
- </doCatch>
- </doTry>
- </route>
+ <!--
+ UNLINK USER
+ -->
+ <route id="unlinkRole">
+ <from uri="direct:unlinkRole"/>
+ <doTry>
+ <bean ref="rwfAdapter" method="update(${body})"/>
+ <setBody>
+ <simple>${body.getResult}</simple>
+ </setBody>
+ <to uri="direct:unlinkRolePort"/>
+ <doCatch>
+ <exception>java.lang.RuntimeException</exception>
+ <handled>
+ <constant>false</constant>
+ </handled>
+ <to uri="direct:unlinkRolePort"/>
+ </doCatch>
+ </doTry>
+ </route>
- <!--
- LINK USER
- -->
+ <!--
+ LINK USER
+ -->
- <route id="linkRole">
- <from uri="direct:linkRole"/>
- <doTry>
- <bean ref="rwfAdapter" method="update(${body})"/>
- <setBody>
- <simple>${body.getResult}</simple>
- </setBody>
- <to uri="direct:linkRolePort"/>
- <doCatch>
- <exception>java.lang.RuntimeException</exception>
- <handled>
- <constant>false</constant>
- </handled>
- <to uri="direct:linkRolePort"/>
- </doCatch>
- </doTry>
- </route>
+ <route id="linkRole">
+ <from uri="direct:linkRole"/>
+ <doTry>
+ <bean ref="rwfAdapter" method="update(${body})"/>
+ <setBody>
+ <simple>${body.getResult}</simple>
+ </setBody>
+ <to uri="direct:linkRolePort"/>
+ <doCatch>
+ <exception>java.lang.RuntimeException</exception>
+ <handled>
+ <constant>false</constant>
+ </handled>
+ <to uri="direct:linkRolePort"/>
+ </doCatch>
+ </doTry>
+ </route>
- <!--
- DEPROVISION ROLE
- -->
- <route id="deprovisionRole">
- <from uri="direct:deprovisionRole"/>
- <process ref="defaultRoleDeprovisionPropagation" />
- <to uri="direct:deprovisionRolePort"/>
- </route>
-</routeContext>
+ <!--
+ DEPROVISION ROLE
+ -->
+ <route id="deprovisionRole">
+ <from uri="direct:deprovisionRole"/>
+ <process ref="defaultRoleDeprovisionPropagation" />
+ <to uri="direct:deprovisionRolePort"/>
+ </route>
+ </routeContext>
</beans>
http://git-wip-us.apache.org/repos/asf/syncope/blob/7aa0db37/core/src/main/resources/userRoute.xml
----------------------------------------------------------------------
diff --git a/core/src/main/resources/userRoute.xml b/core/src/main/resources/userRoute.xml
index e65ef2f..763996d 100644
--- a/core/src/main/resources/userRoute.xml
+++ b/core/src/main/resources/userRoute.xml
@@ -24,240 +24,240 @@ under the License.
http://camel.apache.org/schema/spring
http://camel.apache.org/schema/spring/camel-spring.xsd">
- <!--
- The default routes define each task involved in user creation:
- main operations consist in user workflow creation and its propagation.
- -->
- <routeContext id="defaultUserRoutes" xmlns="http://camel.apache.org/schema/spring">
- <route id="createUser">
- <from uri="direct:createUser"/>
- <setProperty propertyName="actual">
- <simple>${body}</simple>
- </setProperty>
- <doTry>
- <bean ref="uwfAdapter"
- method="create(${body},${property.disablePwdPolicyCheck},
+ <!--
+ The default routes define each task involved in user creation:
+ main operations consist in user workflow creation and its propagation.
+ -->
+ <routeContext id="defaultUserRoutes" xmlns="http://camel.apache.org/schema/spring">
+ <route id="createUser">
+ <from uri="direct:createUser"/>
+ <setProperty propertyName="actual">
+ <simple>${body}</simple>
+ </setProperty>
+ <doTry>
+ <bean ref="uwfAdapter"
+ method="create(${body},${property.disablePwdPolicyCheck},
${property.enabled},${property.storePassword})"/>
- <process ref="defaultUserCreatePropagation" />
- <to uri="direct:createPort"/>
- <doCatch>
- <exception>java.lang.RuntimeException</exception>
- <handled>
- <constant>false</constant>
- </handled>
- <to uri="direct:createPort"/>
- </doCatch>
- </doTry>
- </route>
+ <process ref="defaultUserCreatePropagation" />
+ <to uri="direct:createPort"/>
+ <doCatch>
+ <exception>java.lang.RuntimeException</exception>
+ <handled>
+ <constant>false</constant>
+ </handled>
+ <to uri="direct:createPort"/>
+ </doCatch>
+ </doTry>
+ </route>
- <!--
- The propagation route deals with propagation of created user. In this
- case we used a custom processor to perform this task: it means that
- a custom java class contains the propagation strategy.
- -->
+ <!--
+ The propagation route deals with propagation of created user. In this
+ case we used a custom processor to perform this task: it means that
+ a custom java class contains the propagation strategy.
+ -->
- <!--
- UPDATE USER
- -->
- <route id="updateUser">
- <from uri="direct:updateUser"/>
- <setProperty propertyName="actual">
- <simple>${body}</simple>
- </setProperty>
- <doTry>
- <bean ref="uwfAdapter" method="update(${body})"/>
- <process ref="defaultUserUpdatePropagation" />
- <to uri="direct:updatePort"/>
- <doCatch>
- <exception>java.lang.RuntimeException</exception>
- <handled>
- <constant>false</constant>
- </handled>
- <to uri="direct:updatePort"/>
- </doCatch>
- </doTry>
- </route>
+ <!--
+ UPDATE USER
+ -->
+ <route id="updateUser">
+ <from uri="direct:updateUser"/>
+ <setProperty propertyName="actual">
+ <simple>${body}</simple>
+ </setProperty>
+ <doTry>
+ <bean ref="uwfAdapter" method="update(${body})"/>
+ <process ref="defaultUserUpdatePropagation" />
+ <to uri="direct:updatePort"/>
+ <doCatch>
+ <exception>java.lang.RuntimeException</exception>
+ <handled>
+ <constant>false</constant>
+ </handled>
+ <to uri="direct:updatePort"/>
+ </doCatch>
+ </doTry>
+ </route>
- <!--
- UPDATE SYNC USER
- -->
- <route id="updateSyncUser">
- <from uri="direct:updateSyncUser"/>
- <doTry>
- <bean ref="uwfAdapter" method="update(${body})"/>
- <to uri="direct:syncUserStatus"/>
- <doCatch>
- <exception>java.lang.RuntimeException</exception>
- <handled>
- <constant>false</constant>
- </handled>
- <to uri="direct:updateSyncPort"/>
- </doCatch>
- </doTry>
- </route>
+ <!--
+ UPDATE SYNC USER
+ -->
+ <route id="updateSyncUser">
+ <from uri="direct:updateSyncUser"/>
+ <doTry>
+ <bean ref="uwfAdapter" method="update(${body})"/>
+ <to uri="direct:syncUserStatus"/>
+ <doCatch>
+ <exception>java.lang.RuntimeException</exception>
+ <handled>
+ <constant>false</constant>
+ </handled>
+ <to uri="direct:updateSyncPort"/>
+ </doCatch>
+ </doTry>
+ </route>
- <route id="syncUserStatus">
- <from uri="direct:syncUserStatus"/>
- <process ref="userStatusOnSync" />
- <process ref="defaultUserUpdateSyncPropagation" />
- <to uri="direct:updateSyncPort"/>
- </route>
- <!--
- DELETE USER
- -->
- <route id="deleteUser">
- <from uri="direct:deleteUser"/>
- <doTry>
- <process ref="defaultUserDeletePropagation" />
- <bean ref="uwfAdapter" method="delete(${body})"/>
- <setBody>
- <simple>${property.statuses}</simple>
- </setBody>
- <to uri="direct:deletePort"/>
- <doCatch>
- <exception>java.lang.RuntimeException</exception>
- <handled>
- <constant>false</constant>
- </handled>
- <to uri="direct:deletePort"/>
- </doCatch>
- </doTry>
- </route>
+ <route id="syncUserStatus">
+ <from uri="direct:syncUserStatus"/>
+ <process ref="userStatusOnSync" />
+ <process ref="defaultUserUpdateSyncPropagation" />
+ <to uri="direct:updateSyncPort"/>
+ </route>
+ <!--
+ DELETE USER
+ -->
+ <route id="deleteUser">
+ <from uri="direct:deleteUser"/>
+ <doTry>
+ <process ref="defaultUserDeletePropagation" />
+ <bean ref="uwfAdapter" method="delete(${body})"/>
+ <setBody>
+ <simple>${property.statuses}</simple>
+ </setBody>
+ <to uri="direct:deletePort"/>
+ <doCatch>
+ <exception>java.lang.RuntimeException</exception>
+ <handled>
+ <constant>false</constant>
+ </handled>
+ <to uri="direct:deletePort"/>
+ </doCatch>
+ </doTry>
+ </route>
- <!--
- UNLINK USER
- -->
- <route id="unlinkUser">
- <from uri="direct:unlinkUser"/>
- <doTry>
- <bean ref="uwfAdapter" method="update(${body})"/>
- <setBody>
- <simple>${body.getResult.getKey}</simple>
- </setBody>
- <to uri="direct:unlinkPort"/>
- <doCatch>
- <exception>java.lang.RuntimeException</exception>
- <handled>
- <constant>false</constant>
- </handled>
- <to uri="direct:unlinkPort"/>
- </doCatch>
- </doTry>
- </route>
+ <!--
+ UNLINK USER
+ -->
+ <route id="unlinkUser">
+ <from uri="direct:unlinkUser"/>
+ <doTry>
+ <bean ref="uwfAdapter" method="update(${body})"/>
+ <setBody>
+ <simple>${body.getResult.getKey}</simple>
+ </setBody>
+ <to uri="direct:unlinkPort"/>
+ <doCatch>
+ <exception>java.lang.RuntimeException</exception>
+ <handled>
+ <constant>false</constant>
+ </handled>
+ <to uri="direct:unlinkPort"/>
+ </doCatch>
+ </doTry>
+ </route>
- <!--
- LINK USER
- -->
+ <!--
+ LINK USER
+ -->
- <route id="linkUser">
- <from uri="direct:linkUser"/>
- <doTry>
- <bean ref="uwfAdapter" method="update(${body})"/>
- <setBody>
- <simple>${body.getResult.getKey}</simple>
- </setBody>
- <to uri="direct:linkPort"/>
- <doCatch>
- <exception>java.lang.RuntimeException</exception>
- <handled>
- <constant>false</constant>
- </handled>
- <to uri="direct:linkPort"/>
- </doCatch>
- </doTry>
- </route>
+ <route id="linkUser">
+ <from uri="direct:linkUser"/>
+ <doTry>
+ <bean ref="uwfAdapter" method="update(${body})"/>
+ <setBody>
+ <simple>${body.getResult.getKey}</simple>
+ </setBody>
+ <to uri="direct:linkPort"/>
+ <doCatch>
+ <exception>java.lang.RuntimeException</exception>
+ <handled>
+ <constant>false</constant>
+ </handled>
+ <to uri="direct:linkPort"/>
+ </doCatch>
+ </doTry>
+ </route>
- <!--
- ACTIVATE USER
- -->
- <route id="activateUser">
- <from uri="direct:activateUser"/>
- <doTry>
- <bean ref="uwfAdapter" method="activate(${body}, ${property.token})"/>
- <to uri="direct:statusUser"/>
- <doCatch>
- <exception>java.lang.RuntimeException</exception>
- <handled>
- <constant>false</constant>
- </handled>
- <to uri="direct:statusPort"/>
- </doCatch>
- </doTry>
- </route>
- <!--
- REACTIVATE USER
- -->
- <route id="reactivateUser">
- <from uri="direct:reactivateUser"/>
- <doTry>
- <bean ref="uwfAdapter" method="reactivate(${body})"/>
- <to uri="direct:statusUser"/>
- <doCatch>
- <exception>java.lang.RuntimeException</exception>
- <handled>
- <constant>false</constant>
- </handled>
- <to uri="direct:statusPort"/>
- </doCatch>
- </doTry>
- </route>
- <!--
- SUSPEND USER
- -->
- <route id="suspendUser">
- <from uri="direct:suspendUser"/>
- <doTry>
- <bean ref="uwfAdapter" method="suspend(${body})"/>
- <to uri="direct:statusUser"/>
- <doCatch>
- <exception>java.lang.RuntimeException</exception>
- <handled>
- <constant>false</constant>
- </handled>
- <to uri="direct:statusPort"/>
- </doCatch>
- </doTry>
- </route>
+ <!--
+ ACTIVATE USER
+ -->
+ <route id="activateUser">
+ <from uri="direct:activateUser"/>
+ <doTry>
+ <bean ref="uwfAdapter" method="activate(${body}, ${property.token})"/>
+ <to uri="direct:statusUser"/>
+ <doCatch>
+ <exception>java.lang.RuntimeException</exception>
+ <handled>
+ <constant>false</constant>
+ </handled>
+ <to uri="direct:statusPort"/>
+ </doCatch>
+ </doTry>
+ </route>
+ <!--
+ REACTIVATE USER
+ -->
+ <route id="reactivateUser">
+ <from uri="direct:reactivateUser"/>
+ <doTry>
+ <bean ref="uwfAdapter" method="reactivate(${body})"/>
+ <to uri="direct:statusUser"/>
+ <doCatch>
+ <exception>java.lang.RuntimeException</exception>
+ <handled>
+ <constant>false</constant>
+ </handled>
+ <to uri="direct:statusPort"/>
+ </doCatch>
+ </doTry>
+ </route>
+ <!--
+ SUSPEND USER
+ -->
+ <route id="suspendUser">
+ <from uri="direct:suspendUser"/>
+ <doTry>
+ <bean ref="uwfAdapter" method="suspend(${body})"/>
+ <to uri="direct:statusUser"/>
+ <doCatch>
+ <exception>java.lang.RuntimeException</exception>
+ <handled>
+ <constant>false</constant>
+ </handled>
+ <to uri="direct:statusPort"/>
+ </doCatch>
+ </doTry>
+ </route>
- <!--
- STATUS PROPAGATION
- -->
+ <!--
+ STATUS PROPAGATION
+ -->
- <route id="statusUser">
- <from uri="direct:statusUser"/>
- <process ref="defaultUserStatusPropagation" />
- <to uri="direct:statusPort"/>
- </route>
+ <route id="statusUser">
+ <from uri="direct:statusUser"/>
+ <process ref="defaultUserStatusPropagation" />
+ <to uri="direct:statusPort"/>
+ </route>
- <!--
- DEPROVISION USER
- -->
- <route id="deprovisionUser">
- <from uri="direct:deprovisionUser"/>
- <process ref="defaultUserDeprovisionPropagation" />
- <to uri="direct:deprovisionPort"/>
- </route>
+ <!--
+ DEPROVISION USER
+ -->
+ <route id="deprovisionUser">
+ <from uri="direct:deprovisionUser"/>
+ <process ref="defaultUserDeprovisionPropagation" />
+ <to uri="direct:deprovisionPort"/>
+ </route>
- <route id="suspendUserWF">
- <from uri="direct:suspendUserWF"/>
- <doTry>
- <bean ref="uwfAdapter" method="suspend(${body})"/>
- <process ref="defaultUserWFSuspendPropagation"/>
- <to uri="direct:suspendWFPort"/>
- <doCatch>
- <exception>java.lang.RuntimeException</exception>
- <handled>
- <constant>false</constant>
- </handled>
- <to uri="direct:suspendWFPort"/>
- </doCatch>
- </doTry>
- </route>
+ <route id="suspendUserWF">
+ <from uri="direct:suspendUserWF"/>
+ <doTry>
+ <bean ref="uwfAdapter" method="suspend(${body})"/>
+ <process ref="defaultUserWFSuspendPropagation"/>
+ <to uri="direct:suspendWFPort"/>
+ <doCatch>
+ <exception>java.lang.RuntimeException</exception>
+ <handled>
+ <constant>false</constant>
+ </handled>
+ <to uri="direct:suspendWFPort"/>
+ </doCatch>
+ </doTry>
+ </route>
-</routeContext>
+ </routeContext>
</beans>
http://git-wip-us.apache.org/repos/asf/syncope/blob/7aa0db37/core/src/main/resources/wadl2html/index.xsl
----------------------------------------------------------------------
diff --git a/core/src/main/resources/wadl2html/index.xsl b/core/src/main/resources/wadl2html/index.xsl
index d7b4e98..e238b99 100644
--- a/core/src/main/resources/wadl2html/index.xsl
+++ b/core/src/main/resources/wadl2html/index.xsl
@@ -48,50 +48,50 @@
<link rel="stylesheet" href="{$contextPath}/webjars/jquery-ui/${jquery-ui.version}/themes/base/minified/jquery-ui.min.css"/>
<style>
-body {
- font-family: "Verdana,Arial,sans-serif";
- font-size: 0.9em;
-}
+ body {
+ font-family: "Verdana,Arial,sans-serif";
+ font-size: 0.9em;
+ }
-table {
- font-family: "Verdana,Arial,sans-serif";
- font-size: 0.9em;
- border-width: 1px;
- border-color: #666666;
- border-collapse: collapse;
-}
-table th {
- border-width: 1px;
- padding: 8px;
- border-style: solid;
- border-color: #666666;
- background-color: #dedede;
-}
-td {
- border-width: 1px;
- padding: 8px;
- border-style: solid;
- border-color: #666666;
- background-color: #ffffff;
- vertical-align: top;
-}
+ table {
+ font-family: "Verdana,Arial,sans-serif";
+ font-size: 0.9em;
+ border-width: 1px;
+ border-color: #666666;
+ border-collapse: collapse;
+ }
+ table th {
+ border-width: 1px;
+ padding: 8px;
+ border-style: solid;
+ border-color: #666666;
+ background-color: #dedede;
+ }
+ td {
+ border-width: 1px;
+ padding: 8px;
+ border-style: solid;
+ border-color: #666666;
+ background-color: #ffffff;
+ vertical-align: top;
+ }
-.methods {
- padding: 5px;
-}
+ .methods {
+ padding: 5px;
+ }
-.representation-label {
- font-weight: bold;
- width: 80px;
-}
+ .representation-label {
+ font-weight: bold;
+ width: 80px;
+ }
-.ui-widget { font-size: 0.9em; }
-.ui-tabs-vertical { width: 60em; }
-.ui-tabs-vertical .ui-tabs-nav { padding: .2em .1em .2em .2em; float: left; width: 15em; }
-.ui-tabs-vertical .ui-tabs-nav li { clear: left; width: 100%; border-bottom-width: 1px !important; border-right-width: 0 !important; margin: 0 -1px .2em 0; }
-.ui-tabs-vertical .ui-tabs-nav li a { display:block; }
-.ui-tabs-vertical .ui-tabs-nav li.ui-tabs-active { padding-bottom: 0; padding-right: .1em; border-right-width: 1px; border-right-width: 1px; }
-.ui-tabs-vertical .ui-tabs-panel { padding: 1em; float: right; width: 40em;}
+ .ui-widget { font-size: 0.9em; }
+ .ui-tabs-vertical { width: 60em; }
+ .ui-tabs-vertical .ui-tabs-nav { padding: .2em .1em .2em .2em; float: left; width: 15em; }
+ .ui-tabs-vertical .ui-tabs-nav li { clear: left; width: 100%; border-bottom-width: 1px !important; border-right-width: 0 !important; margin: 0 -1px .2em 0; }
+ .ui-tabs-vertical .ui-tabs-nav li a { display:block; }
+ .ui-tabs-vertical .ui-tabs-nav li.ui-tabs-active { padding-bottom: 0; padding-right: .1em; border-right-width: 1px; border-right-width: 1px; }
+ .ui-tabs-vertical .ui-tabs-panel { padding: 1em; float: right; width: 40em;}
</style>
<script src="{$contextPath}/webjars/jquery/${jquery.version}/jquery.min.js">
http://git-wip-us.apache.org/repos/asf/syncope/blob/7aa0db37/core/src/test/java/org/apache/syncope/core/persistence/dao/DerSchemaTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/syncope/core/persistence/dao/DerSchemaTest.java b/core/src/test/java/org/apache/syncope/core/persistence/dao/DerSchemaTest.java
index fcc9dc8..ff0c099 100644
--- a/core/src/test/java/org/apache/syncope/core/persistence/dao/DerSchemaTest.java
+++ b/core/src/test/java/org/apache/syncope/core/persistence/dao/DerSchemaTest.java
@@ -79,7 +79,6 @@ public class DerSchemaTest extends AbstractDAOTest {
assertNull("delete did not work", actual);
// ------------- //
-
RDerSchema rderiveddata = derSchemaDAO.find("rderiveddata", RDerSchema.class);
assertNotNull(rderiveddata);
http://git-wip-us.apache.org/repos/asf/syncope/blob/7aa0db37/core/src/test/java/org/apache/syncope/core/persistence/dao/SecurityQuestionTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/syncope/core/persistence/dao/SecurityQuestionTest.java b/core/src/test/java/org/apache/syncope/core/persistence/dao/SecurityQuestionTest.java
index 87bf75b..86e725c 100644
--- a/core/src/test/java/org/apache/syncope/core/persistence/dao/SecurityQuestionTest.java
+++ b/core/src/test/java/org/apache/syncope/core/persistence/dao/SecurityQuestionTest.java
@@ -52,7 +52,7 @@ public class SecurityQuestionTest extends AbstractDAOTest {
public void save() {
SecurityQuestion securityQuestion = new SecurityQuestion();
securityQuestion.setContent("What is your favorite pet's name?");
-
+
SecurityQuestion actual = securityQuestionDAO.save(securityQuestion);
assertNotNull(actual);
assertNotNull(actual.getId());
http://git-wip-us.apache.org/repos/asf/syncope/blob/7aa0db37/core/src/test/java/org/apache/syncope/core/persistence/dao/VirSchemaTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/syncope/core/persistence/dao/VirSchemaTest.java b/core/src/test/java/org/apache/syncope/core/persistence/dao/VirSchemaTest.java
index ef0c4a8..efae722 100644
--- a/core/src/test/java/org/apache/syncope/core/persistence/dao/VirSchemaTest.java
+++ b/core/src/test/java/org/apache/syncope/core/persistence/dao/VirSchemaTest.java
@@ -77,7 +77,6 @@ public class VirSchemaTest extends AbstractDAOTest {
assertNull("delete did not work", actual);
// ------------- //
-
RVirSchema rvirtualdata = virSchemaDAO.find("rvirtualdata", RVirSchema.class);
assertNotNull(rvirtualdata);
http://git-wip-us.apache.org/repos/asf/syncope/blob/7aa0db37/core/src/test/java/org/apache/syncope/core/rest/ConnectorTestITCase.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/syncope/core/rest/ConnectorTestITCase.java b/core/src/test/java/org/apache/syncope/core/rest/ConnectorTestITCase.java
index d1063f5..4dbf804 100644
--- a/core/src/test/java/org/apache/syncope/core/rest/ConnectorTestITCase.java
+++ b/core/src/test/java/org/apache/syncope/core/rest/ConnectorTestITCase.java
@@ -709,13 +709,13 @@ public class ConnectorTestITCase extends AbstractTest {
@Test
public void issueSYNCOPE605() {
-
+
ConnInstanceTO connectorInstanceTO = connectorService.read(103L);
assertTrue(connectorInstanceTO.getCapabilities().isEmpty());
-
+
connectorInstanceTO.getCapabilities().add(ConnectorCapability.SEARCH);
connectorService.update(connectorInstanceTO.getId(), connectorInstanceTO);
-
+
ConnInstanceTO updatedCapabilities = connectorService.read(connectorInstanceTO.getId());
assertNotNull(updatedCapabilities.getCapabilities());
assertTrue(updatedCapabilities.getCapabilities().size() == 1);
http://git-wip-us.apache.org/repos/asf/syncope/blob/7aa0db37/core/src/test/java/org/apache/syncope/core/rest/NotificationTestITCase.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/syncope/core/rest/NotificationTestITCase.java b/core/src/test/java/org/apache/syncope/core/rest/NotificationTestITCase.java
index 7d7a433..3008350 100644
--- a/core/src/test/java/org/apache/syncope/core/rest/NotificationTestITCase.java
+++ b/core/src/test/java/org/apache/syncope/core/rest/NotificationTestITCase.java
@@ -44,7 +44,7 @@ public class NotificationTestITCase extends AbstractTest {
NotificationTO notificationTO = new NotificationTO();
notificationTO.setTraceLevel(TraceLevel.SUMMARY);
notificationTO.getEvents().add("create");
-
+
notificationTO.setUserAbout(SyncopeClient.getUserSearchConditionBuilder().
is("fullname").equalTo("*o*").and("fullname").equalTo("*i*").query());
http://git-wip-us.apache.org/repos/asf/syncope/blob/7aa0db37/core/src/test/java/org/apache/syncope/core/rest/PolicyTestITCase.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/syncope/core/rest/PolicyTestITCase.java b/core/src/test/java/org/apache/syncope/core/rest/PolicyTestITCase.java
index 18b1e3f..0100538 100644
--- a/core/src/test/java/org/apache/syncope/core/rest/PolicyTestITCase.java
+++ b/core/src/test/java/org/apache/syncope/core/rest/PolicyTestITCase.java
@@ -227,12 +227,12 @@ public class PolicyTestITCase extends AbstractTest {
public void issueSYNCOPE553() {
AccountPolicyTO policy = new AccountPolicyTO(false);
policy.setDescription("SYNCOPE553");
-
+
final AccountPolicySpec accountPolicySpec = new AccountPolicySpec();
accountPolicySpec.setMinLength(3);
accountPolicySpec.setMaxLength(8);
policy.setSpecification(accountPolicySpec);
-
+
policy = createPolicy(policy);
assertNotNull(policy);
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/7aa0db37/core/src/test/java/org/apache/syncope/core/rest/ResourceTestITCase.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/syncope/core/rest/ResourceTestITCase.java b/core/src/test/java/org/apache/syncope/core/rest/ResourceTestITCase.java
index 77f4c66..e4b915f 100644
--- a/core/src/test/java/org/apache/syncope/core/rest/ResourceTestITCase.java
+++ b/core/src/test/java/org/apache/syncope/core/rest/ResourceTestITCase.java
@@ -507,7 +507,7 @@ public class ResourceTestITCase extends AbstractTest {
item.setExtAttrName("cn");
item.setPurpose(MappingPurpose.BOTH);
mapping.setAccountIdItem(item);
-
+
item = new MappingItemTO();
item.setIntMappingType(IntMappingType.RoleOwnerSchema);
item.setExtAttrName("owner");