You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2013/07/23 16:54:07 UTC
svn commit: r1506085 - in /syncope/trunk: ./
common/src/main/java/org/apache/syncope/common/services/
common/src/main/java/org/apache/syncope/common/to/
console/src/main/java/org/apache/syncope/console/pages/
console/src/main/java/org/apache/syncope/co...
Author: ilgrosso
Date: Tue Jul 23 14:54:06 2013
New Revision: 1506085
URL: http://svn.apache.org/r1506085
Log:
Some additional cleanup in preparation for JSON to work (hopefully)
Added:
syncope/trunk/common/src/main/java/org/apache/syncope/common/to/AbstractPolicyTO.java
- copied, changed from r1505996, syncope/trunk/common/src/main/java/org/apache/syncope/common/to/PolicyTO.java
syncope/trunk/common/src/main/java/org/apache/syncope/common/to/AbstractTaskTO.java
- copied, changed from r1505996, syncope/trunk/common/src/main/java/org/apache/syncope/common/to/TaskTO.java
Removed:
syncope/trunk/common/src/main/java/org/apache/syncope/common/to/PolicyTO.java
syncope/trunk/common/src/main/java/org/apache/syncope/common/to/TaskTO.java
Modified:
syncope/trunk/common/src/main/java/org/apache/syncope/common/services/PolicyService.java
syncope/trunk/common/src/main/java/org/apache/syncope/common/services/TaskService.java
syncope/trunk/common/src/main/java/org/apache/syncope/common/to/AbstractSchemaTO.java
syncope/trunk/common/src/main/java/org/apache/syncope/common/to/AccountPolicyTO.java
syncope/trunk/common/src/main/java/org/apache/syncope/common/to/NotificationTaskTO.java
syncope/trunk/common/src/main/java/org/apache/syncope/common/to/PasswordPolicyTO.java
syncope/trunk/common/src/main/java/org/apache/syncope/common/to/PropagationTaskTO.java
syncope/trunk/common/src/main/java/org/apache/syncope/common/to/SchedTaskTO.java
syncope/trunk/common/src/main/java/org/apache/syncope/common/to/SyncPolicyTO.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/NotificationTaskModalPage.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/PolicyModalPage.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/PropagationTaskModalPage.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/TaskModalPage.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Tasks.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/NotificationTasks.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/PoliciesPanel.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/PropagationTasks.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/ResourceSecurityPanel.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/RoleSecurityPanel.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/SchedTasks.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/SyncTasks.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/rest/PolicyRestClient.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/rest/TaskRestClient.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/PolicyController.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/TaskController.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/data/PolicyDataBinder.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/data/TaskDataBinder.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/services/PolicyServiceImpl.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/services/TaskServiceImpl.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/util/TaskUtil.java
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/AbstractTest.java
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/TaskTestITCase.java
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/UserTestITCase.java
syncope/trunk/pom.xml
Modified: syncope/trunk/common/src/main/java/org/apache/syncope/common/services/PolicyService.java
URL: http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/services/PolicyService.java?rev=1506085&r1=1506084&r2=1506085&view=diff
==============================================================================
--- syncope/trunk/common/src/main/java/org/apache/syncope/common/services/PolicyService.java (original)
+++ syncope/trunk/common/src/main/java/org/apache/syncope/common/services/PolicyService.java Tue Jul 23 14:54:06 2013
@@ -28,7 +28,7 @@ import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
import javax.ws.rs.core.Response;
import org.apache.syncope.common.to.CorrelationRuleClassTO;
-import org.apache.syncope.common.to.PolicyTO;
+import org.apache.syncope.common.to.AbstractPolicyTO;
import org.apache.syncope.common.types.PolicyType;
@Path("policies/{type}")
@@ -42,7 +42,7 @@ public interface PolicyService {
* @return Response containing URI location for created resource
*/
@POST
- <T extends PolicyTO> Response create(@PathParam("type") PolicyType type, T policyTO);
+ <T extends AbstractPolicyTO> Response create(@PathParam("type") PolicyType type, T policyTO);
/**
* @param type Deletes policy with given type
@@ -52,7 +52,7 @@ public interface PolicyService {
*/
@DELETE
@Path("{policyId}")
- <T extends PolicyTO> void delete(@PathParam("type") PolicyType type, @PathParam("policyId") Long policyId);
+ <T extends AbstractPolicyTO> void delete(@PathParam("type") PolicyType type, @PathParam("policyId") Long policyId);
/**
* @param type Type selector for requested policies
@@ -61,7 +61,7 @@ public interface PolicyService {
* @return List of policies with matching type.
*/
@GET
- <T extends PolicyTO> List<T> list(@PathParam("type") PolicyType type);
+ <T extends AbstractPolicyTO> List<T> list(@PathParam("type") PolicyType type);
/**
* @param type Request for policy with given type
@@ -72,7 +72,7 @@ public interface PolicyService {
*/
@GET
@Path("{policyId}")
- <T extends PolicyTO> T read(@PathParam("type") PolicyType type, @PathParam("policyId") Long policyId);
+ <T extends AbstractPolicyTO> T read(@PathParam("type") PolicyType type, @PathParam("policyId") Long policyId);
/**
* @param type PolicyType to read global policy from
@@ -82,7 +82,7 @@ public interface PolicyService {
*/
@GET
@Path("0")
- <T extends PolicyTO> T readGlobal(@PathParam("type") PolicyType type);
+ <T extends AbstractPolicyTO> T readGlobal(@PathParam("type") PolicyType type);
/**
* @param type PolicyType to be updated.
@@ -93,7 +93,7 @@ public interface PolicyService {
*/
@PUT
@Path("{policyId}")
- <T extends PolicyTO> void update(@PathParam("type") PolicyType type, @PathParam("policyId") Long policyId,
+ <T extends AbstractPolicyTO> void update(@PathParam("type") PolicyType type, @PathParam("policyId") Long policyId,
T policyTO);
/**
Modified: syncope/trunk/common/src/main/java/org/apache/syncope/common/services/TaskService.java
URL: http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/services/TaskService.java?rev=1506085&r1=1506084&r2=1506085&view=diff
==============================================================================
--- syncope/trunk/common/src/main/java/org/apache/syncope/common/services/TaskService.java (original)
+++ syncope/trunk/common/src/main/java/org/apache/syncope/common/services/TaskService.java Tue Jul 23 14:54:06 2013
@@ -37,7 +37,7 @@ import org.apache.syncope.common.to.JobC
import org.apache.syncope.common.to.ReportExecTO;
import org.apache.syncope.common.to.SyncActionClassTO;
import org.apache.syncope.common.to.TaskExecTO;
-import org.apache.syncope.common.to.TaskTO;
+import org.apache.syncope.common.to.AbstractTaskTO;
import org.apache.syncope.common.types.TaskType;
@Path("tasks")
@@ -56,7 +56,7 @@ public interface TaskService {
* @return Response containing URI location for created resource
*/
@POST
- Response create(TaskTO taskTO);
+ Response create(AbstractTaskTO taskTO);
/**
* @param taskId Id of task to be deleted
@@ -102,7 +102,7 @@ public interface TaskService {
@GET
@Path("{type}/list")
// TODO '/list' path will be removed once CXF/JAX-B bug is solved
- <T extends TaskTO> List<T> list(@PathParam("type") TaskType taskType);
+ <T extends AbstractTaskTO> List<T> list(@PathParam("type") TaskType taskType);
/**
* @param taskType Type of tasks to be listed
@@ -112,7 +112,7 @@ public interface TaskService {
*/
@GET
@Path("{type}")
- <T extends TaskTO> List<T> list(@PathParam("type") TaskType taskType, @QueryParam("page") int page,
+ <T extends AbstractTaskTO> List<T> list(@PathParam("type") TaskType taskType, @QueryParam("page") int page,
@QueryParam("size") @DefaultValue("25") int size);
/**
@@ -123,7 +123,7 @@ public interface TaskService {
@GET
@Path("{type}/{taskId}")
// TODO TaskType can be removed once CXF migration is done
- <T extends TaskTO> T read(@PathParam("type") TaskType taskType, @PathParam("taskId") Long taskId);
+ <T extends AbstractTaskTO> T read(@PathParam("type") TaskType taskType, @PathParam("taskId") Long taskId);
/**
* @param executionId Id if task execution to be read
@@ -147,7 +147,7 @@ public interface TaskService {
*/
@PUT
@Path("{taskId}")
- void update(@PathParam("taskId") Long taskId, TaskTO taskTO);
+ void update(@PathParam("taskId") Long taskId, AbstractTaskTO taskTO);
@POST
@Path("bulk")
Copied: syncope/trunk/common/src/main/java/org/apache/syncope/common/to/AbstractPolicyTO.java (from r1505996, syncope/trunk/common/src/main/java/org/apache/syncope/common/to/PolicyTO.java)
URL: http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/to/AbstractPolicyTO.java?p2=syncope/trunk/common/src/main/java/org/apache/syncope/common/to/AbstractPolicyTO.java&p1=syncope/trunk/common/src/main/java/org/apache/syncope/common/to/PolicyTO.java&r1=1505996&r2=1506085&rev=1506085&view=diff
==============================================================================
--- syncope/trunk/common/src/main/java/org/apache/syncope/common/to/PolicyTO.java (original)
+++ syncope/trunk/common/src/main/java/org/apache/syncope/common/to/AbstractPolicyTO.java Tue Jul 23 14:54:06 2013
@@ -18,6 +18,9 @@
*/
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,8 +31,8 @@ import org.apache.syncope.common.types.P
@XmlRootElement(name = "policy")
@XmlType
@XmlSeeAlso({AccountPolicyTO.class, PasswordPolicyTO.class, SyncPolicyTO.class})
-//@JsonTypeInfo(use=Id.CLASS, include=As.PROPERTY, property="class")
-public abstract class PolicyTO extends AbstractBaseBean {
+@JsonTypeInfo(use = Id.CLASS, include = As.PROPERTY, property = "@class")
+public abstract class AbstractPolicyTO extends AbstractBaseBean {
private static final long serialVersionUID = -2903888572649721035L;
@@ -51,7 +54,7 @@ public abstract class PolicyTO extends A
return description;
}
- public void setDescription(String description) {
+ public void setDescription(final String description) {
this.description = description;
}
@@ -59,7 +62,7 @@ public abstract class PolicyTO extends A
return type;
}
- public void setType(PolicyType type) {
+ public void setType(final PolicyType type) {
this.type = type;
}
}
Modified: syncope/trunk/common/src/main/java/org/apache/syncope/common/to/AbstractSchemaTO.java
URL: http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/to/AbstractSchemaTO.java?rev=1506085&r1=1506084&r2=1506085&view=diff
==============================================================================
--- syncope/trunk/common/src/main/java/org/apache/syncope/common/to/AbstractSchemaTO.java (original)
+++ syncope/trunk/common/src/main/java/org/apache/syncope/common/to/AbstractSchemaTO.java Tue Jul 23 14:54:06 2013
@@ -18,6 +18,7 @@
*/
package org.apache.syncope.common.to;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlSeeAlso;
import javax.xml.bind.annotation.XmlType;
@@ -27,6 +28,7 @@ import org.apache.syncope.common.Abstrac
@XmlRootElement(name = "abstractSchema")
@XmlType
@XmlSeeAlso({SchemaTO.class, DerSchemaTO.class, VirSchemaTO.class})
+@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.PROPERTY, property = "@class")
public abstract class AbstractSchemaTO extends AbstractBaseBean {
private static final long serialVersionUID = 4088388951694301759L;
Copied: syncope/trunk/common/src/main/java/org/apache/syncope/common/to/AbstractTaskTO.java (from r1505996, syncope/trunk/common/src/main/java/org/apache/syncope/common/to/TaskTO.java)
URL: http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/to/AbstractTaskTO.java?p2=syncope/trunk/common/src/main/java/org/apache/syncope/common/to/AbstractTaskTO.java&p1=syncope/trunk/common/src/main/java/org/apache/syncope/common/to/TaskTO.java&r1=1505996&r2=1506085&rev=1506085&view=diff
==============================================================================
--- syncope/trunk/common/src/main/java/org/apache/syncope/common/to/TaskTO.java (original)
+++ syncope/trunk/common/src/main/java/org/apache/syncope/common/to/AbstractTaskTO.java Tue Jul 23 14:54:06 2013
@@ -18,6 +18,9 @@
*/
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 java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -32,19 +35,9 @@ import org.apache.syncope.common.Abstrac
@XmlRootElement(name = "task")
@XmlType
-@XmlSeeAlso({ SyncTaskTO.class, NotificationTaskTO.class, SyncTaskTO.class,
- SchedTaskTO.class, PropagationTaskTO.class })
-
-/* This will help CXF marshalling but is incompatible with spring services
-@JsonTypeInfo(use=Id.NAME, include=As.PROPERTY, property="type")
-@JsonSubTypes({
- @JsonSubTypes.Type(value=NotificationTaskTO.class, name="notificationTask"),
- @JsonSubTypes.Type(value=PropagationTaskTO.class, name="propagationTask"),
- @JsonSubTypes.Type(value=SchedTaskTO.class, name="schedTask"),
- @JsonSubTypes.Type(value=SyncTaskTO.class, name="syncTask")
-})
-*/
-public abstract class TaskTO extends AbstractBaseBean {
+@XmlSeeAlso({SyncTaskTO.class, NotificationTaskTO.class, SyncTaskTO.class, SchedTaskTO.class, PropagationTaskTO.class})
+@JsonTypeInfo(use = Id.CLASS, include = As.PROPERTY, property = "@class")
+public abstract class AbstractTaskTO extends AbstractBaseBean {
private static final long serialVersionUID = 386450127003321197L;
@@ -62,7 +55,7 @@ public abstract class TaskTO extends Abs
return id;
}
- public void setId(long id) {
+ public void setId(final long id) {
this.id = id;
}
@@ -70,15 +63,15 @@ public abstract class TaskTO extends Abs
return latestExecStatus;
}
- public void setLatestExecStatus(String latestExecStatus) {
+ public void setLatestExecStatus(final String latestExecStatus) {
this.latestExecStatus = latestExecStatus;
}
- public boolean addExecution(TaskExecTO execution) {
+ public boolean addExecution(final TaskExecTO execution) {
return executions.add(execution);
}
- public boolean removeExecution(TaskExecTO execution) {
+ public boolean removeExecution(final TaskExecTO execution) {
return executions.remove(execution);
}
@@ -88,7 +81,7 @@ public abstract class TaskTO extends Abs
return executions;
}
- public void setExecutions(List<TaskExecTO> executions) {
+ public void setExecutions(final List<TaskExecTO> executions) {
this.executions = executions;
}
@@ -98,7 +91,7 @@ public abstract class TaskTO extends Abs
: new Date(startDate.getTime());
}
- public void setStartDate(Date startDate) {
+ public void setStartDate(final Date startDate) {
if (startDate != null) {
this.startDate = new Date(startDate.getTime());
}
@@ -110,7 +103,7 @@ public abstract class TaskTO extends Abs
: new Date(endDate.getTime());
}
- public void setEndDate(Date endDate) {
+ public void setEndDate(final Date endDate) {
if (endDate != null) {
this.endDate = new Date(endDate.getTime());
}
Modified: syncope/trunk/common/src/main/java/org/apache/syncope/common/to/AccountPolicyTO.java
URL: http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/to/AccountPolicyTO.java?rev=1506085&r1=1506084&r2=1506085&view=diff
==============================================================================
--- syncope/trunk/common/src/main/java/org/apache/syncope/common/to/AccountPolicyTO.java (original)
+++ syncope/trunk/common/src/main/java/org/apache/syncope/common/to/AccountPolicyTO.java Tue Jul 23 14:54:06 2013
@@ -26,7 +26,7 @@ import org.apache.syncope.common.types.P
@XmlRootElement(name = "accountPolicy")
@XmlType
-public class AccountPolicyTO extends PolicyTO {
+public class AccountPolicyTO extends AbstractPolicyTO {
private static final long serialVersionUID = -1557150042828800134L;
Modified: syncope/trunk/common/src/main/java/org/apache/syncope/common/to/NotificationTaskTO.java
URL: http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/to/NotificationTaskTO.java?rev=1506085&r1=1506084&r2=1506085&view=diff
==============================================================================
--- syncope/trunk/common/src/main/java/org/apache/syncope/common/to/NotificationTaskTO.java (original)
+++ syncope/trunk/common/src/main/java/org/apache/syncope/common/to/NotificationTaskTO.java Tue Jul 23 14:54:06 2013
@@ -30,7 +30,7 @@ import org.apache.syncope.common.types.T
@XmlRootElement(name = "notificationTask")
@XmlType
-public class NotificationTaskTO extends TaskTO {
+public class NotificationTaskTO extends AbstractTaskTO {
private static final long serialVersionUID = 371671242591093846L;
Modified: syncope/trunk/common/src/main/java/org/apache/syncope/common/to/PasswordPolicyTO.java
URL: http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/to/PasswordPolicyTO.java?rev=1506085&r1=1506084&r2=1506085&view=diff
==============================================================================
--- syncope/trunk/common/src/main/java/org/apache/syncope/common/to/PasswordPolicyTO.java (original)
+++ syncope/trunk/common/src/main/java/org/apache/syncope/common/to/PasswordPolicyTO.java Tue Jul 23 14:54:06 2013
@@ -26,7 +26,7 @@ import org.apache.syncope.common.types.P
@XmlRootElement(name = "passwordPolicy")
@XmlType
-public class PasswordPolicyTO extends PolicyTO {
+public class PasswordPolicyTO extends AbstractPolicyTO {
private static final long serialVersionUID = -5606086441294799690L;
Modified: syncope/trunk/common/src/main/java/org/apache/syncope/common/to/PropagationTaskTO.java
URL: http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/to/PropagationTaskTO.java?rev=1506085&r1=1506084&r2=1506085&view=diff
==============================================================================
--- syncope/trunk/common/src/main/java/org/apache/syncope/common/to/PropagationTaskTO.java (original)
+++ syncope/trunk/common/src/main/java/org/apache/syncope/common/to/PropagationTaskTO.java Tue Jul 23 14:54:06 2013
@@ -27,7 +27,7 @@ import org.apache.syncope.common.types.R
@XmlRootElement(name = "propagationTask")
@XmlType
-public class PropagationTaskTO extends TaskTO {
+public class PropagationTaskTO extends AbstractTaskTO {
private static final long serialVersionUID = 386450127003321197L;
Modified: syncope/trunk/common/src/main/java/org/apache/syncope/common/to/SchedTaskTO.java
URL: http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/to/SchedTaskTO.java?rev=1506085&r1=1506084&r2=1506085&view=diff
==============================================================================
--- syncope/trunk/common/src/main/java/org/apache/syncope/common/to/SchedTaskTO.java (original)
+++ syncope/trunk/common/src/main/java/org/apache/syncope/common/to/SchedTaskTO.java Tue Jul 23 14:54:06 2013
@@ -25,7 +25,7 @@ import javax.xml.bind.annotation.XmlType
@XmlRootElement(name = "schedTask")
@XmlType
-public class SchedTaskTO extends TaskTO {
+public class SchedTaskTO extends AbstractTaskTO {
private static final long serialVersionUID = -5722284116974636425L;
Modified: syncope/trunk/common/src/main/java/org/apache/syncope/common/to/SyncPolicyTO.java
URL: http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/to/SyncPolicyTO.java?rev=1506085&r1=1506084&r2=1506085&view=diff
==============================================================================
--- syncope/trunk/common/src/main/java/org/apache/syncope/common/to/SyncPolicyTO.java (original)
+++ syncope/trunk/common/src/main/java/org/apache/syncope/common/to/SyncPolicyTO.java Tue Jul 23 14:54:06 2013
@@ -26,7 +26,7 @@ import org.apache.syncope.common.types.S
@XmlRootElement(name = "syncPolicy")
@XmlType
-public class SyncPolicyTO extends PolicyTO {
+public class SyncPolicyTO extends AbstractPolicyTO {
private static final long serialVersionUID = 993024634238024242L;
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/NotificationTaskModalPage.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/NotificationTaskModalPage.java?rev=1506085&r1=1506084&r2=1506085&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/NotificationTaskModalPage.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/NotificationTaskModalPage.java Tue Jul 23 14:54:06 2013
@@ -20,7 +20,7 @@ package org.apache.syncope.console.pages
import java.util.ArrayList;
import org.apache.syncope.common.to.NotificationTaskTO;
-import org.apache.syncope.common.to.TaskTO;
+import org.apache.syncope.common.to.AbstractTaskTO;
import org.apache.syncope.console.wicket.markup.html.form.AjaxTextFieldPanel;
import org.apache.wicket.markup.html.form.ListMultipleChoice;
import org.apache.wicket.markup.html.form.TextArea;
@@ -30,7 +30,7 @@ public class NotificationTaskModalPage e
private static final long serialVersionUID = -4399606755452034216L;
- public NotificationTaskModalPage(final TaskTO taskTO) {
+ public NotificationTaskModalPage(final AbstractTaskTO taskTO) {
super(taskTO);
final AjaxTextFieldPanel sender = new AjaxTextFieldPanel("sender", getString("sender"),
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/PolicyModalPage.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/PolicyModalPage.java?rev=1506085&r1=1506084&r2=1506085&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/PolicyModalPage.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/PolicyModalPage.java Tue Jul 23 14:54:06 2013
@@ -21,7 +21,7 @@ package org.apache.syncope.console.pages
import java.util.Arrays;
import org.apache.syncope.common.to.AccountPolicyTO;
import org.apache.syncope.common.to.PasswordPolicyTO;
-import org.apache.syncope.common.to.PolicyTO;
+import org.apache.syncope.common.to.AbstractPolicyTO;
import org.apache.syncope.common.to.SyncPolicyTO;
import org.apache.syncope.common.types.AbstractPolicySpec;
import org.apache.syncope.common.types.AccountPolicySpec;
@@ -46,7 +46,7 @@ import org.apache.wicket.spring.injectio
/**
* Modal window with Resource form.
*/
-public class PolicyModalPage<T extends PolicyTO> extends BaseModalPage {
+public class PolicyModalPage<T extends AbstractPolicyTO> extends BaseModalPage {
private static final long serialVersionUID = -7325772767481076679L;
@@ -152,7 +152,7 @@ public class PolicyModalPage<T extends P
form.add(cancel);
}
- private AbstractPolicySpec getPolicySpecification(final PolicyTO policyTO) {
+ private AbstractPolicySpec getPolicySpecification(final AbstractPolicyTO policyTO) {
AbstractPolicySpec spec;
switch (policyTO.getType()) {
@@ -181,7 +181,7 @@ public class PolicyModalPage<T extends P
return spec;
}
- private void setPolicySpecification(final PolicyTO policyTO, final AbstractPolicySpec specification) {
+ private void setPolicySpecification(final AbstractPolicyTO policyTO, final AbstractPolicySpec specification) {
switch (policyTO.getType()) {
case GLOBAL_ACCOUNT:
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/PropagationTaskModalPage.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/PropagationTaskModalPage.java?rev=1506085&r1=1506084&r2=1506085&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/PropagationTaskModalPage.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/PropagationTaskModalPage.java Tue Jul 23 14:54:06 2013
@@ -18,7 +18,7 @@
*/
package org.apache.syncope.console.pages;
-import org.apache.syncope.common.to.TaskTO;
+import org.apache.syncope.common.to.AbstractTaskTO;
import org.apache.syncope.console.wicket.markup.html.form.AjaxTextFieldPanel;
import org.apache.wicket.model.PropertyModel;
@@ -29,7 +29,7 @@ public class PropagationTaskModalPage ex
private static final long serialVersionUID = 523379887023786151L;
- public PropagationTaskModalPage(final TaskTO taskTO) {
+ public PropagationTaskModalPage(final AbstractTaskTO taskTO) {
super(taskTO);
final AjaxTextFieldPanel accountId = new AjaxTextFieldPanel("accountId", getString("accountId"),
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=1506085&r1=1506084&r2=1506085&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 Tue Jul 23 14:54:06 2013
@@ -27,7 +27,7 @@ import org.apache.syncope.common.to.Prop
import org.apache.syncope.common.to.SchedTaskTO;
import org.apache.syncope.common.to.SyncTaskTO;
import org.apache.syncope.common.to.TaskExecTO;
-import org.apache.syncope.common.to.TaskTO;
+import org.apache.syncope.common.to.AbstractTaskTO;
import org.apache.syncope.common.validation.SyncopeClientCompositeErrorException;
import org.apache.syncope.console.commons.Constants;
import org.apache.syncope.console.commons.SortableDataProviderComparator;
@@ -69,7 +69,7 @@ public abstract class TaskModalPage exte
protected Form form;
- public TaskModalPage(final TaskTO taskTO) {
+ public TaskModalPage(final AbstractTaskTO taskTO) {
final ModalWindow taskExecMessageWin = new ModalWindow("taskExecMessageWin");
taskExecMessageWin.setCssClassName(ModalWindow.CSS_CLASS_GRAY);
taskExecMessageWin.setCookieName("task-exec-message-win-modal");
@@ -199,9 +199,9 @@ public abstract class TaskModalPage exte
private SortableDataProviderComparator<TaskExecTO> comparator;
- private TaskTO taskTO;
+ private AbstractTaskTO taskTO;
- public TaskExecutionsProvider(final TaskTO taskTO) {
+ public TaskExecutionsProvider(final AbstractTaskTO taskTO) {
//Default sorting
this.taskTO = taskTO;
setSort("startDate", SortOrder.DESCENDING);
@@ -238,8 +238,8 @@ public abstract class TaskModalPage exte
}
}
- private TaskTO getCurrentTaskExecution(final TaskTO taskTO) {
- final TaskTO currentTask = taskTO.getId() == 0
+ private AbstractTaskTO getCurrentTaskExecution(final AbstractTaskTO taskTO) {
+ final AbstractTaskTO currentTask = taskTO.getId() == 0
? taskTO
: taskTO instanceof PropagationTaskTO
? taskRestClient.readPropagationTask(taskTO.getId())
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Tasks.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Tasks.java?rev=1506085&r1=1506084&r2=1506085&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Tasks.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Tasks.java Tue Jul 23 14:54:06 2013
@@ -26,7 +26,7 @@ import java.util.Iterator;
import java.util.List;
import org.apache.syncope.common.to.SchedTaskTO;
import org.apache.syncope.common.to.TaskExecTO;
-import org.apache.syncope.common.to.TaskTO;
+import org.apache.syncope.common.to.AbstractTaskTO;
import org.apache.syncope.console.commons.SortableDataProviderComparator;
import org.apache.syncope.console.pages.panels.AjaxDataTablePanel;
import org.apache.syncope.console.pages.panels.NotificationTasks;
@@ -74,9 +74,9 @@ public class Tasks extends BasePage {
private SortableDataProviderComparator<TaskExecTO> comparator;
- private TaskTO taskTO;
+ private AbstractTaskTO taskTO;
- public TaskExecutionsProvider(final TaskTO taskTO) {
+ public TaskExecutionsProvider(final AbstractTaskTO taskTO) {
super();
//Default sorting
@@ -119,7 +119,7 @@ public class Tasks extends BasePage {
}
}
- public static class TasksProvider<T extends TaskTO> extends SortableDataProvider<T, String> {
+ public static class TasksProvider<T extends AbstractTaskTO> extends SortableDataProvider<T, String> {
private static final long serialVersionUID = -20112718133295756L;
@@ -195,18 +195,18 @@ public class Tasks extends BasePage {
* @param currentPage current page index.
* @return data table.
*/
- public static AjaxDataTablePanel<TaskTO, String> updateTaskTable(
- final List<IColumn<TaskTO, String>> columns,
+ public static AjaxDataTablePanel<AbstractTaskTO, String> updateTaskTable(
+ final List<IColumn<AbstractTaskTO, String>> columns,
final TasksProvider dataProvider,
final WebMarkupContainer container,
final int currentPage,
final PageReference pageRef,
final BaseRestClient restClient) {
- final AjaxDataTablePanel<TaskTO, String> table = new AjaxDataTablePanel<TaskTO, String>(
+ final AjaxDataTablePanel<AbstractTaskTO, String> table = new AjaxDataTablePanel<AbstractTaskTO, String>(
"datatable",
columns,
- (ISortableDataProvider<TaskTO, String>) dataProvider,
+ (ISortableDataProvider<AbstractTaskTO, String>) dataProvider,
dataProvider.paginatorRows,
Arrays.asList(new ActionLink.ActionType[]{
ActionLink.ActionType.DELETE, ActionLink.ActionType.DRYRUN, ActionLink.ActionType.EXECUTE}),
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/NotificationTasks.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/NotificationTasks.java?rev=1506085&r1=1506084&r2=1506085&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/NotificationTasks.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/NotificationTasks.java Tue Jul 23 14:54:06 2013
@@ -21,7 +21,7 @@ package org.apache.syncope.console.pages
import java.util.ArrayList;
import java.util.List;
import org.apache.syncope.common.to.NotificationTaskTO;
-import org.apache.syncope.common.to.TaskTO;
+import org.apache.syncope.common.to.AbstractTaskTO;
import org.apache.syncope.common.validation.SyncopeClientCompositeErrorException;
import org.apache.syncope.console.commons.Constants;
import org.apache.syncope.console.pages.NotificationTaskModalPage;
@@ -60,9 +60,9 @@ public class NotificationTasks extends A
private ModalWindow window;
- private final List<IColumn<TaskTO, String>> columns;
+ private final List<IColumn<AbstractTaskTO, String>> columns;
- private AjaxDataTablePanel<TaskTO, String> table;
+ private AjaxDataTablePanel<AbstractTaskTO, String> table;
public NotificationTasks(final String id, final PageReference pageRef) {
super(id);
@@ -75,29 +75,29 @@ public class NotificationTasks extends A
paginatorRows = prefMan.getPaginatorRows(getWebRequest(), Constants.PREF_NOTIFICATION_TASKS_PAGINATOR_ROWS);
- columns = new ArrayList<IColumn<TaskTO, String>>();
+ columns = new ArrayList<IColumn<AbstractTaskTO, String>>();
- columns.add(new PropertyColumn<TaskTO, String>(
+ columns.add(new PropertyColumn<AbstractTaskTO, String>(
new StringResourceModel("id", this, null), "id", "id"));
- columns.add(new PropertyColumn<TaskTO, String>(
+ columns.add(new PropertyColumn<AbstractTaskTO, String>(
new StringResourceModel("sender", this, null), "sender", "sender"));
- columns.add(new PropertyColumn<TaskTO, String>(
+ columns.add(new PropertyColumn<AbstractTaskTO, String>(
new StringResourceModel("recipients", this, null), "recipients", "recipients"));
- columns.add(new PropertyColumn<TaskTO, String>(
+ columns.add(new PropertyColumn<AbstractTaskTO, String>(
new StringResourceModel("subject", this, null), "subject", "subject"));
- columns.add(new PropertyColumn<TaskTO, String>(
+ columns.add(new PropertyColumn<AbstractTaskTO, String>(
new StringResourceModel("traceLevel", this, null), "traceLevel", "traceLevel"));
- columns.add(new PropertyColumn<TaskTO, String>(
+ columns.add(new PropertyColumn<AbstractTaskTO, String>(
new StringResourceModel("latestExecStatus", this, null), "latestExecStatus", "latestExecStatus"));
- columns.add(new ActionColumn<TaskTO, String>(new StringResourceModel("actions", this, null, "")) {
+ columns.add(new ActionColumn<AbstractTaskTO, String>(new StringResourceModel("actions", this, null, "")) {
private static final long serialVersionUID = 2054811145491901166L;
@Override
- public ActionLinksPanel getActions(final String componentId, final IModel<TaskTO> model) {
+ public ActionLinksPanel getActions(final String componentId, final IModel<AbstractTaskTO> model) {
- final TaskTO taskTO = model.getObject();
+ final AbstractTaskTO taskTO = model.getObject();
final ActionLinksPanel panel = new ActionLinksPanel(componentId, model, pageRef);
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/PoliciesPanel.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/PoliciesPanel.java?rev=1506085&r1=1506084&r2=1506085&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/PoliciesPanel.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/PoliciesPanel.java Tue Jul 23 14:54:06 2013
@@ -24,7 +24,7 @@ import java.util.Iterator;
import java.util.List;
import org.apache.syncope.common.to.AccountPolicyTO;
import org.apache.syncope.common.to.PasswordPolicyTO;
-import org.apache.syncope.common.to.PolicyTO;
+import org.apache.syncope.common.to.AbstractPolicyTO;
import org.apache.syncope.common.to.SyncPolicyTO;
import org.apache.syncope.common.types.PolicyType;
import org.apache.syncope.common.validation.SyncopeClientCompositeErrorException;
@@ -114,26 +114,26 @@ public class PoliciesPanel extends Panel
setWindowClosedCallback(mwindow, container);
- final List<IColumn<PolicyTO, String>> columns = new ArrayList<IColumn<PolicyTO, String>>();
+ final List<IColumn<AbstractPolicyTO, String>> columns = new ArrayList<IColumn<AbstractPolicyTO, String>>();
- columns.add(new PropertyColumn<PolicyTO, String>(new ResourceModel("id"), "id", "id"));
+ columns.add(new PropertyColumn<AbstractPolicyTO, String>(new ResourceModel("id"), "id", "id"));
- columns.add(new PropertyColumn<PolicyTO, String>(
+ columns.add(new PropertyColumn<AbstractPolicyTO, String>(
new ResourceModel("description"), "description", "description"));
- columns.add(new AbstractColumn<PolicyTO, String>(new ResourceModel("type")) {
+ columns.add(new AbstractColumn<AbstractPolicyTO, String>(new ResourceModel("type")) {
private static final long serialVersionUID = 8263694778917279290L;
@Override
- public void populateItem(final Item<ICellPopulator<PolicyTO>> cellItem, final String componentId,
- final IModel<PolicyTO> model) {
+ public void populateItem(final Item<ICellPopulator<AbstractPolicyTO>> cellItem, final String componentId,
+ final IModel<AbstractPolicyTO> model) {
cellItem.add(new Label(componentId, getString(model.getObject().getType().name())));
}
});
- columns.add(new AbstractColumn<PolicyTO, String>(new ResourceModel("actions", "")) {
+ columns.add(new AbstractColumn<AbstractPolicyTO, String>(new ResourceModel("actions", "")) {
private static final long serialVersionUID = 2054811145491901166L;
@@ -143,10 +143,10 @@ public class PoliciesPanel extends Panel
}
@Override
- public void populateItem(final Item<ICellPopulator<PolicyTO>> cellItem, final String componentId,
- final IModel<PolicyTO> model) {
+ public void populateItem(final Item<ICellPopulator<AbstractPolicyTO>> cellItem, final String componentId,
+ final IModel<AbstractPolicyTO> model) {
- final PolicyTO accountPolicyTO = model.getObject();
+ final AbstractPolicyTO accountPolicyTO = model.getObject();
final ActionLinksPanel panel = new ActionLinksPanel(componentId, model, pageRef);
@@ -264,11 +264,11 @@ public class PoliciesPanel extends Panel
});
}
- private class PolicyDataProvider extends SortableDataProvider<PolicyTO, String> {
+ private class PolicyDataProvider extends SortableDataProvider<AbstractPolicyTO, String> {
private static final long serialVersionUID = -6976327453925166730L;
- private SortableDataProviderComparator<PolicyTO> comparator;
+ private SortableDataProviderComparator<AbstractPolicyTO> comparator;
public PolicyDataProvider() {
super();
@@ -276,7 +276,7 @@ public class PoliciesPanel extends Panel
//Default sorting
setSort("description", SortOrder.ASCENDING);
- comparator = new SortableDataProviderComparator<PolicyTO>(this);
+ comparator = new SortableDataProviderComparator<AbstractPolicyTO>(this);
}
@Override
@@ -285,9 +285,9 @@ public class PoliciesPanel extends Panel
}
@Override
- public Iterator<PolicyTO> iterator(final long first, final long count) {
+ public Iterator<AbstractPolicyTO> iterator(final long first, final long count) {
- final List<PolicyTO> policies = policyRestClient.getPolicies(policyType, true);
+ final List<AbstractPolicyTO> policies = policyRestClient.getPolicies(policyType, true);
Collections.sort(policies, comparator);
@@ -295,13 +295,13 @@ public class PoliciesPanel extends Panel
}
@Override
- public IModel<PolicyTO> model(final PolicyTO object) {
- return new CompoundPropertyModel<PolicyTO>(object);
+ public IModel<AbstractPolicyTO> model(final AbstractPolicyTO object) {
+ return new CompoundPropertyModel<AbstractPolicyTO>(object);
}
}
- private PolicyTO getPolicyTOInstance(final PolicyType policyType) {
- PolicyTO policyTO;
+ private AbstractPolicyTO getPolicyTOInstance(final PolicyType policyType) {
+ AbstractPolicyTO policyTO;
switch (policyType) {
case GLOBAL_ACCOUNT:
policyTO = new AccountPolicyTO(true);
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/PropagationTasks.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/PropagationTasks.java?rev=1506085&r1=1506084&r2=1506085&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/PropagationTasks.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/PropagationTasks.java Tue Jul 23 14:54:06 2013
@@ -21,7 +21,7 @@ package org.apache.syncope.console.pages
import java.util.ArrayList;
import java.util.List;
import org.apache.syncope.common.to.PropagationTaskTO;
-import org.apache.syncope.common.to.TaskTO;
+import org.apache.syncope.common.to.AbstractTaskTO;
import org.apache.syncope.common.validation.SyncopeClientCompositeErrorException;
import org.apache.syncope.console.commons.Constants;
import org.apache.syncope.console.pages.PropagationTaskModalPage;
@@ -65,9 +65,9 @@ public class PropagationTasks extends Ab
private ModalWindow window;
- private final List<IColumn<TaskTO, String>> columns;
+ private final List<IColumn<AbstractTaskTO, String>> columns;
- private AjaxDataTablePanel<TaskTO, String> table;
+ private AjaxDataTablePanel<AbstractTaskTO, String> table;
public PropagationTasks(final String id, final PageReference pageRef) {
super(id);
@@ -80,33 +80,33 @@ public class PropagationTasks extends Ab
paginatorRows = prefMan.getPaginatorRows(getWebRequest(), Constants.PREF_PROPAGATION_TASKS_PAGINATOR_ROWS);
- columns = new ArrayList<IColumn<TaskTO, String>>();
+ columns = new ArrayList<IColumn<AbstractTaskTO, String>>();
- columns.add(new PropertyColumn<TaskTO, String>(
+ columns.add(new PropertyColumn<AbstractTaskTO, String>(
new StringResourceModel("id", this, null), "id", "id"));
- columns.add(new PropertyColumn<TaskTO, String>(
+ columns.add(new PropertyColumn<AbstractTaskTO, String>(
new StringResourceModel("resource", this, null), "resource", "resource"));
- columns.add(new PropertyColumn<TaskTO, String>(
+ columns.add(new PropertyColumn<AbstractTaskTO, String>(
new StringResourceModel("accountId", this, null), "accountId", "accountId"));
- columns.add(new PropertyColumn<TaskTO, String>(
+ columns.add(new PropertyColumn<AbstractTaskTO, String>(
new StringResourceModel("propagationMode", this, null), "propagationMode", "propagationMode"));
- columns.add(new PropertyColumn<TaskTO, String>(new StringResourceModel(
+ columns.add(new PropertyColumn<AbstractTaskTO, String>(new StringResourceModel(
"propagationOperation", this, null), "propagationOperation", "propagationOperation"));
- columns.add(new DatePropertyColumn<TaskTO>(
+ columns.add(new DatePropertyColumn<AbstractTaskTO>(
new StringResourceModel("startDate", this, null), "startDate", "startDate"));
- columns.add(new DatePropertyColumn<TaskTO>(
+ columns.add(new DatePropertyColumn<AbstractTaskTO>(
new StringResourceModel("endDate", this, null), "endDate", "endDate"));
- columns.add(new PropertyColumn<TaskTO, String>(
+ columns.add(new PropertyColumn<AbstractTaskTO, String>(
new StringResourceModel("latestExecStatus", this, null), "latestExecStatus", "latestExecStatus"));
- columns.add(new ActionColumn<TaskTO, String>(new StringResourceModel("actions", this, null, "")) {
+ columns.add(new ActionColumn<AbstractTaskTO, String>(new StringResourceModel("actions", this, null, "")) {
private static final long serialVersionUID = 2054811145491901166L;
@@ -116,9 +116,9 @@ public class PropagationTasks extends Ab
}
@Override
- public ActionLinksPanel getActions(final String componentId, final IModel<TaskTO> model) {
+ public ActionLinksPanel getActions(final String componentId, final IModel<AbstractTaskTO> model) {
- final TaskTO taskTO = model.getObject();
+ final AbstractTaskTO taskTO = model.getObject();
final ActionLinksPanel panel = new ActionLinksPanel(componentId, model, pageRef);
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/ResourceSecurityPanel.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/ResourceSecurityPanel.java?rev=1506085&r1=1506084&r2=1506085&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/ResourceSecurityPanel.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/ResourceSecurityPanel.java Tue Jul 23 14:54:06 2013
@@ -21,7 +21,7 @@ package org.apache.syncope.console.pages
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
-import org.apache.syncope.common.to.PolicyTO;
+import org.apache.syncope.common.to.AbstractPolicyTO;
import org.apache.syncope.common.to.ResourceTO;
import org.apache.syncope.common.types.PolicyType;
import org.apache.syncope.console.rest.PolicyRestClient;
@@ -62,7 +62,7 @@ public class ResourceSecurityPanel exten
@Override
protected Map<Long, String> load() {
Map<Long, String> res = new HashMap<Long, String>();
- for (PolicyTO policyTO : policyRestClient.getPolicies(PolicyType.PASSWORD, false)) {
+ for (AbstractPolicyTO policyTO : policyRestClient.getPolicies(PolicyType.PASSWORD, false)) {
res.put(policyTO.getId(), policyTO.getDescription());
}
return res;
@@ -76,7 +76,7 @@ public class ResourceSecurityPanel exten
@Override
protected Map<Long, String> load() {
Map<Long, String> res = new HashMap<Long, String>();
- for (PolicyTO policyTO : policyRestClient.getPolicies(PolicyType.ACCOUNT, false)) {
+ for (AbstractPolicyTO policyTO : policyRestClient.getPolicies(PolicyType.ACCOUNT, false)) {
res.put(policyTO.getId(), policyTO.getDescription());
}
return res;
@@ -90,7 +90,7 @@ public class ResourceSecurityPanel exten
@Override
protected Map<Long, String> load() {
Map<Long, String> res = new HashMap<Long, String>();
- for (PolicyTO policyTO : policyRestClient.getPolicies(PolicyType.SYNC, false)) {
+ for (AbstractPolicyTO policyTO : policyRestClient.getPolicies(PolicyType.SYNC, false)) {
res.put(policyTO.getId(), policyTO.getDescription());
}
return res;
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/RoleSecurityPanel.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/RoleSecurityPanel.java?rev=1506085&r1=1506084&r2=1506085&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/RoleSecurityPanel.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/RoleSecurityPanel.java Tue Jul 23 14:54:06 2013
@@ -23,7 +23,7 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.syncope.console.commons.Constants;
import org.apache.syncope.common.to.AbstractAttributableTO;
-import org.apache.syncope.common.to.PolicyTO;
+import org.apache.syncope.common.to.AbstractPolicyTO;
import org.apache.syncope.common.types.PolicyType;
import org.apache.syncope.console.rest.PolicyRestClient;
import org.apache.syncope.console.wicket.markup.html.form.AjaxCheckBoxPanel;
@@ -69,7 +69,7 @@ public class RoleSecurityPanel extends P
@Override
protected Map<Long, String> load() {
Map<Long, String> res = new HashMap<Long, String>();
- for (PolicyTO policyTO : policyRestClient.getPolicies(PolicyType.PASSWORD, false)) {
+ for (AbstractPolicyTO policyTO : policyRestClient.getPolicies(PolicyType.PASSWORD, false)) {
res.put(policyTO.getId(), policyTO.getDescription());
}
return res;
@@ -83,7 +83,7 @@ public class RoleSecurityPanel extends P
@Override
protected Map<Long, String> load() {
Map<Long, String> res = new HashMap<Long, String>();
- for (PolicyTO policyTO : policyRestClient.getPolicies(PolicyType.ACCOUNT, false)) {
+ for (AbstractPolicyTO policyTO : policyRestClient.getPolicies(PolicyType.ACCOUNT, false)) {
res.put(policyTO.getId(), policyTO.getDescription());
}
return res;
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/SchedTasks.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/SchedTasks.java?rev=1506085&r1=1506084&r2=1506085&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/SchedTasks.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/SchedTasks.java Tue Jul 23 14:54:06 2013
@@ -21,7 +21,7 @@ package org.apache.syncope.console.pages
import java.util.ArrayList;
import java.util.List;
import org.apache.syncope.common.to.SchedTaskTO;
-import org.apache.syncope.common.to.TaskTO;
+import org.apache.syncope.common.to.AbstractTaskTO;
import org.apache.syncope.common.validation.SyncopeClientCompositeErrorException;
import org.apache.syncope.console.commons.Constants;
import org.apache.syncope.console.pages.SchedTaskModalPage;
@@ -62,9 +62,9 @@ public class SchedTasks extends Abstract
private ModalWindow window;
- private final List<IColumn<TaskTO, String>> columns;
+ private final List<IColumn<AbstractTaskTO, String>> columns;
- private AjaxDataTablePanel<TaskTO, String> table;
+ private AjaxDataTablePanel<AbstractTaskTO, String> table;
public SchedTasks(final String id, final PageReference pageRef) {
super(id);
@@ -84,29 +84,29 @@ public class SchedTasks extends Abstract
paginatorRows = prefMan.getPaginatorRows(getWebRequest(), Constants.PREF_SCHED_TASKS_PAGINATOR_ROWS);
- columns = new ArrayList<IColumn<TaskTO, String>>();
+ columns = new ArrayList<IColumn<AbstractTaskTO, String>>();
- columns.add(new PropertyColumn<TaskTO, String>(
+ columns.add(new PropertyColumn<AbstractTaskTO, String>(
new StringResourceModel("id", this, null), "id", "id"));
- columns.add(new PropertyColumn<TaskTO, String>(
+ columns.add(new PropertyColumn<AbstractTaskTO, String>(
new StringResourceModel("name", this, null), "name", "name"));
- columns.add(new PropertyColumn<TaskTO, String>(
+ columns.add(new PropertyColumn<AbstractTaskTO, String>(
new StringResourceModel("description", this, null), "description", "description"));
- columns.add(new PropertyColumn<TaskTO, String>(
+ columns.add(new PropertyColumn<AbstractTaskTO, String>(
new StringResourceModel("class", this, null), "jobClassName", "jobClassName"));
- columns.add(new DatePropertyColumn<TaskTO>(
+ columns.add(new DatePropertyColumn<AbstractTaskTO>(
new StringResourceModel("lastExec", this, null), "lastExec", "lastExec"));
- columns.add(new DatePropertyColumn<TaskTO>(
+ columns.add(new DatePropertyColumn<AbstractTaskTO>(
new StringResourceModel("nextExec", this, null), "nextExec", "nextExec"));
- columns.add(new PropertyColumn<TaskTO, String>(
+ columns.add(new PropertyColumn<AbstractTaskTO, String>(
new StringResourceModel("latestExecStatus", this, null), "latestExecStatus", "latestExecStatus"));
- columns.add(new ActionColumn<TaskTO, String>(new StringResourceModel("actions", this, null, "")) {
+ columns.add(new ActionColumn<AbstractTaskTO, String>(new StringResourceModel("actions", this, null, "")) {
private static final long serialVersionUID = 2054811145491901166L;
@Override
- public ActionLinksPanel getActions(final String componentId, final IModel<TaskTO> model) {
+ public ActionLinksPanel getActions(final String componentId, final IModel<AbstractTaskTO> model) {
final SchedTaskTO taskTO = (SchedTaskTO) model.getObject();
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/SyncTasks.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/SyncTasks.java?rev=1506085&r1=1506084&r2=1506085&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/SyncTasks.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/SyncTasks.java Tue Jul 23 14:54:06 2013
@@ -21,7 +21,7 @@ package org.apache.syncope.console.pages
import java.util.ArrayList;
import java.util.List;
import org.apache.syncope.common.to.SyncTaskTO;
-import org.apache.syncope.common.to.TaskTO;
+import org.apache.syncope.common.to.AbstractTaskTO;
import org.apache.syncope.common.validation.SyncopeClientCompositeErrorException;
import org.apache.syncope.console.commons.Constants;
import org.apache.syncope.console.pages.RoleTemplateModalPage;
@@ -64,9 +64,9 @@ public class SyncTasks extends AbstractT
private ModalWindow window;
- private final List<IColumn<TaskTO, String>> columns;
+ private final List<IColumn<AbstractTaskTO, String>> columns;
- private AjaxDataTablePanel<TaskTO, String> table;
+ private AjaxDataTablePanel<AbstractTaskTO, String> table;
public SyncTasks(final String id, final PageReference pageRef) {
super(id);
@@ -86,28 +86,28 @@ public class SyncTasks extends AbstractT
paginatorRows = prefMan.getPaginatorRows(getWebRequest(), Constants.PREF_SYNC_TASKS_PAGINATOR_ROWS);
- columns = new ArrayList<IColumn<TaskTO, String>>();
+ columns = new ArrayList<IColumn<AbstractTaskTO, String>>();
- columns.add(new PropertyColumn<TaskTO, String>(
+ columns.add(new PropertyColumn<AbstractTaskTO, String>(
new StringResourceModel("id", this, null), "id", "id"));
- columns.add(new PropertyColumn<TaskTO, String>(
+ columns.add(new PropertyColumn<AbstractTaskTO, String>(
new StringResourceModel("name", this, null), "name", "name"));
- columns.add(new PropertyColumn<TaskTO, String>(
+ columns.add(new PropertyColumn<AbstractTaskTO, String>(
new StringResourceModel("description", this, null), "description", "description"));
- columns.add(new PropertyColumn<TaskTO, String>(
+ columns.add(new PropertyColumn<AbstractTaskTO, String>(
new StringResourceModel("resourceName", this, null), "resource", "resource"));
- columns.add(new DatePropertyColumn<TaskTO>(
+ columns.add(new DatePropertyColumn<AbstractTaskTO>(
new StringResourceModel("lastExec", this, null), "lastExec", "lastExec"));
- columns.add(new DatePropertyColumn<TaskTO>(
+ columns.add(new DatePropertyColumn<AbstractTaskTO>(
new StringResourceModel("nextExec", this, null), "nextExec", "nextExec"));
- columns.add(new PropertyColumn<TaskTO, String>(
+ columns.add(new PropertyColumn<AbstractTaskTO, String>(
new StringResourceModel("latestExecStatus", this, null), "latestExecStatus", "latestExecStatus"));
- columns.add(new ActionColumn<TaskTO, String>(new StringResourceModel("actions", this, null, "")) {
+ columns.add(new ActionColumn<AbstractTaskTO, String>(new StringResourceModel("actions", this, null, "")) {
private static final long serialVersionUID = 2054811145491901166L;
@Override
- public ActionLinksPanel getActions(final String componentId, final IModel<TaskTO> model) {
+ public ActionLinksPanel getActions(final String componentId, final IModel<AbstractTaskTO> model) {
final SyncTaskTO taskTO = (SyncTaskTO) model.getObject();
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/rest/PolicyRestClient.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/rest/PolicyRestClient.java?rev=1506085&r1=1506084&r2=1506085&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/rest/PolicyRestClient.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/rest/PolicyRestClient.java Tue Jul 23 14:54:06 2013
@@ -23,7 +23,7 @@ import java.util.List;
import org.apache.syncope.common.services.PolicyService;
import org.apache.syncope.common.to.AccountPolicyTO;
import org.apache.syncope.common.to.PasswordPolicyTO;
-import org.apache.syncope.common.to.PolicyTO;
+import org.apache.syncope.common.to.AbstractPolicyTO;
import org.apache.syncope.common.to.SyncPolicyTO;
import org.apache.syncope.common.types.PolicyType;
import org.apache.syncope.common.util.CollectionWrapper;
@@ -37,7 +37,7 @@ public class PolicyRestClient extends Ba
private static final long serialVersionUID = -1392090291817187902L;
- public <T extends PolicyTO> T getGlobalPolicy(final PolicyType type) {
+ public <T extends AbstractPolicyTO> T getGlobalPolicy(final PolicyType type) {
T policy = null;
try {
policy = getService(PolicyService.class).readGlobal(type);
@@ -48,7 +48,7 @@ public class PolicyRestClient extends Ba
}
@SuppressWarnings("unchecked")
- public <T extends PolicyTO> List<T> getPolicies(final PolicyType type, final boolean includeGlobal) {
+ public <T extends AbstractPolicyTO> List<T> getPolicies(final PolicyType type, final boolean includeGlobal) {
final List<T> res = new ArrayList<T>();
try {
@@ -59,7 +59,7 @@ public class PolicyRestClient extends Ba
if (includeGlobal) {
try {
- PolicyTO globalPolicy = getGlobalPolicy(type);
+ AbstractPolicyTO globalPolicy = getGlobalPolicy(type);
if (globalPolicy != null) {
res.add(0, (T) globalPolicy);
}
@@ -71,15 +71,15 @@ public class PolicyRestClient extends Ba
return res;
}
- public <T extends PolicyTO> void createPolicy(final T policy) {
+ public <T extends AbstractPolicyTO> void createPolicy(final T policy) {
getService(PolicyService.class).create(policy.getType(), policy);
}
- public <T extends PolicyTO> void updatePolicy(final T policy) {
+ public <T extends AbstractPolicyTO> void updatePolicy(final T policy) {
getService(PolicyService.class).update(policy.getType(), policy.getId(), policy);
}
- public void delete(final Long id, final Class<? extends PolicyTO> policyClass) {
+ public void delete(final Long id, final Class<? extends AbstractPolicyTO> policyClass) {
getService(PolicyService.class).delete(getPolicyType(policyClass), id);
}
@@ -96,7 +96,7 @@ public class PolicyRestClient extends Ba
return rules;
}
- private PolicyType getPolicyType(final Class<? extends PolicyTO> clazz) {
+ private PolicyType getPolicyType(final Class<? extends AbstractPolicyTO> clazz) {
PolicyType policyType;
if (AccountPolicyTO.class.equals(clazz)) {
policyType = PolicyType.ACCOUNT;
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/rest/TaskRestClient.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/rest/TaskRestClient.java?rev=1506085&r1=1506084&r2=1506085&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/rest/TaskRestClient.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/rest/TaskRestClient.java Tue Jul 23 14:54:06 2013
@@ -29,7 +29,7 @@ import org.apache.syncope.common.to.Prop
import org.apache.syncope.common.to.SchedTaskTO;
import org.apache.syncope.common.to.SyncActionClassTO;
import org.apache.syncope.common.to.SyncTaskTO;
-import org.apache.syncope.common.to.TaskTO;
+import org.apache.syncope.common.to.AbstractTaskTO;
import org.apache.syncope.common.types.TaskType;
import org.apache.syncope.common.util.CollectionWrapper;
import org.apache.syncope.common.validation.SyncopeClientCompositeErrorException;
@@ -87,7 +87,7 @@ public class TaskRestClient extends Base
* @param size per page.
* @return paginated list.
*/
- public <T extends TaskTO> List<T> listTasks(final Class<T> reference, final int page, final int size) {
+ public <T extends AbstractTaskTO> List<T> listTasks(final Class<T> reference, final int page, final int size) {
return getService(TaskService.class).list(getTaskType(reference), page, size);
}
@@ -122,7 +122,7 @@ public class TaskRestClient extends Base
*
* @param taskId task to delete
*/
- public void delete(final Long taskId, final Class<? extends TaskTO> taskToClass) {
+ public void delete(final Long taskId, final Class<? extends AbstractTaskTO> taskToClass) {
getService(TaskService.class).delete(taskId);
}
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/PolicyController.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/PolicyController.java?rev=1506085&r1=1506084&r2=1506085&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/PolicyController.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/PolicyController.java Tue Jul 23 14:54:06 2013
@@ -23,7 +23,7 @@ import java.util.List;
import java.util.Set;
import org.apache.syncope.common.to.AccountPolicyTO;
import org.apache.syncope.common.to.PasswordPolicyTO;
-import org.apache.syncope.common.to.PolicyTO;
+import org.apache.syncope.common.to.AbstractPolicyTO;
import org.apache.syncope.common.to.SyncPolicyTO;
import org.apache.syncope.common.types.AuditElements;
import org.apache.syncope.common.types.AuditElements.Category;
@@ -59,7 +59,7 @@ public class PolicyController extends Ab
private PolicyDataBinder binder;
@PreAuthorize("hasRole('POLICY_CREATE')")
- public <T extends PolicyTO> T create(final T policyTO) {
+ public <T extends AbstractPolicyTO> T create(final T policyTO) {
LOG.debug("Creating policy " + policyTO);
final Policy policy = binder.getPolicy(null, policyTO);
@@ -70,7 +70,7 @@ public class PolicyController extends Ab
return binder.getPolicyTO(policyDAO.save(policy));
}
- private <T extends PolicyTO, K extends Policy> T update(final T policyTO, final K policy) {
+ private <T extends AbstractPolicyTO, K extends Policy> T update(final T policyTO, final K policy) {
LOG.debug("Updating policy " + policyTO);
binder.getPolicy(policy, policyTO);
@@ -114,7 +114,7 @@ public class PolicyController extends Ab
@PreAuthorize("hasRole('POLICY_LIST')")
@SuppressWarnings("unchecked")
- public <T extends PolicyTO> List<T> list(final PolicyType type) {
+ public <T extends AbstractPolicyTO> List<T> list(final PolicyType type) {
LOG.debug("Listing policies");
List<? extends Policy> policies = policyDAO.find(type);
@@ -176,7 +176,7 @@ public class PolicyController extends Ab
}
@PreAuthorize("hasRole('POLICY_READ')")
- public <T extends PolicyTO> T read(final Long id) {
+ public <T extends AbstractPolicyTO> T read(final Long id) {
LOG.debug("Reading policy with id {}", id);
Policy policy = policyDAO.find(id);
@@ -191,13 +191,13 @@ public class PolicyController extends Ab
}
@PreAuthorize("hasRole('POLICY_DELETE')")
- public PolicyTO delete(final Long id) {
+ public AbstractPolicyTO delete(final Long id) {
Policy policy = policyDAO.find(id);
if (policy == null) {
throw new NotFoundException("Policy " + id + " not found");
}
- PolicyTO policyToDelete = binder.getPolicyTO(policy);
+ AbstractPolicyTO policyToDelete = binder.getPolicyTO(policy);
policyDAO.delete(id);
auditManager.audit(Category.policy, PolicySubCategory.delete, Result.success,
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/TaskController.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/TaskController.java?rev=1506085&r1=1506084&r2=1506085&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/TaskController.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/TaskController.java Tue Jul 23 14:54:06 2013
@@ -27,7 +27,7 @@ import org.apache.syncope.common.to.Bulk
import org.apache.syncope.common.to.SchedTaskTO;
import org.apache.syncope.common.to.SyncTaskTO;
import org.apache.syncope.common.to.TaskExecTO;
-import org.apache.syncope.common.to.TaskTO;
+import org.apache.syncope.common.to.AbstractTaskTO;
import org.apache.syncope.common.types.AuditElements.Category;
import org.apache.syncope.common.types.AuditElements.Result;
import org.apache.syncope.common.types.AuditElements.TaskSubCategory;
@@ -93,7 +93,7 @@ public class TaskController extends Abst
private ImplementationClassNamesLoader classNamesLoader;
@PreAuthorize("hasRole('TASK_CREATE')")
- public TaskTO createSchedTask(final SchedTaskTO taskTO) {
+ public AbstractTaskTO createSchedTask(final SchedTaskTO taskTO) {
LOG.debug("Creating task " + taskTO);
TaskUtil taskUtil = TaskUtil.getInstance(taskTO);
@@ -121,12 +121,12 @@ public class TaskController extends Abst
}
@PreAuthorize("hasRole('TASK_UPDATE')")
- public TaskTO updateSync(final SyncTaskTO taskTO) {
+ public AbstractTaskTO updateSync(final SyncTaskTO taskTO) {
return updateSched(taskTO);
}
@PreAuthorize("hasRole('TASK_UPDATE')")
- public TaskTO updateSched(final SchedTaskTO taskTO) {
+ public AbstractTaskTO updateSched(final SchedTaskTO taskTO) {
LOG.debug("Task update called with parameter {}", taskTO);
SchedTask task = taskDAO.find(taskTO.getId());
@@ -165,7 +165,7 @@ public class TaskController extends Abst
@PreAuthorize("hasRole('TASK_LIST')")
@SuppressWarnings("unchecked")
- public <T extends TaskTO> List<T> list(final TaskType taskType) {
+ public <T extends AbstractTaskTO> List<T> list(final TaskType taskType) {
TaskUtil taskUtil = TaskUtil.getInstance(taskType);
List<Task> tasks = taskDAO.findAll(taskUtil.taskClass());
@@ -182,7 +182,7 @@ public class TaskController extends Abst
@PreAuthorize("hasRole('TASK_LIST')")
@SuppressWarnings("unchecked")
- public <T extends TaskTO> List<T> list(final TaskType taskType, final int page, final int size) {
+ public <T extends AbstractTaskTO> List<T> list(final TaskType taskType, final int page, final int size) {
TaskUtil taskUtil = TaskUtil.getInstance(taskType);
List<Task> tasks = taskDAO.findAll(page, size, taskUtil.taskClass());
@@ -219,7 +219,7 @@ public class TaskController extends Abst
}
@PreAuthorize("hasRole('TASK_READ')")
- public TaskTO read(final Long taskId) {
+ public AbstractTaskTO read(final Long taskId) {
Task task = taskDAO.find(taskId);
if (task == null) {
throw new NotFoundException("Task " + taskId);
@@ -365,14 +365,14 @@ public class TaskController extends Abst
}
@PreAuthorize("hasRole('TASK_DELETE')")
- public TaskTO delete(final Long taskId) {
+ public AbstractTaskTO delete(final Long taskId) {
Task task = taskDAO.find(taskId);
if (task == null) {
throw new NotFoundException("Task " + taskId);
}
TaskUtil taskUtil = TaskUtil.getInstance(task);
- TaskTO taskToDelete = binder.getTaskTO(task, taskUtil);
+ AbstractTaskTO taskToDelete = binder.getTaskTO(task, taskUtil);
if (TaskType.SCHEDULED == taskUtil.getType() || TaskType.SYNCHRONIZATION == taskUtil.getType()) {
jobInstanceLoader.unregisterJob(task);
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/data/PolicyDataBinder.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/data/PolicyDataBinder.java?rev=1506085&r1=1506084&r2=1506085&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/data/PolicyDataBinder.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/data/PolicyDataBinder.java Tue Jul 23 14:54:06 2013
@@ -23,7 +23,7 @@ import static org.apache.syncope.common.
import static org.apache.syncope.common.types.PolicyType.GLOBAL_SYNC;
import org.apache.syncope.common.to.AccountPolicyTO;
import org.apache.syncope.common.to.PasswordPolicyTO;
-import org.apache.syncope.common.to.PolicyTO;
+import org.apache.syncope.common.to.AbstractPolicyTO;
import org.apache.syncope.common.to.SyncPolicyTO;
import org.apache.syncope.common.types.AccountPolicySpec;
import org.apache.syncope.common.types.PasswordPolicySpec;
@@ -61,8 +61,8 @@ public class PolicyDataBinder {
* @return policy TO.
*/
@SuppressWarnings("unchecked")
- public <T extends PolicyTO> T getPolicyTO(final Policy policy) {
- final PolicyTO policyTO;
+ public <T extends AbstractPolicyTO> T getPolicyTO(final Policy policy) {
+ final AbstractPolicyTO policyTO;
final boolean isGlobal = isGlobalPolicy(policy.getType());
@@ -106,7 +106,7 @@ public class PolicyDataBinder {
}
@SuppressWarnings("unchecked")
- public <T extends Policy> T getPolicy(T policy, final PolicyTO policyTO) {
+ public <T extends Policy> T getPolicy(T policy, final AbstractPolicyTO policyTO) {
if (policy != null && policy.getType() != policyTO.getType()) {
throw new IllegalArgumentException(
String.format("Cannot update %s from %s", policy.getType(), policyTO.getType()));
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/data/TaskDataBinder.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/data/TaskDataBinder.java?rev=1506085&r1=1506084&r2=1506085&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/data/TaskDataBinder.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/data/TaskDataBinder.java Tue Jul 23 14:54:06 2013
@@ -26,7 +26,7 @@ import org.apache.syncope.common.to.Role
import org.apache.syncope.common.to.SchedTaskTO;
import org.apache.syncope.common.to.SyncTaskTO;
import org.apache.syncope.common.to.TaskExecTO;
-import org.apache.syncope.common.to.TaskTO;
+import org.apache.syncope.common.to.AbstractTaskTO;
import org.apache.syncope.common.to.UserTO;
import org.apache.syncope.common.types.SyncopeClientExceptionType;
import org.apache.syncope.common.types.TaskType;
@@ -226,8 +226,8 @@ public class TaskDataBinder {
}
}
- public TaskTO getTaskTO(final Task task, final TaskUtil taskUtil) {
- TaskTO taskTO = taskUtil.newTaskTO();
+ public AbstractTaskTO getTaskTO(final Task task, final TaskUtil taskUtil) {
+ AbstractTaskTO taskTO = taskUtil.newTaskTO();
BeanUtils.copyProperties(task, taskTO, IGNORE_TASK_PROPERTIES);
TaskExec latestExec = taskExecDAO.findLatestStarted(task);
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/services/PolicyServiceImpl.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/services/PolicyServiceImpl.java?rev=1506085&r1=1506084&r2=1506085&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/services/PolicyServiceImpl.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/services/PolicyServiceImpl.java Tue Jul 23 14:54:06 2013
@@ -28,7 +28,7 @@ import org.apache.syncope.common.service
import org.apache.syncope.common.to.AccountPolicyTO;
import org.apache.syncope.common.to.CorrelationRuleClassTO;
import org.apache.syncope.common.to.PasswordPolicyTO;
-import org.apache.syncope.common.to.PolicyTO;
+import org.apache.syncope.common.to.AbstractPolicyTO;
import org.apache.syncope.common.to.SyncPolicyTO;
import org.apache.syncope.common.types.PolicyType;
import org.apache.syncope.common.util.CollectionWrapper;
@@ -43,8 +43,8 @@ public class PolicyServiceImpl extends A
private PolicyController policyController;
@Override
- public <T extends PolicyTO> Response create(final PolicyType type, final T policyTO) {
- PolicyTO policy = policyController.create(policyTO);
+ public <T extends AbstractPolicyTO> Response create(final PolicyType type, final T policyTO) {
+ AbstractPolicyTO policy = policyController.create(policyTO);
URI location = uriInfo.getAbsolutePathBuilder().path(policy.getId() + "").build();
return Response.created(location).header(SyncopeConstants.REST_HEADER_ID, policy.getId()).build();
}
@@ -55,18 +55,18 @@ public class PolicyServiceImpl extends A
}
@Override
- public <T extends PolicyTO> List<T> list(final PolicyType type) {
+ public <T extends AbstractPolicyTO> List<T> list(final PolicyType type) {
return policyController.list(type);
}
@Override
- public <T extends PolicyTO> T read(final PolicyType type, final Long policyId) {
+ public <T extends AbstractPolicyTO> T read(final PolicyType type, final Long policyId) {
return policyController.read(policyId);
}
@SuppressWarnings("unchecked")
@Override
- public <T extends PolicyTO> T readGlobal(final PolicyType type) {
+ public <T extends AbstractPolicyTO> T readGlobal(final PolicyType type) {
T result = null;
switch (type) {
@@ -93,7 +93,7 @@ public class PolicyServiceImpl extends A
}
@Override
- public <T extends PolicyTO> void update(final PolicyType type, final Long policyId, final T policyTO) {
+ public <T extends AbstractPolicyTO> void update(final PolicyType type, final Long policyId, final T policyTO) {
switch (type) {
case ACCOUNT:
case GLOBAL_ACCOUNT:
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/services/TaskServiceImpl.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/services/TaskServiceImpl.java?rev=1506085&r1=1506084&r2=1506085&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/services/TaskServiceImpl.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/services/TaskServiceImpl.java Tue Jul 23 14:54:06 2013
@@ -33,7 +33,7 @@ import org.apache.syncope.common.to.Sche
import org.apache.syncope.common.to.SyncActionClassTO;
import org.apache.syncope.common.to.SyncTaskTO;
import org.apache.syncope.common.to.TaskExecTO;
-import org.apache.syncope.common.to.TaskTO;
+import org.apache.syncope.common.to.AbstractTaskTO;
import org.apache.syncope.common.types.PropagationTaskExecStatus;
import org.apache.syncope.common.types.TaskType;
import org.apache.syncope.common.util.CollectionWrapper;
@@ -54,8 +54,8 @@ public class TaskServiceImpl extends Abs
}
@Override
- public Response create(final TaskTO taskTO) {
- TaskTO createdTask;
+ public Response create(final AbstractTaskTO taskTO) {
+ AbstractTaskTO createdTask;
if (taskTO instanceof SyncTaskTO || taskTO instanceof SchedTaskTO) {
createdTask = controller.createSchedTask((SchedTaskTO) taskTO);
} else {
@@ -93,18 +93,18 @@ public class TaskServiceImpl extends Abs
}
@Override
- public <T extends TaskTO> List<T> list(final TaskType taskType) {
+ public <T extends AbstractTaskTO> List<T> list(final TaskType taskType) {
return controller.list(taskType);
}
@Override
- public <T extends TaskTO> List<T> list(final TaskType taskType, final int page, final int size) {
+ public <T extends AbstractTaskTO> List<T> list(final TaskType taskType, final int page, final int size) {
return controller.list(taskType, page, size);
}
@SuppressWarnings("unchecked")
@Override
- public <T extends TaskTO> T read(final TaskType taskType, final Long taskId) {
+ public <T extends AbstractTaskTO> T read(final TaskType taskType, final Long taskId) {
return (T) controller.read(taskId);
}
@@ -120,7 +120,7 @@ public class TaskServiceImpl extends Abs
}
@Override
- public void update(final Long taskId, final TaskTO taskTO) {
+ public void update(final Long taskId, final AbstractTaskTO taskTO) {
if (taskTO instanceof SyncTaskTO) {
controller.updateSync((SyncTaskTO) taskTO);
} else if (taskTO instanceof SchedTaskTO) {
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/util/TaskUtil.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/util/TaskUtil.java?rev=1506085&r1=1506084&r2=1506085&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/util/TaskUtil.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/util/TaskUtil.java Tue Jul 23 14:54:06 2013
@@ -22,7 +22,7 @@ import org.apache.syncope.common.to.Noti
import org.apache.syncope.common.to.PropagationTaskTO;
import org.apache.syncope.common.to.SchedTaskTO;
import org.apache.syncope.common.to.SyncTaskTO;
-import org.apache.syncope.common.to.TaskTO;
+import org.apache.syncope.common.to.AbstractTaskTO;
import org.apache.syncope.common.types.TaskType;
import org.apache.syncope.core.persistence.beans.NotificationTask;
import org.apache.syncope.core.persistence.beans.PropagationTask;
@@ -56,7 +56,7 @@ public final class TaskUtil {
return getInstance(type);
}
- public static TaskUtil getInstance(Class<? extends TaskTO> taskClass) {
+ public static TaskUtil getInstance(Class<? extends AbstractTaskTO> taskClass) {
TaskType type;
if (taskClass == PropagationTaskTO.class) {
type = TaskType.PROPAGATION;
@@ -73,7 +73,7 @@ public final class TaskUtil {
return getInstance(type);
}
- public static TaskUtil getInstance(final TaskTO taskTO) {
+ public static TaskUtil getInstance(final AbstractTaskTO taskTO) {
return getInstance(taskTO.getClass());
}
@@ -137,7 +137,7 @@ public final class TaskUtil {
return result;
}
- public <T extends TaskTO> Class<T> taskTOClass() {
+ public <T extends AbstractTaskTO> Class<T> taskTOClass() {
Class<T> result = null;
switch (type) {
@@ -163,7 +163,7 @@ public final class TaskUtil {
return result;
}
- public <T extends TaskTO> T newTaskTO() {
+ public <T extends AbstractTaskTO> T newTaskTO() {
T result = null;
switch (type) {
Modified: syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/AbstractTest.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/AbstractTest.java?rev=1506085&r1=1506084&r2=1506085&view=diff
==============================================================================
--- syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/AbstractTest.java (original)
+++ syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/AbstractTest.java Tue Jul 23 14:54:06 2013
@@ -50,7 +50,7 @@ import org.apache.syncope.common.service
import org.apache.syncope.common.services.WorkflowService;
import org.apache.syncope.common.to.AbstractSchemaTO;
import org.apache.syncope.common.to.AttributeTO;
-import org.apache.syncope.common.to.PolicyTO;
+import org.apache.syncope.common.to.AbstractPolicyTO;
import org.apache.syncope.common.to.ResourceTO;
import org.apache.syncope.common.to.RoleTO;
import org.apache.syncope.common.to.UserTO;
@@ -235,7 +235,7 @@ public abstract class AbstractTest {
}
@SuppressWarnings("unchecked")
- protected <T extends PolicyTO> T createPolicy(final PolicyType policyType, final T policy) {
+ protected <T extends AbstractPolicyTO> T createPolicy(final PolicyType policyType, final T policy) {
Response response = policyService.create(policyType, policy);
if (response.getStatus() != org.apache.http.HttpStatus.SC_CREATED) {
Exception ex = clientExceptionMapper.fromResponse(response);
Modified: syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/TaskTestITCase.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/TaskTestITCase.java?rev=1506085&r1=1506084&r2=1506085&view=diff
==============================================================================
--- syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/TaskTestITCase.java (original)
+++ syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/TaskTestITCase.java Tue Jul 23 14:54:06 2013
@@ -50,7 +50,7 @@ import org.apache.syncope.common.to.Sync
import org.apache.syncope.common.to.SyncPolicyTO;
import org.apache.syncope.common.to.SyncTaskTO;
import org.apache.syncope.common.to.TaskExecTO;
-import org.apache.syncope.common.to.TaskTO;
+import org.apache.syncope.common.to.AbstractTaskTO;
import org.apache.syncope.common.to.UserTO;
import org.apache.syncope.common.types.IntMappingType;
import org.apache.syncope.common.types.PolicyType;
@@ -148,7 +148,7 @@ public class TaskTestITCase extends Abst
assertNotNull(tasks);
assertFalse(tasks.isEmpty());
- for (TaskTO task : tasks) {
+ for (AbstractTaskTO task : tasks) {
assertNotNull(task);
}
}
@@ -161,7 +161,7 @@ public class TaskTestITCase extends Abst
assertFalse(tasks.isEmpty());
assertEquals(2, tasks.size());
- for (TaskTO task : tasks) {
+ for (AbstractTaskTO task : tasks) {
assertNotNull(task);
}
@@ -170,7 +170,7 @@ public class TaskTestITCase extends Abst
assertNotNull(tasks);
assertFalse(tasks.isEmpty());
- for (TaskTO task : tasks) {
+ for (AbstractTaskTO task : tasks) {
assertNotNull(task);
}
@@ -693,7 +693,7 @@ public class TaskTestITCase extends Abst
private TaskExecTO execSyncTask(final Long taskId, final int maxWaitSeconds,
final boolean dryRun) {
- TaskTO taskTO = taskService.read(TaskType.SYNCHRONIZATION, taskId);
+ AbstractTaskTO taskTO = taskService.read(TaskType.SYNCHRONIZATION, taskId);
assertNotNull(taskTO);
assertNotNull(taskTO.getExecutions());
@@ -901,7 +901,7 @@ public class TaskTestITCase extends Abst
final BulkAction bulkAction = new BulkAction();
bulkAction.setOperation(BulkAction.Type.DELETE);
- for (TaskTO taskTO : after) {
+ for (AbstractTaskTO taskTO : after) {
bulkAction.addTarget(String.valueOf(taskTO.getId()));
}
Modified: syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/UserTestITCase.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/UserTestITCase.java?rev=1506085&r1=1506084&r2=1506085&view=diff
==============================================================================
--- syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/UserTestITCase.java (original)
+++ syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/UserTestITCase.java Tue Jul 23 14:54:06 2013
@@ -55,7 +55,7 @@ import org.apache.syncope.common.to.Mapp
import org.apache.syncope.common.to.MappingTO;
import org.apache.syncope.common.to.MembershipTO;
import org.apache.syncope.common.to.PasswordPolicyTO;
-import org.apache.syncope.common.to.PolicyTO;
+import org.apache.syncope.common.to.AbstractPolicyTO;
import org.apache.syncope.common.to.PropagationRequestTO;
import org.apache.syncope.common.to.PropagationStatusTO;
import org.apache.syncope.common.to.PropagationTaskTO;
@@ -198,7 +198,7 @@ public class UserTestITCase extends Abst
} finally {
for (PasswordPolicyTO policyTO : policies) {
Response response = policyService.create(PolicyType.GLOBAL_PASSWORD, policyTO);
- PolicyTO cPolicyTO = getObject(response, PasswordPolicyTO.class, policyService);
+ AbstractPolicyTO cPolicyTO = getObject(response, PasswordPolicyTO.class, policyService);
assertNotNull(cPolicyTO);
}
}
Modified: syncope/trunk/pom.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/pom.xml?rev=1506085&r1=1506084&r2=1506085&view=diff
==============================================================================
--- syncope/trunk/pom.xml (original)
+++ syncope/trunk/pom.xml Tue Jul 23 14:54:06 2013
@@ -633,11 +633,6 @@ under the License.
<version>${jackson.version}</version>
</dependency>
<dependency>
- <groupId>com.fasterxml.jackson.module</groupId>
- <artifactId>jackson-module-jaxb-annotations</artifactId>
- <version>${jackson.version}</version>
- </dependency>
- <dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-json-provider</artifactId>
<version>${jackson.version}</version>