You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by cs...@apache.org on 2013/01/25 13:42:04 UTC
svn commit: r1438473 - in
/syncope/trunk/common/src/main/java/org/apache/syncope/common:
report/AbstractReportletConf.java report/StaticReportletConf.java
report/UserReportletConf.java to/ReportTO.java
Author: cschneider
Date: Fri Jan 25 12:42:03 2013
New Revision: 1438473
URL: http://svn.apache.org/viewvc?rev=1438473&view=rev
Log:
SYNCOPE-231 Fix for reportservice to correctly serialize ReportTOs
Modified:
syncope/trunk/common/src/main/java/org/apache/syncope/common/report/AbstractReportletConf.java
syncope/trunk/common/src/main/java/org/apache/syncope/common/report/StaticReportletConf.java
syncope/trunk/common/src/main/java/org/apache/syncope/common/report/UserReportletConf.java
syncope/trunk/common/src/main/java/org/apache/syncope/common/to/ReportTO.java
Modified: syncope/trunk/common/src/main/java/org/apache/syncope/common/report/AbstractReportletConf.java
URL: http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/report/AbstractReportletConf.java?rev=1438473&r1=1438472&r2=1438473&view=diff
==============================================================================
--- syncope/trunk/common/src/main/java/org/apache/syncope/common/report/AbstractReportletConf.java (original)
+++ syncope/trunk/common/src/main/java/org/apache/syncope/common/report/AbstractReportletConf.java Fri Jan 25 12:42:03 2013
@@ -18,8 +18,11 @@
*/
package org.apache.syncope.common.report;
+import javax.xml.bind.annotation.XmlType;
+
import org.apache.syncope.common.AbstractBaseBean;
+@XmlType
public abstract class AbstractReportletConf extends AbstractBaseBean implements ReportletConf {
private static final long serialVersionUID = -6130008602014516608L;
Modified: syncope/trunk/common/src/main/java/org/apache/syncope/common/report/StaticReportletConf.java
URL: http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/report/StaticReportletConf.java?rev=1438473&r1=1438472&r2=1438473&view=diff
==============================================================================
--- syncope/trunk/common/src/main/java/org/apache/syncope/common/report/StaticReportletConf.java (original)
+++ syncope/trunk/common/src/main/java/org/apache/syncope/common/report/StaticReportletConf.java Fri Jan 25 12:42:03 2013
@@ -22,8 +22,11 @@ import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import javax.xml.bind.annotation.XmlRootElement;
+
import org.apache.syncope.common.types.TraceLevel;
+@XmlRootElement
public class StaticReportletConf extends AbstractReportletConf {
private static final long serialVersionUID = -4814950086361753689L;
Modified: syncope/trunk/common/src/main/java/org/apache/syncope/common/report/UserReportletConf.java
URL: http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/report/UserReportletConf.java?rev=1438473&r1=1438472&r2=1438473&view=diff
==============================================================================
--- syncope/trunk/common/src/main/java/org/apache/syncope/common/report/UserReportletConf.java (original)
+++ syncope/trunk/common/src/main/java/org/apache/syncope/common/report/UserReportletConf.java Fri Jan 25 12:42:03 2013
@@ -21,10 +21,13 @@ package org.apache.syncope.common.report
import java.util.ArrayList;
import java.util.List;
+import javax.xml.bind.annotation.XmlRootElement;
+
import org.apache.syncope.common.annotation.FormAttributeField;
import org.apache.syncope.common.search.NodeCond;
import org.apache.syncope.common.types.IntMappingType;
+@XmlRootElement
public class UserReportletConf extends AbstractReportletConf {
public enum Feature {
Modified: syncope/trunk/common/src/main/java/org/apache/syncope/common/to/ReportTO.java
URL: http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/to/ReportTO.java?rev=1438473&r1=1438472&r2=1438473&view=diff
==============================================================================
--- syncope/trunk/common/src/main/java/org/apache/syncope/common/to/ReportTO.java (original)
+++ syncope/trunk/common/src/main/java/org/apache/syncope/common/to/ReportTO.java Fri Jan 25 12:42:03 2013
@@ -28,6 +28,7 @@ import javax.xml.bind.annotation.XmlRoot
import javax.xml.bind.annotation.XmlType;
import org.apache.syncope.common.AbstractBaseBean;
+import org.apache.syncope.common.report.AbstractReportletConf;
import org.apache.syncope.common.report.ReportletConf;
@XmlRootElement(name = "report")
@@ -88,7 +89,7 @@ public class ReportTO extends AbstractBa
}
@XmlElementWrapper(name = "reportletConfigurations")
- @XmlElement(name = "configuration")
+ @XmlElement(name = "configuration", type=AbstractReportletConf.class)
public List<ReportletConf> getReportletConfs() {
return reportletConfs;
}