syncope-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ilgro...@apache.org
Subject svn commit: r1551172 [2/7] - in /syncope/trunk: ./ client/ client/src/main/java/org/apache/syncope/client/ client/src/main/java/org/apache/syncope/client/rest/ common/ common/src/main/java/org/apache/syncope/common/ common/src/main/java/org/apache/sync...
Date Mon, 16 Dec 2013 11:04:57 GMT
Modified: syncope/trunk/common/src/main/java/org/apache/syncope/common/services/UserSelfService.java
URL: http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/services/UserSelfService.java?rev=1551172&r1=1551171&r2=1551172&view=diff
==============================================================================
--- syncope/trunk/common/src/main/java/org/apache/syncope/common/services/UserSelfService.java (original)
+++ syncope/trunk/common/src/main/java/org/apache/syncope/common/services/UserSelfService.java Mon Dec 16 11:04:52 2013
@@ -34,7 +34,7 @@ import org.apache.syncope.common.to.User
 @Path("users/self")
 @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
 @Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
-public interface UserSelfService {
+public interface UserSelfService extends JAXRSService {
 
     /**
      * @return Response contains special syncope HTTP header indicating if user self registration is allowed

Modified: syncope/trunk/common/src/main/java/org/apache/syncope/common/services/UserService.java
URL: http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/services/UserService.java?rev=1551172&r1=1551171&r2=1551172&view=diff
==============================================================================
--- syncope/trunk/common/src/main/java/org/apache/syncope/common/services/UserService.java (original)
+++ syncope/trunk/common/src/main/java/org/apache/syncope/common/services/UserService.java Mon Dec 16 11:04:52 2013
@@ -36,17 +36,17 @@ import org.apache.cxf.jaxrs.model.wadl.D
 import org.apache.cxf.jaxrs.model.wadl.DocTarget;
 import org.apache.syncope.common.mod.StatusMod;
 import org.apache.syncope.common.mod.UserMod;
-import org.apache.syncope.common.search.NodeCond;
-import org.apache.syncope.common.to.BulkAction;
-import org.apache.syncope.common.to.BulkActionRes;
-import org.apache.syncope.common.to.ResourceNameTO;
+import org.apache.syncope.common.wrap.ResourceName;
+import org.apache.syncope.common.reqres.PagedResult;
+import org.apache.syncope.common.reqres.BulkAction;
+import org.apache.syncope.common.reqres.BulkActionResult;
 import org.apache.syncope.common.to.UserTO;
 import org.apache.syncope.common.types.ResourceAssociationActionType;
 
 @Path("users")
 @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
 @Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
-public interface UserService {
+public interface UserService extends JAXRSService {
 
     @OPTIONS
     @Path("{userId}/username")
@@ -71,101 +71,72 @@ public interface UserService {
     UserTO read(@Description("id of user to be read") @PathParam("userId") Long userId);
 
     /**
-     * Returns the number of existing users.
-     *
-     * @return Number of existing users
-     */
-    @GET
-    @Path("count")
-    @Descriptions({
-        @Description(target = DocTarget.METHOD, value = "Returns the number of existing users"),
-        @Description(target = DocTarget.RETURN, value = "Number of existing users")
-    })
-    int count();
-
-    /**
-     * Returns a list of all existing users.
+     * Returns a paged list of existing users.
      *
-     * @return A list of all existing users.
+     * @return Paged list of all existing users
      */
     @GET
     @Descriptions({
         @Description(target = DocTarget.METHOD, value = "Returns a list of all existing users"),
-        @Description(target = DocTarget.RETURN, value = "A list of all existing users")
+        @Description(target = DocTarget.RETURN, value = "Paged list of all existing users")
     })
-    List<UserTO> list();
+    PagedResult<UserTO> list();
 
     /**
-     * Returns a paged list of existing users.
+     * Returns a paged list of existing users matching page/size conditions.
      *
      * @param page result page number
      * @param size number of entries per page
-     * @return A list of all existing users matching page/size conditions.
+     * @return Paged list of existing users matching page/size conditions
      */
     @GET
     @Descriptions({
-        @Description(target = DocTarget.METHOD, value = "Returns a list of all existing users"),
-        @Description(target = DocTarget.RETURN, value = "A list of all existing users matching page/size conditions")
-    })
-    List<UserTO> list(@Description("result page number") @QueryParam("page") @DefaultValue("1") int page,
-            @Description("number of entries per page") @QueryParam("size") @DefaultValue("25") int size);
-
-    /**
-     * Returns the number of users matching the provided search condition.
-     *
-     * @param searchCondition search condition
-     * @return Number of users matching the provided search condition
-     * @throws InvalidSearchConditionException if provided search condition is not valid
-     */
-    @POST
-    @Path("search/count")
-    @Descriptions({
         @Description(target = DocTarget.METHOD,
-                value = "Returns the number of users matching the provided search condition"),
-        @Description(target = DocTarget.RETURN,
-                value = "Number of users matching the provided search condition")
+                value = "Returns a list of all existing users matching page/size conditions"),
+        @Description(target = DocTarget.RETURN, value = "Paged list of existing users matching page/size conditions")
     })
-    int searchCount(@Description("search condition") NodeCond searchCondition)
-            throws InvalidSearchConditionException;
+    PagedResult<UserTO> list(
+            @Description("result page number")
+            @QueryParam(PARAM_PAGE) @DefaultValue(DEFAULT_PARAM_PAGE) int page,
+            @Description("number of entries per page")
+            @QueryParam(PARAM_SIZE) @DefaultValue(DEFAULT_PARAM_SIZE) int size);
 
     /**
-     * Returns the list of users matching the given search condition.
+     * Returns a paged list of users matching the provided FIQL search condition.
      *
-     * @param searchCondition search condition
-     * @return List of users matching the given search condition
-     * @throws InvalidSearchConditionException if provided search condition is not valid
+     * @param fiql FIQL search expression
+     * @return Paged list of users matching the provided FIQL search condition
      */
-    @POST
+    @GET
     @Path("search")
     @Descriptions({
         @Description(target = DocTarget.METHOD,
-                value = "Returns the list of users matching the given search condition"),
+                value = "Returns a paged list of users matching the provided FIQL search condition"),
         @Description(target = DocTarget.RETURN, value = "List of users matching the given condition")
     })
-    List<UserTO> search(@Description("search condition") NodeCond searchCondition)
-            throws InvalidSearchConditionException;
+    PagedResult<UserTO> search(@Description("FIQL search expression") @QueryParam("fiql") String fiql);
 
     /**
-     * Returns the paged list of users matching the given search condition.
+     * Returns a paged list of users matching the provided FIQL search condition.
      *
-     * @param searchCondition search condition
+     * @param fiql FIQL search expression
      * @param page result page number
      * @param size number of entries per page
-     * @return List of users matching the given search and page/size conditions
-     * @throws InvalidSearchConditionException if provided search condition is not valid
+     * @return Paged list of users matching the provided FIQL search condition
      */
-    @POST
+    @GET
     @Path("search")
     @Descriptions({
         @Description(target = DocTarget.METHOD,
-                value = "Returns the paged list of users matching the given search condition"),
+                value = "Returns a paged list of users matching the provided FIQL search condition"),
         @Description(target = DocTarget.RETURN,
-                value = "List of users matching the given search and page/size conditions")
+                value = "Paged list of users matching the provided FIQL search condition")
     })
-    List<UserTO> search(@Description("search condition") NodeCond searchCondition,
-            @Description("result page number") @QueryParam("page") @DefaultValue("1") int page,
-            @Description("number of entries per page") @QueryParam("size") @DefaultValue("25") int size)
-            throws InvalidSearchConditionException;
+    PagedResult<UserTO> search(@Description("FIQL search expression") @QueryParam("fiql") String fiql,
+            @Description("result page number")
+            @QueryParam(PARAM_PAGE) @DefaultValue(DEFAULT_PARAM_PAGE) int page,
+            @Description("number of entries per page")
+            @QueryParam(PARAM_SIZE) @DefaultValue(DEFAULT_PARAM_SIZE) int size);
 
     /**
      * Creates a new user.
@@ -255,7 +226,7 @@ public interface UserService {
     Response associate(@Description("user id") @PathParam("userId") Long userId,
             @Description("resource association action type") @PathParam("type") ResourceAssociationActionType type,
             @Description("external resources to be used for propagation-related operations"
-            ) List<ResourceNameTO> resourceNames);
+            ) List<ResourceName> resourceNames);
 
     /**
      * Executes the provided bulk action.
@@ -269,6 +240,6 @@ public interface UserService {
         @Description(target = DocTarget.METHOD, value = "Executes the provided bulk action"),
         @Description(target = DocTarget.RETURN, value = "Bulk action result")
     })
-    BulkActionRes bulk(@Description("list of &lt;username, action&gt; pairs") BulkAction bulkAction);
+    BulkActionResult bulk(@Description("list of &lt;username, action&gt; pairs") BulkAction bulkAction);
 
 }

Modified: syncope/trunk/common/src/main/java/org/apache/syncope/common/services/UserWorkflowService.java
URL: http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/services/UserWorkflowService.java?rev=1551172&r1=1551171&r2=1551172&view=diff
==============================================================================
--- syncope/trunk/common/src/main/java/org/apache/syncope/common/services/UserWorkflowService.java (original)
+++ syncope/trunk/common/src/main/java/org/apache/syncope/common/services/UserWorkflowService.java Mon Dec 16 11:04:52 2013
@@ -18,6 +18,7 @@
  */
 package org.apache.syncope.common.services;
 
