------------------------------------------------------------ revno: 5165 committer: Morten Olav Hansen <[email protected]> branch nick: dhis2 timestamp: Tue 2011-11-15 12:05:52 +0000 message: minor changes added: dhis-2/dhis-api/src/main/java/org/hisp/dhis/codelist/ dhis-2/dhis-api/src/main/java/org/hisp/dhis/codelist/CodeList.java modified: dhis-2/dhis-web/dhis-web-api/pom.xml dhis-2/pom.xml
-- 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
=== added directory 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/codelist' === added file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/codelist/CodeList.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/codelist/CodeList.java 1970-01-01 00:00:00 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/codelist/CodeList.java 2011-11-15 12:05:52 +0000 @@ -0,0 +1,41 @@ +package org.hisp.dhis.codelist; + +import org.hisp.dhis.common.AbstractIdentifiableObject; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import java.util.ArrayList; +import java.util.List; + +/** + * @author Morten Olav Hansen <[email protected]> + */ +@XmlRootElement( name = "codeList" ) +@XmlAccessorType( value = XmlAccessType.FIELD ) +public class CodeList<T extends AbstractIdentifiableObject> +{ + @XmlElement( name = "identifiableObject" ) + private List<T> list = new ArrayList<T>(); + + public CodeList() + { + + } + + public CodeList( List<T> list ) + { + this.list = list; + } + + public List<T> getList() + { + return list; + } + + public void setList( List<T> list ) + { + this.list = list; + } +} === modified file 'dhis-2/dhis-web/dhis-web-api/pom.xml' --- dhis-2/dhis-web/dhis-web-api/pom.xml 2011-11-14 12:19:36 +0000 +++ dhis-2/dhis-web/dhis-web-api/pom.xml 2011-11-15 12:05:52 +0000 @@ -40,6 +40,10 @@ </dependency> <dependency> <groupId>org.codehaus.jackson</groupId> + <artifactId>jackson-core-asl</artifactId> + </dependency> + <dependency> + <groupId>org.codehaus.jackson</groupId> <artifactId>jackson-mapper-asl</artifactId> </dependency> <dependency> === modified file 'dhis-2/pom.xml' --- dhis-2/pom.xml 2011-11-14 12:19:36 +0000 +++ dhis-2/pom.xml 2011-11-15 12:05:52 +0000 @@ -763,6 +763,12 @@ <!-- Jackson JSON Mapper --> <dependency> <groupId>org.codehaus.jackson</groupId> + <artifactId>jackson-core-asl</artifactId> + <version>1.7.1</version> + </dependency> + + <dependency> + <groupId>org.codehaus.jackson</groupId> <artifactId>jackson-mapper-asl</artifactId> <version>1.7.1</version> </dependency> @@ -776,7 +782,7 @@ <dependency> <groupId>javax.xml.bind</groupId> <artifactId>jaxb-api</artifactId> - <version>2.0</version> + <version>2.2.2</version> </dependency> </dependencies>
_______________________________________________ Mailing list: https://launchpad.net/~dhis2-devs Post to : [email protected] Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp
