You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by jb...@apache.org on 2012/11/05 16:00:11 UTC
svn commit: r1405820 [7/8] - in /incubator/syncope/branches/cxf: ./
archetype/ build-tools/ client/
client/src/main/java/org/apache/syncope/annotation/
client/src/main/java/org/apache/syncope/client/
client/src/main/java/org/apache/syncope/client/mod/ ...
Modified: incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/controller/RoleController.java
URL: http://svn.apache.org/viewvc/incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/controller/RoleController.java?rev=1405820&r1=1405819&r2=1405820&view=diff
==============================================================================
--- incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/controller/RoleController.java (original)
+++ incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/controller/RoleController.java Mon Nov 5 15:00:01 2012
@@ -22,9 +22,6 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Set;
import javax.servlet.http.HttpServletResponse;
-import org.apache.syncope.client.mod.RoleMod;
-import org.apache.syncope.client.to.RoleTO;
-import org.apache.syncope.client.validation.SyncopeClientCompositeErrorException;
import org.apache.syncope.core.audit.AuditManager;
import org.apache.syncope.core.persistence.beans.role.SyncopeRole;
import org.apache.syncope.core.persistence.beans.user.SyncopeUser;
@@ -33,9 +30,12 @@ import org.apache.syncope.core.persisten
import org.apache.syncope.core.rest.data.RoleDataBinder;
import org.apache.syncope.core.util.EntitlementUtil;
import org.apache.syncope.core.util.NotFoundException;
+import org.apache.syncope.mod.RoleMod;
+import org.apache.syncope.to.RoleTO;
import org.apache.syncope.types.AuditElements.Category;
import org.apache.syncope.types.AuditElements.Result;
import org.apache.syncope.types.AuditElements.RoleSubCategory;
+import org.apache.syncope.validation.SyncopeClientCompositeErrorException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.security.core.context.SecurityContextHolder;
Modified: incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/controller/SchemaController.java
URL: http://svn.apache.org/viewvc/incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/controller/SchemaController.java?rev=1405820&r1=1405819&r2=1405820&view=diff
==============================================================================
--- incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/controller/SchemaController.java (original)
+++ incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/controller/SchemaController.java Mon Nov 5 15:00:01 2012
@@ -21,13 +21,13 @@ package org.apache.syncope.core.rest.con
import java.util.ArrayList;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
-import org.apache.syncope.client.to.SchemaTO;
import org.apache.syncope.core.audit.AuditManager;
import org.apache.syncope.core.persistence.beans.AbstractSchema;
import org.apache.syncope.core.persistence.dao.SchemaDAO;
import org.apache.syncope.core.rest.data.SchemaDataBinder;
import org.apache.syncope.core.util.AttributableUtil;
import org.apache.syncope.core.util.NotFoundException;
+import org.apache.syncope.to.SchemaTO;
import org.apache.syncope.types.AuditElements.Category;
import org.apache.syncope.types.AuditElements.Result;
import org.apache.syncope.types.AuditElements.SchemaSubCategory;
Modified: incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/controller/TaskController.java
URL: http://svn.apache.org/viewvc/incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/controller/TaskController.java?rev=1405820&r1=1405819&r2=1405820&view=diff
==============================================================================
--- incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/controller/TaskController.java (original)
+++ incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/controller/TaskController.java Mon Nov 5 15:00:01 2012
@@ -23,12 +23,6 @@ import java.util.Date;
import java.util.List;
import java.util.Set;
import javax.servlet.http.HttpServletResponse;
-import org.apache.syncope.client.to.SchedTaskTO;
-import org.apache.syncope.client.to.SyncTaskTO;
-import org.apache.syncope.client.to.TaskExecTO;
-import org.apache.syncope.client.to.TaskTO;
-import org.apache.syncope.client.validation.SyncopeClientCompositeErrorException;
-import org.apache.syncope.client.validation.SyncopeClientException;
import org.apache.syncope.core.audit.AuditManager;
import org.apache.syncope.core.init.ImplementationClassNamesLoader;
import org.apache.syncope.core.init.JobInstanceLoader;
@@ -45,12 +39,18 @@ import org.apache.syncope.core.quartz.Ab
import org.apache.syncope.core.notification.NotificationJob;
import org.apache.syncope.core.util.NotFoundException;
import org.apache.syncope.core.util.TaskUtil;
+import org.apache.syncope.to.SchedTaskTO;
+import org.apache.syncope.to.SyncTaskTO;
+import org.apache.syncope.to.TaskExecTO;
+import org.apache.syncope.to.TaskTO;
import org.apache.syncope.types.AuditElements.Category;
import org.apache.syncope.types.AuditElements.Result;
import org.apache.syncope.types.AuditElements.TaskSubCategory;
import org.apache.syncope.types.PropagationMode;
import org.apache.syncope.types.PropagationTaskExecStatus;
import org.apache.syncope.types.SyncopeClientExceptionType;
+import org.apache.syncope.validation.SyncopeClientCompositeErrorException;
+import org.apache.syncope.validation.SyncopeClientException;
import org.quartz.JobDataMap;
import org.quartz.JobKey;
import org.quartz.Scheduler;
Modified: incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/controller/UserController.java
URL: http://svn.apache.org/viewvc/incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/controller/UserController.java?rev=1405820&r1=1405819&r2=1405820&view=diff
==============================================================================
--- incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/controller/UserController.java (original)
+++ incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/controller/UserController.java Mon Nov 5 15:00:01 2012
@@ -24,14 +24,10 @@ import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
+
import javax.servlet.http.HttpServletResponse;
+
import org.apache.commons.collections.keyvalue.DefaultMapEntry;
-import org.apache.syncope.client.mod.UserMod;
-import org.apache.syncope.client.search.NodeCond;
-import org.apache.syncope.client.to.MembershipTO;
-import org.apache.syncope.client.to.PropagationTO;
-import org.apache.syncope.client.to.UserTO;
-import org.apache.syncope.client.to.WorkflowFormTO;
import org.apache.syncope.core.audit.AuditManager;
import org.apache.syncope.core.notification.NotificationManager;
import org.apache.syncope.core.persistence.beans.PropagationTask;
@@ -49,6 +45,12 @@ import org.apache.syncope.core.util.NotF
import org.apache.syncope.core.workflow.UserWorkflowAdapter;
import org.apache.syncope.core.workflow.WorkflowException;
import org.apache.syncope.core.workflow.WorkflowResult;
+import org.apache.syncope.mod.UserMod;
+import org.apache.syncope.search.NodeCond;
+import org.apache.syncope.to.MembershipTO;
+import org.apache.syncope.to.PropagationTO;
+import org.apache.syncope.to.UserTO;
+import org.apache.syncope.to.WorkflowFormTO;
import org.apache.syncope.types.AuditElements.Category;
import org.apache.syncope.types.AuditElements.Result;
import org.apache.syncope.types.AuditElements.UserSubCategory;
Modified: incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/controller/UserRequestController.java
URL: http://svn.apache.org/viewvc/incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/controller/UserRequestController.java?rev=1405820&r1=1405819&r2=1405820&view=diff
==============================================================================
--- incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/controller/UserRequestController.java (original)
+++ incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/controller/UserRequestController.java Mon Nov 5 15:00:01 2012
@@ -21,9 +21,6 @@ package org.apache.syncope.core.rest.con
import java.util.ArrayList;
import java.util.List;
import javax.persistence.RollbackException;
-import org.apache.syncope.client.mod.UserMod;
-import org.apache.syncope.client.to.UserRequestTO;
-import org.apache.syncope.client.to.UserTO;
import org.apache.syncope.core.audit.AuditManager;
import org.apache.syncope.core.persistence.beans.SyncopeConf;
import org.apache.syncope.core.persistence.beans.UserRequest;
@@ -31,6 +28,9 @@ import org.apache.syncope.core.persisten
import org.apache.syncope.core.persistence.dao.UserRequestDAO;
import org.apache.syncope.core.rest.data.UserRequestDataBinder;
import org.apache.syncope.core.util.NotFoundException;
+import org.apache.syncope.mod.UserMod;
+import org.apache.syncope.to.UserRequestTO;
+import org.apache.syncope.to.UserTO;
import org.apache.syncope.types.AuditElements.Category;
import org.apache.syncope.types.AuditElements.Result;
import org.apache.syncope.types.AuditElements.UserRequestSubCategory;
Modified: incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/controller/VirtualSchemaController.java
URL: http://svn.apache.org/viewvc/incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/controller/VirtualSchemaController.java?rev=1405820&r1=1405819&r2=1405820&view=diff
==============================================================================
--- incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/controller/VirtualSchemaController.java (original)
+++ incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/controller/VirtualSchemaController.java Mon Nov 5 15:00:01 2012
@@ -21,16 +21,16 @@ package org.apache.syncope.core.rest.con
import java.util.ArrayList;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
-import org.apache.syncope.client.to.VirtualSchemaTO;
-import org.apache.syncope.client.validation.SyncopeClientCompositeErrorException;
import org.apache.syncope.core.audit.AuditManager;
import org.apache.syncope.core.persistence.beans.AbstractVirSchema;
import org.apache.syncope.core.persistence.dao.VirSchemaDAO;
import org.apache.syncope.core.rest.data.VirtualSchemaDataBinder;
import org.apache.syncope.core.util.NotFoundException;
+import org.apache.syncope.to.VirtualSchemaTO;
import org.apache.syncope.types.AuditElements.Category;
import org.apache.syncope.types.AuditElements.Result;
import org.apache.syncope.types.AuditElements.SchemaSubCategory;
+import org.apache.syncope.validation.SyncopeClientCompositeErrorException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.stereotype.Controller;
Modified: incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/controller/WorkflowController.java
URL: http://svn.apache.org/viewvc/incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/controller/WorkflowController.java?rev=1405820&r1=1405819&r2=1405820&view=diff
==============================================================================
--- incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/controller/WorkflowController.java (original)
+++ incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/controller/WorkflowController.java Mon Nov 5 15:00:01 2012
@@ -19,11 +19,11 @@
package org.apache.syncope.core.rest.controller;
import java.util.List;
-import org.apache.syncope.client.to.WorkflowDefinitionTO;
import org.apache.syncope.core.audit.AuditManager;
import org.apache.syncope.core.util.NotFoundException;
import org.apache.syncope.core.workflow.UserWorkflowAdapter;
import org.apache.syncope.core.workflow.WorkflowException;
+import org.apache.syncope.to.WorkflowDefinitionTO;
import org.apache.syncope.types.AuditElements.Category;
import org.apache.syncope.types.AuditElements.Result;
import org.apache.syncope.types.AuditElements.WorkflowSubCategory;
Modified: incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/data/AbstractAttributableDataBinder.java
URL: http://svn.apache.org/viewvc/incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/data/AbstractAttributableDataBinder.java?rev=1405820&r1=1405819&r2=1405820&view=diff
==============================================================================
--- incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/data/AbstractAttributableDataBinder.java (original)
+++ incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/data/AbstractAttributableDataBinder.java Mon Nov 5 15:00:01 2012
@@ -32,12 +32,6 @@ import org.apache.commons.lang.StringUti
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
-import org.apache.syncope.client.mod.AbstractAttributableMod;
-import org.apache.syncope.client.mod.AttributeMod;
-import org.apache.syncope.client.to.AbstractAttributableTO;
-import org.apache.syncope.client.to.AttributeTO;
-import org.apache.syncope.client.validation.SyncopeClientCompositeErrorException;
-import org.apache.syncope.client.validation.SyncopeClientException;
import org.apache.syncope.core.persistence.beans.AbstractAttr;
import org.apache.syncope.core.persistence.beans.AbstractAttrValue;
import org.apache.syncope.core.persistence.beans.AbstractAttributable;
@@ -64,10 +58,16 @@ import org.apache.syncope.core.persisten
import org.apache.syncope.core.propagation.PropagationByResource;
import org.apache.syncope.core.util.AttributableUtil;
import org.apache.syncope.core.util.JexlUtil;
+import org.apache.syncope.mod.AbstractAttributableMod;
+import org.apache.syncope.mod.AttributeMod;
+import org.apache.syncope.to.AbstractAttributableTO;
+import org.apache.syncope.to.AttributeTO;
import org.apache.syncope.types.AttributableType;
import org.apache.syncope.types.IntMappingType;
import org.apache.syncope.types.PropagationOperation;
import org.apache.syncope.types.SyncopeClientExceptionType;
+import org.apache.syncope.validation.SyncopeClientCompositeErrorException;
+import org.apache.syncope.validation.SyncopeClientException;
public abstract class AbstractAttributableDataBinder {
Modified: incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/data/ConfigurationDataBinder.java
URL: http://svn.apache.org/viewvc/incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/data/ConfigurationDataBinder.java?rev=1405820&r1=1405819&r2=1405820&view=diff
==============================================================================
--- incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/data/ConfigurationDataBinder.java (original)
+++ incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/data/ConfigurationDataBinder.java Mon Nov 5 15:00:01 2012
@@ -19,8 +19,8 @@
package org.apache.syncope.core.rest.data;
import org.springframework.stereotype.Component;
-import org.apache.syncope.client.to.ConfigurationTO;
import org.apache.syncope.core.persistence.beans.SyncopeConf;
+import org.apache.syncope.to.ConfigurationTO;
@Component
public class ConfigurationDataBinder {
Modified: incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/data/ConnInstanceDataBinder.java
URL: http://svn.apache.org/viewvc/incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/data/ConnInstanceDataBinder.java?rev=1405820&r1=1405819&r2=1405820&view=diff
==============================================================================
--- incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/data/ConnInstanceDataBinder.java (original)
+++ incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/data/ConnInstanceDataBinder.java Mon Nov 5 15:00:01 2012
@@ -19,16 +19,16 @@
package org.apache.syncope.core.rest.data;
import java.util.Map;
-import org.apache.syncope.client.to.ConnInstanceTO;
-import org.apache.syncope.client.validation.SyncopeClientCompositeErrorException;
-import org.apache.syncope.client.validation.SyncopeClientException;
import org.apache.syncope.core.persistence.beans.ConnInstance;
import org.apache.syncope.core.persistence.dao.ConnInstanceDAO;
import org.apache.syncope.core.util.ConnBundleManager;
import org.apache.syncope.core.util.NotFoundException;
+import org.apache.syncope.to.ConnInstanceTO;
import org.apache.syncope.types.ConnConfPropSchema;
import org.apache.syncope.types.ConnConfProperty;
import org.apache.syncope.types.SyncopeClientExceptionType;
+import org.apache.syncope.validation.SyncopeClientCompositeErrorException;
+import org.apache.syncope.validation.SyncopeClientException;
import org.identityconnectors.framework.api.ConfigurationProperties;
import org.identityconnectors.framework.impl.api.ConfigurationPropertyImpl;
import org.springframework.beans.BeanUtils;
Modified: incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/data/DerivedSchemaDataBinder.java
URL: http://svn.apache.org/viewvc/incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/data/DerivedSchemaDataBinder.java?rev=1405820&r1=1405819&r2=1405820&view=diff
==============================================================================
--- incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/data/DerivedSchemaDataBinder.java (original)
+++ incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/data/DerivedSchemaDataBinder.java Mon Nov 5 15:00:01 2012
@@ -22,13 +22,13 @@ import org.springframework.beans.BeanUti
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.stereotype.Component;
-import org.apache.syncope.client.to.DerivedSchemaTO;
-import org.apache.syncope.client.validation.SyncopeClientCompositeErrorException;
-import org.apache.syncope.client.validation.SyncopeClientException;
import org.apache.syncope.core.persistence.beans.AbstractDerSchema;
import org.apache.syncope.core.persistence.beans.AbstractSchema;
import org.apache.syncope.core.util.JexlUtil;
+import org.apache.syncope.to.DerivedSchemaTO;
import org.apache.syncope.types.SyncopeClientExceptionType;
+import org.apache.syncope.validation.SyncopeClientCompositeErrorException;
+import org.apache.syncope.validation.SyncopeClientException;
@Component
public class DerivedSchemaDataBinder {
Modified: incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/data/NotificationDataBinder.java
URL: http://svn.apache.org/viewvc/incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/data/NotificationDataBinder.java?rev=1405820&r1=1405819&r2=1405820&view=diff
==============================================================================
--- incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/data/NotificationDataBinder.java (original)
+++ incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/data/NotificationDataBinder.java Mon Nov 5 15:00:01 2012
@@ -20,8 +20,8 @@ package org.apache.syncope.core.rest.dat
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Component;
-import org.apache.syncope.client.to.NotificationTO;
import org.apache.syncope.core.persistence.beans.Notification;
+import org.apache.syncope.to.NotificationTO;
@Component
public class NotificationDataBinder {
Modified: incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/data/PolicyDataBinder.java
URL: http://svn.apache.org/viewvc/incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/data/PolicyDataBinder.java?rev=1405820&r1=1405819&r2=1405820&view=diff
==============================================================================
--- incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/data/PolicyDataBinder.java (original)
+++ incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/data/PolicyDataBinder.java Mon Nov 5 15:00:01 2012
@@ -19,14 +19,14 @@
package org.apache.syncope.core.rest.data;
import org.springframework.stereotype.Component;
-import org.apache.syncope.client.to.AccountPolicyTO;
-import org.apache.syncope.client.to.PasswordPolicyTO;
-import org.apache.syncope.client.to.PolicyTO;
-import org.apache.syncope.client.to.SyncPolicyTO;
import org.apache.syncope.core.persistence.beans.AccountPolicy;
import org.apache.syncope.core.persistence.beans.PasswordPolicy;
import org.apache.syncope.core.persistence.beans.Policy;
import org.apache.syncope.core.persistence.beans.SyncPolicy;
+import org.apache.syncope.to.AccountPolicyTO;
+import org.apache.syncope.to.PasswordPolicyTO;
+import org.apache.syncope.to.PolicyTO;
+import org.apache.syncope.to.SyncPolicyTO;
import org.apache.syncope.types.AccountPolicySpec;
import org.apache.syncope.types.PasswordPolicySpec;
import org.apache.syncope.types.SyncPolicySpec;
Modified: incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/data/ReportDataBinder.java
URL: http://svn.apache.org/viewvc/incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/data/ReportDataBinder.java?rev=1405820&r1=1405819&r2=1405820&view=diff
==============================================================================
--- incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/data/ReportDataBinder.java (original)
+++ incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/data/ReportDataBinder.java Mon Nov 5 15:00:01 2012
@@ -20,9 +20,6 @@ package org.apache.syncope.core.rest.dat
import java.util.HashSet;
import java.util.Set;
-import org.apache.syncope.client.report.ReportletConf;
-import org.apache.syncope.client.to.ReportExecTO;
-import org.apache.syncope.client.to.ReportTO;
import org.apache.syncope.core.init.ImplementationClassNamesLoader;
import org.apache.syncope.core.init.JobInstanceLoader;
import org.apache.syncope.core.persistence.beans.Report;
@@ -30,6 +27,9 @@ import org.apache.syncope.core.persisten
import org.apache.syncope.core.persistence.dao.ReportExecDAO;
import org.apache.syncope.core.report.Reportlet;
import org.apache.syncope.core.report.ReportletConfClass;
+import org.apache.syncope.report.ReportletConf;
+import org.apache.syncope.to.ReportExecTO;
+import org.apache.syncope.to.ReportTO;
import org.quartz.Scheduler;
import org.quartz.SchedulerException;
import org.quartz.Trigger;
Modified: incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/data/ResourceDataBinder.java
URL: http://svn.apache.org/viewvc/incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/data/ResourceDataBinder.java?rev=1405820&r1=1405819&r2=1405820&view=diff
==============================================================================
--- incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/data/ResourceDataBinder.java (original)
+++ incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/data/ResourceDataBinder.java Mon Nov 5 15:00:01 2012
@@ -26,10 +26,6 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import org.apache.commons.lang.SerializationUtils;
-import org.apache.syncope.client.to.ResourceTO;
-import org.apache.syncope.client.to.SchemaMappingTO;
-import org.apache.syncope.client.validation.SyncopeClientCompositeErrorException;
-import org.apache.syncope.client.validation.SyncopeClientException;
import org.apache.syncope.core.persistence.beans.AccountPolicy;
import org.apache.syncope.core.persistence.beans.ConnInstance;
import org.apache.syncope.core.persistence.beans.ExternalResource;
@@ -40,9 +36,13 @@ import org.apache.syncope.core.persisten
import org.apache.syncope.core.persistence.dao.PolicyDAO;
import org.apache.syncope.core.util.JexlUtil;
import org.apache.syncope.core.util.NotFoundException;
+import org.apache.syncope.to.ResourceTO;
+import org.apache.syncope.to.SchemaMappingTO;
import org.apache.syncope.types.ConnConfProperty;
import org.apache.syncope.types.IntMappingType;
import org.apache.syncope.types.SyncopeClientExceptionType;
+import org.apache.syncope.validation.SyncopeClientCompositeErrorException;
+import org.apache.syncope.validation.SyncopeClientException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils;
Modified: incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/data/RoleDataBinder.java
URL: http://svn.apache.org/viewvc/incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/data/RoleDataBinder.java?rev=1405820&r1=1405819&r2=1405820&view=diff
==============================================================================
--- incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/data/RoleDataBinder.java (original)
+++ incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/data/RoleDataBinder.java Mon Nov 5 15:00:01 2012
@@ -19,10 +19,6 @@
package org.apache.syncope.core.rest.data;
import java.util.List;
-import org.apache.syncope.client.mod.RoleMod;
-import org.apache.syncope.client.to.RoleTO;
-import org.apache.syncope.client.validation.SyncopeClientCompositeErrorException;
-import org.apache.syncope.client.validation.SyncopeClientException;
import org.apache.syncope.core.persistence.beans.AccountPolicy;
import org.apache.syncope.core.persistence.beans.Entitlement;
import org.apache.syncope.core.persistence.beans.PasswordPolicy;
@@ -35,8 +31,12 @@ import org.apache.syncope.core.persisten
import org.apache.syncope.core.propagation.PropagationByResource;
import org.apache.syncope.core.util.AttributableUtil;
import org.apache.syncope.core.util.NotFoundException;
+import org.apache.syncope.mod.RoleMod;
+import org.apache.syncope.to.RoleTO;
import org.apache.syncope.types.AttributableType;
import org.apache.syncope.types.SyncopeClientExceptionType;
+import org.apache.syncope.validation.SyncopeClientCompositeErrorException;
+import org.apache.syncope.validation.SyncopeClientException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.stereotype.Component;
Modified: incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/data/SchemaDataBinder.java
URL: http://svn.apache.org/viewvc/incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/data/SchemaDataBinder.java?rev=1405820&r1=1405819&r2=1405820&view=diff
==============================================================================
--- incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/data/SchemaDataBinder.java (original)
+++ incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/data/SchemaDataBinder.java Mon Nov 5 15:00:01 2012
@@ -25,16 +25,16 @@ import org.springframework.beans.BeanUti
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.stereotype.Component;
-import org.apache.syncope.client.to.SchemaTO;
-import org.apache.syncope.client.validation.SyncopeClientCompositeErrorException;
-import org.apache.syncope.client.validation.SyncopeClientException;
import org.apache.syncope.core.persistence.beans.AbstractAttr;
import org.apache.syncope.core.persistence.beans.AbstractDerSchema;
import org.apache.syncope.core.persistence.beans.AbstractSchema;
import org.apache.syncope.core.persistence.dao.SchemaDAO;
import org.apache.syncope.core.util.AttributableUtil;
import org.apache.syncope.core.util.JexlUtil;
+import org.apache.syncope.to.SchemaTO;
import org.apache.syncope.types.SyncopeClientExceptionType;
+import org.apache.syncope.validation.SyncopeClientCompositeErrorException;
+import org.apache.syncope.validation.SyncopeClientException;
@Component
public class SchemaDataBinder {
Modified: incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/data/TaskDataBinder.java
URL: http://svn.apache.org/viewvc/incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/data/TaskDataBinder.java?rev=1405820&r1=1405819&r2=1405820&view=diff
==============================================================================
--- incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/data/TaskDataBinder.java (original)
+++ incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/data/TaskDataBinder.java Mon Nov 5 15:00:01 2012
@@ -19,17 +19,6 @@
package org.apache.syncope.core.rest.data;
import org.apache.commons.lang.StringUtils;
-import org.apache.syncope.client.to.AbstractAttributableTO;
-import org.apache.syncope.client.to.AttributeTO;
-import org.apache.syncope.client.to.MembershipTO;
-import org.apache.syncope.client.to.PropagationTaskTO;
-import org.apache.syncope.client.to.SchedTaskTO;
-import org.apache.syncope.client.to.SyncTaskTO;
-import org.apache.syncope.client.to.TaskExecTO;
-import org.apache.syncope.client.to.TaskTO;
-import org.apache.syncope.client.to.UserTO;
-import org.apache.syncope.client.validation.SyncopeClientCompositeErrorException;
-import org.apache.syncope.client.validation.SyncopeClientException;
import org.apache.syncope.core.init.JobInstanceLoader;
import org.apache.syncope.core.persistence.beans.ExternalResource;
import org.apache.syncope.core.persistence.beans.NotificationTask;
@@ -43,7 +32,18 @@ import org.apache.syncope.core.persisten
import org.apache.syncope.core.util.JexlUtil;
import org.apache.syncope.core.util.NotFoundException;
import org.apache.syncope.core.util.TaskUtil;
+import org.apache.syncope.to.AbstractAttributableTO;
+import org.apache.syncope.to.AttributeTO;
+import org.apache.syncope.to.MembershipTO;
+import org.apache.syncope.to.PropagationTaskTO;
+import org.apache.syncope.to.SchedTaskTO;
+import org.apache.syncope.to.SyncTaskTO;
+import org.apache.syncope.to.TaskExecTO;
+import org.apache.syncope.to.TaskTO;
+import org.apache.syncope.to.UserTO;
import org.apache.syncope.types.SyncopeClientExceptionType;
+import org.apache.syncope.validation.SyncopeClientCompositeErrorException;
+import org.apache.syncope.validation.SyncopeClientException;
import org.quartz.Scheduler;
import org.quartz.SchedulerException;
import org.quartz.Trigger;
Modified: incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/data/UserDataBinder.java
URL: http://svn.apache.org/viewvc/incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/data/UserDataBinder.java?rev=1405820&r1=1405819&r2=1405820&view=diff
==============================================================================
--- incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/data/UserDataBinder.java (original)
+++ incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/data/UserDataBinder.java Mon Nov 5 15:00:01 2012
@@ -21,13 +21,8 @@ package org.apache.syncope.core.rest.dat
import java.util.Date;
import java.util.HashSet;
import java.util.Set;
+
import org.apache.commons.lang.StringUtils;
-import org.apache.syncope.client.mod.MembershipMod;
-import org.apache.syncope.client.mod.UserMod;
-import org.apache.syncope.client.to.MembershipTO;
-import org.apache.syncope.client.to.UserTO;
-import org.apache.syncope.client.validation.SyncopeClientCompositeErrorException;
-import org.apache.syncope.client.validation.SyncopeClientException;
import org.apache.syncope.core.persistence.beans.AbstractAttr;
import org.apache.syncope.core.persistence.beans.AbstractDerAttr;
import org.apache.syncope.core.persistence.beans.AbstractVirAttr;
@@ -47,12 +42,18 @@ import org.apache.syncope.core.util.Attr
import org.apache.syncope.core.util.ConnObjectUtil;
import org.apache.syncope.core.util.EntitlementUtil;
import org.apache.syncope.core.util.NotFoundException;
+import org.apache.syncope.mod.MembershipMod;
+import org.apache.syncope.mod.UserMod;
+import org.apache.syncope.to.MembershipTO;
+import org.apache.syncope.to.UserTO;
import org.apache.syncope.types.AttributableType;
import org.apache.syncope.types.CipherAlgorithm;
import org.apache.syncope.types.IntMappingType;
import org.apache.syncope.types.PasswordPolicySpec;
import org.apache.syncope.types.PropagationOperation;
import org.apache.syncope.types.SyncopeClientExceptionType;
+import org.apache.syncope.validation.SyncopeClientCompositeErrorException;
+import org.apache.syncope.validation.SyncopeClientException;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
Modified: incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/data/UserRequestDataBinder.java
URL: http://svn.apache.org/viewvc/incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/data/UserRequestDataBinder.java?rev=1405820&r1=1405819&r2=1405820&view=diff
==============================================================================
--- incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/data/UserRequestDataBinder.java (original)
+++ incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/data/UserRequestDataBinder.java Mon Nov 5 15:00:01 2012
@@ -19,14 +19,14 @@
package org.apache.syncope.core.rest.data;
import javax.persistence.RollbackException;
-import org.apache.syncope.client.mod.UserMod;
-import org.apache.syncope.client.to.UserRequestTO;
-import org.apache.syncope.client.to.UserTO;
import org.apache.syncope.core.persistence.beans.UserRequest;
import org.apache.syncope.core.persistence.beans.user.SyncopeUser;
import org.apache.syncope.core.persistence.dao.UserDAO;
import org.apache.syncope.core.rest.controller.UnauthorizedRoleException;
import org.apache.syncope.core.util.NotFoundException;
+import org.apache.syncope.mod.UserMod;
+import org.apache.syncope.to.UserRequestTO;
+import org.apache.syncope.to.UserTO;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.core.context.SecurityContextHolder;
Modified: incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/data/VirtualSchemaDataBinder.java
URL: http://svn.apache.org/viewvc/incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/data/VirtualSchemaDataBinder.java?rev=1405820&r1=1405819&r2=1405820&view=diff
==============================================================================
--- incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/data/VirtualSchemaDataBinder.java (original)
+++ incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/data/VirtualSchemaDataBinder.java Mon Nov 5 15:00:01 2012
@@ -23,10 +23,10 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils;
import org.springframework.http.HttpStatus;
import org.springframework.stereotype.Component;
-import org.apache.syncope.client.to.VirtualSchemaTO;
-import org.apache.syncope.client.validation.SyncopeClientCompositeErrorException;
import org.apache.syncope.core.persistence.beans.AbstractVirSchema;
import org.apache.syncope.core.persistence.beans.AbstractSchema;
+import org.apache.syncope.to.VirtualSchemaTO;
+import org.apache.syncope.validation.SyncopeClientCompositeErrorException;
@Component
public class VirtualSchemaDataBinder {
Modified: incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/sync/DefaultSyncActions.java
URL: http://svn.apache.org/viewvc/incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/sync/DefaultSyncActions.java?rev=1405820&r1=1405819&r2=1405820&view=diff
==============================================================================
--- incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/sync/DefaultSyncActions.java (original)
+++ incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/sync/DefaultSyncActions.java Mon Nov 5 15:00:01 2012
@@ -19,9 +19,9 @@
package org.apache.syncope.core.sync;
import java.util.List;
-import org.apache.syncope.client.mod.UserMod;
-import org.apache.syncope.client.to.UserTO;
import org.apache.syncope.core.persistence.beans.SyncTask;
+import org.apache.syncope.mod.UserMod;
+import org.apache.syncope.to.UserTO;
import org.identityconnectors.framework.common.objects.SyncDelta;
import org.quartz.JobExecutionException;
Modified: incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/sync/SyncActions.java
URL: http://svn.apache.org/viewvc/incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/sync/SyncActions.java?rev=1405820&r1=1405819&r2=1405820&view=diff
==============================================================================
--- incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/sync/SyncActions.java (original)
+++ incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/sync/SyncActions.java Mon Nov 5 15:00:01 2012
@@ -19,9 +19,9 @@
package org.apache.syncope.core.sync;
import java.util.List;
-import org.apache.syncope.client.mod.UserMod;
-import org.apache.syncope.client.to.UserTO;
import org.apache.syncope.core.persistence.beans.SyncTask;
+import org.apache.syncope.mod.UserMod;
+import org.apache.syncope.to.UserTO;
import org.identityconnectors.framework.common.objects.SyncDelta;
import org.quartz.JobExecutionException;
Modified: incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/sync/SyncopeSyncResultHanlder.java
URL: http://svn.apache.org/viewvc/incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/sync/SyncopeSyncResultHanlder.java?rev=1405820&r1=1405819&r2=1405820&view=diff
==============================================================================
--- incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/sync/SyncopeSyncResultHanlder.java (original)
+++ incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/sync/SyncopeSyncResultHanlder.java Mon Nov 5 15:00:01 2012
@@ -24,11 +24,7 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.apache.syncope.client.mod.UserMod;
-import org.apache.syncope.client.search.AttributeCond;
-import org.apache.syncope.client.search.NodeCond;
-import org.apache.syncope.client.search.SyncopeUserCond;
-import org.apache.syncope.client.to.UserTO;
+
import org.apache.syncope.core.notification.NotificationManager;
import org.apache.syncope.core.persistence.beans.PropagationTask;
import org.apache.syncope.core.persistence.beans.SchemaMapping;
@@ -54,6 +50,11 @@ import org.apache.syncope.core.util.NotF
import org.apache.syncope.core.util.SchemaMappingUtil;
import org.apache.syncope.core.workflow.UserWorkflowAdapter;
import org.apache.syncope.core.workflow.WorkflowResult;
+import org.apache.syncope.mod.UserMod;
+import org.apache.syncope.search.AttributeCond;
+import org.apache.syncope.search.NodeCond;
+import org.apache.syncope.search.SyncopeUserCond;
+import org.apache.syncope.to.UserTO;
import org.apache.syncope.types.ConflictResolutionAction;
import org.apache.syncope.types.SyncPolicySpec;
import org.identityconnectors.framework.common.objects.Attribute;
Modified: incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/util/ConnObjectUtil.java
URL: http://svn.apache.org/viewvc/incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/util/ConnObjectUtil.java?rev=1405820&r1=1405819&r2=1405820&view=diff
==============================================================================
--- incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/util/ConnObjectUtil.java (original)
+++ incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/util/ConnObjectUtil.java Mon Nov 5 15:00:01 2012
@@ -28,13 +28,6 @@ import java.util.Map;
import java.util.Set;
import org.apache.commons.lang.RandomStringUtils;
import org.apache.commons.lang.StringUtils;
-import org.apache.syncope.client.mod.UserMod;
-import org.apache.syncope.client.to.AbstractAttributableTO;
-import org.apache.syncope.client.to.AttributeTO;
-import org.apache.syncope.client.to.ConnObjectTO;
-import org.apache.syncope.client.to.MembershipTO;
-import org.apache.syncope.client.to.UserTO;
-import org.apache.syncope.client.util.AttributableOperations;
import org.apache.syncope.core.init.ConnInstanceLoader;
import org.apache.syncope.core.persistence.beans.AbstractAttributable;
import org.apache.syncope.core.persistence.beans.AbstractVirAttr;
@@ -49,7 +42,14 @@ import org.apache.syncope.core.persisten
import org.apache.syncope.core.propagation.ConnectorFacadeProxy;
import org.apache.syncope.core.rest.controller.UnauthorizedRoleException;
import org.apache.syncope.core.rest.data.UserDataBinder;
+import org.apache.syncope.mod.UserMod;
+import org.apache.syncope.to.AbstractAttributableTO;
+import org.apache.syncope.to.AttributeTO;
+import org.apache.syncope.to.ConnObjectTO;
+import org.apache.syncope.to.MembershipTO;
+import org.apache.syncope.to.UserTO;
import org.apache.syncope.types.PasswordPolicySpec;
+import org.apache.syncope.util.AttributableOperations;
import org.identityconnectors.common.security.GuardedByteArray;
import org.identityconnectors.common.security.GuardedString;
import org.identityconnectors.framework.common.objects.Attribute;
Modified: incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/util/ImportExport.java
URL: http://svn.apache.org/viewvc/incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/util/ImportExport.java?rev=1405820&r1=1405819&r2=1405820&view=diff
==============================================================================
--- incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/util/ImportExport.java (original)
+++ incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/util/ImportExport.java Mon Nov 5 15:00:01 2012
@@ -42,6 +42,7 @@ import java.util.Map;
import java.util.Properties;
import java.util.Set;
import java.util.TreeMap;
+
import javax.persistence.EntityManager;
import javax.persistence.Query;
import javax.persistence.TemporalType;
@@ -52,9 +53,10 @@ import javax.xml.transform.TransformerCo
import javax.xml.transform.sax.SAXTransformerFactory;
import javax.xml.transform.sax.TransformerHandler;
import javax.xml.transform.stream.StreamResult;
+
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.time.DateUtils;
-import org.apache.syncope.client.SyncopeConstants;
+import org.apache.syncope.SyncopeConstants;
import org.apache.syncope.core.util.multiparent.MultiParentNode;
import org.apache.syncope.core.util.multiparent.MultiParentNodeOp;
import org.slf4j.Logger;
Modified: incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/util/JexlUtil.java
URL: http://svn.apache.org/viewvc/incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/util/JexlUtil.java?rev=1405820&r1=1405819&r2=1405820&view=diff
==============================================================================
--- incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/util/JexlUtil.java (original)
+++ incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/util/JexlUtil.java Mon Nov 5 15:00:01 2012
@@ -29,12 +29,12 @@ import org.apache.commons.jexl2.JexlExce
import org.apache.commons.jexl2.MapContext;
import org.apache.commons.lang.ArrayUtils;
import org.apache.commons.lang.StringUtils;
-import org.apache.syncope.client.to.AbstractAttributableTO;
-import org.apache.syncope.client.to.AttributeTO;
import org.apache.syncope.core.persistence.beans.AbstractAttr;
import org.apache.syncope.core.persistence.beans.AbstractBaseBean;
import org.apache.syncope.core.persistence.beans.AbstractDerAttr;
import org.apache.syncope.core.persistence.beans.AbstractVirAttr;
+import org.apache.syncope.to.AbstractAttributableTO;
+import org.apache.syncope.to.AttributeTO;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
Modified: incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/util/TaskUtil.java
URL: http://svn.apache.org/viewvc/incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/util/TaskUtil.java?rev=1405820&r1=1405819&r2=1405820&view=diff
==============================================================================
--- incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/util/TaskUtil.java (original)
+++ incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/util/TaskUtil.java Mon Nov 5 15:00:01 2012
@@ -18,16 +18,16 @@
*/
package org.apache.syncope.core.util;
-import org.apache.syncope.client.to.NotificationTaskTO;
-import org.apache.syncope.client.to.PropagationTaskTO;
-import org.apache.syncope.client.to.SchedTaskTO;
-import org.apache.syncope.client.to.SyncTaskTO;
-import org.apache.syncope.client.to.TaskTO;
import org.apache.syncope.core.persistence.beans.NotificationTask;
import org.apache.syncope.core.persistence.beans.PropagationTask;
import org.apache.syncope.core.persistence.beans.SchedTask;
import org.apache.syncope.core.persistence.beans.SyncTask;
import org.apache.syncope.core.persistence.beans.Task;
+import org.apache.syncope.to.NotificationTaskTO;
+import org.apache.syncope.to.PropagationTaskTO;
+import org.apache.syncope.to.SchedTaskTO;
+import org.apache.syncope.to.SyncTaskTO;
+import org.apache.syncope.to.TaskTO;
public enum TaskUtil {
Modified: incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/workflow/AbstractUserWorkflowAdapter.java
URL: http://svn.apache.org/viewvc/incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/workflow/AbstractUserWorkflowAdapter.java?rev=1405820&r1=1405819&r2=1405820&view=diff
==============================================================================
--- incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/workflow/AbstractUserWorkflowAdapter.java (original)
+++ incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/workflow/AbstractUserWorkflowAdapter.java Mon Nov 5 15:00:01 2012
@@ -20,14 +20,14 @@ package org.apache.syncope.core.workflow
import java.util.Map;
import java.util.Map.Entry;
-import org.apache.syncope.client.mod.UserMod;
-import org.apache.syncope.client.to.UserTO;
import org.apache.syncope.core.init.WorkflowLoader;
import org.apache.syncope.core.persistence.beans.user.SyncopeUser;
import org.apache.syncope.core.persistence.dao.UserDAO;
import org.apache.syncope.core.rest.controller.UnauthorizedRoleException;
import org.apache.syncope.core.rest.data.UserDataBinder;
import org.apache.syncope.core.util.NotFoundException;
+import org.apache.syncope.mod.UserMod;
+import org.apache.syncope.to.UserTO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
Modified: incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/workflow/ActivitiUserWorkflowAdapter.java
URL: http://svn.apache.org/viewvc/incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/workflow/ActivitiUserWorkflowAdapter.java?rev=1405820&r1=1405819&r2=1405820&view=diff
==============================================================================
--- incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/workflow/ActivitiUserWorkflowAdapter.java (original)
+++ incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/workflow/ActivitiUserWorkflowAdapter.java Mon Nov 5 15:00:01 2012
@@ -54,17 +54,17 @@ import org.activiti.engine.runtime.Proce
import org.activiti.engine.task.Task;
import org.apache.commons.collections.keyvalue.DefaultMapEntry;
import org.apache.commons.lang.StringUtils;
-import org.apache.syncope.client.mod.UserMod;
-import org.apache.syncope.client.to.UserTO;
-import org.apache.syncope.client.to.WorkflowDefinitionTO;
-import org.apache.syncope.client.to.WorkflowFormPropertyTO;
-import org.apache.syncope.client.to.WorkflowFormTO;
import org.apache.syncope.core.init.ActivitiWorkflowLoader;
import org.apache.syncope.core.init.WorkflowLoader;
import org.apache.syncope.core.persistence.beans.user.SyncopeUser;
import org.apache.syncope.core.propagation.PropagationByResource;
import org.apache.syncope.core.rest.controller.UnauthorizedRoleException;
import org.apache.syncope.core.util.NotFoundException;
+import org.apache.syncope.mod.UserMod;
+import org.apache.syncope.to.UserTO;
+import org.apache.syncope.to.WorkflowDefinitionTO;
+import org.apache.syncope.to.WorkflowFormPropertyTO;
+import org.apache.syncope.to.WorkflowFormTO;
import org.apache.syncope.types.PropagationOperation;
import org.apache.syncope.types.WorkflowFormPropertyType;
import org.identityconnectors.common.security.EncryptorFactory;
Modified: incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/workflow/NoOpUserWorkflowAdapter.java
URL: http://svn.apache.org/viewvc/incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/workflow/NoOpUserWorkflowAdapter.java?rev=1405820&r1=1405819&r2=1405820&view=diff
==============================================================================
--- incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/workflow/NoOpUserWorkflowAdapter.java (original)
+++ incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/workflow/NoOpUserWorkflowAdapter.java Mon Nov 5 15:00:01 2012
@@ -23,14 +23,14 @@ import java.util.Collections;
import java.util.List;
import java.util.Map;
import org.apache.commons.collections.keyvalue.DefaultMapEntry;
-import org.apache.syncope.client.mod.UserMod;
-import org.apache.syncope.client.to.UserTO;
-import org.apache.syncope.client.to.WorkflowDefinitionTO;
-import org.apache.syncope.client.to.WorkflowFormTO;
import org.apache.syncope.core.persistence.beans.user.SyncopeUser;
import org.apache.syncope.core.propagation.PropagationByResource;
import org.apache.syncope.core.rest.controller.UnauthorizedRoleException;
import org.apache.syncope.core.util.NotFoundException;
+import org.apache.syncope.mod.UserMod;
+import org.apache.syncope.to.UserTO;
+import org.apache.syncope.to.WorkflowDefinitionTO;
+import org.apache.syncope.to.WorkflowFormTO;
import org.apache.syncope.types.PropagationOperation;
import org.springframework.transaction.annotation.Transactional;
Modified: incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/workflow/UserWorkflowAdapter.java
URL: http://svn.apache.org/viewvc/incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/workflow/UserWorkflowAdapter.java?rev=1405820&r1=1405819&r2=1405820&view=diff
==============================================================================
--- incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/workflow/UserWorkflowAdapter.java (original)
+++ incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/workflow/UserWorkflowAdapter.java Mon Nov 5 15:00:01 2012
@@ -20,15 +20,15 @@ package org.apache.syncope.core.workflow
import java.util.List;
import java.util.Map;
-import org.apache.syncope.client.mod.UserMod;
-import org.apache.syncope.client.to.UserTO;
-import org.apache.syncope.client.to.WorkflowDefinitionTO;
-import org.apache.syncope.client.to.WorkflowFormTO;
import org.apache.syncope.core.init.SpringContextInitializer;
import org.apache.syncope.core.init.WorkflowLoader;
import org.apache.syncope.core.persistence.beans.user.SyncopeUser;
import org.apache.syncope.core.rest.controller.UnauthorizedRoleException;
import org.apache.syncope.core.util.NotFoundException;
+import org.apache.syncope.mod.UserMod;
+import org.apache.syncope.to.UserTO;
+import org.apache.syncope.to.WorkflowDefinitionTO;
+import org.apache.syncope.to.WorkflowFormTO;
/**
* Interface for calling underlying workflow implementations.
Modified: incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/workflow/activiti/Create.java
URL: http://svn.apache.org/viewvc/incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/workflow/activiti/Create.java?rev=1405820&r1=1405819&r2=1405820&view=diff
==============================================================================
--- incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/workflow/activiti/Create.java (original)
+++ incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/workflow/activiti/Create.java Mon Nov 5 15:00:01 2012
@@ -19,9 +19,9 @@
package org.apache.syncope.core.workflow.activiti;
import org.activiti.engine.delegate.DelegateExecution;
-import org.apache.syncope.client.to.UserTO;
import org.apache.syncope.core.persistence.beans.user.SyncopeUser;
import org.apache.syncope.core.workflow.ActivitiUserWorkflowAdapter;
+import org.apache.syncope.to.UserTO;
public class Create extends AbstractActivitiDelegate {
Modified: incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/workflow/activiti/Update.java
URL: http://svn.apache.org/viewvc/incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/workflow/activiti/Update.java?rev=1405820&r1=1405819&r2=1405820&view=diff
==============================================================================
--- incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/workflow/activiti/Update.java (original)
+++ incubator/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/workflow/activiti/Update.java Mon Nov 5 15:00:01 2012
@@ -19,10 +19,10 @@
package org.apache.syncope.core.workflow.activiti;
import org.activiti.engine.delegate.DelegateExecution;
-import org.apache.syncope.client.mod.UserMod;
import org.apache.syncope.core.persistence.beans.user.SyncopeUser;
import org.apache.syncope.core.propagation.PropagationByResource;
import org.apache.syncope.core.workflow.ActivitiUserWorkflowAdapter;
+import org.apache.syncope.mod.UserMod;
public class Update extends AbstractActivitiDelegate {
Modified: incubator/syncope/branches/cxf/core/src/main/webapp/cacheStats.jsp
URL: http://svn.apache.org/viewvc/incubator/syncope/branches/cxf/core/src/main/webapp/cacheStats.jsp?rev=1405820&r1=1405819&r2=1405820&view=diff
==============================================================================
--- incubator/syncope/branches/cxf/core/src/main/webapp/cacheStats.jsp (original)
+++ incubator/syncope/branches/cxf/core/src/main/webapp/cacheStats.jsp Mon Nov 5 15:00:01 2012
@@ -19,7 +19,7 @@ under the License.
<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
<%@taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn"%>
-<%@page import="org.apache.syncope.client.SyncopeConstants"%>
+<%@page import="org.apache.syncope.SyncopeConstants"%>
<%@page import="java.text.SimpleDateFormat"%>
<%@page import="java.util.Date"%>
<%@page import="org.apache.openjpa.datacache.CacheStatisticsImpl"%>
Modified: incubator/syncope/branches/cxf/core/src/main/webapp/syncopeClientError.jsp
URL: http://svn.apache.org/viewvc/incubator/syncope/branches/cxf/core/src/main/webapp/syncopeClientError.jsp?rev=1405820&r1=1405819&r2=1405820&view=diff
==============================================================================
--- incubator/syncope/branches/cxf/core/src/main/webapp/syncopeClientError.jsp (original)
+++ incubator/syncope/branches/cxf/core/src/main/webapp/syncopeClientError.jsp Mon Nov 5 15:00:01 2012
@@ -27,14 +27,14 @@ under the License.
<%@page import="org.apache.syncope.core.rest.controller.InvalidSearchConditionException"%>
<%@page import="org.apache.syncope.core.rest.controller.UnauthorizedRoleException"%>
<%@page import="org.apache.syncope.core.persistence.dao.MissingConfKeyException"%>
-<%@page import="org.apache.syncope.client.validation.SyncopeClientException"%>
-<%@page import="org.apache.syncope.client.validation.SyncopeClientCompositeErrorException"%>
+<%@page import="org.apache.syncope.SyncopeClientException"%>
+<%@page import="org.apache.syncope.SyncopeClientCompositeErrorException"%>
<%@page import="org.apache.syncope.core.propagation.PropagationException"%>
<%@page import="org.apache.syncope.core.workflow.WorkflowException"%>
<%@page import="org.apache.syncope.types.SyncopeClientExceptionType"%>
<%@page import="org.apache.syncope.core.util.NotFoundException"%>
<%@page import="org.identityconnectors.framework.common.exceptions.ConfigurationException"%>
-<%@page import="org.apache.syncope.client.validation.SyncopeClientErrorHandler"%>
+<%@page import="org.apache.syncope.SyncopeClientErrorHandler"%>
<%@page import="org.slf4j.LoggerFactory"%>
<%@page import="org.slf4j.Logger"%>
<%@page import="org.apache.syncope.core.rest.controller.AbstractController"%>
Modified: incubator/syncope/branches/cxf/core/src/test/java/org/apache/syncope/core/notification/NotificationTest.java
URL: http://svn.apache.org/viewvc/incubator/syncope/branches/cxf/core/src/test/java/org/apache/syncope/core/notification/NotificationTest.java?rev=1405820&r1=1405819&r2=1405820&view=diff
==============================================================================
--- incubator/syncope/branches/cxf/core/src/test/java/org/apache/syncope/core/notification/NotificationTest.java (original)
+++ incubator/syncope/branches/cxf/core/src/test/java/org/apache/syncope/core/notification/NotificationTest.java Mon Nov 5 15:00:01 2012
@@ -18,25 +18,22 @@
*/
package org.apache.syncope.core.notification;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
-import com.icegreen.greenmail.util.GreenMail;
-import com.icegreen.greenmail.util.ServerSetup;
import java.util.ArrayList;
import java.util.List;
import java.util.Random;
+
import javax.annotation.Resource;
import javax.mail.Flags.Flag;
import javax.mail.Folder;
import javax.mail.Message;
import javax.mail.Session;
import javax.mail.Store;
+
import org.apache.commons.lang.StringUtils;
-import org.apache.syncope.client.search.MembershipCond;
-import org.apache.syncope.client.search.NodeCond;
-import org.apache.syncope.client.to.MembershipTO;
-import org.apache.syncope.client.to.NotificationTaskTO;
-import org.apache.syncope.client.to.UserTO;
import org.apache.syncope.core.persistence.beans.Entitlement;
import org.apache.syncope.core.persistence.beans.Notification;
import org.apache.syncope.core.persistence.beans.NotificationTask;
@@ -48,6 +45,11 @@ import org.apache.syncope.core.persisten
import org.apache.syncope.core.rest.UserTestITCase;
import org.apache.syncope.core.rest.controller.TaskController;
import org.apache.syncope.core.rest.controller.UserController;
+import org.apache.syncope.search.MembershipCond;
+import org.apache.syncope.search.NodeCond;
+import org.apache.syncope.to.MembershipTO;
+import org.apache.syncope.to.NotificationTaskTO;
+import org.apache.syncope.to.UserTO;
import org.apache.syncope.types.IntMappingType;
import org.apache.syncope.types.TraceLevel;
import org.junit.AfterClass;
@@ -71,6 +73,9 @@ import org.springframework.test.context.
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.transaction.annotation.Transactional;
+import com.icegreen.greenmail.util.GreenMail;
+import com.icegreen.greenmail.util.ServerSetup;
+
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration(locations = {
"classpath:syncopeContext.xml",
@@ -190,10 +195,10 @@ public class NotificationTest {
inbox.open(Folder.READ_WRITE);
Message[] messages = inbox.getMessages();
- for (int i = 0; i < messages.length; i++) {
- if (sender.equals(messages[i].getFrom()[0].toString()) && subject.equals(messages[i].getSubject())) {
+ for (Message message : messages) {
+ if (sender.equals(message.getFrom()[0].toString()) && subject.equals(message.getSubject())) {
found = true;
- messages[i].setFlag(Flag.DELETED, true);
+ message.setFlag(Flag.DELETED, true);
}
}
inbox.close(true);
Modified: incubator/syncope/branches/cxf/core/src/test/java/org/apache/syncope/core/persistence/dao/NotificationTest.java
URL: http://svn.apache.org/viewvc/incubator/syncope/branches/cxf/core/src/test/java/org/apache/syncope/core/persistence/dao/NotificationTest.java?rev=1405820&r1=1405819&r2=1405820&view=diff
==============================================================================
--- incubator/syncope/branches/cxf/core/src/test/java/org/apache/syncope/core/persistence/dao/NotificationTest.java (original)
+++ incubator/syncope/branches/cxf/core/src/test/java/org/apache/syncope/core/persistence/dao/NotificationTest.java Mon Nov 5 15:00:01 2012
@@ -18,17 +18,22 @@
*/
package org.apache.syncope.core.persistence.dao;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import org.apache.syncope.client.search.AttributeCond;
-import org.apache.syncope.client.search.MembershipCond;
-import org.apache.syncope.client.search.NodeCond;
+
import org.apache.syncope.core.AbstractTest;
import org.apache.syncope.core.persistence.beans.Notification;
import org.apache.syncope.core.persistence.validation.entity.InvalidEntityException;
+import org.apache.syncope.search.AttributeCond;
+import org.apache.syncope.search.MembershipCond;
+import org.apache.syncope.search.NodeCond;
import org.apache.syncope.types.EntityViolationType;
import org.apache.syncope.types.IntMappingType;
import org.junit.Test;
Modified: incubator/syncope/branches/cxf/core/src/test/java/org/apache/syncope/core/persistence/dao/ReportTest.java
URL: http://svn.apache.org/viewvc/incubator/syncope/branches/cxf/core/src/test/java/org/apache/syncope/core/persistence/dao/ReportTest.java?rev=1405820&r1=1405819&r2=1405820&view=diff
==============================================================================
--- incubator/syncope/branches/cxf/core/src/test/java/org/apache/syncope/core/persistence/dao/ReportTest.java (original)
+++ incubator/syncope/branches/cxf/core/src/test/java/org/apache/syncope/core/persistence/dao/ReportTest.java Mon Nov 5 15:00:01 2012
@@ -25,9 +25,9 @@ import java.util.List;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
-import org.apache.syncope.client.report.UserReportletConf;
import org.apache.syncope.core.AbstractTest;
import org.apache.syncope.core.persistence.beans.Report;
+import org.apache.syncope.report.UserReportletConf;
@Transactional
public class ReportTest extends AbstractTest {
Modified: incubator/syncope/branches/cxf/core/src/test/java/org/apache/syncope/core/persistence/dao/TaskTest.java
URL: http://svn.apache.org/viewvc/incubator/syncope/branches/cxf/core/src/test/java/org/apache/syncope/core/persistence/dao/TaskTest.java?rev=1405820&r1=1405819&r2=1405820&view=diff
==============================================================================
--- incubator/syncope/branches/cxf/core/src/test/java/org/apache/syncope/core/persistence/dao/TaskTest.java (original)
+++ incubator/syncope/branches/cxf/core/src/test/java/org/apache/syncope/core/persistence/dao/TaskTest.java Mon Nov 5 15:00:01 2012
@@ -23,7 +23,6 @@ import static org.junit.Assert.*;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import org.apache.syncope.client.to.UserTO;
import org.apache.syncope.core.AbstractTest;
import org.apache.syncope.core.persistence.beans.ExternalResource;
import org.apache.syncope.core.persistence.beans.PropagationTask;
@@ -32,6 +31,7 @@ import org.apache.syncope.core.persisten
import org.apache.syncope.core.persistence.beans.user.SyncopeUser;
import org.apache.syncope.core.persistence.validation.entity.InvalidEntityException;
import org.apache.syncope.core.quartz.TestSyncActions;
+import org.apache.syncope.to.UserTO;
import org.apache.syncope.types.PropagationMode;
import org.apache.syncope.types.PropagationOperation;
import org.identityconnectors.framework.common.objects.Attribute;
Modified: incubator/syncope/branches/cxf/core/src/test/java/org/apache/syncope/core/persistence/dao/UserSearchTest.java
URL: http://svn.apache.org/viewvc/incubator/syncope/branches/cxf/core/src/test/java/org/apache/syncope/core/persistence/dao/UserSearchTest.java?rev=1405820&r1=1405819&r2=1405820&view=diff
==============================================================================
--- incubator/syncope/branches/cxf/core/src/test/java/org/apache/syncope/core/persistence/dao/UserSearchTest.java (original)
+++ incubator/syncope/branches/cxf/core/src/test/java/org/apache/syncope/core/persistence/dao/UserSearchTest.java Mon Nov 5 15:00:01 2012
@@ -18,27 +18,28 @@
*/
package org.apache.syncope.core.persistence.dao;
-import org.apache.syncope.core.persistence.dao.EntitlementDAO;
-import org.apache.syncope.core.persistence.dao.UserDAO;
-import org.apache.syncope.core.persistence.dao.UserSearchDAO;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
+
+import org.apache.syncope.core.persistence.beans.user.SyncopeUser;
+import org.apache.syncope.core.util.EntitlementUtil;
+import org.apache.syncope.search.AttributeCond;
+import org.apache.syncope.search.MembershipCond;
+import org.apache.syncope.search.NodeCond;
+import org.apache.syncope.search.ResourceCond;
+import org.apache.syncope.search.SyncopeUserCond;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.transaction.annotation.Transactional;
-import org.apache.syncope.client.search.AttributeCond;
-import org.apache.syncope.client.search.MembershipCond;
-import org.apache.syncope.client.search.NodeCond;
-import org.apache.syncope.client.search.ResourceCond;
-import org.apache.syncope.client.search.SyncopeUserCond;
-import org.apache.syncope.core.persistence.beans.user.SyncopeUser;
-import org.apache.syncope.core.util.EntitlementUtil;
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration(locations = {"classpath:syncopeContext.xml", "classpath:persistenceContext.xml",
@@ -301,7 +302,7 @@ public class UserSearchTest {
final ResourceCond ws1 = new ResourceCond();
ws1.setResourceName("ws-target-resource-list-mappings-1");
- final NodeCond searchCondition =
+ final NodeCond searchCondition =
NodeCond.getAndCond(NodeCond.getNotLeafCond(ws2), NodeCond.getNotLeafCond(ws1));
assertTrue(searchCondition.checkValidity());
Modified: incubator/syncope/branches/cxf/core/src/test/java/org/apache/syncope/core/persistence/relationships/ResourceTest.java
URL: http://svn.apache.org/viewvc/incubator/syncope/branches/cxf/core/src/test/java/org/apache/syncope/core/persistence/relationships/ResourceTest.java?rev=1405820&r1=1405819&r2=1405820&view=diff
==============================================================================
--- incubator/syncope/branches/cxf/core/src/test/java/org/apache/syncope/core/persistence/relationships/ResourceTest.java (original)
+++ incubator/syncope/branches/cxf/core/src/test/java/org/apache/syncope/core/persistence/relationships/ResourceTest.java Mon Nov 5 15:00:01 2012
@@ -27,8 +27,6 @@ import java.util.Set;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
-import org.apache.syncope.client.to.ResourceTO;
-import org.apache.syncope.client.to.SchemaMappingTO;
import org.apache.syncope.core.persistence.beans.ConnInstance;
import org.apache.syncope.core.persistence.beans.ExternalResource;
import org.apache.syncope.core.persistence.beans.SchemaMapping;
@@ -45,6 +43,8 @@ import org.apache.syncope.core.persisten
import org.apache.syncope.core.persistence.dao.PolicyDAO;
import org.apache.syncope.core.persistence.dao.TaskDAO;
import org.apache.syncope.core.util.SchemaMappingUtil;
+import org.apache.syncope.to.ResourceTO;
+import org.apache.syncope.to.SchemaMappingTO;
import org.apache.syncope.types.PropagationMode;
import org.apache.syncope.types.IntMappingType;
Modified: incubator/syncope/branches/cxf/core/src/test/java/org/apache/syncope/core/persistence/relationships/UserSearchTest.java
URL: http://svn.apache.org/viewvc/incubator/syncope/branches/cxf/core/src/test/java/org/apache/syncope/core/persistence/relationships/UserSearchTest.java?rev=1405820&r1=1405819&r2=1405820&view=diff
==============================================================================
--- incubator/syncope/branches/cxf/core/src/test/java/org/apache/syncope/core/persistence/relationships/UserSearchTest.java (original)
+++ incubator/syncope/branches/cxf/core/src/test/java/org/apache/syncope/core/persistence/relationships/UserSearchTest.java Mon Nov 5 15:00:01 2012
@@ -18,23 +18,29 @@
*/
package org.apache.syncope.core.persistence.relationships;
-import org.apache.syncope.core.persistence.dao.*;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
+
+import org.apache.syncope.core.persistence.beans.role.SyncopeRole;
+import org.apache.syncope.core.persistence.beans.user.SyncopeUser;
+import org.apache.syncope.core.persistence.dao.EntitlementDAO;
+import org.apache.syncope.core.persistence.dao.RoleDAO;
+import org.apache.syncope.core.persistence.dao.UserDAO;
+import org.apache.syncope.core.persistence.dao.UserSearchDAO;
+import org.apache.syncope.core.util.EntitlementUtil;
+import org.apache.syncope.search.AttributeCond;
+import org.apache.syncope.search.NodeCond;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.transaction.annotation.Transactional;
-import org.apache.syncope.client.search.AttributeCond;
-import org.apache.syncope.client.search.NodeCond;
-import org.apache.syncope.core.persistence.beans.role.SyncopeRole;
-import org.apache.syncope.core.persistence.beans.user.SyncopeUser;
-import org.apache.syncope.core.util.EntitlementUtil;
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration(locations = {"classpath:syncopeContext.xml", "classpath:persistenceContext.xml",
Modified: incubator/syncope/branches/cxf/core/src/test/java/org/apache/syncope/core/quartz/TestSyncActions.java
URL: http://svn.apache.org/viewvc/incubator/syncope/branches/cxf/core/src/test/java/org/apache/syncope/core/quartz/TestSyncActions.java?rev=1405820&r1=1405819&r2=1405820&view=diff
==============================================================================
--- incubator/syncope/branches/cxf/core/src/test/java/org/apache/syncope/core/quartz/TestSyncActions.java (original)
+++ incubator/syncope/branches/cxf/core/src/test/java/org/apache/syncope/core/quartz/TestSyncActions.java Mon Nov 5 15:00:01 2012
@@ -19,11 +19,11 @@
package org.apache.syncope.core.quartz;
import java.util.Collections;
-import org.apache.syncope.client.mod.AttributeMod;
-import org.apache.syncope.client.mod.UserMod;
-import org.apache.syncope.client.to.AttributeTO;
-import org.apache.syncope.client.to.UserTO;
import org.apache.syncope.core.sync.DefaultSyncActions;
+import org.apache.syncope.mod.AttributeMod;
+import org.apache.syncope.mod.UserMod;
+import org.apache.syncope.to.AttributeTO;
+import org.apache.syncope.to.UserTO;
import org.identityconnectors.framework.common.objects.SyncDelta;
import org.quartz.JobExecutionException;
Modified: incubator/syncope/branches/cxf/core/src/test/java/org/apache/syncope/core/rest/AbstractTest.java
URL: http://svn.apache.org/viewvc/incubator/syncope/branches/cxf/core/src/test/java/org/apache/syncope/core/rest/AbstractTest.java?rev=1405820&r1=1405819&r2=1405820&view=diff
==============================================================================
--- incubator/syncope/branches/cxf/core/src/test/java/org/apache/syncope/core/rest/AbstractTest.java (original)
+++ incubator/syncope/branches/cxf/core/src/test/java/org/apache/syncope/core/rest/AbstractTest.java Mon Nov 5 15:00:01 2012
@@ -19,6 +19,7 @@
package org.apache.syncope.core.rest;
import javax.sql.DataSource;
+
import org.apache.http.auth.UsernamePasswordCredentials;
import org.apache.http.impl.client.DefaultHttpClient;
import org.apache.syncope.client.http.PreemptiveAuthHttpRequestFactory;
Modified: incubator/syncope/branches/cxf/core/src/test/java/org/apache/syncope/core/rest/AuthenticationTestITCase.java
URL: http://svn.apache.org/viewvc/incubator/syncope/branches/cxf/core/src/test/java/org/apache/syncope/core/rest/AuthenticationTestITCase.java?rev=1405820&r1=1405819&r2=1405820&view=diff
==============================================================================
--- incubator/syncope/branches/cxf/core/src/test/java/org/apache/syncope/core/rest/AuthenticationTestITCase.java (original)
+++ incubator/syncope/branches/cxf/core/src/test/java/org/apache/syncope/core/rest/AuthenticationTestITCase.java Mon Nov 5 15:00:01 2012
@@ -18,26 +18,31 @@
*/
package org.apache.syncope.core.rest;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
+
+import org.apache.syncope.search.AttributeCond;
+import org.apache.syncope.search.NodeCond;
+import org.apache.syncope.to.AttributeTO;
+import org.apache.syncope.to.MembershipTO;
+import org.apache.syncope.to.RoleTO;
+import org.apache.syncope.to.SchemaTO;
+import org.apache.syncope.to.UserTO;
+import org.apache.syncope.types.SchemaType;
+import org.apache.syncope.types.SyncopeClientExceptionType;
+import org.apache.syncope.validation.SyncopeClientCompositeErrorException;
+import org.apache.syncope.validation.SyncopeClientException;
import org.junit.Test;
import org.springframework.http.HttpStatus;
import org.springframework.web.client.HttpClientErrorException;
-import org.apache.syncope.client.search.AttributeCond;
-import org.apache.syncope.client.search.NodeCond;
-import org.apache.syncope.client.to.AttributeTO;
-import org.apache.syncope.client.to.MembershipTO;
-import org.apache.syncope.client.to.RoleTO;
-import org.apache.syncope.client.to.SchemaTO;
-import org.apache.syncope.client.to.UserTO;
-import org.apache.syncope.client.validation.SyncopeClientCompositeErrorException;
-import org.apache.syncope.client.validation.SyncopeClientException;
-import org.apache.syncope.types.SchemaType;
-import org.apache.syncope.types.SyncopeClientExceptionType;
public class AuthenticationTestITCase extends AbstractTest {
Modified: incubator/syncope/branches/cxf/core/src/test/java/org/apache/syncope/core/rest/ConfigurationTestITCase.java
URL: http://svn.apache.org/viewvc/incubator/syncope/branches/cxf/core/src/test/java/org/apache/syncope/core/rest/ConfigurationTestITCase.java?rev=1405820&r1=1405819&r2=1405820&view=diff
==============================================================================
--- incubator/syncope/branches/cxf/core/src/test/java/org/apache/syncope/core/rest/ConfigurationTestITCase.java (original)
+++ incubator/syncope/branches/cxf/core/src/test/java/org/apache/syncope/core/rest/ConfigurationTestITCase.java Mon Nov 5 15:00:01 2012
@@ -26,7 +26,7 @@ import java.util.List;
import org.junit.Test;
import org.springframework.http.HttpStatus;
import org.springframework.web.client.HttpStatusCodeException;
-import org.apache.syncope.client.to.ConfigurationTO;
+import org.apache.syncope.to.ConfigurationTO;
public class ConfigurationTestITCase extends AbstractTest {
Modified: incubator/syncope/branches/cxf/core/src/test/java/org/apache/syncope/core/rest/ConnInstanceTestITCase.java
URL: http://svn.apache.org/viewvc/incubator/syncope/branches/cxf/core/src/test/java/org/apache/syncope/core/rest/ConnInstanceTestITCase.java?rev=1405820&r1=1405819&r2=1405820&view=diff
==============================================================================
--- incubator/syncope/branches/cxf/core/src/test/java/org/apache/syncope/core/rest/ConnInstanceTestITCase.java (original)
+++ incubator/syncope/branches/cxf/core/src/test/java/org/apache/syncope/core/rest/ConnInstanceTestITCase.java Mon Nov 5 15:00:01 2012
@@ -36,15 +36,15 @@ import org.junit.BeforeClass;
import org.junit.Test;
import org.springframework.http.HttpStatus;
import org.springframework.web.client.HttpStatusCodeException;
-import org.apache.syncope.client.to.ConnBundleTO;
-import org.apache.syncope.client.to.ConnInstanceTO;
-import org.apache.syncope.client.to.ResourceTO;
-import org.apache.syncope.client.to.SchemaMappingTO;
-import org.apache.syncope.client.validation.SyncopeClientCompositeErrorException;
+import org.apache.syncope.to.ConnBundleTO;
+import org.apache.syncope.to.ConnInstanceTO;
+import org.apache.syncope.to.ResourceTO;
+import org.apache.syncope.to.SchemaMappingTO;
import org.apache.syncope.types.ConnConfPropSchema;
import org.apache.syncope.types.ConnConfProperty;
import org.apache.syncope.types.ConnectorCapability;
import org.apache.syncope.types.IntMappingType;
+import org.apache.syncope.validation.SyncopeClientCompositeErrorException;
public class ConnInstanceTestITCase extends AbstractTest {
Modified: incubator/syncope/branches/cxf/core/src/test/java/org/apache/syncope/core/rest/DerivedSchemaTestITCase.java
URL: http://svn.apache.org/viewvc/incubator/syncope/branches/cxf/core/src/test/java/org/apache/syncope/core/rest/DerivedSchemaTestITCase.java?rev=1405820&r1=1405819&r2=1405820&view=diff
==============================================================================
--- incubator/syncope/branches/cxf/core/src/test/java/org/apache/syncope/core/rest/DerivedSchemaTestITCase.java (original)
+++ incubator/syncope/branches/cxf/core/src/test/java/org/apache/syncope/core/rest/DerivedSchemaTestITCase.java Mon Nov 5 15:00:01 2012
@@ -18,12 +18,13 @@
*/
package org.apache.syncope.core.rest;
-import org.apache.syncope.client.validation.SyncopeClientCompositeErrorException;
import java.util.Arrays;
import java.util.List;
-import org.apache.syncope.client.to.DerivedSchemaTO;
import org.junit.Test;
+import org.apache.syncope.to.DerivedSchemaTO;
import org.apache.syncope.types.SyncopeClientExceptionType;
+import org.apache.syncope.validation.SyncopeClientCompositeErrorException;
+
import static org.junit.Assert.*;
public class DerivedSchemaTestITCase extends AbstractTest {
Modified: incubator/syncope/branches/cxf/core/src/test/java/org/apache/syncope/core/rest/LoggerTestITCase.java
URL: http://svn.apache.org/viewvc/incubator/syncope/branches/cxf/core/src/test/java/org/apache/syncope/core/rest/LoggerTestITCase.java?rev=1405820&r1=1405819&r2=1405820&view=diff
==============================================================================
--- incubator/syncope/branches/cxf/core/src/test/java/org/apache/syncope/core/rest/LoggerTestITCase.java (original)
+++ incubator/syncope/branches/cxf/core/src/test/java/org/apache/syncope/core/rest/LoggerTestITCase.java Mon Nov 5 15:00:01 2012
@@ -23,7 +23,7 @@ import static org.junit.Assert.*;
import java.util.Arrays;
import java.util.List;
import org.junit.Test;
-import org.apache.syncope.client.to.LoggerTO;
+import org.apache.syncope.to.LoggerTO;
import org.apache.syncope.types.AuditElements;
import org.apache.syncope.types.AuditLoggerName;
import org.apache.syncope.types.SyncopeLoggerLevel;
Modified: incubator/syncope/branches/cxf/core/src/test/java/org/apache/syncope/core/rest/NotificationTestITCase.java
URL: http://svn.apache.org/viewvc/incubator/syncope/branches/cxf/core/src/test/java/org/apache/syncope/core/rest/NotificationTestITCase.java?rev=1405820&r1=1405819&r2=1405820&view=diff
==============================================================================
--- incubator/syncope/branches/cxf/core/src/test/java/org/apache/syncope/core/rest/NotificationTestITCase.java (original)
+++ incubator/syncope/branches/cxf/core/src/test/java/org/apache/syncope/core/rest/NotificationTestITCase.java Mon Nov 5 15:00:01 2012
@@ -18,19 +18,23 @@
*/
package org.apache.syncope.core.rest;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
import java.util.Arrays;
import java.util.List;
-import org.apache.syncope.client.search.AttributeCond;
-import org.apache.syncope.client.search.MembershipCond;
-import org.apache.syncope.client.search.NodeCond;
-import org.apache.syncope.client.to.NotificationTO;
-import org.apache.syncope.client.validation.SyncopeClientCompositeErrorException;
-import org.apache.syncope.client.validation.SyncopeClientException;
+
+import org.apache.syncope.search.AttributeCond;
+import org.apache.syncope.search.MembershipCond;
+import org.apache.syncope.search.NodeCond;
+import org.apache.syncope.to.NotificationTO;
import org.apache.syncope.types.IntMappingType;
import org.apache.syncope.types.SyncopeClientExceptionType;
import org.apache.syncope.types.TraceLevel;
+import org.apache.syncope.validation.SyncopeClientCompositeErrorException;
+import org.apache.syncope.validation.SyncopeClientException;
import org.junit.Test;
public class NotificationTestITCase extends AbstractTest {
Modified: incubator/syncope/branches/cxf/core/src/test/java/org/apache/syncope/core/rest/PolicyTestITCase.java
URL: http://svn.apache.org/viewvc/incubator/syncope/branches/cxf/core/src/test/java/org/apache/syncope/core/rest/PolicyTestITCase.java?rev=1405820&r1=1405819&r2=1405820&view=diff
==============================================================================
--- incubator/syncope/branches/cxf/core/src/test/java/org/apache/syncope/core/rest/PolicyTestITCase.java (original)
+++ incubator/syncope/branches/cxf/core/src/test/java/org/apache/syncope/core/rest/PolicyTestITCase.java Mon Nov 5 15:00:01 2012
@@ -23,15 +23,15 @@ import static org.junit.Assert.*;
import java.util.Arrays;
import java.util.List;
import org.junit.Test;
-import org.apache.syncope.client.to.AccountPolicyTO;
-import org.apache.syncope.client.to.PasswordPolicyTO;
-import org.apache.syncope.client.to.PolicyTO;
-import org.apache.syncope.client.to.SyncPolicyTO;
-import org.apache.syncope.client.validation.SyncopeClientCompositeErrorException;
+import org.apache.syncope.to.AccountPolicyTO;
+import org.apache.syncope.to.PasswordPolicyTO;
+import org.apache.syncope.to.PolicyTO;
+import org.apache.syncope.to.SyncPolicyTO;
import org.apache.syncope.types.PasswordPolicySpec;
import org.apache.syncope.types.PolicyType;
import org.apache.syncope.types.SyncPolicySpec;
import org.apache.syncope.types.SyncopeClientExceptionType;
+import org.apache.syncope.validation.SyncopeClientCompositeErrorException;
public class PolicyTestITCase extends AbstractTest {
Modified: incubator/syncope/branches/cxf/core/src/test/java/org/apache/syncope/core/rest/ReportTestITCase.java
URL: http://svn.apache.org/viewvc/incubator/syncope/branches/cxf/core/src/test/java/org/apache/syncope/core/rest/ReportTestITCase.java?rev=1405820&r1=1405819&r2=1405820&view=diff
==============================================================================
--- incubator/syncope/branches/cxf/core/src/test/java/org/apache/syncope/core/rest/ReportTestITCase.java (original)
+++ incubator/syncope/branches/cxf/core/src/test/java/org/apache/syncope/core/rest/ReportTestITCase.java Mon Nov 5 15:00:01 2012
@@ -32,10 +32,10 @@ import org.apache.commons.io.IOUtils;
import org.junit.Test;
import org.springframework.http.HttpStatus;
import org.springframework.web.client.HttpStatusCodeException;
-import org.apache.syncope.client.report.UserReportletConf;
-import org.apache.syncope.client.to.ReportExecTO;
-import org.apache.syncope.client.to.ReportTO;
-import org.apache.syncope.client.to.UserTO;
+import org.apache.syncope.report.UserReportletConf;
+import org.apache.syncope.to.ReportExecTO;
+import org.apache.syncope.to.ReportTO;
+import org.apache.syncope.to.UserTO;
public class ReportTestITCase extends AbstractTest {
Modified: incubator/syncope/branches/cxf/core/src/test/java/org/apache/syncope/core/rest/ResourceTestITCase.java
URL: http://svn.apache.org/viewvc/incubator/syncope/branches/cxf/core/src/test/java/org/apache/syncope/core/rest/ResourceTestITCase.java?rev=1405820&r1=1405819&r2=1405820&view=diff
==============================================================================
--- incubator/syncope/branches/cxf/core/src/test/java/org/apache/syncope/core/rest/ResourceTestITCase.java (original)
+++ incubator/syncope/branches/cxf/core/src/test/java/org/apache/syncope/core/rest/ResourceTestITCase.java Mon Nov 5 15:00:01 2012
@@ -29,14 +29,14 @@ import java.util.Set;
import org.junit.Test;
import org.springframework.http.HttpStatus;
import org.springframework.web.client.HttpStatusCodeException;
-import org.apache.syncope.client.to.ResourceTO;
-import org.apache.syncope.client.to.SchemaMappingTO;
-import org.apache.syncope.client.validation.SyncopeClientCompositeErrorException;
-import org.apache.syncope.client.validation.SyncopeClientException;
+import org.apache.syncope.to.ResourceTO;
+import org.apache.syncope.to.SchemaMappingTO;
import org.apache.syncope.types.ConnConfPropSchema;
import org.apache.syncope.types.ConnConfProperty;
import org.apache.syncope.types.IntMappingType;
import org.apache.syncope.types.SyncopeClientExceptionType;
+import org.apache.syncope.validation.SyncopeClientCompositeErrorException;
+import org.apache.syncope.validation.SyncopeClientException;
public class ResourceTestITCase extends AbstractTest {