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 2014/01/07 16:53:51 UTC
svn commit: r1556252 - in
/syncope/trunk/common/src/main/java/org/apache/syncope/common:
AbstractBaseBean.java to/AbstractSyncTaskTO.java to/AbstractTaskTO.java
to/SchedTaskTO.java
Author: ilgrosso
Date: Tue Jan 7 15:53:50 2014
New Revision: 1556252
URL: http://svn.apache.org/r1556252
Log:
Fixing @XmlSeeAlso - making application/xml core integration tests working again
Modified:
syncope/trunk/common/src/main/java/org/apache/syncope/common/AbstractBaseBean.java
syncope/trunk/common/src/main/java/org/apache/syncope/common/to/AbstractSyncTaskTO.java
syncope/trunk/common/src/main/java/org/apache/syncope/common/to/AbstractTaskTO.java
syncope/trunk/common/src/main/java/org/apache/syncope/common/to/SchedTaskTO.java
Modified: syncope/trunk/common/src/main/java/org/apache/syncope/common/AbstractBaseBean.java
URL: http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/AbstractBaseBean.java?rev=1556252&r1=1556251&r2=1556252&view=diff
==============================================================================
--- syncope/trunk/common/src/main/java/org/apache/syncope/common/AbstractBaseBean.java (original)
+++ syncope/trunk/common/src/main/java/org/apache/syncope/common/AbstractBaseBean.java Tue Jan 7 15:53:50 2014
@@ -27,10 +27,12 @@ import org.apache.commons.lang3.builder.
import org.apache.commons.lang3.builder.ToStringStyle;
import org.apache.syncope.common.to.AbstractTaskTO;
import org.apache.syncope.common.to.ReportTO;
+import org.apache.syncope.common.to.RoleTO;
+import org.apache.syncope.common.to.UserTO;
@XmlType
// Reporting here only classes used via PagedResult
-@XmlSeeAlso({ AbstractTaskTO.class, ReportTO.class })
+@XmlSeeAlso({ AbstractTaskTO.class, ReportTO.class, RoleTO.class, UserTO.class })
public abstract class AbstractBaseBean implements Serializable {
private static final long serialVersionUID = 3119542005279892164L;
Modified: syncope/trunk/common/src/main/java/org/apache/syncope/common/to/AbstractSyncTaskTO.java
URL: http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/to/AbstractSyncTaskTO.java?rev=1556252&r1=1556251&r2=1556252&view=diff
==============================================================================
--- syncope/trunk/common/src/main/java/org/apache/syncope/common/to/AbstractSyncTaskTO.java (original)
+++ syncope/trunk/common/src/main/java/org/apache/syncope/common/to/AbstractSyncTaskTO.java Tue Jan 7 15:53:50 2014
@@ -18,6 +18,13 @@
*/
package org.apache.syncope.common.to;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlSeeAlso;
+import javax.xml.bind.annotation.XmlType;
+
+@XmlRootElement(name = "abstractSyncTask")
+@XmlType
+@XmlSeeAlso({ PushTaskTO.class, SyncTaskTO.class })
public class AbstractSyncTaskTO extends SchedTaskTO {
private static final long serialVersionUID = -2143537546915809016L;
@@ -78,7 +85,7 @@ public class AbstractSyncTaskTO extends
return actionsClassName;
}
- public void setActionsClassName(String actionsClassName) {
+ public void setActionsClassName(final String actionsClassName) {
this.actionsClassName = actionsClassName;
}
}
Modified: syncope/trunk/common/src/main/java/org/apache/syncope/common/to/AbstractTaskTO.java
URL: http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/to/AbstractTaskTO.java?rev=1556252&r1=1556251&r2=1556252&view=diff
==============================================================================
--- syncope/trunk/common/src/main/java/org/apache/syncope/common/to/AbstractTaskTO.java (original)
+++ syncope/trunk/common/src/main/java/org/apache/syncope/common/to/AbstractTaskTO.java Tue Jan 7 15:53:50 2014
@@ -35,7 +35,7 @@ import org.apache.syncope.common.Abstrac
@XmlRootElement(name = "abstractTask")
@XmlType
-@XmlSeeAlso({ PropagationTaskTO.class, SyncTaskTO.class, SchedTaskTO.class, NotificationTaskTO.class })
+@XmlSeeAlso({ PropagationTaskTO.class, SchedTaskTO.class, NotificationTaskTO.class })
@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.PROPERTY, property = "@class")
public abstract class AbstractTaskTO extends AbstractBaseBean {
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=1556252&r1=1556251&r2=1556252&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 Jan 7 15:53:50 2014
@@ -21,10 +21,12 @@ package org.apache.syncope.common.to;
import java.util.Date;
import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlSeeAlso;
import javax.xml.bind.annotation.XmlType;
@XmlRootElement(name = "schedTask")
@XmlType
+@XmlSeeAlso(AbstractSyncTaskTO.class)
public class SchedTaskTO extends AbstractTaskTO {
private static final long serialVersionUID = -5722284116974636425L;