+import org.apache.syncope.common.to.WorkflowFormTO;
 import java.util.List;
 import javax.ws.rs.Consumes;
 
@@ -29,12 +30,11 @@ import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
 
 import org.apache.syncope.common.to.UserTO;
-import org.apache.syncope.common.to.WorkflowFormTO;
 
 @Path("userworkflow")
 @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
 @Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
-public interface UserWorkflowService {
+public interface UserWorkflowService extends JAXRSService {
 
     @POST
     @Path("forms")

Modified: syncope/trunk/common/src/main/java/org/apache/syncope/common/services/WorkflowService.java
URL: http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/services/WorkflowService.java?rev=1551172&r1=1551171&r2=1551172&view=diff
==============================================================================
--- syncope/trunk/common/src/main/java/org/apache/syncope/common/services/WorkflowService.java (original)
+++ syncope/trunk/common/src/main/java/org/apache/syncope/common/services/WorkflowService.java Mon Dec 16 11:04:52 2013
@@ -32,9 +32,10 @@ import org.apache.syncope.common.types.A
 import org.apache.syncope.common.types.RESTHeaders;
 
 @Path("workflows/{kind}")
-public interface WorkflowService {
+public interface WorkflowService extends JAXRSService {
 
     /**
+     * @param kind Kind can be USER or ROLE only!
      * @return Response contains special syncope HTTP header indicating if Activiti is enabled for users / roles
      * @see org.apache.syncope.common.types.RESTHeaders#ACTIVITI_USER_ENABLED
      * @see org.apache.syncope.common.types.RESTHeaders#ACTIVITI_ROLE_ENABLED

Modified: syncope/trunk/common/src/main/java/org/apache/syncope/common/to/AbstractAttributableTO.java
URL: http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/to/AbstractAttributableTO.java?rev=1551172&r1=1551171&r2=1551172&view=diff
==============================================================================
--- syncope/trunk/common/src/main/java/org/apache/syncope/common/to/AbstractAttributableTO.java (original)
+++ syncope/trunk/common/src/main/java/org/apache/syncope/common/to/AbstractAttributableTO.java Mon Dec 16 11:04:52 2013
@@ -44,7 +44,7 @@ public abstract class AbstractAttributab
 
     private Set<String> resources;
 
-    private final List<PropagationStatusTO> propagationStatusTOs;
+    private final List<PropagationStatus> propagationStatusTOs;
 
     protected AbstractAttributableTO() {
         super();
@@ -52,7 +52,7 @@ public abstract class AbstractAttributab
         derAttrs = new ArrayList<AttributeTO>();
         virAttrs = new ArrayList<AttributeTO>();
         resources = new HashSet<String>();
-        propagationStatusTOs = new ArrayList<PropagationStatusTO>();
+        propagationStatusTOs = new ArrayList<PropagationStatus>();
     }
 
     public long getId() {
@@ -108,9 +108,9 @@ public abstract class AbstractAttributab
 
     public boolean removePropagationTO(final String resource) {
         if (resource != null && getPropagationStatusTOs().isEmpty()) {
-            final List<PropagationStatusTO> toBeRemoved = new ArrayList<PropagationStatusTO>();
+            final List<PropagationStatus> toBeRemoved = new ArrayList<PropagationStatus>();
 
-            for (PropagationStatusTO propagationTO : getPropagationStatusTOs()) {
+            for (PropagationStatus propagationTO : getPropagationStatusTOs()) {
                 if (resource.equals(propagationTO.getResource())) {
                     toBeRemoved.add(propagationTO);
                 }
@@ -124,7 +124,7 @@ public abstract class AbstractAttributab
     @XmlElementWrapper(name = "propagationStatuses")
     @XmlElement(name = "propagationStatus")
     @JsonProperty("propagationStatuses")
-    public List<PropagationStatusTO> getPropagationStatusTOs() {
+    public List<PropagationStatus> getPropagationStatusTOs() {
         return propagationStatusTOs;
     }
 }

Modified: syncope/trunk/common/src/main/java/org/apache/syncope/common/to/AbstractPolicyTO.java
URL: http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/to/AbstractPolicyTO.java?rev=1551172&r1=1551171&r2=1551172&view=diff
==============================================================================
--- syncope/trunk/common/src/main/java/org/apache/syncope/common/to/AbstractPolicyTO.java (original)
+++ syncope/trunk/common/src/main/java/org/apache/syncope/common/to/AbstractPolicyTO.java Mon Dec 16 11:04:52 2013
@@ -19,8 +19,6 @@
 package org.apache.syncope.common.to;
 
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import com.fasterxml.jackson.annotation.JsonTypeInfo.As;
-import com.fasterxml.jackson.annotation.JsonTypeInfo.Id;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlSeeAlso;
 import javax.xml.bind.annotation.XmlType;
@@ -28,10 +26,10 @@ import javax.xml.bind.annotation.XmlType
 import org.apache.syncope.common.AbstractBaseBean;
 import org.apache.syncope.common.types.PolicyType;
 
-@XmlRootElement(name = "policy")
+@XmlRootElement(name = "abstractPolicy")
 @XmlType
 @XmlSeeAlso({ AccountPolicyTO.class, PasswordPolicyTO.class, SyncPolicyTO.class })
-@JsonTypeInfo(use = Id.CLASS, include = As.PROPERTY, property = "@class")
+@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.PROPERTY, property = "@class")
 public abstract class AbstractPolicyTO extends AbstractBaseBean {
 
     private static final long serialVersionUID = -2903888572649721035L;

Modified: syncope/trunk/common/src/main/java/org/apache/syncope/common/to/AbstractSysInfoTO.java
URL: http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/to/AbstractSysInfoTO.java?rev=1551172&r1=1551171&r2=1551172&view=diff
==============================================================================
--- syncope/trunk/common/src/main/java/org/apache/syncope/common/to/AbstractSysInfoTO.java (original)
+++ syncope/trunk/common/src/main/java/org/apache/syncope/common/to/AbstractSysInfoTO.java Mon Dec 16 11:04:52 2013
@@ -20,12 +20,14 @@ package org.apache.syncope.common.to;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import java.util.Date;
+import javax.xml.bind.annotation.XmlType;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.syncope.common.AbstractBaseBean;
 
 /**
  * Abstract wrapper for common system information.
  */
+@XmlType
 public class AbstractSysInfoTO extends AbstractBaseBean {
 
     private static final long serialVersionUID = -930797879027642457L;

Modified: syncope/trunk/common/src/main/java/org/apache/syncope/common/to/AbstractTaskTO.java
URL: http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/to/AbstractTaskTO.java?rev=1551172&r1=1551171&r2=1551172&view=diff
==============================================================================
--- syncope/trunk/common/src/main/java/org/apache/syncope/common/to/AbstractTaskTO.java (original)
+++ syncope/trunk/common/src/main/java/org/apache/syncope/common/to/AbstractTaskTO.java Mon Dec 16 11:04:52 2013
@@ -20,8 +20,7 @@ package org.apache.syncope.common.to;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import com.fasterxml.jackson.annotation.JsonTypeInfo.As;
-import com.fasterxml.jackson.annotation.JsonTypeInfo.Id;
+
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -34,12 +33,10 @@ import javax.xml.bind.annotation.XmlType
 
 import org.apache.syncope.common.AbstractBaseBean;
 
-@XmlRootElement(name = "task")
+@XmlRootElement(name = "abstractTask")
 @XmlType
-@XmlSeeAlso({
-    SyncTaskTO.class, NotificationTaskTO.class, SyncTaskTO.class, SchedTaskTO.class, PropagationTaskTO.class
-})
-@JsonTypeInfo(use = Id.CLASS, include = As.PROPERTY, property = "@class")
+@XmlSeeAlso({ PropagationTaskTO.class, SyncTaskTO.class, SchedTaskTO.class, NotificationTaskTO.class })
+@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.PROPERTY, property = "@class")
 public abstract class AbstractTaskTO extends AbstractBaseBean {
 
     private static final long serialVersionUID = 386450127003321197L;
@@ -70,9 +67,9 @@ public abstract class AbstractTaskTO ext
         this.latestExecStatus = latestExecStatus;
     }
 
-    @XmlElementWrapper(name = "excecutions")
-    @XmlElement(name = "excecution")
-    @JsonProperty("excecutions")
+    @XmlElementWrapper(name = "executions")
+    @XmlElement(name = "execution")
+    @JsonProperty("executions")
     public List<TaskExecTO> getExecutions() {
         return executions;
     }

Modified: syncope/trunk/common/src/main/java/org/apache/syncope/common/to/MembershipTO.java
URL: http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/to/MembershipTO.java?rev=1551172&r1=1551171&r2=1551172&view=diff
==============================================================================
--- syncope/trunk/common/src/main/java/org/apache/syncope/common/to/MembershipTO.java (original)
+++ syncope/trunk/common/src/main/java/org/apache/syncope/common/to/MembershipTO.java Mon Dec 16 11:04:52 2013
@@ -63,7 +63,7 @@ public class MembershipTO extends Abstra
     }
 
     @Override
-    public List<PropagationStatusTO> getPropagationStatusTOs() {
-        return Collections.<PropagationStatusTO>emptyList();
+    public List<PropagationStatus> getPropagationStatusTOs() {
+        return Collections.<PropagationStatus>emptyList();
     }
 }

Modified: syncope/trunk/common/src/main/java/org/apache/syncope/common/to/NotificationTO.java
URL: http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/to/NotificationTO.java?rev=1551172&r1=1551171&r2=1551172&view=diff
==============================================================================
--- syncope/trunk/common/src/main/java/org/apache/syncope/common/to/NotificationTO.java (original)
+++ syncope/trunk/common/src/main/java/org/apache/syncope/common/to/NotificationTO.java Mon Dec 16 11:04:52 2013
@@ -28,7 +28,6 @@ import javax.xml.bind.annotation.XmlRoot
 import javax.xml.bind.annotation.XmlType;
 
 import org.apache.syncope.common.AbstractBaseBean;
-import org.apache.syncope.common.search.NodeCond;
 import org.apache.syncope.common.types.IntMappingType;
 import org.apache.syncope.common.types.TraceLevel;
 
@@ -42,9 +41,9 @@ public class NotificationTO extends Abst
 
     private List<String> events = new ArrayList<String>();
 
-    private NodeCond about;
+    private String about;
 
-    private NodeCond recipients;
+    private String recipients;
 
     private IntMappingType recipientAttrType;
 
@@ -60,11 +59,11 @@ public class NotificationTO extends Abst
 
     private TraceLevel traceLevel;
 
-    public NodeCond getAbout() {
+    public String getAbout() {
         return about;
     }
 
-    public void setAbout(final NodeCond about) {
+    public void setAbout(final String about) {
         this.about = about;
     }
 
@@ -83,11 +82,11 @@ public class NotificationTO extends Abst
         this.id = id;
     }
 
-    public NodeCond getRecipients() {
+    public String getRecipients() {
         return recipients;
     }
 
-    public void setRecipients(NodeCond recipients) {
+    public void setRecipients(String recipients) {
         this.recipients = recipients;
     }
 

Copied: syncope/trunk/common/src/main/java/org/apache/syncope/common/to/PropagationStatus.java (from r1550061, syncope/trunk/common/src/main/java/org/apache/syncope/common/to/PropagationStatusTO.java)
URL: http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/to/PropagationStatus.java?p2=syncope/trunk/common/src/main/java/org/apache/syncope/common/to/PropagationStatus.java&p1=syncope/trunk/common/src/main/java/org/apache/syncope/common/to/PropagationStatusTO.java&r1=1550061&r2=1551172&rev=1551172&view=diff
==============================================================================
--- syncope/trunk/common/src/main/java/org/apache/syncope/common/to/PropagationStatusTO.java (original)
+++ syncope/trunk/common/src/main/java/org/apache/syncope/common/to/PropagationStatus.java Mon Dec 16 11:04:52 2013
@@ -22,6 +22,7 @@ import javax.xml.bind.annotation.XmlRoot
 import javax.xml.bind.annotation.XmlType;
 
 import org.apache.syncope.common.AbstractBaseBean;
+import org.apache.syncope.common.to.ConnObjectTO;
 import org.apache.syncope.common.types.PropagationTaskExecStatus;
 
 /**
@@ -29,7 +30,7 @@ import org.apache.syncope.common.types.P
  */
 @XmlRootElement(name = "propagationStatus")
 @XmlType
-public class PropagationStatusTO extends AbstractBaseBean {
+public class PropagationStatus extends AbstractBaseBean {
 
     /**
      * Serial version ID.

Modified: syncope/trunk/common/src/main/java/org/apache/syncope/common/to/WorkflowFormTO.java
URL: http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/to/WorkflowFormTO.java?rev=1551172&r1=1551171&r2=1551172&view=diff
==============================================================================
--- syncope/trunk/common/src/main/java/org/apache/syncope/common/to/WorkflowFormTO.java (original)
+++ syncope/trunk/common/src/main/java/org/apache/syncope/common/to/WorkflowFormTO.java Mon Dec 16 11:04:52 2013
@@ -32,6 +32,7 @@ import javax.xml.bind.annotation.XmlElem
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 import org.apache.syncope.common.AbstractBaseBean;
+import org.apache.syncope.common.to.WorkflowFormPropertyTO;
 
 @XmlRootElement(name = "workflowForm")
 @XmlType

Modified: syncope/trunk/common/src/main/java/org/apache/syncope/common/types/AuditLoggerName.java
URL: http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/types/AuditLoggerName.java?rev=1551172&r1=1551171&r2=1551172&view=diff
==============================================================================
--- syncope/trunk/common/src/main/java/org/apache/syncope/common/types/AuditLoggerName.java (original)
+++ syncope/trunk/common/src/main/java/org/apache/syncope/common/types/AuditLoggerName.java Mon Dec 16 11:04:52 2013
@@ -20,7 +20,6 @@ package org.apache.syncope.common.types;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import java.text.ParseException;
 import java.util.Map;
 import org.apache.commons.lang3.StringUtils;
@@ -39,7 +38,6 @@ public class AuditLoggerName extends Abs
 
     private final String subcategory;
 
-    @JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.PROPERTY, property = "@class")
     private final String event;
 
     private final Result result;
@@ -83,7 +81,7 @@ public class AuditLoggerName extends Abs
     public String toLoggerName() {
         return new StringBuilder().append(
                 LoggerType.AUDIT.getPrefix()).append('.').append(
-                LoggerEventUtils.buildEvent(type, category, subcategory, event, result)).toString();
+                        LoggerEventUtils.buildEvent(type, category, subcategory, event, result)).toString();
     }
 
     @SuppressWarnings("unchecked")

Modified: syncope/trunk/common/src/main/java/org/apache/syncope/common/types/ClientExceptionType.java
URL: http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/types/ClientExceptionType.java?rev=1551172&r1=1551171&r2=1551172&view=diff
==============================================================================
--- syncope/trunk/common/src/main/java/org/apache/syncope/common/types/ClientExceptionType.java (original)
+++ syncope/trunk/common/src/main/java/org/apache/syncope/common/types/ClientExceptionType.java Mon Dec 16 11:04:52 2013
@@ -37,7 +37,8 @@ public enum ClientExceptionType {
     InvalidReportExec(Response.Status.BAD_REQUEST),
     InvalidRoles(Response.Status.BAD_REQUEST),
     InvalidSchemaDefinition(Response.Status.BAD_REQUEST),
-    InvalidSearchCondition(Response.Status.BAD_REQUEST),
+    InvalidSearchExpression(Response.Status.BAD_REQUEST),
+    InvalidPageOrSize(Response.Status.BAD_REQUEST),
     InvalidPropagationTaskExecReport(Response.Status.BAD_REQUEST),
     InvalidUSchema(Response.Status.BAD_REQUEST),
     InvalidUDerSchema(Response.Status.BAD_REQUEST),

Modified: syncope/trunk/common/src/main/java/org/apache/syncope/common/util/AttributableOperations.java
URL: http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/util/AttributableOperations.java?rev=1551172&r1=1551171&r2=1551172&view=diff
==============================================================================
--- syncope/trunk/common/src/main/java/org/apache/syncope/common/util/AttributableOperations.java (original)
+++ syncope/trunk/common/src/main/java/org/apache/syncope/common/util/AttributableOperations.java Mon Dec 16 11:04:52 2013
@@ -84,7 +84,6 @@ public final class AttributableOperation
                 } else {
                     result.getAttrsToUpdate().add(mod);
                 }
-
             } else if (!updatedValues.equals(originalValues)) {
                 // avoid unwanted inputs
                 updatedValues.remove("");

Modified: syncope/trunk/common/src/main/java/org/apache/syncope/common/util/CollectionWrapper.java
URL: http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/util/CollectionWrapper.java?rev=1551172&r1=1551171&r2=1551172&view=diff
==============================================================================
--- syncope/trunk/common/src/main/java/org/apache/syncope/common/util/CollectionWrapper.java (original)
+++ syncope/trunk/common/src/main/java/org/apache/syncope/common/util/CollectionWrapper.java Mon Dec 16 11:04:52 2013
@@ -22,7 +22,7 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
-import org.apache.syncope.common.AbstractWrappable;
+import org.apache.syncope.common.wrap.AbstractWrappable;
 import org.apache.syncope.common.to.LoggerTO;
 import org.apache.syncope.common.types.AuditLoggerName;
 import org.apache.syncope.common.types.LoggerLevel;

Copied: syncope/trunk/common/src/main/java/org/apache/syncope/common/wrap/AbstractWrappable.java (from r1550061, syncope/trunk/common/src/main/java/org/apache/syncope/common/AbstractWrappable.java)
URL: http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/wrap/AbstractWrappable.java?p2=syncope/trunk/common/src/main/java/org/apache/syncope/common/wrap/AbstractWrappable.java&p1=syncope/trunk/common/src/main/java/org/apache/syncope/common/AbstractWrappable.java&r1=1550061&r2=1551172&rev=1551172&view=diff
==============================================================================
--- syncope/trunk/common/src/main/java/org/apache/syncope/common/AbstractWrappable.java (original)
+++ syncope/trunk/common/src/main/java/org/apache/syncope/common/wrap/AbstractWrappable.java Mon Dec 16 11:04:52 2013
@@ -16,7 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.syncope.common;
+package org.apache.syncope.common.wrap;
+
+import org.apache.syncope.common.AbstractBaseBean;
 
 public abstract class AbstractWrappable extends AbstractBaseBean {
 

Copied: syncope/trunk/common/src/main/java/org/apache/syncope/common/wrap/CorrelationRuleClass.java (from r1550061, syncope/trunk/common/src/main/java/org/apache/syncope/common/to/CorrelationRuleClassTO.java)
URL: http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/wrap/CorrelationRuleClass.java?p2=syncope/trunk/common/src/main/java/org/apache/syncope/common/wrap/CorrelationRuleClass.java&p1=syncope/trunk/common/src/main/java/org/apache/syncope/common/to/CorrelationRuleClassTO.java&r1=1550061&r2=1551172&rev=1551172&view=diff
==============================================================================
--- syncope/trunk/common/src/main/java/org/apache/syncope/common/to/CorrelationRuleClassTO.java (original)
+++ syncope/trunk/common/src/main/java/org/apache/syncope/common/wrap/CorrelationRuleClass.java Mon Dec 16 11:04:52 2013
@@ -16,15 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.syncope.common.to;
+package org.apache.syncope.common.wrap;
 
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
-import org.apache.syncope.common.AbstractWrappable;
 
 @XmlRootElement(name = "correlationRuleClass")
 @XmlType
-public class CorrelationRuleClassTO extends AbstractWrappable {
+public class CorrelationRuleClass extends AbstractWrappable {
 
     private static final long serialVersionUID = -6715106427060816725L;
 

Copied: syncope/trunk/common/src/main/java/org/apache/syncope/common/wrap/EntitlementTO.java (from r1550061, syncope/trunk/common/src/main/java/org/apache/syncope/common/to/EntitlementTO.java)
URL: http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/wrap/EntitlementTO.java?p2=syncope/trunk/common/src/main/java/org/apache/syncope/common/wrap/EntitlementTO.java&p1=syncope/trunk/common/src/main/java/org/apache/syncope/common/to/EntitlementTO.java&r1=1550061&r2=1551172&rev=1551172&view=diff
==============================================================================
--- syncope/trunk/common/src/main/java/org/apache/syncope/common/to/EntitlementTO.java (original)
+++ syncope/trunk/common/src/main/java/org/apache/syncope/common/wrap/EntitlementTO.java Mon Dec 16 11:04:52 2013
@@ -16,13 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.syncope.common.to;
+package org.apache.syncope.common.wrap;
 
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 
-import org.apache.syncope.common.AbstractWrappable;
-
 @XmlRootElement(name = "entitlement")
 @XmlType
 public class EntitlementTO extends AbstractWrappable {

Copied: syncope/trunk/common/src/main/java/org/apache/syncope/common/wrap/JobClass.java (from r1550061, syncope/trunk/common/src/main/java/org/apache/syncope/common/to/JobClassTO.java)
URL: http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/wrap/JobClass.java?p2=syncope/trunk/common/src/main/java/org/apache/syncope/common/wrap/JobClass.java&p1=syncope/trunk/common/src/main/java/org/apache/syncope/common/to/JobClassTO.java&r1=1550061&r2=1551172&rev=1551172&view=diff
==============================================================================
--- syncope/trunk/common/src/main/java/org/apache/syncope/common/to/JobClassTO.java (original)
+++ syncope/trunk/common/src/main/java/org/apache/syncope/common/wrap/JobClass.java Mon Dec 16 11:04:52 2013
@@ -16,16 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.syncope.common.to;
+package org.apache.syncope.common.wrap;
 
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 
-import org.apache.syncope.common.AbstractWrappable;
-
 @XmlRootElement(name = "jobClass")
 @XmlType
-public class JobClassTO extends AbstractWrappable {
+public class JobClass extends AbstractWrappable {
 
     private static final long serialVersionUID = -1953799905627918822L;
 

Copied: syncope/trunk/common/src/main/java/org/apache/syncope/common/wrap/MailTemplate.java (from r1550061, syncope/trunk/common/src/main/java/org/apache/syncope/common/to/MailTemplateTO.java)
URL: http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/wrap/MailTemplate.java?p2=syncope/trunk/common/src/main/java/org/apache/syncope/common/wrap/MailTemplate.java&p1=syncope/trunk/common/src/main/java/org/apache/syncope/common/to/MailTemplateTO.java&r1=1550061&r2=1551172&rev=1551172&view=diff
==============================================================================
--- syncope/trunk/common/src/main/java/org/apache/syncope/common/to/MailTemplateTO.java (original)
+++ syncope/trunk/common/src/main/java/org/apache/syncope/common/wrap/MailTemplate.java Mon Dec 16 11:04:52 2013
@@ -16,16 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.syncope.common.to;
+package org.apache.syncope.common.wrap;
 
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 
-import org.apache.syncope.common.AbstractWrappable;
-
 @XmlRootElement(name = "mailTemplate")
 @XmlType
-public class MailTemplateTO extends AbstractWrappable {
+public class MailTemplate extends AbstractWrappable {
 
     private static final long serialVersionUID = 7232619557172031478L;
 

Copied: syncope/trunk/common/src/main/java/org/apache/syncope/common/wrap/PropagationActionClass.java (from r1550061, syncope/trunk/common/src/main/java/org/apache/syncope/common/to/PropagationActionClassTO.java)
URL: http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/wrap/PropagationActionClass.java?p2=syncope/trunk/common/src/main/java/org/apache/syncope/common/wrap/PropagationActionClass.java&p1=syncope/trunk/common/src/main/java/org/apache/syncope/common/to/PropagationActionClassTO.java&r1=1550061&r2=1551172&rev=1551172&view=diff
==============================================================================
--- syncope/trunk/common/src/main/java/org/apache/syncope/common/to/PropagationActionClassTO.java (original)
+++ syncope/trunk/common/src/main/java/org/apache/syncope/common/wrap/PropagationActionClass.java Mon Dec 16 11:04:52 2013
@@ -16,16 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.syncope.common.to;
+package org.apache.syncope.common.wrap;
 
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 
-import org.apache.syncope.common.AbstractWrappable;
-
 @XmlRootElement(name = "propagationActionClass")
 @XmlType
-public class PropagationActionClassTO extends AbstractWrappable {
+public class PropagationActionClass extends AbstractWrappable {
 
     private static final long serialVersionUID = 2187654394121198308L;
 

Copied: syncope/trunk/common/src/main/java/org/apache/syncope/common/wrap/ReportletConfClass.java (from r1550061, syncope/trunk/common/src/main/java/org/apache/syncope/common/to/JobClassTO.java)
URL: http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/wrap/ReportletConfClass.java?p2=syncope/trunk/common/src/main/java/org/apache/syncope/common/wrap/ReportletConfClass.java&p1=syncope/trunk/common/src/main/java/org/apache/syncope/common/to/JobClassTO.java&r1=1550061&r2=1551172&rev=1551172&view=diff
==============================================================================
--- syncope/trunk/common/src/main/java/org/apache/syncope/common/to/JobClassTO.java (original)
+++ syncope/trunk/common/src/main/java/org/apache/syncope/common/wrap/ReportletConfClass.java Mon Dec 16 11:04:52 2013
@@ -16,17 +16,15 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.syncope.common.to;
+package org.apache.syncope.common.wrap;
 
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 
-import org.apache.syncope.common.AbstractWrappable;
-
-@XmlRootElement(name = "jobClass")
+@XmlRootElement(name = "reportletConfClass")
 @XmlType
-public class JobClassTO extends AbstractWrappable {
+public class ReportletConfClass extends AbstractWrappable {
 
-    private static final long serialVersionUID = -1953799905627918822L;
+    private static final long serialVersionUID = 1343357929074360450L;
 
 }

Copied: syncope/trunk/common/src/main/java/org/apache/syncope/common/wrap/ResourceName.java (from r1550061, syncope/trunk/common/src/main/java/org/apache/syncope/common/to/ResourceNameTO.java)
URL: http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/wrap/ResourceName.java?p2=syncope/trunk/common/src/main/java/org/apache/syncope/common/wrap/ResourceName.java&p1=syncope/trunk/common/src/main/java/org/apache/syncope/common/to/ResourceNameTO.java&r1=1550061&r2=1551172&rev=1551172&view=diff
==============================================================================
--- syncope/trunk/common/src/main/java/org/apache/syncope/common/to/ResourceNameTO.java (original)
+++ syncope/trunk/common/src/main/java/org/apache/syncope/common/wrap/ResourceName.java Mon Dec 16 11:04:52 2013
@@ -16,15 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.syncope.common.to;
+package org.apache.syncope.common.wrap;
 
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
-import org.apache.syncope.common.AbstractWrappable;
 
 @XmlRootElement(name = "resourceName")
 @XmlType
-public class ResourceNameTO extends AbstractWrappable {
+public class ResourceName extends AbstractWrappable {
 
     private static final long serialVersionUID = -175720097924079573L;
 

Copied: syncope/trunk/common/src/main/java/org/apache/syncope/common/wrap/SyncActionClass.java (from r1550061, syncope/trunk/common/src/main/java/org/apache/syncope/common/to/SyncActionClassTO.java)
URL: http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/wrap/SyncActionClass.java?p2=syncope/trunk/common/src/main/java/org/apache/syncope/common/wrap/SyncActionClass.java&p1=syncope/trunk/common/src/main/java/org/apache/syncope/common/to/SyncActionClassTO.java&r1=1550061&r2=1551172&rev=1551172&view=diff
==============================================================================
--- syncope/trunk/common/src/main/java/org/apache/syncope/common/to/SyncActionClassTO.java (original)
+++ syncope/trunk/common/src/main/java/org/apache/syncope/common/wrap/SyncActionClass.java Mon Dec 16 11:04:52 2013
@@ -16,15 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.syncope.common.to;
+package org.apache.syncope.common.wrap;
 
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 
-import org.apache.syncope.common.AbstractWrappable;
-
 @XmlRootElement(name = "syncActionClass")
 @XmlType
-public class SyncActionClassTO extends AbstractWrappable {
+public class SyncActionClass extends AbstractWrappable {
 
 }

Copied: syncope/trunk/common/src/main/java/org/apache/syncope/common/wrap/Validator.java (from r1550061, syncope/trunk/common/src/main/java/org/apache/syncope/common/to/ValidatorTO.java)
URL: http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/wrap/Validator.java?p2=syncope/trunk/common/src/main/java/org/apache/syncope/common/wrap/Validator.java&p1=syncope/trunk/common/src/main/java/org/apache/syncope/common/to/ValidatorTO.java&r1=1550061&r2=1551172&rev=1551172&view=diff
==============================================================================
--- syncope/trunk/common/src/main/java/org/apache/syncope/common/to/ValidatorTO.java (original)
+++ syncope/trunk/common/src/main/java/org/apache/syncope/common/wrap/Validator.java Mon Dec 16 11:04:52 2013
@@ -16,16 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.syncope.common.to;
+package org.apache.syncope.common.wrap;
 
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 
-import org.apache.syncope.common.AbstractWrappable;
-
 @XmlRootElement(name = "validator")
 @XmlType
-public class ValidatorTO extends AbstractWrappable {
+public class Validator extends AbstractWrappable {
 
     private static final long serialVersionUID = 7233619557177034453L;
 

Modified: syncope/trunk/common/src/test/java/org/apache/syncope/common/JSONTest.java
URL: http://svn.apache.org/viewvc/syncope/trunk/common/src/test/java/org/apache/syncope/common/JSONTest.java?rev=1551172&r1=1551171&r2=1551172&view=diff
==============================================================================
--- syncope/trunk/common/src/test/java/org/apache/syncope/common/JSONTest.java (original)
+++ syncope/trunk/common/src/test/java/org/apache/syncope/common/JSONTest.java Mon Dec 16 11:04:52 2013
@@ -20,7 +20,6 @@ package org.apache.syncope.common;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import java.io.IOException;
@@ -29,9 +28,6 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import org.apache.syncope.common.report.UserReportletConf;
-import org.apache.syncope.common.search.AttributeCond;
-import org.apache.syncope.common.search.MembershipCond;
-import org.apache.syncope.common.search.NodeCond;
 import org.apache.syncope.common.to.ConfigurationTO;
 import org.apache.syncope.common.to.ReportTO;
 import org.apache.syncope.common.to.WorkflowFormPropertyTO;
@@ -40,29 +36,6 @@ import org.junit.Test;
 public class JSONTest {
 
     @Test
-    public void searchCondition() throws IOException {
-        final AttributeCond usernameCond = new AttributeCond(AttributeCond.Type.LIKE);
-        usernameCond.setSchema("username");
-        usernameCond.setExpression("%o%");
-
-        final MembershipCond membershipCond = new MembershipCond();
-        membershipCond.setRoleName("root");
-
-        final NodeCond searchCondition = NodeCond.getAndCond(NodeCond.getLeafCond(usernameCond),
-                NodeCond.getLeafCond(membershipCond));
-
-        assertTrue(searchCondition.isValid());
-
-        ObjectMapper mapper = new ObjectMapper();
-
-        StringWriter writer = new StringWriter();
-        mapper.writeValue(writer, searchCondition);
-
-        NodeCond actual = mapper.readValue(writer.toString(), NodeCond.class);
-        assertEquals(searchCondition, actual);
-    }
-
-    @Test
     public void lists() throws IOException {
         List<ConfigurationTO> confList = new ArrayList<ConfigurationTO>();
         ConfigurationTO configuration = new ConfigurationTO();

Modified: syncope/trunk/console/pom.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/console/pom.xml?rev=1551172&r1=1551171&r2=1551172&view=diff
==============================================================================
--- syncope/trunk/console/pom.xml (original)
+++ syncope/trunk/console/pom.xml Mon Dec 16 11:04:52 2013
@@ -627,7 +627,7 @@ under the License.
               </execution>
             </executions>
           </plugin>
-
+          
           <plugin>
             <groupId>org.codehaus.cargo</groupId>
             <artifactId>cargo-maven2-plugin</artifactId>
@@ -651,7 +651,7 @@ under the License.
                 <phase>none</phase>
               </execution>
             </executions>
-          </plugin>        
+          </plugin>          
         </plugins>
       </build>
     </profile>

Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/SyncopeRequestCycleListener.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/SyncopeRequestCycleListener.java?rev=1551172&r1=1551171&r2=1551172&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/SyncopeRequestCycleListener.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/SyncopeRequestCycleListener.java Mon Dec 16 11:04:52 2013
@@ -21,7 +21,7 @@ package org.apache.syncope.console;
 import java.security.AccessControlException;
 import javax.ws.rs.BadRequestException;
 import javax.xml.ws.WebServiceException;
-import org.apache.syncope.common.validation.SyncopeClientException;
+import org.apache.syncope.common.SyncopeClientException;
 import org.apache.syncope.console.pages.ErrorPage;
 import org.apache.wicket.Page;
 import org.apache.wicket.authorization.UnauthorizedInstantiationException;

Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/commons/AttributableDataProvider.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/commons/AttributableDataProvider.java?rev=1551172&r1=1551171&r2=1551172&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/commons/AttributableDataProvider.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/commons/AttributableDataProvider.java Mon Dec 16 11:04:52 2013
@@ -21,8 +21,6 @@ package org.apache.syncope.console.commo
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
-import org.apache.syncope.common.search.NodeCond;
-import org.apache.syncope.common.services.InvalidSearchConditionException;
 import org.apache.syncope.common.to.AbstractAttributableTO;
 import org.apache.syncope.console.rest.AbstractAttributableRestClient;
 import org.apache.wicket.extensions.markup.html.repeater.data.sort.SortOrder;
@@ -40,7 +38,7 @@ public class AttributableDataProvider ex
 
     private final SortableAttributableProviderComparator comparator;
 
-    private NodeCond filter = null;
+    private String fiql = null;
 
     private final int paginatorRows;
 
@@ -63,8 +61,8 @@ public class AttributableDataProvider ex
         this.comparator = new SortableAttributableProviderComparator(this);
     }
 
-    public void setSearchCond(final NodeCond searchCond) {
-        this.filter = searchCond;
+    public void setFIQL(final String fiql) {
+        this.fiql = fiql;
     }
 
     @Override
@@ -72,14 +70,9 @@ public class AttributableDataProvider ex
         List<? extends AbstractAttributableTO> result;
 
         if (filtered) {
-            try {
-                result = filter == null
-                        ? Collections.<AbstractAttributableTO>emptyList()
-                        : restClient.search(filter, ((int) first / paginatorRows) + 1, paginatorRows);
-            } catch (InvalidSearchConditionException e) {
-                LOG.error(e.getMessage(), e);
-                result = Collections.<AbstractAttributableTO>emptyList();
-            }
+            result = fiql == null
+                    ? Collections.<AbstractAttributableTO>emptyList()
+                    : restClient.search(fiql, ((int) first / paginatorRows) + 1, paginatorRows);
         } else {
             result = restClient.list(((int) first / paginatorRows) + 1, paginatorRows);
         }
@@ -93,14 +86,9 @@ public class AttributableDataProvider ex
         long result;
 
         if (filtered) {
-            try {
-                result = filter == null
-                        ? 0
-                        : restClient.searchCount(filter);
-            } catch (InvalidSearchConditionException e) {
-                LOG.error(e.getMessage(), e);
-                result = 0;
-            }
+            result = fiql == null
+                    ? 0
+                    : restClient.searchCount(fiql);
         } else {
             result = restClient.count();
         }

Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/AbstractSchedTaskModalPage.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/AbstractSchedTaskModalPage.java?rev=1551172&r1=1551171&r2=1551172&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/AbstractSchedTaskModalPage.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/AbstractSchedTaskModalPage.java Mon Dec 16 11:04:52 2013
@@ -20,7 +20,7 @@ package org.apache.syncope.console.pages
 
 import org.apache.syncope.common.to.SchedTaskTO;
 import org.apache.syncope.common.to.SyncTaskTO;
-import org.apache.syncope.common.validation.SyncopeClientException;
+import org.apache.syncope.common.SyncopeClientException;
 import org.apache.syncope.console.commons.Constants;
 import org.apache.syncope.console.commons.DateFormatROModel;
 import org.apache.syncope.console.markup.html.CrontabContainer;

Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ApprovalModalPage.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ApprovalModalPage.java?rev=1551172&r1=1551171&r2=1551172&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ApprovalModalPage.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ApprovalModalPage.java Mon Dec 16 11:04:52 2013
@@ -29,7 +29,7 @@ import java.util.Map;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.syncope.common.to.WorkflowFormPropertyTO;
 import org.apache.syncope.common.to.WorkflowFormTO;
-import org.apache.syncope.common.validation.SyncopeClientException;
+import org.apache.syncope.common.SyncopeClientException;
 import org.apache.syncope.console.commons.Constants;
 import org.apache.syncope.console.commons.MapChoiceRenderer;
 import org.apache.syncope.console.markup.html.list.AltListView;

Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/BulkActionModalPage.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/BulkActionModalPage.java?rev=1551172&r1=1551171&r2=1551172&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/BulkActionModalPage.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/BulkActionModalPage.java Mon Dec 16 11:04:52 2013
@@ -24,8 +24,8 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
-import org.apache.syncope.common.to.BulkAction;
-import org.apache.syncope.common.to.BulkActionRes;
+import org.apache.syncope.common.reqres.BulkAction;
+import org.apache.syncope.common.reqres.BulkActionResult;
 import org.apache.syncope.console.rest.BaseRestClient;
 import org.apache.syncope.console.wicket.ajax.markup.html.ClearIndicatingAjaxButton;
 import org.apache.syncope.console.wicket.markup.html.form.ActionLink;
@@ -124,7 +124,7 @@ public class BulkActionModalPage<T, S> e
                 @Override
                 public void onClick(final AjaxRequestTarget target) {
                     try {
-                        final BulkActionRes res = (BulkActionRes) bulkActionExecutor.getClass().
+                        final BulkActionResult res = (BulkActionResult) bulkActionExecutor.getClass().
                                 getMethod("bulkAction", BulkAction.class).invoke(bulkActionExecutor, bulkAction);
 
                         setResponsePage(new BulkActionResultModalPage(window, items, columns, res, idFieldName));

Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/BulkActionResultModalPage.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/BulkActionResultModalPage.java?rev=1551172&r1=1551171&r2=1551172&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/BulkActionResultModalPage.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/BulkActionResultModalPage.java Mon Dec 16 11:04:52 2013
@@ -21,7 +21,7 @@ package org.apache.syncope.console.pages
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
-import org.apache.syncope.common.to.BulkActionRes;
+import org.apache.syncope.common.reqres.BulkActionResult;
 import org.apache.syncope.console.wicket.extensions.markup.html.repeater.data.table.ActionResultColumn;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.markup.html.AjaxLink;
@@ -47,7 +47,7 @@ public class BulkActionResultModalPage<T
             final ModalWindow window,
             final List<T> items,
             final List<IColumn<T, S>> columns,
-            final BulkActionRes results,
+            final BulkActionResult results,
             final String idFieldName) {
 
         super();

Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Configuration.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Configuration.java?rev=1551172&r1=1551171&r2=1551172&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Configuration.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Configuration.java Mon Dec 16 11:04:52 2013
@@ -34,7 +34,7 @@ import org.apache.syncope.common.to.Logg
 import org.apache.syncope.common.to.NotificationTO;
 import org.apache.syncope.common.types.PolicyType;
 import org.apache.syncope.common.types.LoggerLevel;
-import org.apache.syncope.common.validation.SyncopeClientException;
+import org.apache.syncope.common.SyncopeClientException;
 import org.apache.syncope.console.commons.Constants;
 import org.apache.syncope.console.commons.HttpResourceStream;
 import org.apache.syncope.console.commons.PreferenceManager;

Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ConfigurationModalPage.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ConfigurationModalPage.java?rev=1551172&r1=1551171&r2=1551172&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ConfigurationModalPage.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ConfigurationModalPage.java Mon Dec 16 11:04:52 2013
@@ -19,7 +19,7 @@
 package org.apache.syncope.console.pages;
 
 import org.apache.syncope.common.to.ConfigurationTO;
-import org.apache.syncope.common.validation.SyncopeClientException;
+import org.apache.syncope.common.SyncopeClientException;
 import org.apache.syncope.console.rest.ConfigurationRestClient;
 import org.apache.syncope.console.wicket.markup.html.form.AjaxTextFieldPanel;
 import org.apache.wicket.PageReference;

Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ConnectorModalPage.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ConnectorModalPage.java?rev=1551172&r1=1551171&r2=1551172&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ConnectorModalPage.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ConnectorModalPage.java Mon Dec 16 11:04:52 2013
@@ -33,7 +33,7 @@ import org.apache.syncope.common.to.Conn
 import org.apache.syncope.common.types.ConnConfPropSchema;
 import org.apache.syncope.common.types.ConnConfProperty;
 import org.apache.syncope.common.types.ConnectorCapability;
-import org.apache.syncope.common.validation.SyncopeClientException;
+import org.apache.syncope.common.SyncopeClientException;
 import org.apache.syncope.console.commons.Constants;
 import org.apache.syncope.console.markup.html.list.AltListView;
 import org.apache.syncope.console.rest.ConnectorRestClient;

Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/DerivedSchemaModalPage.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/DerivedSchemaModalPage.java?rev=1551172&r1=1551171&r2=1551172&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/DerivedSchemaModalPage.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/DerivedSchemaModalPage.java Mon Dec 16 11:04:52 2013
@@ -21,7 +21,7 @@ package org.apache.syncope.console.pages
 import org.apache.syncope.common.AbstractBaseBean;
 import org.apache.syncope.common.to.DerSchemaTO;
 import org.apache.syncope.common.types.AttributableType;
-import org.apache.syncope.common.validation.SyncopeClientException;
+import org.apache.syncope.common.SyncopeClientException;
 import org.apache.syncope.console.commons.Constants;
 import org.apache.syncope.console.commons.JexlHelpUtil;
 import org.apache.syncope.console.wicket.markup.html.form.AjaxTextFieldPanel;

Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/DisplayAttributesModalPage.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/DisplayAttributesModalPage.java?rev=1551172&r1=1551171&r2=1551172&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/DisplayAttributesModalPage.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/DisplayAttributesModalPage.java Mon Dec 16 11:04:52 2013
@@ -18,13 +18,10 @@
  */
 package org.apache.syncope.console.pages;
 
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import org.apache.commons.lang3.ArrayUtils;
+import org.apache.syncope.common.search.SearchableFields;
 import org.apache.syncope.common.to.UserTO;
 import org.apache.syncope.console.commons.Constants;
 import org.apache.syncope.console.commons.PreferenceManager;
@@ -50,7 +47,7 @@ import org.apache.wicket.spring.injectio
 /**
  * Modal window with Display attributes form.
  */
-@SuppressWarnings({"unchecked", "rawtypes"})
+@SuppressWarnings({ "unchecked", "rawtypes" })
 public class DisplayAttributesModalPage extends BaseModalPage {
 
     private static final long serialVersionUID = -4274117450918385110L;
@@ -60,11 +57,7 @@ public class DisplayAttributesModalPage 
      */
     private static final int MAX_SELECTIONS = 9;
 
-    private static final String[] ATTRIBUTES_TO_HIDE = {
-        "attrs", "derAttrs", "virAttrs", "memberships", "resources",
-        "serialVersionUID", "password", "propagationTOs"};
-
-    public static final String[] DEFAULT_SELECTION = {"id", "username", "status"};
+    public static final String[] DEFAULT_SELECTION = { "id", "username", "status" };
 
     @SpringBean
     private PreferenceManager prefMan;
@@ -88,23 +81,7 @@ public class DisplayAttributesModalPage 
 
             @Override
             protected List<String> load() {
-
-                final List<String> details = new ArrayList<String>();
-
-                Class<?> clazz = UserTO.class;
-
-                // loop on class and all superclasses searching for field
-                while (clazz != null && clazz != Object.class) {
-                    for (Field field : clazz.getDeclaredFields()) {
-                        if (!ArrayUtils.contains(ATTRIBUTES_TO_HIDE, field.getName())) {
-                            details.add(field.getName());
-                        }
-                    }
-                    clazz = clazz.getSuperclass();
-                }
-
-                Collections.reverse(details);
-                return details;
+                return SearchableFields.get(UserTO.class);
             }
         };
 
@@ -138,7 +115,6 @@ public class DisplayAttributesModalPage 
             }
         };
 
-
         final Form form = new Form(FORM);
         form.setModel(new CompoundPropertyModel(this));
 

Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Login.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Login.java?rev=1551172&r1=1551171&r2=1551172&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Login.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Login.java Mon Dec 16 11:04:52 2013
@@ -22,7 +22,7 @@ import java.security.AccessControlExcept
 import java.util.List;
 import java.util.Locale;
 import org.apache.syncope.common.services.EntitlementService;
-import org.apache.syncope.common.to.EntitlementTO;
+import org.apache.syncope.common.wrap.EntitlementTO;
 import org.apache.syncope.common.to.UserTO;
 import org.apache.syncope.common.util.CollectionWrapper;
 import org.apache.syncope.console.SyncopeSession;

Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/NotificationModalPage.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/NotificationModalPage.java?rev=1551172&r1=1551171&r2=1551172&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/NotificationModalPage.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/NotificationModalPage.java Mon Dec 16 11:04:52 2013
@@ -23,12 +23,11 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.EnumSet;
 import java.util.List;
-import org.apache.syncope.common.to.EventCategoryTO;
 import org.apache.syncope.common.to.NotificationTO;
 import org.apache.syncope.common.types.AttributableType;
 import org.apache.syncope.common.types.IntMappingType;
 import org.apache.syncope.common.types.TraceLevel;
-import org.apache.syncope.common.validation.SyncopeClientException;
+import org.apache.syncope.common.SyncopeClientException;
 import org.apache.syncope.console.commons.Constants;
 import org.apache.syncope.console.pages.panels.LoggerCategoryPanel;
 import org.apache.syncope.console.pages.panels.UserSearchPanel;
@@ -101,10 +100,10 @@ class NotificationModalPage extends Base
 
         final AjaxCheckBoxPanel checkAbout =
                 new AjaxCheckBoxPanel("checkAbout", "checkAbout",
-                new Model<Boolean>(notificationTO.getAbout() == null));
+                        new Model<Boolean>(notificationTO.getAbout() == null));
         aboutContainer.add(checkAbout);
 
-        final UserSearchPanel about = new UserSearchPanel.Builder("about").nodeCond(notificationTO.getAbout()).build();
+        final UserSearchPanel about = new UserSearchPanel.Builder("about").fiql(notificationTO.getAbout()).build();
         aboutContainer.add(about);
         about.setEnabled(!checkAbout.getModelObject());
 
@@ -125,7 +124,7 @@ class NotificationModalPage extends Base
                 new PropertyModel<IntMappingType>(notificationTO, "recipientAttrType"));
         recipientAttrType.setChoices(new ArrayList<IntMappingType>(
                 IntMappingType.getAttributeTypes(AttributableType.USER,
-                EnumSet.of(IntMappingType.UserId, IntMappingType.Password))));
+                        EnumSet.of(IntMappingType.UserId, IntMappingType.Password))));
         recipientAttrType.setRequired(true);
         form.add(recipientAttrType);
 
@@ -154,18 +153,18 @@ class NotificationModalPage extends Base
                 getPageReference(),
                 "Notification") {
 
-            private static final long serialVersionUID = 6429053774964787735L;
+                    private static final long serialVersionUID = 6429053774964787735L;
 
-            @Override
-            protected String[] getListRoles() {
-                return new String[] {};
-            }
+                    @Override
+                    protected String[] getListRoles() {
+                        return new String[] {};
+                    }
 
-            @Override
-            protected String[] getChangeRoles() {
-                return new String[] {};
-            }
-        });
+                    @Override
+                    protected String[] getChangeRoles() {
+                        return new String[] {};
+                    }
+                });
 
         final WebMarkupContainer recipientsContainer = new WebMarkupContainer("recipientsContainer");
         recipientsContainer.setOutputMarkupId(true);
