------------------------------------------------------------ revno: 21475 committer: Morten Olav Hansen <morte...@gmail.com> branch nick: dhis2 timestamp: Thu 2015-12-17 09:38:15 +0100 message: minor fix, dont namespace xml attributes modified: dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/Event.java dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/webdomain/WebMetaData.java
-- lp:dhis2 https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk Your team DHIS 2 developers is subscribed to branch lp:dhis2. To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/Event.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/Event.java 2015-11-20 11:38:58 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/Event.java 2015-12-17 08:38:15 +0000 @@ -32,7 +32,6 @@ import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; - import org.hisp.dhis.common.BaseLinkableObject; import org.hisp.dhis.common.DxfNamespaces; import org.hisp.dhis.dxf2.events.enrollment.EnrollmentStatus; @@ -83,13 +82,13 @@ private String created; private String lastUpdated; - + private String attributeCategoryOptions; - + private String completedUser; private String completedDate; - + public Event() { } @@ -311,7 +310,7 @@ { this.lastUpdated = lastUpdated; } - + @JsonProperty @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 ) public String getAttributeCategoryOptions() @@ -322,7 +321,7 @@ public void setAttributeCategoryOptions( String attributeCategoryOptions ) { this.attributeCategoryOptions = attributeCategoryOptions; - } + } @JsonProperty @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 ) @@ -386,5 +385,5 @@ ", completedUser=" + completedUser + ", completedDate=" + completedDate + '}'; - } + } } === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/webdomain/WebMetaData.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/webdomain/WebMetaData.java 2015-01-17 07:41:26 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/webdomain/WebMetaData.java 2015-12-17 08:38:15 +0000 @@ -58,7 +58,7 @@ } @JsonProperty - @JacksonXmlProperty( isAttribute = true, namespace = DxfNamespaces.DXF_2_0 ) + @JacksonXmlProperty( isAttribute = true ) public String getLink() { if ( linkableObject == null )
_______________________________________________ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp