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 2013/01/21 10:09:04 UTC
svn commit: r1436230 [9/14] - in /syncope/trunk: ./ 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/
client/src/main/java/org/apache/syncope/...
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/AbstractSchema.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/AbstractSchema.java?rev=1436230&r1=1436229&r2=1436230&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/AbstractSchema.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/AbstractSchema.java Mon Jan 21 09:08:54 2013
@@ -24,6 +24,7 @@ import java.lang.reflect.Constructor;
import java.text.DecimalFormat;
import java.text.Format;
import java.text.SimpleDateFormat;
+
import javax.persistence.Basic;
import javax.persistence.Column;
import javax.persistence.Enumerated;
@@ -33,10 +34,11 @@ import javax.persistence.MappedSuperclas
import javax.persistence.Transient;
import javax.validation.constraints.Max;
import javax.validation.constraints.Min;
-import org.apache.syncope.core.persistence.validation.attrvalue.BasicValidator;
+
+import org.apache.syncope.common.types.SchemaType;
import org.apache.syncope.core.persistence.validation.attrvalue.AbstractValidator;
+import org.apache.syncope.core.persistence.validation.attrvalue.BasicValidator;
import org.apache.syncope.core.persistence.validation.entity.SchemaCheck;
-import org.apache.syncope.types.SchemaType;
@MappedSuperclass
@SchemaCheck
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/AbstractVirAttr.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/AbstractVirAttr.java?rev=1436230&r1=1436229&r2=1436230&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/AbstractVirAttr.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/AbstractVirAttr.java Mon Jan 21 09:08:54 2013
@@ -20,6 +20,7 @@ package org.apache.syncope.core.persiste
import java.util.ArrayList;
import java.util.List;
+
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/AbstractVirSchema.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/AbstractVirSchema.java?rev=1436230&r1=1436229&r2=1436230&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/AbstractVirSchema.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/AbstractVirSchema.java Mon Jan 21 09:08:54 2013
@@ -20,7 +20,8 @@ package org.apache.syncope.core.persiste
import javax.persistence.Id;
import javax.persistence.MappedSuperclass;
-import org.apache.syncope.types.SchemaType;
+
+import org.apache.syncope.common.types.SchemaType;
@MappedSuperclass
public abstract class AbstractVirSchema extends AbstractBaseBean {
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/AccountPolicy.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/AccountPolicy.java?rev=1436230&r1=1436229&r2=1436230&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/AccountPolicy.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/AccountPolicy.java Mon Jan 21 09:08:54 2013
@@ -19,7 +19,8 @@
package org.apache.syncope.core.persistence.beans;
import javax.persistence.Entity;
-import org.apache.syncope.types.PolicyType;
+
+import org.apache.syncope.common.types.PolicyType;
@Entity
public class AccountPolicy extends Policy {
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/ConnInstance.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/ConnInstance.java?rev=1436230&r1=1436229&r2=1436230&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/ConnInstance.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/ConnInstance.java Mon Jan 21 09:08:54 2013
@@ -23,6 +23,7 @@ import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
+
import javax.persistence.CascadeType;
import javax.persistence.Column;
import javax.persistence.ElementCollection;
@@ -33,9 +34,10 @@ import javax.persistence.FetchType;
import javax.persistence.Id;
import javax.persistence.Lob;
import javax.persistence.OneToMany;
+
+import org.apache.syncope.common.types.ConnConfProperty;
+import org.apache.syncope.common.types.ConnectorCapability;
import org.apache.syncope.core.util.XMLSerializer;
-import org.apache.syncope.types.ConnConfProperty;
-import org.apache.syncope.types.ConnectorCapability;
@Entity
public class ConnInstance extends AbstractBaseBean {
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/Entitlement.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/Entitlement.java?rev=1436230&r1=1436229&r2=1436230&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/Entitlement.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/Entitlement.java Mon Jan 21 09:08:54 2013
@@ -22,6 +22,7 @@ import javax.persistence.Cacheable;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
+
import org.apache.syncope.core.persistence.validation.entity.EntitlementCheck;
@Entity
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/ExternalResource.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/ExternalResource.java?rev=1436230&r1=1436229&r2=1436230&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/ExternalResource.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/ExternalResource.java Mon Jan 21 09:08:54 2013
@@ -21,6 +21,7 @@ package org.apache.syncope.core.persiste
import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
+
import javax.persistence.Basic;
import javax.persistence.CascadeType;
import javax.persistence.Column;
@@ -35,14 +36,15 @@ import javax.persistence.OneToOne;
import javax.validation.constraints.Max;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotNull;
+
import org.apache.commons.lang.StringUtils;
-import org.apache.syncope.core.util.XMLSerializer;
+import org.apache.syncope.common.types.ConnConfProperty;
+import org.apache.syncope.common.types.PropagationMode;
+import org.apache.syncope.common.types.TraceLevel;
import org.apache.syncope.core.persistence.beans.role.RMapping;
import org.apache.syncope.core.persistence.beans.user.UMapping;
import org.apache.syncope.core.persistence.validation.entity.ExternalResourceCheck;
-import org.apache.syncope.types.ConnConfProperty;
-import org.apache.syncope.types.PropagationMode;
-import org.apache.syncope.types.TraceLevel;
+import org.apache.syncope.core.util.XMLSerializer;
import org.identityconnectors.framework.common.objects.SyncToken;
/**
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/Notification.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/Notification.java?rev=1436230&r1=1436229&r2=1436230&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/Notification.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/Notification.java Mon Jan 21 09:08:54 2013
@@ -20,6 +20,7 @@ package org.apache.syncope.core.persiste
import java.util.ArrayList;
import java.util.List;
+
import javax.persistence.Basic;
import javax.persistence.Column;
import javax.persistence.ElementCollection;
@@ -34,11 +35,12 @@ import javax.persistence.Lob;
import javax.validation.constraints.Max;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotNull;
-import org.apache.syncope.client.search.NodeCond;
-import org.apache.syncope.core.util.XMLSerializer;
+
+import org.apache.syncope.common.search.NodeCond;
+import org.apache.syncope.common.types.IntMappingType;
+import org.apache.syncope.common.types.TraceLevel;
import org.apache.syncope.core.persistence.validation.entity.NotificationCheck;
-import org.apache.syncope.types.IntMappingType;
-import org.apache.syncope.types.TraceLevel;
+import org.apache.syncope.core.util.XMLSerializer;
@NotificationCheck
@Entity
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/NotificationTask.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/NotificationTask.java?rev=1436230&r1=1436229&r2=1436230&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/NotificationTask.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/NotificationTask.java Mon Jan 21 09:08:54 2013
@@ -20,6 +20,7 @@ package org.apache.syncope.core.persiste
import java.util.HashSet;
import java.util.Set;
+
import javax.persistence.Basic;
import javax.persistence.Column;
import javax.persistence.ElementCollection;
@@ -31,7 +32,8 @@ import javax.persistence.Lob;
import javax.validation.constraints.Max;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotNull;
-import org.apache.syncope.types.TraceLevel;
+
+import org.apache.syncope.common.types.TraceLevel;
/**
* Encapsulate all information about a notification task.
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/PasswordPolicy.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/PasswordPolicy.java?rev=1436230&r1=1436229&r2=1436230&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/PasswordPolicy.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/PasswordPolicy.java Mon Jan 21 09:08:54 2013
@@ -19,7 +19,8 @@
package org.apache.syncope.core.persistence.beans;
import javax.persistence.Entity;
-import org.apache.syncope.types.PolicyType;
+
+import org.apache.syncope.common.types.PolicyType;
@Entity
public class PasswordPolicy extends Policy {
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/Policy.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/Policy.java?rev=1436230&r1=1436229&r2=1436230&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/Policy.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/Policy.java Mon Jan 21 09:08:54 2013
@@ -24,10 +24,11 @@ import javax.persistence.Enumerated;
import javax.persistence.Id;
import javax.persistence.Lob;
import javax.validation.constraints.NotNull;
+
+import org.apache.syncope.common.types.AbstractPolicySpec;
+import org.apache.syncope.common.types.PolicyType;
import org.apache.syncope.core.persistence.validation.entity.PolicyCheck;
import org.apache.syncope.core.util.XMLSerializer;
-import org.apache.syncope.types.AbstractPolicySpec;
-import org.apache.syncope.types.PolicyType;
@Entity
@PolicyCheck
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/PropagationTask.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/PropagationTask.java?rev=1436230&r1=1436229&r2=1436230&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/PropagationTask.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/PropagationTask.java Mon Jan 21 09:08:54 2013
@@ -19,16 +19,18 @@
package org.apache.syncope.core.persistence.beans;
import java.util.Set;
+
import javax.persistence.Entity;
import javax.persistence.EnumType;
import javax.persistence.Enumerated;
import javax.persistence.Lob;
import javax.persistence.ManyToOne;
-import org.apache.syncope.core.util.XMLSerializer;
+
+import org.apache.syncope.common.types.AttributableType;
+import org.apache.syncope.common.types.PropagationMode;
+import org.apache.syncope.common.types.ResourceOperation;
import org.apache.syncope.core.persistence.validation.entity.PropagationTaskCheck;
-import org.apache.syncope.types.AttributableType;
-import org.apache.syncope.types.PropagationMode;
-import org.apache.syncope.types.ResourceOperation;
+import org.apache.syncope.core.util.XMLSerializer;
import org.identityconnectors.framework.common.objects.Attribute;
/**
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/Report.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/Report.java?rev=1436230&r1=1436229&r2=1436230&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/Report.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/Report.java Mon Jan 21 09:08:54 2013
@@ -20,13 +20,15 @@ package org.apache.syncope.core.persiste
import java.util.ArrayList;
import java.util.List;
+
import javax.persistence.CascadeType;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.FetchType;
import javax.persistence.Id;
import javax.persistence.OneToMany;
-import org.apache.syncope.client.report.ReportletConf;
+
+import org.apache.syncope.common.report.ReportletConf;
import org.apache.syncope.core.persistence.validation.entity.ReportCheck;
@Entity
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/ReportExec.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/ReportExec.java?rev=1436230&r1=1436229&r2=1436230&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/ReportExec.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/ReportExec.java Mon Jan 21 09:08:54 2013
@@ -24,8 +24,9 @@ import javax.persistence.FetchType;
import javax.persistence.Id;
import javax.persistence.Lob;
import javax.persistence.ManyToOne;
+
import org.apache.commons.lang.ArrayUtils;
-import org.apache.syncope.types.ReportExecStatus;
+import org.apache.syncope.common.types.ReportExecStatus;
@Entity
public class ReportExec extends AbstractExec {
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/ReportletConfInstance.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/ReportletConfInstance.java?rev=1436230&r1=1436229&r2=1436230&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/ReportletConfInstance.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/ReportletConfInstance.java Mon Jan 21 09:08:54 2013
@@ -22,7 +22,8 @@ import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Lob;
import javax.persistence.ManyToOne;
-import org.apache.syncope.client.report.ReportletConf;
+
+import org.apache.syncope.common.report.ReportletConf;
import org.apache.syncope.core.util.XMLSerializer;
@Entity
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/SchedTask.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/SchedTask.java?rev=1436230&r1=1436229&r2=1436230&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/SchedTask.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/SchedTask.java Mon Jan 21 09:08:54 2013
@@ -20,6 +20,7 @@ package org.apache.syncope.core.persiste
import javax.persistence.Entity;
import javax.validation.constraints.NotNull;
+
import org.apache.syncope.core.persistence.validation.entity.SchedTaskCheck;
@Entity
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/SyncPolicy.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/SyncPolicy.java?rev=1436230&r1=1436229&r2=1436230&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/SyncPolicy.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/SyncPolicy.java Mon Jan 21 09:08:54 2013
@@ -19,7 +19,8 @@
package org.apache.syncope.core.persistence.beans;
import javax.persistence.Entity;
-import org.apache.syncope.types.PolicyType;
+
+import org.apache.syncope.common.types.PolicyType;
@Entity
public class SyncPolicy extends Policy {
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/SyncTask.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/SyncTask.java?rev=1436230&r1=1436229&r2=1436230&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/SyncTask.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/SyncTask.java Mon Jan 21 09:08:54 2013
@@ -24,10 +24,11 @@ import javax.persistence.Lob;
import javax.persistence.ManyToOne;
import javax.validation.constraints.Max;
import javax.validation.constraints.Min;
-import org.apache.syncope.client.to.RoleTO;
-import org.apache.syncope.client.to.UserTO;
-import org.apache.syncope.core.util.XMLSerializer;
+
+import org.apache.syncope.common.to.RoleTO;
+import org.apache.syncope.common.to.UserTO;
import org.apache.syncope.core.persistence.validation.entity.SyncTaskCheck;
+import org.apache.syncope.core.util.XMLSerializer;
@Entity
@SyncTaskCheck
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/SyncopeLogger.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/SyncopeLogger.java?rev=1436230&r1=1436229&r2=1436230&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/SyncopeLogger.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/SyncopeLogger.java Mon Jan 21 09:08:54 2013
@@ -23,8 +23,9 @@ import javax.persistence.Entity;
import javax.persistence.EnumType;
import javax.persistence.Enumerated;
import javax.persistence.Id;
-import org.apache.syncope.types.SyncopeLoggerLevel;
-import org.apache.syncope.types.SyncopeLoggerType;
+
+import org.apache.syncope.common.types.SyncopeLoggerLevel;
+import org.apache.syncope.common.types.SyncopeLoggerType;
@Entity
public class SyncopeLogger extends AbstractBaseBean {
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/Task.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/Task.java?rev=1436230&r1=1436229&r2=1436230&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/Task.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/Task.java Mon Jan 21 09:08:54 2013
@@ -20,6 +20,7 @@ package org.apache.syncope.core.persiste
import java.util.ArrayList;
import java.util.List;
+
import javax.persistence.CascadeType;
import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/UserRequest.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/UserRequest.java?rev=1436230&r1=1436229&r2=1436230&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/UserRequest.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/UserRequest.java Mon Jan 21 09:08:54 2013
@@ -26,10 +26,11 @@ import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Lob;
import javax.validation.constraints.NotNull;
-import org.apache.syncope.client.mod.UserMod;
-import org.apache.syncope.client.to.UserTO;
+
+import org.apache.syncope.common.mod.UserMod;
+import org.apache.syncope.common.to.UserTO;
+import org.apache.syncope.common.types.UserRequestType;
import org.apache.syncope.core.util.XMLSerializer;
-import org.apache.syncope.types.UserRequestType;
@Entity
public class UserRequest extends AbstractBaseBean {
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/membership/MAttr.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/membership/MAttr.java?rev=1436230&r1=1436229&r2=1436230&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/membership/MAttr.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/membership/MAttr.java Mon Jan 21 09:08:54 2013
@@ -20,6 +20,7 @@ package org.apache.syncope.core.persiste
import java.util.ArrayList;
import java.util.List;
+
import javax.persistence.CascadeType;
import javax.persistence.Entity;
import javax.persistence.FetchType;
@@ -29,6 +30,7 @@ import javax.persistence.ManyToOne;
import javax.persistence.OneToMany;
import javax.persistence.OneToOne;
import javax.validation.Valid;
+
import org.apache.syncope.core.persistence.beans.AbstractAttr;
import org.apache.syncope.core.persistence.beans.AbstractAttrValue;
import org.apache.syncope.core.persistence.beans.AbstractAttributable;
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/membership/MAttrUniqueValue.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/membership/MAttrUniqueValue.java?rev=1436230&r1=1436229&r2=1436230&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/membership/MAttrUniqueValue.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/membership/MAttrUniqueValue.java Mon Jan 21 09:08:54 2013
@@ -23,6 +23,7 @@ import javax.persistence.Id;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.OneToOne;
+
import org.apache.syncope.core.persistence.beans.AbstractAttr;
import org.apache.syncope.core.persistence.beans.AbstractAttrUniqueValue;
import org.apache.syncope.core.persistence.beans.AbstractSchema;
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/membership/MAttrValue.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/membership/MAttrValue.java?rev=1436230&r1=1436229&r2=1436230&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/membership/MAttrValue.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/membership/MAttrValue.java Mon Jan 21 09:08:54 2013
@@ -24,6 +24,7 @@ import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
import javax.persistence.ManyToOne;
import javax.validation.constraints.NotNull;
+
import org.apache.syncope.core.persistence.beans.AbstractAttr;
import org.apache.syncope.core.persistence.beans.AbstractAttrValue;
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/membership/MDerAttr.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/membership/MDerAttr.java?rev=1436230&r1=1436229&r2=1436230&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/membership/MDerAttr.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/membership/MDerAttr.java Mon Jan 21 09:08:54 2013
@@ -21,6 +21,7 @@ package org.apache.syncope.core.persiste
import javax.persistence.Entity;
import javax.persistence.FetchType;
import javax.persistence.ManyToOne;
+
import org.apache.syncope.core.persistence.beans.AbstractAttributable;
import org.apache.syncope.core.persistence.beans.AbstractDerAttr;
import org.apache.syncope.core.persistence.beans.AbstractDerSchema;
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/membership/MDerSchema.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/membership/MDerSchema.java?rev=1436230&r1=1436229&r2=1436230&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/membership/MDerSchema.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/membership/MDerSchema.java Mon Jan 21 09:08:54 2013
@@ -20,6 +20,7 @@ package org.apache.syncope.core.persiste
import javax.persistence.Cacheable;
import javax.persistence.Entity;
+
import org.apache.syncope.core.persistence.beans.AbstractDerSchema;
@Entity
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/membership/MSchema.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/membership/MSchema.java?rev=1436230&r1=1436229&r2=1436230&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/membership/MSchema.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/membership/MSchema.java Mon Jan 21 09:08:54 2013
@@ -20,6 +20,7 @@ package org.apache.syncope.core.persiste
import javax.persistence.Cacheable;
import javax.persistence.Entity;
+
import org.apache.syncope.core.persistence.beans.AbstractSchema;
@Entity
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/membership/MVirAttr.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/membership/MVirAttr.java?rev=1436230&r1=1436229&r2=1436230&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/membership/MVirAttr.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/membership/MVirAttr.java Mon Jan 21 09:08:54 2013
@@ -20,9 +20,11 @@ package org.apache.syncope.core.persiste
import java.util.Collections;
import java.util.List;
+
import javax.persistence.Entity;
import javax.persistence.FetchType;
import javax.persistence.ManyToOne;
+
import org.apache.syncope.core.persistence.beans.AbstractAttributable;
import org.apache.syncope.core.persistence.beans.AbstractVirAttr;
import org.apache.syncope.core.persistence.beans.AbstractVirSchema;
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/membership/MVirSchema.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/membership/MVirSchema.java?rev=1436230&r1=1436229&r2=1436230&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/membership/MVirSchema.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/membership/MVirSchema.java Mon Jan 21 09:08:54 2013
@@ -20,6 +20,7 @@ package org.apache.syncope.core.persiste
import javax.persistence.Cacheable;
import javax.persistence.Entity;
+
import org.apache.syncope.core.persistence.beans.AbstractVirSchema;
@Entity
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/membership/Membership.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/membership/Membership.java?rev=1436230&r1=1436229&r2=1436230&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/membership/Membership.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/membership/Membership.java Mon Jan 21 09:08:54 2013
@@ -22,6 +22,7 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Set;
+
import javax.persistence.CascadeType;
import javax.persistence.Entity;
import javax.persistence.Id;
@@ -30,6 +31,7 @@ import javax.persistence.OneToMany;
import javax.persistence.Table;
import javax.persistence.UniqueConstraint;
import javax.validation.Valid;
+
import org.apache.syncope.core.persistence.beans.AbstractAttr;
import org.apache.syncope.core.persistence.beans.AbstractAttributable;
import org.apache.syncope.core.persistence.beans.AbstractDerAttr;
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/role/RAttr.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/role/RAttr.java?rev=1436230&r1=1436229&r2=1436230&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/role/RAttr.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/role/RAttr.java Mon Jan 21 09:08:54 2013
@@ -20,6 +20,7 @@ package org.apache.syncope.core.persiste
import java.util.ArrayList;
import java.util.List;
+
import javax.persistence.CascadeType;
import javax.persistence.Entity;
import javax.persistence.FetchType;
@@ -29,6 +30,7 @@ import javax.persistence.ManyToOne;
import javax.persistence.OneToMany;
import javax.persistence.OneToOne;
import javax.validation.Valid;
+
import org.apache.syncope.core.persistence.beans.AbstractAttr;
import org.apache.syncope.core.persistence.beans.AbstractAttrValue;
import org.apache.syncope.core.persistence.beans.AbstractAttributable;
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/role/RAttrUniqueValue.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/role/RAttrUniqueValue.java?rev=1436230&r1=1436229&r2=1436230&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/role/RAttrUniqueValue.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/role/RAttrUniqueValue.java Mon Jan 21 09:08:54 2013
@@ -23,6 +23,7 @@ import javax.persistence.Id;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.OneToOne;
+
import org.apache.syncope.core.persistence.beans.AbstractAttr;
import org.apache.syncope.core.persistence.beans.AbstractAttrUniqueValue;
import org.apache.syncope.core.persistence.beans.AbstractSchema;
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/role/RAttrValue.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/role/RAttrValue.java?rev=1436230&r1=1436229&r2=1436230&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/role/RAttrValue.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/role/RAttrValue.java Mon Jan 21 09:08:54 2013
@@ -24,6 +24,7 @@ import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
import javax.persistence.ManyToOne;
import javax.validation.constraints.NotNull;
+
import org.apache.syncope.core.persistence.beans.AbstractAttr;
import org.apache.syncope.core.persistence.beans.AbstractAttrValue;
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/role/RDerAttr.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/role/RDerAttr.java?rev=1436230&r1=1436229&r2=1436230&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/role/RDerAttr.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/role/RDerAttr.java Mon Jan 21 09:08:54 2013
@@ -21,6 +21,7 @@ package org.apache.syncope.core.persiste
import javax.persistence.Entity;
import javax.persistence.FetchType;
import javax.persistence.ManyToOne;
+
import org.apache.syncope.core.persistence.beans.AbstractAttributable;
import org.apache.syncope.core.persistence.beans.AbstractDerAttr;
import org.apache.syncope.core.persistence.beans.AbstractDerSchema;
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/role/RDerSchema.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/role/RDerSchema.java?rev=1436230&r1=1436229&r2=1436230&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/role/RDerSchema.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/role/RDerSchema.java Mon Jan 21 09:08:54 2013
@@ -19,6 +19,7 @@
package org.apache.syncope.core.persistence.beans.role;
import javax.persistence.Entity;
+
import org.apache.syncope.core.persistence.beans.AbstractDerSchema;
@Entity
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/role/RMapping.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/role/RMapping.java?rev=1436230&r1=1436229&r2=1436230&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/role/RMapping.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/role/RMapping.java Mon Jan 21 09:08:54 2013
@@ -20,12 +20,14 @@ package org.apache.syncope.core.persiste
import java.util.ArrayList;
import java.util.List;
+
import javax.persistence.CascadeType;
import javax.persistence.Entity;
import javax.persistence.FetchType;
import javax.persistence.Id;
import javax.persistence.OneToMany;
import javax.persistence.OneToOne;
+
import org.apache.syncope.core.persistence.beans.AbstractMapping;
import org.apache.syncope.core.persistence.beans.AbstractMappingItem;
import org.apache.syncope.core.persistence.beans.ExternalResource;
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/role/RMappingItem.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/role/RMappingItem.java?rev=1436230&r1=1436229&r2=1436230&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/role/RMappingItem.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/role/RMappingItem.java Mon Jan 21 09:08:54 2013
@@ -21,6 +21,7 @@ package org.apache.syncope.core.persiste
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.ManyToOne;
+
import org.apache.syncope.core.persistence.beans.AbstractMapping;
import org.apache.syncope.core.persistence.beans.AbstractMappingItem;
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/role/RSchema.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/role/RSchema.java?rev=1436230&r1=1436229&r2=1436230&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/role/RSchema.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/role/RSchema.java Mon Jan 21 09:08:54 2013
@@ -20,6 +20,7 @@ package org.apache.syncope.core.persiste
import javax.persistence.Cacheable;
import javax.persistence.Entity;
+
import org.apache.syncope.core.persistence.beans.AbstractSchema;
@Entity
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/role/RVirAttr.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/role/RVirAttr.java?rev=1436230&r1=1436229&r2=1436230&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/role/RVirAttr.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/role/RVirAttr.java Mon Jan 21 09:08:54 2013
@@ -20,9 +20,11 @@ package org.apache.syncope.core.persiste
import java.util.ArrayList;
import java.util.List;
+
import javax.persistence.Entity;
import javax.persistence.FetchType;
import javax.persistence.ManyToOne;
+
import org.apache.syncope.core.persistence.beans.AbstractAttributable;
import org.apache.syncope.core.persistence.beans.AbstractVirAttr;
import org.apache.syncope.core.persistence.beans.AbstractVirSchema;
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/role/RVirSchema.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/role/RVirSchema.java?rev=1436230&r1=1436229&r2=1436230&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/role/RVirSchema.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/role/RVirSchema.java Mon Jan 21 09:08:54 2013
@@ -20,6 +20,7 @@ package org.apache.syncope.core.persiste
import javax.persistence.Cacheable;
import javax.persistence.Entity;
+
import org.apache.syncope.core.persistence.beans.AbstractVirSchema;
@Entity
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/role/SyncopeRole.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/role/SyncopeRole.java?rev=1436230&r1=1436229&r2=1436230&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/role/SyncopeRole.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/role/SyncopeRole.java Mon Jan 21 09:08:54 2013
@@ -25,6 +25,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
+
import javax.persistence.Basic;
import javax.persistence.Cacheable;
import javax.persistence.CascadeType;
@@ -42,6 +43,7 @@ import javax.validation.Valid;
import javax.validation.constraints.Max;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotNull;
+
import org.apache.syncope.core.persistence.beans.AbstractAttr;
import org.apache.syncope.core.persistence.beans.AbstractAttributable;
import org.apache.syncope.core.persistence.beans.AbstractDerAttr;
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/user/SyncopeUser.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/user/SyncopeUser.java?rev=1436230&r1=1436229&r2=1436230&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/user/SyncopeUser.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/user/SyncopeUser.java Mon Jan 21 09:08:54 2013
@@ -28,6 +28,7 @@ import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
+
import javax.crypto.BadPaddingException;
import javax.crypto.IllegalBlockSizeException;
import javax.crypto.NoSuchPaddingException;
@@ -53,7 +54,9 @@ import javax.validation.Valid;
import javax.validation.constraints.Max;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotNull;
+
import org.apache.commons.lang.RandomStringUtils;
+import org.apache.syncope.common.types.CipherAlgorithm;
import org.apache.syncope.core.persistence.beans.AbstractAttr;
import org.apache.syncope.core.persistence.beans.AbstractAttributable;
import org.apache.syncope.core.persistence.beans.AbstractDerAttr;
@@ -63,7 +66,6 @@ import org.apache.syncope.core.persisten
import org.apache.syncope.core.persistence.beans.role.SyncopeRole;
import org.apache.syncope.core.persistence.validation.entity.SyncopeUserCheck;
import org.apache.syncope.core.util.PasswordEncoder;
-import org.apache.syncope.types.CipherAlgorithm;
@Entity
@Cacheable
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/user/UAttr.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/user/UAttr.java?rev=1436230&r1=1436229&r2=1436230&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/user/UAttr.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/user/UAttr.java Mon Jan 21 09:08:54 2013
@@ -20,6 +20,7 @@ package org.apache.syncope.core.persiste
import java.util.ArrayList;
import java.util.List;
+
import javax.persistence.CascadeType;
import javax.persistence.Entity;
import javax.persistence.FetchType;
@@ -29,6 +30,7 @@ import javax.persistence.ManyToOne;
import javax.persistence.OneToMany;
import javax.persistence.OneToOne;
import javax.validation.Valid;
+
import org.apache.syncope.core.persistence.beans.AbstractAttr;
import org.apache.syncope.core.persistence.beans.AbstractAttrValue;
import org.apache.syncope.core.persistence.beans.AbstractAttributable;
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/user/UAttrUniqueValue.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/user/UAttrUniqueValue.java?rev=1436230&r1=1436229&r2=1436230&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/user/UAttrUniqueValue.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/user/UAttrUniqueValue.java Mon Jan 21 09:08:54 2013
@@ -23,6 +23,7 @@ import javax.persistence.Id;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.OneToOne;
+
import org.apache.syncope.core.persistence.beans.AbstractAttr;
import org.apache.syncope.core.persistence.beans.AbstractAttrUniqueValue;
import org.apache.syncope.core.persistence.beans.AbstractSchema;
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/user/UAttrValue.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/user/UAttrValue.java?rev=1436230&r1=1436229&r2=1436230&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/user/UAttrValue.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/user/UAttrValue.java Mon Jan 21 09:08:54 2013
@@ -24,6 +24,7 @@ import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
import javax.persistence.ManyToOne;
import javax.validation.constraints.NotNull;
+
import org.apache.syncope.core.persistence.beans.AbstractAttr;
import org.apache.syncope.core.persistence.beans.AbstractAttrValue;
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/user/UDerAttr.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/user/UDerAttr.java?rev=1436230&r1=1436229&r2=1436230&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/user/UDerAttr.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/user/UDerAttr.java Mon Jan 21 09:08:54 2013
@@ -21,6 +21,7 @@ package org.apache.syncope.core.persiste
import javax.persistence.Entity;
import javax.persistence.FetchType;
import javax.persistence.ManyToOne;
+
import org.apache.syncope.core.persistence.beans.AbstractAttributable;
import org.apache.syncope.core.persistence.beans.AbstractDerAttr;
import org.apache.syncope.core.persistence.beans.AbstractDerSchema;
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/user/UDerSchema.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/user/UDerSchema.java?rev=1436230&r1=1436229&r2=1436230&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/user/UDerSchema.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/user/UDerSchema.java Mon Jan 21 09:08:54 2013
@@ -19,6 +19,7 @@
package org.apache.syncope.core.persistence.beans.user;
import javax.persistence.Entity;
+
import org.apache.syncope.core.persistence.beans.AbstractDerSchema;
import org.apache.syncope.core.persistence.validation.entity.USchemaCheck;
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/user/UMapping.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/user/UMapping.java?rev=1436230&r1=1436229&r2=1436230&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/user/UMapping.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/user/UMapping.java Mon Jan 21 09:08:54 2013
@@ -20,12 +20,14 @@ package org.apache.syncope.core.persiste
import java.util.ArrayList;
import java.util.List;
+
import javax.persistence.CascadeType;
import javax.persistence.Entity;
import javax.persistence.FetchType;
import javax.persistence.Id;
import javax.persistence.OneToMany;
import javax.persistence.OneToOne;
+
import org.apache.syncope.core.persistence.beans.AbstractMapping;
import org.apache.syncope.core.persistence.beans.AbstractMappingItem;
import org.apache.syncope.core.persistence.beans.ExternalResource;
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/user/UMappingItem.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/user/UMappingItem.java?rev=1436230&r1=1436229&r2=1436230&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/user/UMappingItem.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/user/UMappingItem.java Mon Jan 21 09:08:54 2013
@@ -21,6 +21,7 @@ package org.apache.syncope.core.persiste
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.ManyToOne;
+
import org.apache.syncope.core.persistence.beans.AbstractMapping;
import org.apache.syncope.core.persistence.beans.AbstractMappingItem;
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/user/USchema.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/user/USchema.java?rev=1436230&r1=1436229&r2=1436230&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/user/USchema.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/user/USchema.java Mon Jan 21 09:08:54 2013
@@ -20,6 +20,7 @@ package org.apache.syncope.core.persiste
import javax.persistence.Cacheable;
import javax.persistence.Entity;
+
import org.apache.syncope.core.persistence.beans.AbstractSchema;
import org.apache.syncope.core.persistence.validation.entity.USchemaCheck;
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/user/UVirAttr.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/user/UVirAttr.java?rev=1436230&r1=1436229&r2=1436230&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/user/UVirAttr.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/user/UVirAttr.java Mon Jan 21 09:08:54 2013
@@ -20,9 +20,11 @@ package org.apache.syncope.core.persiste
import java.util.ArrayList;
import java.util.List;
+
import javax.persistence.Entity;
import javax.persistence.FetchType;
import javax.persistence.ManyToOne;
+
import org.apache.syncope.core.persistence.beans.AbstractAttributable;
import org.apache.syncope.core.persistence.beans.AbstractVirAttr;
import org.apache.syncope.core.persistence.beans.AbstractVirSchema;
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/user/UVirSchema.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/user/UVirSchema.java?rev=1436230&r1=1436229&r2=1436230&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/user/UVirSchema.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/user/UVirSchema.java Mon Jan 21 09:08:54 2013
@@ -20,6 +20,7 @@ package org.apache.syncope.core.persiste
import javax.persistence.Cacheable;
import javax.persistence.Entity;
+
import org.apache.syncope.core.persistence.beans.AbstractVirSchema;
import org.apache.syncope.core.persistence.validation.entity.USchemaCheck;
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/AttrDAO.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/AttrDAO.java?rev=1436230&r1=1436229&r2=1436230&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/AttrDAO.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/AttrDAO.java Mon Jan 21 09:08:54 2013
@@ -18,9 +18,10 @@
*/
package org.apache.syncope.core.persistence.dao;
-import org.apache.syncope.core.persistence.validation.entity.InvalidEntityException;
import java.util.List;
+
import org.apache.syncope.core.persistence.beans.AbstractAttr;
+import org.apache.syncope.core.persistence.validation.entity.InvalidEntityException;
public interface AttrDAO extends DAO {
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/AttrValueDAO.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/AttrValueDAO.java?rev=1436230&r1=1436229&r2=1436230&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/AttrValueDAO.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/AttrValueDAO.java Mon Jan 21 09:08:54 2013
@@ -19,6 +19,7 @@
package org.apache.syncope.core.persistence.dao;
import java.util.List;
+
import org.apache.syncope.core.persistence.beans.AbstractAttrValue;
import org.apache.syncope.core.persistence.validation.entity.InvalidEntityException;
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/AttributableDAO.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/AttributableDAO.java?rev=1436230&r1=1436229&r2=1436230&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/AttributableDAO.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/AttributableDAO.java Mon Jan 21 09:08:54 2013
@@ -19,6 +19,7 @@
package org.apache.syncope.core.persistence.dao;
import java.util.List;
+
import org.apache.syncope.core.persistence.beans.AbstractAttrValue;
import org.apache.syncope.core.persistence.beans.AbstractAttributable;
import org.apache.syncope.core.persistence.beans.ExternalResource;
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/AttributableSearchDAO.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/AttributableSearchDAO.java?rev=1436230&r1=1436229&r2=1436230&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/AttributableSearchDAO.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/AttributableSearchDAO.java Mon Jan 21 09:08:54 2013
@@ -20,7 +20,8 @@ package org.apache.syncope.core.persiste
import java.util.List;
import java.util.Set;
-import org.apache.syncope.client.search.NodeCond;
+
+import org.apache.syncope.common.search.NodeCond;
import org.apache.syncope.core.persistence.beans.AbstractAttributable;
import org.apache.syncope.core.util.AttributableUtil;
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/ConfDAO.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/ConfDAO.java?rev=1436230&r1=1436229&r2=1436230&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/ConfDAO.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/ConfDAO.java Mon Jan 21 09:08:54 2013
@@ -19,6 +19,7 @@
package org.apache.syncope.core.persistence.dao;
import java.util.List;
+
import org.apache.syncope.core.persistence.beans.SyncopeConf;
import org.apache.syncope.core.persistence.validation.entity.InvalidEntityException;
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/ConnInstanceDAO.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/ConnInstanceDAO.java?rev=1436230&r1=1436229&r2=1436230&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/ConnInstanceDAO.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/ConnInstanceDAO.java Mon Jan 21 09:08:54 2013
@@ -19,6 +19,7 @@
package org.apache.syncope.core.persistence.dao;
import java.util.List;
+
import org.apache.syncope.core.persistence.beans.ConnInstance;
import org.apache.syncope.core.persistence.validation.entity.InvalidEntityException;
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/DerAttrDAO.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/DerAttrDAO.java?rev=1436230&r1=1436229&r2=1436230&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/DerAttrDAO.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/DerAttrDAO.java Mon Jan 21 09:08:54 2013
@@ -19,6 +19,7 @@
package org.apache.syncope.core.persistence.dao;
import java.util.List;
+
import org.apache.syncope.core.persistence.beans.AbstractDerAttr;
import org.apache.syncope.core.persistence.validation.entity.InvalidEntityException;
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/DerSchemaDAO.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/DerSchemaDAO.java?rev=1436230&r1=1436229&r2=1436230&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/DerSchemaDAO.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/DerSchemaDAO.java Mon Jan 21 09:08:54 2013
@@ -19,6 +19,7 @@
package org.apache.syncope.core.persistence.dao;
import java.util.List;
+
import org.apache.syncope.core.persistence.beans.AbstractDerAttr;
import org.apache.syncope.core.persistence.beans.AbstractDerSchema;
import org.apache.syncope.core.persistence.validation.entity.InvalidEntityException;
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/EntitlementDAO.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/EntitlementDAO.java?rev=1436230&r1=1436229&r2=1436230&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/EntitlementDAO.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/EntitlementDAO.java Mon Jan 21 09:08:54 2013
@@ -19,6 +19,7 @@
package org.apache.syncope.core.persistence.dao;
import java.util.List;
+
import org.apache.syncope.core.persistence.beans.Entitlement;
import org.apache.syncope.core.persistence.beans.role.SyncopeRole;
import org.apache.syncope.core.persistence.validation.entity.InvalidEntityException;
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/LoggerDAO.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/LoggerDAO.java?rev=1436230&r1=1436229&r2=1436230&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/LoggerDAO.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/LoggerDAO.java Mon Jan 21 09:08:54 2013
@@ -19,9 +19,10 @@
package org.apache.syncope.core.persistence.dao;
import java.util.List;
+
+import org.apache.syncope.common.types.SyncopeLoggerType;
import org.apache.syncope.core.persistence.beans.SyncopeLogger;
import org.apache.syncope.core.persistence.validation.entity.InvalidEntityException;
-import org.apache.syncope.types.SyncopeLoggerType;
public interface LoggerDAO extends DAO {
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/MembershipDAO.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/MembershipDAO.java?rev=1436230&r1=1436229&r2=1436230&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/MembershipDAO.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/MembershipDAO.java Mon Jan 21 09:08:54 2013
@@ -19,6 +19,7 @@
package org.apache.syncope.core.persistence.dao;
import java.util.List;
+
import org.apache.syncope.core.persistence.beans.membership.Membership;
import org.apache.syncope.core.persistence.beans.role.SyncopeRole;
import org.apache.syncope.core.persistence.beans.user.SyncopeUser;
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/NotificationDAO.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/NotificationDAO.java?rev=1436230&r1=1436229&r2=1436230&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/NotificationDAO.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/NotificationDAO.java Mon Jan 21 09:08:54 2013
@@ -19,6 +19,7 @@
package org.apache.syncope.core.persistence.dao;
import java.util.List;
+
import org.apache.syncope.core.persistence.beans.Notification;
import org.apache.syncope.core.persistence.validation.entity.InvalidEntityException;
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/PolicyDAO.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/PolicyDAO.java?rev=1436230&r1=1436229&r2=1436230&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/PolicyDAO.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/PolicyDAO.java Mon Jan 21 09:08:54 2013
@@ -19,11 +19,12 @@
package org.apache.syncope.core.persistence.dao;
import java.util.List;
+
+import org.apache.syncope.common.types.PolicyType;
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.types.PolicyType;
public interface PolicyDAO extends DAO {
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/ReportDAO.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/ReportDAO.java?rev=1436230&r1=1436229&r2=1436230&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/ReportDAO.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/ReportDAO.java Mon Jan 21 09:08:54 2013
@@ -19,6 +19,7 @@
package org.apache.syncope.core.persistence.dao;
import java.util.List;
+
import org.apache.syncope.core.persistence.beans.Report;
import org.apache.syncope.core.persistence.validation.entity.InvalidEntityException;
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/ReportExecDAO.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/ReportExecDAO.java?rev=1436230&r1=1436229&r2=1436230&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/ReportExecDAO.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/ReportExecDAO.java Mon Jan 21 09:08:54 2013
@@ -19,6 +19,7 @@
package org.apache.syncope.core.persistence.dao;
import java.util.List;
+
import org.apache.syncope.core.persistence.beans.Report;
import org.apache.syncope.core.persistence.beans.ReportExec;
import org.apache.syncope.core.persistence.validation.entity.InvalidEntityException;
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/ResourceDAO.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/ResourceDAO.java?rev=1436230&r1=1436229&r2=1436230&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/ResourceDAO.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/ResourceDAO.java Mon Jan 21 09:08:54 2013
@@ -19,10 +19,11 @@
package org.apache.syncope.core.persistence.dao;
import java.util.List;
+
+import org.apache.syncope.common.types.IntMappingType;
import org.apache.syncope.core.persistence.beans.AbstractMappingItem;
import org.apache.syncope.core.persistence.beans.ExternalResource;
import org.apache.syncope.core.persistence.validation.entity.InvalidEntityException;
-import org.apache.syncope.types.IntMappingType;
public interface ResourceDAO extends DAO {
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/RoleDAO.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/RoleDAO.java?rev=1436230&r1=1436229&r2=1436230&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/RoleDAO.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/RoleDAO.java Mon Jan 21 09:08:54 2013
@@ -19,6 +19,7 @@
package org.apache.syncope.core.persistence.dao;
import java.util.List;
+
import org.apache.syncope.core.persistence.beans.Entitlement;
import org.apache.syncope.core.persistence.beans.ExternalResource;
import org.apache.syncope.core.persistence.beans.membership.Membership;
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/SchemaDAO.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/SchemaDAO.java?rev=1436230&r1=1436229&r2=1436230&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/SchemaDAO.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/SchemaDAO.java Mon Jan 21 09:08:54 2013
@@ -19,6 +19,7 @@
package org.apache.syncope.core.persistence.dao;
import java.util.List;
+
import org.apache.syncope.core.persistence.beans.AbstractAttr;
import org.apache.syncope.core.persistence.beans.AbstractSchema;
import org.apache.syncope.core.persistence.validation.entity.InvalidEntityException;
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/TaskDAO.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/TaskDAO.java?rev=1436230&r1=1436229&r2=1436230&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/TaskDAO.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/TaskDAO.java Mon Jan 21 09:08:54 2013
@@ -19,6 +19,7 @@
package org.apache.syncope.core.persistence.dao;
import java.util.List;
+
import org.apache.syncope.core.persistence.beans.ExternalResource;
import org.apache.syncope.core.persistence.beans.Task;
import org.apache.syncope.core.persistence.validation.entity.InvalidEntityException;
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/TaskExecDAO.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/TaskExecDAO.java?rev=1436230&r1=1436229&r2=1436230&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/TaskExecDAO.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/TaskExecDAO.java Mon Jan 21 09:08:54 2013
@@ -19,6 +19,7 @@
package org.apache.syncope.core.persistence.dao;
import java.util.List;
+
import org.apache.syncope.core.persistence.beans.Task;
import org.apache.syncope.core.persistence.beans.TaskExec;
import org.apache.syncope.core.persistence.validation.entity.InvalidEntityException;
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/UserDAO.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/UserDAO.java?rev=1436230&r1=1436229&r2=1436230&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/UserDAO.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/UserDAO.java Mon Jan 21 09:08:54 2013
@@ -20,6 +20,7 @@ package org.apache.syncope.core.persiste
import java.util.List;
import java.util.Set;
+
import org.apache.syncope.core.persistence.beans.ExternalResource;
import org.apache.syncope.core.persistence.beans.user.SyncopeUser;
import org.apache.syncope.core.persistence.beans.user.UAttrValue;
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/UserRequestDAO.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/UserRequestDAO.java?rev=1436230&r1=1436229&r2=1436230&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/UserRequestDAO.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/UserRequestDAO.java Mon Jan 21 09:08:54 2013
@@ -19,6 +19,7 @@
package org.apache.syncope.core.persistence.dao;
import java.util.List;
+
import org.apache.syncope.core.persistence.beans.UserRequest;
import org.apache.syncope.core.persistence.validation.entity.InvalidEntityException;
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/VirAttrDAO.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/VirAttrDAO.java?rev=1436230&r1=1436229&r2=1436230&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/VirAttrDAO.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/VirAttrDAO.java Mon Jan 21 09:08:54 2013
@@ -19,6 +19,7 @@
package org.apache.syncope.core.persistence.dao;
import java.util.List;
+
import org.apache.syncope.core.persistence.beans.AbstractVirAttr;
import org.apache.syncope.core.persistence.validation.entity.InvalidEntityException;
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/VirSchemaDAO.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/VirSchemaDAO.java?rev=1436230&r1=1436229&r2=1436230&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/VirSchemaDAO.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/VirSchemaDAO.java Mon Jan 21 09:08:54 2013
@@ -19,6 +19,7 @@
package org.apache.syncope.core.persistence.dao;
import java.util.List;
+
import org.apache.syncope.core.persistence.beans.AbstractVirAttr;
import org.apache.syncope.core.persistence.beans.AbstractVirSchema;
import org.apache.syncope.core.persistence.validation.entity.InvalidEntityException;
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/AbstractAttributableDAOImpl.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/AbstractAttributableDAOImpl.java?rev=1436230&r1=1436229&r2=1436230&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/AbstractAttributableDAOImpl.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/AbstractAttributableDAOImpl.java Mon Jan 21 09:08:54 2013
@@ -26,8 +26,10 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.regex.Pattern;
+
import javax.persistence.Query;
import javax.persistence.TemporalType;
+
import org.apache.commons.jexl2.parser.Parser;
import org.apache.commons.jexl2.parser.ParserConstants;
import org.apache.commons.jexl2.parser.Token;
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/AbstractDAOImpl.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/AbstractDAOImpl.java?rev=1436230&r1=1436229&r2=1436230&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/AbstractDAOImpl.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/AbstractDAOImpl.java Mon Jan 21 09:08:54 2013
@@ -23,12 +23,13 @@ import javax.persistence.CacheStoreMode;
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
import javax.persistence.PersistenceContextType;
+
+import org.apache.syncope.core.persistence.beans.AbstractBaseBean;
+import org.apache.syncope.core.persistence.dao.DAO;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Configurable;
import org.springframework.beans.factory.annotation.Value;
-import org.apache.syncope.core.persistence.beans.AbstractBaseBean;
-import org.apache.syncope.core.persistence.dao.DAO;
@Configurable
public abstract class AbstractDAOImpl implements DAO {
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/AttrDAOImpl.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/AttrDAOImpl.java?rev=1436230&r1=1436229&r2=1436230&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/AttrDAOImpl.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/AttrDAOImpl.java Mon Jan 21 09:08:54 2013
@@ -19,10 +19,12 @@
package org.apache.syncope.core.persistence.dao.impl;
import java.util.List;
+
import javax.persistence.Query;
-import org.springframework.stereotype.Repository;
+
import org.apache.syncope.core.persistence.beans.AbstractAttr;
import org.apache.syncope.core.persistence.dao.AttrDAO;
+import org.springframework.stereotype.Repository;
@Repository
public class AttrDAOImpl extends AbstractDAOImpl implements AttrDAO {
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/AttrValueDAOImpl.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/AttrValueDAOImpl.java?rev=1436230&r1=1436229&r2=1436230&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/AttrValueDAOImpl.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/AttrValueDAOImpl.java Mon Jan 21 09:08:54 2013
@@ -19,10 +19,12 @@
package org.apache.syncope.core.persistence.dao.impl;
import java.util.List;
+
import javax.persistence.Query;
-import org.springframework.stereotype.Repository;
+
import org.apache.syncope.core.persistence.beans.AbstractAttrValue;
import org.apache.syncope.core.persistence.dao.AttrValueDAO;
+import org.springframework.stereotype.Repository;
@Repository
public class AttrValueDAOImpl extends AbstractDAOImpl implements AttrValueDAO {
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/AttributableSearchDAOImpl.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/AttributableSearchDAOImpl.java?rev=1436230&r1=1436229&r2=1436230&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/AttributableSearchDAOImpl.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/AttributableSearchDAOImpl.java Mon Jan 21 09:08:54 2013
@@ -26,18 +26,22 @@ import java.util.Date;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
+
import javax.persistence.Entity;
import javax.persistence.Query;
import javax.persistence.TemporalType;
import javax.validation.ValidationException;
import javax.validation.constraints.Max;
import javax.validation.constraints.Min;
-import org.apache.syncope.client.search.AttributableCond;
-import org.apache.syncope.client.search.AttributeCond;
-import org.apache.syncope.client.search.EntitlementCond;
-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.common.search.AttributableCond;
+import org.apache.syncope.common.search.AttributeCond;
+import org.apache.syncope.common.search.EntitlementCond;
+import org.apache.syncope.common.search.MembershipCond;
+import org.apache.syncope.common.search.NodeCond;
+import org.apache.syncope.common.search.ResourceCond;
+import org.apache.syncope.common.types.AttributableType;
+import org.apache.syncope.common.types.SchemaType;
import org.apache.syncope.core.persistence.beans.AbstractAttrValue;
import org.apache.syncope.core.persistence.beans.AbstractAttributable;
import org.apache.syncope.core.persistence.beans.AbstractSchema;
@@ -46,8 +50,6 @@ import org.apache.syncope.core.persisten
import org.apache.syncope.core.persistence.dao.SchemaDAO;
import org.apache.syncope.core.persistence.dao.UserDAO;
import org.apache.syncope.core.util.AttributableUtil;
-import org.apache.syncope.types.AttributableType;
-import org.apache.syncope.types.SchemaType;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Repository;
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/ConfDAOImpl.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/ConfDAOImpl.java?rev=1436230&r1=1436229&r2=1436230&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/ConfDAOImpl.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/ConfDAOImpl.java Mon Jan 21 09:08:54 2013
@@ -19,11 +19,13 @@
package org.apache.syncope.core.persistence.dao.impl;
import java.util.List;
+
import javax.persistence.Query;
-import org.springframework.stereotype.Repository;
+
import org.apache.syncope.core.persistence.beans.SyncopeConf;
-import org.apache.syncope.core.persistence.dao.MissingConfKeyException;
import org.apache.syncope.core.persistence.dao.ConfDAO;
+import org.apache.syncope.core.persistence.dao.MissingConfKeyException;
+import org.springframework.stereotype.Repository;
@Repository
public class ConfDAOImpl extends AbstractDAOImpl implements ConfDAO {
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/DerAttrDAOImpl.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/DerAttrDAOImpl.java?rev=1436230&r1=1436229&r2=1436230&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/DerAttrDAOImpl.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/DerAttrDAOImpl.java Mon Jan 21 09:08:54 2013
@@ -19,10 +19,12 @@
package org.apache.syncope.core.persistence.dao.impl;
import java.util.List;
+
import javax.persistence.Query;
-import org.springframework.stereotype.Repository;
+
import org.apache.syncope.core.persistence.beans.AbstractDerAttr;
import org.apache.syncope.core.persistence.dao.DerAttrDAO;
+import org.springframework.stereotype.Repository;
@Repository
public class DerAttrDAOImpl extends AbstractDAOImpl implements DerAttrDAO {
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/DerSchemaDAOImpl.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/DerSchemaDAOImpl.java?rev=1436230&r1=1436229&r2=1436230&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/DerSchemaDAOImpl.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/DerSchemaDAOImpl.java Mon Jan 21 09:08:54 2013
@@ -21,9 +21,9 @@ package org.apache.syncope.core.persiste
import java.util.HashSet;
import java.util.List;
import java.util.Set;
+
import javax.persistence.Query;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Repository;
+
import org.apache.syncope.core.persistence.beans.AbstractDerAttr;
import org.apache.syncope.core.persistence.beans.AbstractDerSchema;
import org.apache.syncope.core.persistence.beans.user.UMappingItem;
@@ -31,6 +31,8 @@ import org.apache.syncope.core.persisten
import org.apache.syncope.core.persistence.dao.DerSchemaDAO;
import org.apache.syncope.core.persistence.dao.ResourceDAO;
import org.apache.syncope.core.util.AttributableUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Repository;
@Repository
public class DerSchemaDAOImpl extends AbstractDAOImpl implements DerSchemaDAO {
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/EntitlementDAOImpl.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/EntitlementDAOImpl.java?rev=1436230&r1=1436229&r2=1436230&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/EntitlementDAOImpl.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/EntitlementDAOImpl.java Mon Jan 21 09:08:54 2013
@@ -19,14 +19,16 @@
package org.apache.syncope.core.persistence.dao.impl;
import java.util.List;
+
import javax.persistence.Query;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Repository;
+
import org.apache.syncope.core.persistence.beans.Entitlement;
import org.apache.syncope.core.persistence.beans.role.SyncopeRole;
import org.apache.syncope.core.persistence.dao.EntitlementDAO;
import org.apache.syncope.core.persistence.dao.RoleDAO;
import org.apache.syncope.core.util.EntitlementUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Repository;
@Repository
public class EntitlementDAOImpl extends AbstractDAOImpl implements EntitlementDAO {
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/LoggerDAOImpl.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/LoggerDAOImpl.java?rev=1436230&r1=1436229&r2=1436230&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/LoggerDAOImpl.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/LoggerDAOImpl.java Mon Jan 21 09:08:54 2013
@@ -19,12 +19,14 @@
package org.apache.syncope.core.persistence.dao.impl;
import java.util.List;
+
import javax.persistence.Query;
-import org.springframework.stereotype.Repository;
+
+import org.apache.syncope.common.types.SyncopeLoggerLevel;
+import org.apache.syncope.common.types.SyncopeLoggerType;
import org.apache.syncope.core.persistence.beans.SyncopeLogger;
import org.apache.syncope.core.persistence.dao.LoggerDAO;
-import org.apache.syncope.types.SyncopeLoggerLevel;
-import org.apache.syncope.types.SyncopeLoggerType;
+import org.springframework.stereotype.Repository;
@Repository
public class LoggerDAOImpl extends AbstractDAOImpl implements LoggerDAO {
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/MembershipDAOImpl.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/MembershipDAOImpl.java?rev=1436230&r1=1436229&r2=1436230&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/MembershipDAOImpl.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/MembershipDAOImpl.java Mon Jan 21 09:08:54 2013
@@ -19,16 +19,18 @@
package org.apache.syncope.core.persistence.dao.impl;
import java.util.List;
+
import javax.persistence.NoResultException;
import javax.persistence.Query;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Repository;
+
import org.apache.syncope.core.persistence.beans.membership.Membership;
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.MembershipDAO;
import org.apache.syncope.core.persistence.dao.RoleDAO;
import org.apache.syncope.core.persistence.dao.UserDAO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Repository;
@Repository
public class MembershipDAOImpl extends AbstractDAOImpl implements MembershipDAO {