@@ -182,12 +181,11 @@ class NotificationModalPage extends Base
 
         final AjaxCheckBoxPanel checkRecipients =
                 new AjaxCheckBoxPanel("checkRecipients", "checkRecipients",
-                new Model<Boolean>(notificationTO.getRecipients() == null ? false : true));
+                        new Model<Boolean>(notificationTO.getRecipients() == null ? false : true));
         recipientsContainer.add(checkRecipients);
 
         final UserSearchPanel recipients =
-                new UserSearchPanel.Builder("recipients")
-                .nodeCond(notificationTO.getRecipients() == null ? null : notificationTO.getRecipients()).build();
+                new UserSearchPanel.Builder("recipients").fiql(notificationTO.getRecipients()).build();
         recipientsContainer.add(recipients);
         recipients.setEnabled(checkRecipients.getModelObject());
 
@@ -229,8 +227,8 @@ class NotificationModalPage extends Base
 
             @Override
             protected void onSubmit(final AjaxRequestTarget target, final Form<?> form) {
-                notificationTO.setAbout(checkAbout.getModelObject() ? null : about.buildSearchCond());
-                notificationTO.setRecipients(checkRecipients.getModelObject() ? recipients.buildSearchCond() : null);
+                notificationTO.setAbout(checkAbout.getModelObject() ? null : about.buildFIQL());
+                notificationTO.setRecipients(checkRecipients.getModelObject() ? recipients.buildFIQL() : null);
 
                 try {
                     if (createFlag) {
@@ -252,7 +250,6 @@ class NotificationModalPage extends Base
 
             @Override
             protected void onError(final AjaxRequestTarget target, final Form<?> form) {
-
                 target.add(feedbackPanel);
             }
         };
@@ -312,10 +309,4 @@ class NotificationModalPage extends Base
 
         return result;
     }
-
-    private EventCategoryTO getEventCategoryTO(final List<String> events) {
-        final EventCategoryTO res = new EventCategoryTO();
-
-        return res;
-    }
 }

Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ProvisioningModalPage.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ProvisioningModalPage.java?rev=1551172&r1=1551171&r2=1551172&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ProvisioningModalPage.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ProvisioningModalPage.java Mon Dec 16 11:04:52 2013
@@ -22,12 +22,10 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.List;
-import org.apache.syncope.common.search.NodeCond;
-import org.apache.syncope.common.search.ResourceCond;
-import org.apache.syncope.common.services.InvalidSearchConditionException;
+import org.apache.syncope.client.SyncopeClient;
 import org.apache.syncope.common.to.AbstractAttributableTO;
