dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #22535
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 10851: reorganized list of maven repositories
------------------------------------------------------------
revno: 10851
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2013-05-15 22:15:05 +0700
message:
reorganized list of maven repositories
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnit.java
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
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnit.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnit.java 2013-03-09 14:35:08 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnit.java 2013-05-15 15:15:05 +0000
@@ -61,7 +61,7 @@
/**
* @author Kristian Nordal
*/
-@JacksonXmlRootElement(localName = "organisationUnit", namespace = DxfNamespaces.DXF_2_0)
+@JacksonXmlRootElement( localName = "organisationUnit", namespace = DxfNamespaces.DXF_2_0 )
public class OrganisationUnit
extends BaseNameableObject
{
@@ -72,10 +72,10 @@
public static final String FEATURETYPE_POLYGON = "Polygon";
public static final String FEATURETYPE_POINT = "Point";
public static final String RESULTTYPE_SYMBOL = "Symbol";
-
+
public static final String KEY_USER_ORGUNIT = "USER_ORGUNIT";
public static final String KEY_USER_ORGUNIT_CHILDREN = "USER_ORGUNIT_CHILDREN";
-
+
private static final List<String> FEATURETYPES = Arrays.asList( FEATURETYPE_NONE, FEATURETYPE_MULTIPOLYGON, FEATURETYPE_POLYGON, FEATURETYPE_POINT );
private static final Comparator<IdentifiableObject> COMPARATOR = new IdentifiableObjectNameComparator();
@@ -629,9 +629,9 @@
}
@JsonProperty
- @JsonSerialize(as = BaseIdentifiableObject.class)
- @JsonView({ DetailedView.class, ExportView.class })
- @JacksonXmlProperty(namespace = DxfNamespaces.DXF_2_0)
+ @JsonSerialize( as = BaseIdentifiableObject.class )
+ @JsonView( { DetailedView.class, ExportView.class } )
+ @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
public OrganisationUnit getParent()
{
return parent;
@@ -643,10 +643,10 @@
}
@JsonProperty
- @JsonSerialize(contentAs = BaseIdentifiableObject.class)
- @JsonView({ DetailedView.class })
- @JacksonXmlElementWrapper(localName = "children", namespace = DxfNamespaces.DXF_2_0)
- @JacksonXmlProperty(localName = "child", namespace = DxfNamespaces.DXF_2_0)
+ @JsonSerialize( contentAs = BaseIdentifiableObject.class )
+ @JsonView( { DetailedView.class } )
+ @JacksonXmlElementWrapper( localName = "children", namespace = DxfNamespaces.DXF_2_0 )
+ @JacksonXmlProperty( localName = "child", namespace = DxfNamespaces.DXF_2_0 )
public Set<OrganisationUnit> getChildren()
{
return children;
@@ -667,8 +667,8 @@
}
@JsonProperty
- @JsonView({ DetailedView.class, ExportView.class })
- @JacksonXmlProperty(namespace = DxfNamespaces.DXF_2_0)
+ @JsonView( { DetailedView.class, ExportView.class } )
+ @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
public Date getOpeningDate()
{
return openingDate;
@@ -680,8 +680,8 @@
}
@JsonProperty
- @JsonView({ DetailedView.class, ExportView.class })
- @JacksonXmlProperty(namespace = DxfNamespaces.DXF_2_0)
+ @JsonView( { DetailedView.class, ExportView.class } )
+ @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
public Date getClosedDate()
{
return closedDate;
@@ -693,8 +693,8 @@
}
@JsonProperty
- @JsonView({ DetailedView.class, ExportView.class })
- @JacksonXmlProperty(namespace = DxfNamespaces.DXF_2_0)
+ @JsonView( { DetailedView.class, ExportView.class } )
+ @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
public boolean isActive()
{
return active;
@@ -706,8 +706,8 @@
}
@JsonProperty
- @JsonView({ DetailedView.class, ExportView.class })
- @JacksonXmlProperty(namespace = DxfNamespaces.DXF_2_0)
+ @JsonView( { DetailedView.class, ExportView.class } )
+ @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
public String getComment()
{
return comment;
@@ -719,8 +719,8 @@
}
@JsonProperty
- @JsonView({ DetailedView.class, ExportView.class })
- @JacksonXmlProperty(namespace = DxfNamespaces.DXF_2_0)
+ @JsonView( { DetailedView.class, ExportView.class } )
+ @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
public String getGeoCode()
{
return geoCode;
@@ -732,8 +732,8 @@
}
@JsonProperty
- @JsonView({ DetailedView.class, ExportView.class })
- @JacksonXmlProperty(namespace = DxfNamespaces.DXF_2_0)
+ @JsonView( { DetailedView.class, ExportView.class } )
+ @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
public String getFeatureType()
{
return featureType;
@@ -745,8 +745,8 @@
}
@JsonProperty
- @JsonView({ DetailedView.class, ExportView.class })
- @JacksonXmlProperty(namespace = DxfNamespaces.DXF_2_0)
+ @JsonView( { DetailedView.class, ExportView.class } )
+ @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
public String getCoordinates()
{
return coordinates;
@@ -758,8 +758,8 @@
}
@JsonProperty
- @JsonView({ DetailedView.class, ExportView.class })
- @JacksonXmlProperty(namespace = DxfNamespaces.DXF_2_0)
+ @JsonView( { DetailedView.class, ExportView.class } )
+ @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
public String getUrl()
{
return url;
@@ -771,8 +771,8 @@
}
@JsonProperty
- @JsonView({ DetailedView.class, ExportView.class })
- @JacksonXmlProperty(namespace = DxfNamespaces.DXF_2_0)
+ @JsonView( { DetailedView.class, ExportView.class } )
+ @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
public String getContactPerson()
{
return contactPerson;
@@ -784,8 +784,8 @@
}
@JsonProperty
- @JsonView({ DetailedView.class, ExportView.class })
- @JacksonXmlProperty(namespace = DxfNamespaces.DXF_2_0)
+ @JsonView( { DetailedView.class, ExportView.class } )
+ @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
public String getAddress()
{
return address;
@@ -797,8 +797,8 @@
}
@JsonProperty
- @JsonView({ DetailedView.class, ExportView.class })
- @JacksonXmlProperty(namespace = DxfNamespaces.DXF_2_0)
+ @JsonView( { DetailedView.class, ExportView.class } )
+ @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
public String getEmail()
{
return email;
@@ -810,8 +810,8 @@
}
@JsonProperty
- @JsonView({ DetailedView.class, ExportView.class })
- @JacksonXmlProperty(namespace = DxfNamespaces.DXF_2_0)
+ @JsonView( { DetailedView.class, ExportView.class } )
+ @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
public String getPhoneNumber()
{
return phoneNumber;
@@ -823,8 +823,8 @@
}
@JsonProperty
- @JsonView({ DetailedView.class, ExportView.class })
- @JacksonXmlProperty(namespace = DxfNamespaces.DXF_2_0)
+ @JsonView( { DetailedView.class, ExportView.class } )
+ @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
public String getType()
{
return type;
@@ -835,11 +835,11 @@
this.type = type;
}
- @JsonProperty(value = "organisationUnitGroups")
- @JsonSerialize(contentAs = BaseIdentifiableObject.class)
- @JsonView({ DetailedView.class })
- @JacksonXmlElementWrapper(localName = "organisationUnitGroups", namespace = DxfNamespaces.DXF_2_0)
- @JacksonXmlProperty(localName = "organisationUnitGroup", namespace = DxfNamespaces.DXF_2_0)
+ @JsonProperty( value = "organisationUnitGroups" )
+ @JsonSerialize( contentAs = BaseIdentifiableObject.class )
+ @JsonView( { DetailedView.class } )
+ @JacksonXmlElementWrapper( localName = "organisationUnitGroups", namespace = DxfNamespaces.DXF_2_0 )
+ @JacksonXmlProperty( localName = "organisationUnitGroup", namespace = DxfNamespaces.DXF_2_0 )
public Set<OrganisationUnitGroup> getGroups()
{
return groups;
@@ -866,10 +866,10 @@
}
@JsonProperty
- @JsonSerialize(contentAs = BaseIdentifiableObject.class)
- @JsonView({ DetailedView.class })
- @JacksonXmlElementWrapper(localName = "users", namespace = DxfNamespaces.DXF_2_0)
- @JacksonXmlProperty(localName = "user", namespace = DxfNamespaces.DXF_2_0)
+ @JsonSerialize( contentAs = BaseIdentifiableObject.class )
+ @JsonView( { DetailedView.class } )
+ @JacksonXmlElementWrapper( localName = "users", namespace = DxfNamespaces.DXF_2_0 )
+ @JacksonXmlProperty( localName = "user", namespace = DxfNamespaces.DXF_2_0 )
public Set<User> getUsers()
{
return users;
@@ -880,10 +880,10 @@
this.users = users;
}
- @JsonProperty(value = "attributes")
- @JsonView({ DetailedView.class, ExportView.class })
- @JacksonXmlElementWrapper(localName = "attributes", namespace = DxfNamespaces.DXF_2_0)
- @JacksonXmlProperty(localName = "attribute", namespace = DxfNamespaces.DXF_2_0)
+ @JsonProperty( value = "attributes" )
+ @JsonView( { DetailedView.class, ExportView.class } )
+ @JacksonXmlElementWrapper( localName = "attributes", namespace = DxfNamespaces.DXF_2_0 )
+ @JacksonXmlProperty( localName = "attribute", namespace = DxfNamespaces.DXF_2_0 )
public Set<AttributeValue> getAttributeValues()
{
return attributeValues;
=== modified file 'dhis-2/pom.xml'
--- dhis-2/pom.xml 2013-05-13 10:39:38 +0000
+++ dhis-2/pom.xml 2013-05-15 15:15:05 +0000
@@ -46,6 +46,23 @@
<repositories>
<repository>
+ <id>MavenCentral</id>
+ <name>Maven repository</name>
+ <url>http://repo1.maven.org/maven2</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+
+ <repository>
+ <id>UK</id>
+ <name>UK Central</name>
+ <url>http://uk.maven.org/maven2</url>
+ </repository>
+ <repository>
<id>org.springframework.maven.release</id>
<name>Spring Maven Repository</name>
<url>http://maven.springframework.org/release</url>
@@ -61,20 +78,15 @@
<url>http://maven.dhis2.org/amplecode-local</url>
</repository>
<repository>
+ <id>osgeo</id>
+ <name>Open Source Geospatial Foundation Repository</name>
+ <url>http://download.osgeo.org/webdav/geotools/</url>
+ </repository>
+ <repository>
<id>dhis.uio.no</id>
<name>Dhis2 External Dependencies Repository</name>
<url>http://dhis.uio.no/maven/external</url>
</repository>
- <repository>
- <id>UK</id>
- <name>UK Central</name>
- <url>http://uk.maven.org/maven2</url>
- </repository>
- <repository>
- <id>osgeo</id>
- <name>Open Source Geospatial Foundation Repository</name>
- <url>http://download.osgeo.org/webdav/geotools/</url>
- </repository>
<!--
<repository>
@@ -719,9 +731,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>net.sf.jasperreports</groupId>
- <artifactId>jasperreports-fonts</artifactId>
- <version>4.0.0</version>
+ <groupId>net.sf.jasperreports</groupId>
+ <artifactId>jasperreports-fonts</artifactId>
+ <version>4.0.0</version>
</dependency>
<dependency>
<groupId>jfree</groupId>
@@ -923,16 +935,16 @@
</dependency>
<dependency>
- <groupId>com.jayway.jsonpath</groupId>
- <artifactId>json-path</artifactId>
- <version>0.8.1</version>
- <scope>test</scope>
+ <groupId>com.jayway.jsonpath</groupId>
+ <artifactId>json-path</artifactId>
+ <version>0.8.1</version>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-library</artifactId>
- <version>1.3</version>
- <scope>test</scope>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-library</artifactId>
+ <version>1.3</version>
+ <scope>test</scope>
</dependency>
</dependencies>
