Author: jbernhardt
Date: Thu Jan 24 09:01:07 2013
New Revision: 1437912
URL: http://svn.apache.org/viewvc?rev=1437912&view=rev
Log:
[SYNCOPE-231]
Reverted last changes to trunk
Removed:
syncope/trunk/common/src/main/java/org/apache/syncope/common/to/JobClassTO.java
syncope/trunk/common/src/main/java/org/apache/syncope/common/to/SyncActionClassTO.java
syncope/trunk/common/src/main/java/org/apache/syncope/common/types/LoggerType.java
Modified:
syncope/trunk/common/src/main/java/org/apache/syncope/common/SyncopeConstants.java
syncope/trunk/common/src/main/java/org/apache/syncope/common/to/AttributeTO.java
syncope/trunk/common/src/main/java/org/apache/syncope/common/to/ConnObjectTO.java
syncope/trunk/common/src/main/java/org/apache/syncope/common/to/MembershipTO.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/PropagationTaskTO.java
syncope/trunk/common/src/main/java/org/apache/syncope/common/to/RoleTO.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/SyncTaskTO.java
syncope/trunk/common/src/main/java/org/apache/syncope/common/to/TaskExecTO.java
syncope/trunk/common/src/main/java/org/apache/syncope/common/to/TaskTO.java
syncope/trunk/common/src/main/java/org/apache/syncope/common/to/UserTO.java
syncope/trunk/common/src/main/java/org/apache/syncope/common/types/PropagationMode.java
syncope/trunk/common/src/main/java/org/apache/syncope/common/types/PropagationTaskExecStatus.java
syncope/trunk/common/src/main/java/org/apache/syncope/common/types/ResourceOperation.java
syncope/trunk/common/src/main/java/org/apache/syncope/common/types/TaskType.java
syncope/trunk/common/src/main/java/org/apache/syncope/common/types/TraceLevel.java
Modified:
syncope/trunk/common/src/main/java/org/apache/syncope/common/SyncopeConstants.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/SyncopeConstants.java?rev=1437912&r1=1437911&r2=1437912&view=diff
==============================================================================
---
syncope/trunk/common/src/main/java/org/apache/syncope/common/SyncopeConstants.java
(original)
+++
syncope/trunk/common/src/main/java/org/apache/syncope/common/SyncopeConstants.java
Thu Jan 24 09:01:07 2013
@@ -31,11 +31,4 @@ public class SyncopeConstants {
public static final String DEFAULT_DATE_PATTERN = "yyyy-MM-dd'T'HH:mm:ssZ";
- /**
- * This constant will be used to identify HTTP header key to look for
object ID assigned
- * to an object after its creation. HTTP Response after PUT operation
should contain this
- * key with resource id as its value.
- */
- public static final String REST_HEADER_ID = "org.apache.syncope.id";
-
}
Modified:
syncope/trunk/common/src/main/java/org/apache/syncope/common/to/AttributeTO.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/to/AttributeTO.java?rev=1437912&r1=1437911&r2=1437912&view=diff
==============================================================================
---
syncope/trunk/common/src/main/java/org/apache/syncope/common/to/AttributeTO.java
(original)
+++
syncope/trunk/common/src/main/java/org/apache/syncope/common/to/AttributeTO.java
Thu Jan 24 09:01:07 2013
@@ -21,15 +21,8 @@ package org.apache.syncope.common.to;
import java.util.ArrayList;
import java.util.List;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
import org.apache.syncope.common.AbstractBaseBean;
-@XmlRootElement(name = "attribute")
-@XmlType
public class AttributeTO extends AbstractBaseBean {
private static final long serialVersionUID = 4941691338796323623L;
@@ -96,8 +89,6 @@ public class AttributeTO extends Abstrac
/**
* @return attribute values as strings
*/
- @XmlElementWrapper(name = "values")
- @XmlElement(name = "value")
public List<String> getValues() {
return values;
}
Modified:
syncope/trunk/common/src/main/java/org/apache/syncope/common/to/ConnObjectTO.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/to/ConnObjectTO.java?rev=1437912&r1=1437911&r2=1437912&view=diff
==============================================================================
---
syncope/trunk/common/src/main/java/org/apache/syncope/common/to/ConnObjectTO.java
(original)
+++
syncope/trunk/common/src/main/java/org/apache/syncope/common/to/ConnObjectTO.java
Thu Jan 24 09:01:07 2013
@@ -24,16 +24,9 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
import org.apache.syncope.common.AbstractBaseBean;
import org.codehaus.jackson.annotate.JsonIgnore;
-@XmlRootElement(name = "connector")
-@XmlType
public class ConnObjectTO extends AbstractBaseBean {
private static final long serialVersionUID = 5139554911265442497L;
@@ -54,8 +47,6 @@ public class ConnObjectTO extends Abstra
return attributes.remove(attribute);
}
- @XmlElementWrapper(name = "attributes")
- @XmlElement(name = "attribute")
public List<AttributeTO> getAttributes() {
return attributes;
}
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=1437912&r1=1437911&r2=1437912&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
Thu Jan 24 09:01:07 2013
@@ -22,13 +22,6 @@ import java.util.Collections;
import java.util.List;
import java.util.Set;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-@XmlRootElement(name = "membership")
-@XmlType
public class MembershipTO extends AbstractAttributableTO {
private static final long serialVersionUID = 5992828670273935861L;
@@ -64,8 +57,6 @@ public class MembershipTO extends Abstra
}
@Override
- @XmlElementWrapper(name = "resources")
- @XmlElement(name = "resource")
public Set<String> getResources() {
return Collections.<String>emptySet();
}
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=1437912&r1=1437911&r2=1437912&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
Thu Jan 24 09:01:07 2013
@@ -21,20 +21,13 @@ package org.apache.syncope.common.to;
import java.util.HashSet;
import java.util.Set;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
import org.apache.syncope.common.types.TraceLevel;
-@XmlRootElement(name = "notificationTask")
-@XmlType
public class NotificationTaskTO extends TaskTO {
private static final long serialVersionUID = 371671242591093846L;
- private final Set<String> recipients;
+ private Set<String> recipients;
private String sender;
@@ -54,8 +47,6 @@ public class NotificationTaskTO extends
recipients = new HashSet<String>();
}
- @XmlElementWrapper(name = "recipients")
- @XmlElement(name = "recipient")
public Set<String> getRecipients() {
return recipients;
}
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=1437912&r1=1437911&r2=1437912&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
Thu Jan 24 09:01:07 2013
@@ -18,15 +18,10 @@
*/
package org.apache.syncope.common.to;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
import org.apache.syncope.common.types.AttributableType;
import org.apache.syncope.common.types.PropagationMode;
import org.apache.syncope.common.types.ResourceOperation;
-@XmlRootElement(name = "propagationTask")
-@XmlType
public class PropagationTaskTO extends TaskTO {
private static final long serialVersionUID = 386450127003321197L;
Modified:
syncope/trunk/common/src/main/java/org/apache/syncope/common/to/RoleTO.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/to/RoleTO.java?rev=1437912&r1=1437911&r2=1437912&view=diff
==============================================================================
--- syncope/trunk/common/src/main/java/org/apache/syncope/common/to/RoleTO.java
(original)
+++ syncope/trunk/common/src/main/java/org/apache/syncope/common/to/RoleTO.java
Thu Jan 24 09:01:07 2013
@@ -20,16 +20,8 @@ package org.apache.syncope.common.to;
import java.util.ArrayList;
import java.util.List;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
import org.codehaus.jackson.annotate.JsonIgnoreProperties;
-@XmlRootElement(name = "role")
-@XmlType
@JsonIgnoreProperties({"displayName"})
public class RoleTO extends AbstractAttributableTO {
@@ -55,7 +47,7 @@ public class RoleTO extends AbstractAttr
private boolean inheritAccountPolicy;
- private final List<String> entitlements;
+ private List<String> entitlements;
private Long passwordPolicy;
@@ -138,8 +130,6 @@ public class RoleTO extends AbstractAttr
return entitlements.remove(entitlement);
}
- @XmlElementWrapper(name = "entitlements")
- @XmlElement(name = "entitlement")
public List<String> getEntitlements() {
return entitlements;
}
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=1437912&r1=1437911&r2=1437912&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
Thu Jan 24 09:01:07 2013
@@ -20,11 +20,6 @@ package org.apache.syncope.common.to;
import java.util.Date;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-@XmlRootElement(name = "schedTask")
-@XmlType
public class SchedTaskTO extends TaskTO {
private static final long serialVersionUID = -5722284116974636425L;
Modified:
syncope/trunk/common/src/main/java/org/apache/syncope/common/to/SyncTaskTO.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/to/SyncTaskTO.java?rev=1437912&r1=1437911&r2=1437912&view=diff
==============================================================================
---
syncope/trunk/common/src/main/java/org/apache/syncope/common/to/SyncTaskTO.java
(original)
+++
syncope/trunk/common/src/main/java/org/apache/syncope/common/to/SyncTaskTO.java
Thu Jan 24 09:01:07 2013
@@ -18,11 +18,6 @@
*/
package org.apache.syncope.common.to;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-@XmlRootElement(name = "syncTask")
-@XmlType
public class SyncTaskTO extends SchedTaskTO {
private static final long serialVersionUID = -2143537546915809016L;
Modified:
syncope/trunk/common/src/main/java/org/apache/syncope/common/to/TaskExecTO.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/to/TaskExecTO.java?rev=1437912&r1=1437911&r2=1437912&view=diff
==============================================================================
---
syncope/trunk/common/src/main/java/org/apache/syncope/common/to/TaskExecTO.java
(original)
+++
syncope/trunk/common/src/main/java/org/apache/syncope/common/to/TaskExecTO.java
Thu Jan 24 09:01:07 2013
@@ -18,11 +18,6 @@
*/
package org.apache.syncope.common.to;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-@XmlRootElement(name = "taskExecution")
-@XmlType
public class TaskExecTO extends AbstractExecTO {
private static final long serialVersionUID = -5401795154606268973L;
Modified:
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/TaskTO.java?rev=1437912&r1=1437911&r2=1437912&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/TaskTO.java
Thu Jan 24 09:01:07 2013
@@ -22,15 +22,8 @@ import java.util.ArrayList;
import java.util.Date;
import java.util.List;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
import org.apache.syncope.common.AbstractBaseBean;
-@XmlRootElement
-@XmlType
public class TaskTO extends AbstractBaseBean {
private static final long serialVersionUID = 386450127003321197L;
@@ -40,9 +33,9 @@ public class TaskTO extends AbstractBase
private String latestExecStatus;
private List<TaskExecTO> executions;
-
+
private Date startDate;
-
+
private Date endDate;
public TaskTO() {
@@ -75,8 +68,6 @@ public class TaskTO extends AbstractBase
return executions.remove(execution);
}
- @XmlElementWrapper(name = "excecutions")
- @XmlElement(name = "excecution")
public List<TaskExecTO> getExecutions() {
return executions;
}
Modified:
syncope/trunk/common/src/main/java/org/apache/syncope/common/to/UserTO.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/to/UserTO.java?rev=1437912&r1=1437911&r2=1437912&view=diff
==============================================================================
--- syncope/trunk/common/src/main/java/org/apache/syncope/common/to/UserTO.java
(original)
+++ syncope/trunk/common/src/main/java/org/apache/syncope/common/to/UserTO.java
Thu Jan 24 09:01:07 2013
@@ -25,18 +25,10 @@ import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
import org.apache.commons.lang.builder.ReflectionToStringBuilder;
import org.apache.commons.lang.builder.ToStringStyle;
import org.codehaus.jackson.annotate.JsonIgnore;
-@XmlRootElement(name = "user")
-@XmlType
public class UserTO extends AbstractAttributableTO {
private static final long serialVersionUID = 7791304495192615740L;
@@ -83,8 +75,6 @@ public class UserTO extends AbstractAttr
return memberships.remove(membershipTO);
}
- @XmlElementWrapper(name = "memberships")
- @XmlElement(name = "membership")
public List<MembershipTO> getMemberships() {
return memberships;
}
Modified:
syncope/trunk/common/src/main/java/org/apache/syncope/common/types/PropagationMode.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/types/PropagationMode.java?rev=1437912&r1=1437911&r2=1437912&view=diff
==============================================================================
---
syncope/trunk/common/src/main/java/org/apache/syncope/common/types/PropagationMode.java
(original)
+++
syncope/trunk/common/src/main/java/org/apache/syncope/common/types/PropagationMode.java
Thu Jan 24 09:01:07 2013
@@ -18,9 +18,6 @@
*/
package org.apache.syncope.common.types;
-import javax.xml.bind.annotation.XmlEnum;
-
-@XmlEnum
public enum PropagationMode {
ONE_PHASE,
Modified:
syncope/trunk/common/src/main/java/org/apache/syncope/common/types/PropagationTaskExecStatus.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/types/PropagationTaskExecStatus.java?rev=1437912&r1=1437911&r2=1437912&view=diff
==============================================================================
---
syncope/trunk/common/src/main/java/org/apache/syncope/common/types/PropagationTaskExecStatus.java
(original)
+++
syncope/trunk/common/src/main/java/org/apache/syncope/common/types/PropagationTaskExecStatus.java
Thu Jan 24 09:01:07 2013
@@ -18,8 +18,6 @@
*/
package org.apache.syncope.common.types;
-import javax.xml.bind.annotation.XmlEnum;
-
/**
* Status of a TaskExecution.
*
@@ -30,7 +28,6 @@ import javax.xml.bind.annotation.XmlEnum
*
* @see TaskExecution
*/
-@XmlEnum
public enum PropagationTaskExecStatus {
CREATED,
Modified:
syncope/trunk/common/src/main/java/org/apache/syncope/common/types/ResourceOperation.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/types/ResourceOperation.java?rev=1437912&r1=1437911&r2=1437912&view=diff
==============================================================================
---
syncope/trunk/common/src/main/java/org/apache/syncope/common/types/ResourceOperation.java
(original)
+++
syncope/trunk/common/src/main/java/org/apache/syncope/common/types/ResourceOperation.java
Thu Jan 24 09:01:07 2013
@@ -18,9 +18,6 @@
*/
package org.apache.syncope.common.types;
-import javax.xml.bind.annotation.XmlEnum;
-
-@XmlEnum
public enum ResourceOperation {
CREATE,
Modified:
syncope/trunk/common/src/main/java/org/apache/syncope/common/types/TaskType.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/types/TaskType.java?rev=1437912&r1=1437911&r2=1437912&view=diff
==============================================================================
---
syncope/trunk/common/src/main/java/org/apache/syncope/common/types/TaskType.java
(original)
+++
syncope/trunk/common/src/main/java/org/apache/syncope/common/types/TaskType.java
Thu Jan 24 09:01:07 2013
@@ -18,9 +18,6 @@
*/
package org.apache.syncope.common.types;
-import javax.xml.bind.annotation.XmlEnum;
-
-@XmlEnum
public enum TaskType {
PROPAGATION("propagation"),
@@ -41,12 +38,12 @@ public enum TaskType {
public static TaskType fromString(String name) {
if (name != null) {
- for (TaskType t : TaskType.values()) {
- if (t.name.equalsIgnoreCase(name)) {
- return t;
- }
+ for (TaskType t : TaskType.values()) {
+ if (t.name.equalsIgnoreCase(name)) {
+ return t;
}
+ }
}
return null;
- }
+ }
}
Modified:
syncope/trunk/common/src/main/java/org/apache/syncope/common/types/TraceLevel.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/types/TraceLevel.java?rev=1437912&r1=1437911&r2=1437912&view=diff
==============================================================================
---
syncope/trunk/common/src/main/java/org/apache/syncope/common/types/TraceLevel.java
(original)
+++
syncope/trunk/common/src/main/java/org/apache/syncope/common/types/TraceLevel.java
Thu Jan 24 09:01:07 2013
@@ -18,9 +18,6 @@
*/
package org.apache.syncope.common.types;
-import javax.xml.bind.annotation.XmlEnum;
-
-@XmlEnum
public enum TraceLevel {
/**
