------------------------------------------------------------
revno: 6421
committer: Lars Helge Overland <larshe...@gmail.com>
branch nick: dhis2
timestamp: Wed 2012-03-28 18:14:44 +0200
message:
Moved class Messages from dhis-web-api to dxf2 module
added:
dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/message/
renamed:
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/webdomain/Message.java
=> dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/message/Message.java
modified:
dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalue/DataValue.java
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/MessageConversationController.java
dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/message/Message.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-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalue/DataValue.java'
--- dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalue/DataValue.java 2012-03-28 16:04:53 +0000
+++ dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalue/DataValue.java 2012-03-28 16:14:44 +0000
@@ -64,7 +64,7 @@
{
}
- @JsonProperty( required=true)
+ @JsonProperty( required=true )
@JacksonXmlProperty( isAttribute=true, namespace = Dxf2Namespace.NAMESPACE )
public String getDataElement()
{
=== added directory 'dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/message'
=== renamed file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/webdomain/Message.java' => 'dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/message/Message.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/webdomain/Message.java 2012-03-27 17:38:48 +0000
+++ dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/message/Message.java 2012-03-28 16:14:44 +0000
@@ -1,4 +1,4 @@
-package org.hisp.dhis.api.webdomain;
+package org.hisp.dhis.dxf2.message;
/*
* Copyright (c) 2004-2012, University of Oslo
=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/MessageConversationController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/MessageConversationController.java 2012-03-22 15:11:32 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/MessageConversationController.java 2012-03-28 16:14:44 +0000
@@ -31,7 +31,7 @@
import org.hisp.dhis.api.utils.IdentifiableObjectParams;
import org.hisp.dhis.api.utils.WebLinkPopulator;
import org.hisp.dhis.dxf2.utils.JacksonUtils;
-import org.hisp.dhis.api.webdomain.Message;
+import org.hisp.dhis.dxf2.message.Message;
import org.hisp.dhis.common.Pager;
import org.hisp.dhis.message.MessageConversation;
import org.hisp.dhis.message.MessageConversations;
_______________________________________________
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