-import org.apache.syncope.common.to.BulkActionRes;
-import org.apache.syncope.common.to.BulkAssociationAction;
+import org.apache.syncope.common.reqres.BulkActionResult;
+import org.apache.syncope.common.reqres.BulkAssociationAction;
 import org.apache.syncope.common.to.ResourceTO;
 import org.apache.syncope.common.to.RoleTO;
 import org.apache.syncope.common.to.UserTO;
@@ -53,7 +51,7 @@ import org.apache.wicket.model.StringRes
 
 public class ProvisioningModalPage<T extends AbstractAttributableTO> extends AbstractStatusModalPage {
 
-    private static final long serialVersionUID = 4114026480146090961L;
+    private static final long serialVersionUID = -4285220460543213901L;
 
     private final ResourceTO resourceTO;
 
@@ -188,19 +186,13 @@ public class ProvisioningModalPage<T ext
         @SuppressWarnings("unchecked")
         @Override
         public List<StatusBean> getStatusBeans() {
-            final ResourceCond res = new ResourceCond();
-            res.setResourceName(resourceTO.getName());
+            final String fiql = SyncopeClient.getSearchConditionBuilder().hasResources(resourceTO.getName()).query();
 
             final List<T> attributables = new ArrayList<T>();
-
-            try {
-                if (UserTO.class.isAssignableFrom(typeRef)) {
-                    attributables.addAll((List<T>) userRestClient.search(NodeCond.getLeafCond(res), 0, rowsPerPage));
-                } else {
-                    attributables.addAll((List<T>) roleRestClient.search(NodeCond.getLeafCond(res), 0, rowsPerPage));
-                }
-            } catch (InvalidSearchConditionException e) {
-                LOG.warn("Invalid serach condition {}", res, e);
+            if (UserTO.class.isAssignableFrom(typeRef)) {
+                attributables.addAll((List<T>) userRestClient.search(fiql, 0, rowsPerPage));
+            } else {
+                attributables.addAll((List<T>) roleRestClient.search(fiql, 0, rowsPerPage));
             }
 
             final List<ConnObjectWrapper> connObjects = statusUtils.getConnectorObjects(
@@ -243,7 +235,7 @@ public class ProvisioningModalPage<T ext
         if (beans.isEmpty()) {
             window.close(target);
         } else {
-            final BulkActionRes res = resourceRestClient.bulkAssociationAction(
+            final BulkActionResult res = resourceRestClient.bulkAssociationAction(
                     resourceTO.getName(), bulkAction, typeRef);
 
             ((BasePage) pageRef.getPage()).setModalResult(true);

Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ReportModalPage.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ReportModalPage.java?rev=1551172&r1=1551171&r2=1551172&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ReportModalPage.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ReportModalPage.java Mon Dec 16 11:04:52 2013
@@ -28,7 +28,7 @@ import org.apache.syncope.common.to.Repo
 import org.apache.syncope.common.to.ReportTO;
 import org.apache.syncope.common.types.ReportExecExportFormat;
 import org.apache.syncope.common.types.ReportExecStatus;
-import org.apache.syncope.common.validation.SyncopeClientException;
+import org.apache.syncope.common.SyncopeClientException;
 import org.apache.syncope.console.commons.Constants;
 import org.apache.syncope.console.commons.DateFormatROModel;
 import org.apache.syncope.console.commons.HttpResourceStream;

Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ReportletConfModalPage.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ReportletConfModalPage.java?rev=1551172&r1=1551171&r2=1551172&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ReportletConfModalPage.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ReportletConfModalPage.java Mon Dec 16 11:04:52 2013
@@ -30,7 +30,6 @@ import org.apache.commons.lang3.ArrayUti
 import org.apache.syncope.common.SyncopeConstants;
 import org.apache.syncope.common.annotation.FormAttributeField;
 import org.apache.syncope.common.report.AbstractReportletConf;
-import org.apache.syncope.common.search.NodeCond;
 import org.apache.syncope.common.types.AttributableType;
 import org.apache.syncope.console.commons.Constants;
 import org.apache.syncope.console.pages.panels.UserSearchPanel;
@@ -166,7 +165,7 @@ public class ReportletConfModalPage exte
                     if (component instanceof UserSearchPanel) {
                         // using component.getDefaultModelObjectAsString() to fetch field name (set above)
                         wrapper.setPropertyValue(component.getDefaultModelObjectAsString(),
-                                ((UserSearchPanel) component).buildSearchCond());
+                                ((UserSearchPanel) component).buildFIQL());
                     }
                 }
 
@@ -267,9 +266,9 @@ public class ReportletConfModalPage exte
 
                 Panel panel;
 
-                if (NodeCond.class.equals(field.getType())) {
+                if (String.class.equals(field.getType())) {
                     panel = new UserSearchPanel.Builder("value")
-                            .nodeCond((NodeCond) wrapper.getPropertyValue(fieldName)).required(false).build();
+                            .fiql((String) wrapper.getPropertyValue(fieldName)).required(false).build();
                     // This is needed in order to manually update this.reportletConf with search panel selections
                     panel.setDefaultModel(new Model<String>(fieldName));
                 } else if (List.class.equals(field.getType())) {

Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Reports.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Reports.java?rev=1551172&r1=1551171&r2=1551172&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Reports.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Reports.java Mon Dec 16 11:04:52 2013
@@ -28,7 +28,7 @@ import org.apache.syncope.common.to.Repo
 import org.apache.syncope.common.types.AuditElements.Result;
 import org.apache.syncope.common.types.AuditLoggerName;
 import org.apache.syncope.common.util.LoggerEventUtils;
-import org.apache.syncope.common.validation.SyncopeClientException;
+import org.apache.syncope.common.SyncopeClientException;
 import org.apache.syncope.console.commons.Constants;
 import org.apache.syncope.console.commons.PreferenceManager;
 import org.apache.syncope.console.commons.SortableDataProviderComparator;

Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Resources.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Resources.java?rev=1551172&r1=1551171&r2=1551172&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Resources.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Resources.java Mon Dec 16 11:04:52 2013
@@ -27,7 +27,7 @@ import org.apache.syncope.common.to.Conn
 import org.apache.syncope.common.to.ResourceTO;
 import org.apache.syncope.common.to.RoleTO;
 import org.apache.syncope.common.to.UserTO;
-import org.apache.syncope.common.validation.SyncopeClientException;
+import org.apache.syncope.common.SyncopeClientException;
 import org.apache.syncope.console.commons.Constants;
 import org.apache.syncope.console.commons.PreferenceManager;
 import org.apache.syncope.console.commons.SortableDataProviderComparator;

Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ResultStatusModalPage.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ResultStatusModalPage.java?rev=1551172&r1=1551171&r2=1551172&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ResultStatusModalPage.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ResultStatusModalPage.java Mon Dec 16 11:04:52 2013
@@ -29,7 +29,7 @@ import org.apache.commons.lang3.StringUt
 import org.apache.syncope.common.to.AbstractAttributableTO;
 import org.apache.syncope.common.to.AttributeTO;
 import org.apache.syncope.common.to.ConnObjectTO;
-import org.apache.syncope.common.to.PropagationStatusTO;
+import org.apache.syncope.common.to.PropagationStatus;
 import org.apache.syncope.common.to.RoleTO;
 import org.apache.syncope.common.to.UserTO;
 import org.apache.syncope.common.types.PropagationTaskExecStatus;
@@ -125,11 +125,11 @@ public class ResultStatusModalPage exten
 
         if (mode == UserModalPage.Mode.ADMIN) {
             // add Syncope propagation status
-            PropagationStatusTO syncope = new PropagationStatusTO();
+            PropagationStatus syncope = new PropagationStatus();
             syncope.setResource("Syncope");
             syncope.setStatus(PropagationTaskExecStatus.SUCCESS);
 
-            List<PropagationStatusTO> propagations = new ArrayList<PropagationStatusTO>();
+            List<PropagationStatus> propagations = new ArrayList<PropagationStatus>();
             propagations.add(syncope);
             propagations.addAll(attributable.getPropagationStatusTOs());
 
@@ -140,14 +140,14 @@ public class ResultStatusModalPage exten
                     ? ((RoleTO) attributable).getName()
                     : String.valueOf(attributable.getId())));
 
-            final ListView<PropagationStatusTO> propRes = new ListView<PropagationStatusTO>("resources",
+            final ListView<PropagationStatus> propRes = new ListView<PropagationStatus>("resources",
                     propagations) {
 
                         private static final long serialVersionUID = -1020475259727720708L;
 
                         @Override
-                        protected void populateItem(final ListItem<PropagationStatusTO> item) {
-                            final PropagationStatusTO propTO = (PropagationStatusTO) item.getDefaultModelObject();
+                        protected void populateItem(final ListItem<PropagationStatus> item) {
+                            final PropagationStatus propTO = (PropagationStatus) item.getDefaultModelObject();
 
                             final ListView attributes = getConnObjectView(propTO);
 
@@ -260,7 +260,7 @@ public class ResultStatusModalPage exten
      * @param propTO propagation TO.
      * @return list view.
      */
-    private ListView getConnObjectView(final PropagationStatusTO propTO) {
+    private ListView getConnObjectView(final PropagationStatus propTO) {
         final ConnObjectTO before = propTO.getBeforeObj();
         final ConnObjectTO after = propTO.getAfterObj();
 

Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Roles.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Roles.java?rev=1551172&r1=1551171&r2=1551172&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Roles.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Roles.java Mon Dec 16 11:04:52 2013
@@ -18,7 +18,6 @@
  */
 package org.apache.syncope.console.pages;
 
-import org.apache.syncope.common.search.NodeCond;
 import org.apache.syncope.console.commons.Constants;
 import org.apache.syncope.console.pages.panels.AbstractSearchResultPanel;
 import org.apache.syncope.console.pages.panels.RoleSearchPanel;
@@ -110,10 +109,10 @@ public class Roles extends BasePage {
 
             @Override
             protected void onSubmitInternal(final AjaxRequestTarget target, final Form<?> form) {
-                final NodeCond searchCond = searchPanel.buildSearchCond();
-                LOG.debug("Node condition {}", searchCond);
+                final String fiql = searchPanel.buildFIQL();
+                LOG.debug("Node condition {}", fiql);
 
-                doSearch(target, searchCond, searchResult);
+                doSearch(target, fiql, searchResult);
 
                 Session.get().getFeedbackMessages().clear();
                 target.add(searchPanel.getSearchFeedback());
@@ -126,15 +125,15 @@ public class Roles extends BasePage {
         });
     }
 
-    private void doSearch(final AjaxRequestTarget target, final NodeCond searchCond,
+    private void doSearch(final AjaxRequestTarget target, final String fiql,
             final AbstractSearchResultPanel resultsetPanel) {
 
-        if (searchCond == null || !searchCond.isValid()) {
+        if (fiql == null) {
             error(getString(Constants.SEARCH_ERROR));
             return;
         }
 
-        resultsetPanel.search(searchCond, target);
+        resultsetPanel.search(fiql, target);
     }
 
     @Override

Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/SchemaModalPage.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/SchemaModalPage.java?rev=1551172&r1=1551171&r2=1551172&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/SchemaModalPage.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/SchemaModalPage.java Mon Dec 16 11:04:52 2013
@@ -30,7 +30,7 @@ import org.apache.syncope.common.Syncope
 import org.apache.syncope.common.to.SchemaTO;
 import org.apache.syncope.common.types.AttributableType;
 import org.apache.syncope.common.types.AttributeSchemaType;
-import org.apache.syncope.common.validation.SyncopeClientException;
+import org.apache.syncope.common.SyncopeClientException;
 import org.apache.syncope.console.commons.Constants;
 import org.apache.syncope.console.commons.JexlHelpUtil;
 import org.apache.syncope.console.wicket.markup.html.form.AjaxCheckBoxPanel;

Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/TaskModalPage.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/TaskModalPage.java?rev=1551172&r1=1551171&r2=1551172&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/TaskModalPage.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/TaskModalPage.java Mon Dec 16 11:04:52 2013
@@ -28,7 +28,7 @@ import org.apache.syncope.common.to.Sche
 import org.apache.syncope.common.to.SyncTaskTO;
 import org.apache.syncope.common.to.TaskExecTO;
 import org.apache.syncope.common.to.AbstractTaskTO;
-import org.apache.syncope.common.validation.SyncopeClientException;
+import org.apache.syncope.common.SyncopeClientException;
 import org.apache.syncope.console.commons.Constants;
 import org.apache.syncope.console.commons.SortableDataProviderComparator;
 import org.apache.syncope.console.wicket.extensions.markup.html.repeater.data.table.ActionColumn;

Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Todo.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Todo.java?rev=1551172&r1=1551171&r2=1551172&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Todo.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Todo.java Mon Dec 16 11:04:52 2013
@@ -23,7 +23,7 @@ import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 import org.apache.syncope.common.to.WorkflowFormTO;
-import org.apache.syncope.common.validation.SyncopeClientException;
+import org.apache.syncope.common.SyncopeClientException;
 import org.apache.syncope.console.SyncopeSession;
 import org.apache.syncope.console.commons.Constants;
 import org.apache.syncope.console.commons.PreferenceManager;

Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/UserOwnerSelectModalPage.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/UserOwnerSelectModalPage.java?rev=1551172&r1=1551171&r2=1551172&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/UserOwnerSelectModalPage.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/UserOwnerSelectModalPage.java Mon Dec 16 11:04:52 2013
@@ -18,7 +18,6 @@
  */
 package org.apache.syncope.console.pages;
 
-import org.apache.syncope.common.search.NodeCond;
 import org.apache.syncope.console.commons.Constants;
 import org.apache.syncope.console.pages.panels.AbstractSearchResultPanel;
 import org.apache.syncope.console.pages.panels.SelectOnlyUserSearchResultPanel;
@@ -54,7 +53,7 @@ public class UserOwnerSelectModalPage ex
 
             @Override
             protected void onSubmit(final AjaxRequestTarget target, final Form<?> form) {
-                final NodeCond searchCond = searchPanel.buildSearchCond();
+                final String searchCond = searchPanel.buildFIQL();
                 doSearch(target, searchCond, searchResult);
 
                 Session.get().getFeedbackMessages().clear();
@@ -69,14 +68,14 @@ public class UserOwnerSelectModalPage ex
 
     }
 
-    private void doSearch(final AjaxRequestTarget target, final NodeCond searchCond,
+    private void doSearch(final AjaxRequestTarget target, final String fiql,
             final AbstractSearchResultPanel resultsetPanel) {
 
-        if (searchCond == null || !searchCond.isValid()) {
+        if (fiql == null) {
             error(getString(Constants.SEARCH_ERROR));
             return;
         }
 
-        resultsetPanel.search(searchCond, target);
+        resultsetPanel.search(fiql, target);
     }
 }



Mime
View raw message