dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #30513
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 15482: minor update to schema order, add a bit more room between each schema, makes it easier to plug in...
------------------------------------------------------------
revno: 15482
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Sat 2014-05-31 15:18:51 +0200
message:
minor update to schema order, add a bit more room between each schema, makes it easier to plug in other schemas later
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/AttributeSchemaDescriptor.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/CategoryComboSchemaDescriptor.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/CategoryOptionComboSchemaDescriptor.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/CategoryOptionGroupSchemaDescriptor.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/CategoryOptionGroupSetSchemaDescriptor.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/CategoryOptionSchemaDescriptor.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/CategorySchemaDescriptor.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/ChartSchemaDescriptor.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/ConceptSchemaDescriptor.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/ConstantSchemaDescriptor.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/DashboardSchemaDescriptor.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/DataApprovalLevelSchemaDescriptor.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/DataDictionarySchemaDescriptor.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/DataElementGroupSchemaDescriptor.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/DataElementGroupSetSchemaDescriptor.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/DataElementOperandSchemaDescriptor.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/DataElementSchemaDescriptor.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/DataSetSchemaDescriptor.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/DocumentSchemaDescriptor.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/EventReportSchemaDescriptor.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/IndicatorGroupSchemaDescriptor.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/IndicatorGroupSetSchemaDescriptor.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/IndicatorSchemaDescriptor.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/IndicatorTypeSchemaDescriptor.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/InterpretationSchemaDescriptor.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/MapLayerSchemaDescriptor.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/MapLegendSchemaDescriptor.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/MapLegendSetSchemaDescriptor.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/MapSchemaDescriptor.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/MapViewSchemaDescriptor.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/MessageConversationSchemaDescriptor.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/OptionSetSchemaDescriptor.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/OrganisationUnitGroupSchemaDescriptor.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/OrganisationUnitGroupSetSchemaDescriptor.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/OrganisationUnitLevelSchemaDescriptor.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/OrganisationUnitSchemaDescriptor.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/ProgramSchemaDescriptor.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/ProgramStageSchemaDescriptor.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/ProgramStageSectionSchemaDescriptor.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/ProgramValidationSchemaDescriptor.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/RelationshipTypeSchemaDescriptor.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/ReportSchemaDescriptor.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/ReportTableSchemaDescriptor.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/SectionSchemaDescriptor.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/SqlViewSchemaDescriptor.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/TrackedEntityAttributeGroupSchemaDescriptor.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/TrackedEntityAttributeSchemaDescriptor.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/TrackedEntitySchemaDescriptor.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/UserGroupSchemaDescriptor.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/UserRoleSchemaDescriptor.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/UserSchemaDescriptor.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/ValidationCriteriaSchemaDescriptor.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/ValidationRuleGroupSchemaDescriptor.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/ValidationRuleSchemaDescriptor.java
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/ExchangeClasses.java
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/DataSetController.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-api/src/main/java/org/hisp/dhis/schema/descriptors/AttributeSchemaDescriptor.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/AttributeSchemaDescriptor.java 2014-05-28 11:48:43 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/AttributeSchemaDescriptor.java 2014-05-31 13:18:51 +0000
@@ -53,7 +53,7 @@
{
Schema schema = new Schema( Attribute.class, SINGULAR, PLURAL );
schema.setApiEndpoint( API_ENDPOINT );
- schema.setOrder( 106 );
+ schema.setOrder( 1060 );
schema.getAuthorities().add( new Authority( AuthorityType.CREATE, Lists.newArrayList( "F_ATTRIBUTE_ADD" ) ) );
schema.getAuthorities().add( new Authority( AuthorityType.DELETE, Lists.newArrayList( "F_ATTRIBUTE_DELETE" ) ) );
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/CategoryComboSchemaDescriptor.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/CategoryComboSchemaDescriptor.java 2014-05-28 11:48:43 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/CategoryComboSchemaDescriptor.java 2014-05-31 13:18:51 +0000
@@ -54,7 +54,7 @@
Schema schema = new Schema( DataElementCategoryCombo.class, SINGULAR, PLURAL );
schema.setApiEndpoint( API_ENDPOINT );
schema.setShareable( true );
- schema.setOrder( 118 );
+ schema.setOrder( 1180 );
schema.getAuthorities().add( new Authority( AuthorityType.CREATE_PUBLIC, Lists.newArrayList( "F_CATEGORY_COMBO_PUBLIC_ADD" ) ) );
schema.getAuthorities().add( new Authority( AuthorityType.CREATE_PRIVATE, Lists.newArrayList( "F_CATEGORY_COMBO_PRIVATE_ADD" ) ) );
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/CategoryOptionComboSchemaDescriptor.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/CategoryOptionComboSchemaDescriptor.java 2014-05-28 11:48:43 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/CategoryOptionComboSchemaDescriptor.java 2014-05-31 13:18:51 +0000
@@ -54,7 +54,7 @@
Schema schema = new Schema( DataElementCategoryOptionCombo.class, SINGULAR, PLURAL );
schema.setApiEndpoint( API_ENDPOINT );
schema.setShareable( false );
- schema.setOrder( 119 );
+ schema.setOrder( 1190 );
schema.getAuthorities().add( new Authority( AuthorityType.CREATE,
Lists.newArrayList( "F_CATEGORY_COMBO_PUBLIC_ADD", "F_CATEGORY_COMBO_PRIVATE_ADD" ) ) );
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/CategoryOptionGroupSchemaDescriptor.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/CategoryOptionGroupSchemaDescriptor.java 2014-05-28 11:48:43 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/CategoryOptionGroupSchemaDescriptor.java 2014-05-31 13:18:51 +0000
@@ -54,7 +54,7 @@
Schema schema = new Schema( CategoryOptionGroup.class, SINGULAR, PLURAL );
schema.setApiEndpoint( API_ENDPOINT );
schema.setShareable( true );
- schema.setOrder( 115 );
+ schema.setOrder( 1150 );
schema.getAuthorities().add( new Authority( AuthorityType.CREATE_PUBLIC, Lists.newArrayList( "F_CATEGORY_OPTION_GROUP_PUBLIC_ADD" ) ) );
schema.getAuthorities().add( new Authority( AuthorityType.CREATE_PRIVATE, Lists.newArrayList( "F_CATEGORY_OPTION_GROUP_PRIVATE_ADD" ) ) );
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/CategoryOptionGroupSetSchemaDescriptor.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/CategoryOptionGroupSetSchemaDescriptor.java 2014-05-28 11:48:43 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/CategoryOptionGroupSetSchemaDescriptor.java 2014-05-31 13:18:51 +0000
@@ -54,7 +54,7 @@
Schema schema = new Schema( CategoryOptionGroupSet.class, SINGULAR, PLURAL );
schema.setApiEndpoint( API_ENDPOINT );
schema.setShareable( true );
- schema.setOrder( 116 );
+ schema.setOrder( 1160 );
schema.getAuthorities().add( new Authority( AuthorityType.CREATE_PUBLIC, Lists.newArrayList( "F_CATEGORY_OPTION_GROUP_SET_PUBLIC_ADD" ) ) );
schema.getAuthorities().add( new Authority( AuthorityType.CREATE_PRIVATE, Lists.newArrayList( "F_CATEGORY_OPTION_GROUP_SET_PRIVATE_ADD" ) ) );
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/CategoryOptionSchemaDescriptor.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/CategoryOptionSchemaDescriptor.java 2014-05-28 11:48:43 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/CategoryOptionSchemaDescriptor.java 2014-05-31 13:18:51 +0000
@@ -54,7 +54,7 @@
Schema schema = new Schema( DataElementCategoryOption.class, SINGULAR, PLURAL );
schema.setApiEndpoint( API_ENDPOINT );
schema.setShareable( true );
- schema.setOrder( 114 );
+ schema.setOrder( 1140 );
schema.getAuthorities().add( new Authority( AuthorityType.CREATE_PUBLIC, Lists.newArrayList( "F_CATEGORY_OPTION_PUBLIC_ADD" ) ) );
schema.getAuthorities().add( new Authority( AuthorityType.CREATE_PRIVATE, Lists.newArrayList( "F_CATEGORY_OPTION_PRIVATE_ADD" ) ) );
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/CategorySchemaDescriptor.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/CategorySchemaDescriptor.java 2014-05-28 11:48:43 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/CategorySchemaDescriptor.java 2014-05-31 13:18:51 +0000
@@ -54,7 +54,7 @@
Schema schema = new Schema( DataElementCategory.class, SINGULAR, PLURAL );
schema.setApiEndpoint( API_ENDPOINT );
schema.setShareable( true );
- schema.setOrder( 117 );
+ schema.setOrder( 1170 );
schema.getAuthorities().add( new Authority( AuthorityType.CREATE_PUBLIC, Lists.newArrayList( "F_CATEGORY_PUBLIC_ADD" ) ) );
schema.getAuthorities().add( new Authority( AuthorityType.CREATE_PRIVATE, Lists.newArrayList( "F_CATEGORY_PRIVATE_ADD" ) ) );
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/ChartSchemaDescriptor.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/ChartSchemaDescriptor.java 2014-05-28 11:48:43 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/ChartSchemaDescriptor.java 2014-05-31 13:18:51 +0000
@@ -54,7 +54,7 @@
Schema schema = new Schema( Chart.class, SINGULAR, PLURAL );
schema.setApiEndpoint( API_ENDPOINT );
schema.setShareable( true );
- schema.setOrder( 136 );
+ schema.setOrder( 1360 );
schema.getAuthorities().add( new Authority( AuthorityType.CREATE_PUBLIC, Lists.newArrayList( "F_CHART_PUBLIC_ADD" ) ) );
schema.getAuthorities().add( new Authority( AuthorityType.EXTERNALIZE, Lists.newArrayList( "F_CHART_EXTERNAL" ) ) );
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/ConceptSchemaDescriptor.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/ConceptSchemaDescriptor.java 2014-05-28 11:48:43 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/ConceptSchemaDescriptor.java 2014-05-31 13:18:51 +0000
@@ -50,7 +50,7 @@
{
Schema schema = new Schema( Concept.class, SINGULAR, PLURAL );
schema.setApiEndpoint( API_ENDPOINT );
- schema.setOrder( 102 );
+ schema.setOrder( 1020 );
return schema;
}
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/ConstantSchemaDescriptor.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/ConstantSchemaDescriptor.java 2014-05-28 11:48:43 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/ConstantSchemaDescriptor.java 2014-05-31 13:18:51 +0000
@@ -53,7 +53,7 @@
{
Schema schema = new Schema( Constant.class, SINGULAR, PLURAL );
schema.setApiEndpoint( API_ENDPOINT );
- schema.setOrder( 103 );
+ schema.setOrder( 1030 );
schema.getAuthorities().add( new Authority( AuthorityType.CREATE, Lists.newArrayList( "F_CONSTANT_ADD" ) ) );
schema.getAuthorities().add( new Authority( AuthorityType.DELETE, Lists.newArrayList( "F_CONSTANT_DELETE" ) ) );
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/DashboardSchemaDescriptor.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/DashboardSchemaDescriptor.java 2014-05-28 11:48:43 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/DashboardSchemaDescriptor.java 2014-05-31 13:18:51 +0000
@@ -55,7 +55,7 @@
schema.setApiEndpoint( API_ENDPOINT );
schema.setMetadata( false );
schema.setShareable( true );
- schema.setOrder( 139 );
+ schema.setOrder( 1380 );
schema.getAuthorities().add( new Authority( AuthorityType.CREATE_PUBLIC, Lists.newArrayList( "F_DASHBOARD_PUBLIC_ADD" ) ) );
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/DataApprovalLevelSchemaDescriptor.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/DataApprovalLevelSchemaDescriptor.java 2014-05-28 11:48:43 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/DataApprovalLevelSchemaDescriptor.java 2014-05-31 13:18:51 +0000
@@ -51,7 +51,7 @@
Schema schema = new Schema( DataApprovalLevel.class, SINGULAR, PLURAL );
schema.setApiEndpoint( API_ENDPOINT );
schema.setShareable( true );
- schema.setOrder( 138 );
+ schema.setOrder( 1370 );
schema.getAuthorities().add( new Authority( AuthorityType.CREATE_PUBLIC, Lists.newArrayList( "F_SYSTEM_SETTING" ) ) );
schema.getAuthorities().add( new Authority( AuthorityType.CREATE_PRIVATE, Lists.newArrayList( "F_SYSTEM_SETTING" ) ) );
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/DataDictionarySchemaDescriptor.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/DataDictionarySchemaDescriptor.java 2014-05-28 11:48:43 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/DataDictionarySchemaDescriptor.java 2014-05-31 13:18:51 +0000
@@ -54,7 +54,7 @@
Schema schema = new Schema( DataDictionary.class, SINGULAR, PLURAL );
schema.setApiEndpoint( API_ENDPOINT );
schema.setShareable( true );
- schema.setOrder( 128 );
+ schema.setOrder( 1280 );
schema.getAuthorities().add( new Authority( AuthorityType.CREATE_PUBLIC, Lists.newArrayList( "F_DATADICTIONARY_PUBLIC_ADD" ) ) );
schema.getAuthorities().add( new Authority( AuthorityType.CREATE_PRIVATE, Lists.newArrayList( "F_DATADICTIONARY_PRIVATE_ADD" ) ) );
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/DataElementGroupSchemaDescriptor.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/DataElementGroupSchemaDescriptor.java 2014-05-28 11:48:43 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/DataElementGroupSchemaDescriptor.java 2014-05-31 13:18:51 +0000
@@ -54,7 +54,7 @@
Schema schema = new Schema( DataElementGroup.class, SINGULAR, PLURAL );
schema.setApiEndpoint( API_ENDPOINT );
schema.setShareable( true );
- schema.setOrder( 121 );
+ schema.setOrder( 1210 );
schema.getAuthorities().add( new Authority( AuthorityType.CREATE_PUBLIC, Lists.newArrayList( "F_DATAELEMENTGROUP_PUBLIC_ADD" ) ) );
schema.getAuthorities().add( new Authority( AuthorityType.CREATE_PRIVATE, Lists.newArrayList( "F_DATAELEMENTGROUP_PRIVATE_ADD" ) ) );
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/DataElementGroupSetSchemaDescriptor.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/DataElementGroupSetSchemaDescriptor.java 2014-05-28 11:48:43 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/DataElementGroupSetSchemaDescriptor.java 2014-05-31 13:18:51 +0000
@@ -54,7 +54,7 @@
Schema schema = new Schema( DataElementGroupSet.class, SINGULAR, PLURAL );
schema.setApiEndpoint( API_ENDPOINT );
schema.setShareable( true );
- schema.setOrder( 122 );
+ schema.setOrder( 1220 );
schema.getAuthorities().add( new Authority( AuthorityType.CREATE_PUBLIC, Lists.newArrayList( "F_DATAELEMENTGROUPSET_PUBLIC_ADD" ) ) );
schema.getAuthorities().add( new Authority( AuthorityType.CREATE_PRIVATE, Lists.newArrayList( "F_DATAELEMENTGROUPSET_PRIVATE_ADD" ) ) );
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/DataElementOperandSchemaDescriptor.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/DataElementOperandSchemaDescriptor.java 2014-05-28 11:48:43 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/DataElementOperandSchemaDescriptor.java 2014-05-31 13:18:51 +0000
@@ -51,7 +51,7 @@
Schema schema = new Schema( DataElementOperand.class, SINGULAR, PLURAL );
schema.setApiEndpoint( API_ENDPOINT );
schema.setMetadata( false );
- schema.setOrder( 123 );
+ schema.setOrder( 1230 );
return schema;
}
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/DataElementSchemaDescriptor.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/DataElementSchemaDescriptor.java 2014-05-28 11:48:43 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/DataElementSchemaDescriptor.java 2014-05-31 13:18:51 +0000
@@ -54,7 +54,7 @@
Schema schema = new Schema( DataElement.class, SINGULAR, PLURAL );
schema.setApiEndpoint( API_ENDPOINT );
schema.setShareable( true );
- schema.setOrder( 120 );
+ schema.setOrder( 1200 );
schema.getAuthorities().add( new Authority( AuthorityType.CREATE_PUBLIC, Lists.newArrayList( "F_DATAELEMENT_PUBLIC_ADD" ) ) );
schema.getAuthorities().add( new Authority( AuthorityType.CREATE_PRIVATE, Lists.newArrayList( "F_DATAELEMENT_PRIVATE_ADD" ) ) );
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/DataSetSchemaDescriptor.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/DataSetSchemaDescriptor.java 2014-05-28 11:48:43 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/DataSetSchemaDescriptor.java 2014-05-31 13:18:51 +0000
@@ -54,7 +54,7 @@
Schema schema = new Schema( DataSet.class, SINGULAR, PLURAL );
schema.setApiEndpoint( API_ENDPOINT );
schema.setShareable( true );
- schema.setOrder( 131 );
+ schema.setOrder( 1310 );
schema.getAuthorities().add( new Authority( AuthorityType.CREATE_PUBLIC, Lists.newArrayList( "F_DATASET_PUBLIC_ADD" ) ) );
schema.getAuthorities().add( new Authority( AuthorityType.CREATE_PRIVATE, Lists.newArrayList( "F_DATASET_PRIVATE_ADD" ) ) );
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/DocumentSchemaDescriptor.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/DocumentSchemaDescriptor.java 2014-05-28 11:48:43 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/DocumentSchemaDescriptor.java 2014-05-31 13:18:51 +0000
@@ -54,7 +54,7 @@
Schema schema = new Schema( Document.class, SINGULAR, PLURAL );
schema.setApiEndpoint( API_ENDPOINT );
schema.setShareable( true );
- schema.setOrder( 104 );
+ schema.setOrder( 1040 );
schema.getAuthorities().add( new Authority( AuthorityType.CREATE_PUBLIC, Lists.newArrayList( "F_DOCUMENT_PUBLIC_ADD" ) ) );
schema.getAuthorities().add( new Authority( AuthorityType.CREATE_PRIVATE, Lists.newArrayList( "F_DOCUMENT_PRIVATE_ADD" ) ) );
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/EventReportSchemaDescriptor.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/EventReportSchemaDescriptor.java 2014-05-28 19:02:46 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/EventReportSchemaDescriptor.java 2014-05-31 13:18:51 +0000
@@ -51,7 +51,7 @@
Schema schema = new Schema( EventReport.class, SINGULAR, PLURAL );
schema.setApiEndpoint( API_ENDPOINT );
schema.setShareable( true );
- schema.setOrder( 160 );
+ schema.setOrder( 1540 );
schema.getAuthorities().add( new Authority( AuthorityType.CREATE_PUBLIC, Lists.newArrayList( "F_EVENTREPORT_PUBLIC_ADD" ) ) );
schema.getAuthorities().add( new Authority( AuthorityType.EXTERNALIZE, Lists.newArrayList( "F_EVENTREPORT_EXTERNAL" ) ) );
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/IndicatorGroupSchemaDescriptor.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/IndicatorGroupSchemaDescriptor.java 2014-05-28 11:48:43 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/IndicatorGroupSchemaDescriptor.java 2014-05-31 13:18:51 +0000
@@ -54,7 +54,7 @@
Schema schema = new Schema( IndicatorGroup.class, SINGULAR, PLURAL );
schema.setApiEndpoint( API_ENDPOINT );
schema.setShareable( true );
- schema.setOrder( 126 );
+ schema.setOrder( 1260 );
schema.getAuthorities().add( new Authority( AuthorityType.CREATE_PUBLIC, Lists.newArrayList( "F_INDICATORGROUP_PUBLIC_ADD" ) ) );
schema.getAuthorities().add( new Authority( AuthorityType.CREATE_PRIVATE, Lists.newArrayList( "F_INDICATORGROUP_PRIVATE_ADD" ) ) );
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/IndicatorGroupSetSchemaDescriptor.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/IndicatorGroupSetSchemaDescriptor.java 2014-05-28 11:48:43 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/IndicatorGroupSetSchemaDescriptor.java 2014-05-31 13:18:51 +0000
@@ -54,7 +54,7 @@
Schema schema = new Schema( IndicatorGroupSet.class, SINGULAR, PLURAL );
schema.setApiEndpoint( API_ENDPOINT );
schema.setShareable( true );
- schema.setOrder( 127 );
+ schema.setOrder( 1270 );
schema.getAuthorities().add( new Authority( AuthorityType.CREATE_PUBLIC, Lists.newArrayList( "F_INDICATORGROUPSET_PUBLIC_ADD" ) ) );
schema.getAuthorities().add( new Authority( AuthorityType.CREATE_PRIVATE, Lists.newArrayList( "F_INDICATORGROUPSET_PRIVATE_ADD" ) ) );
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/IndicatorSchemaDescriptor.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/IndicatorSchemaDescriptor.java 2014-05-28 11:48:43 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/IndicatorSchemaDescriptor.java 2014-05-31 13:18:51 +0000
@@ -54,7 +54,7 @@
Schema schema = new Schema( Indicator.class, SINGULAR, PLURAL );
schema.setApiEndpoint( API_ENDPOINT );
schema.setShareable( true );
- schema.setOrder( 125 );
+ schema.setOrder( 1250 );
schema.getAuthorities().add( new Authority( AuthorityType.CREATE_PUBLIC, Lists.newArrayList( "F_INDICATOR_PUBLIC_ADD" ) ) );
schema.getAuthorities().add( new Authority( AuthorityType.CREATE_PRIVATE, Lists.newArrayList( "F_INDICATOR_PRIVATE_ADD" ) ) );
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/IndicatorTypeSchemaDescriptor.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/IndicatorTypeSchemaDescriptor.java 2014-05-28 11:48:43 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/IndicatorTypeSchemaDescriptor.java 2014-05-31 13:18:51 +0000
@@ -53,7 +53,7 @@
{
Schema schema = new Schema( IndicatorType.class, SINGULAR, PLURAL );
schema.setApiEndpoint( API_ENDPOINT );
- schema.setOrder( 124 );
+ schema.setOrder( 1240 );
schema.getAuthorities().add( new Authority( AuthorityType.CREATE, Lists.newArrayList( "F_INDICATORTYPE_ADD" ) ) );
schema.getAuthorities().add( new Authority( AuthorityType.DELETE, Lists.newArrayList( "F_INDICATORTYPE_DELETE" ) ) );
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/InterpretationSchemaDescriptor.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/InterpretationSchemaDescriptor.java 2014-05-28 09:57:38 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/InterpretationSchemaDescriptor.java 2014-05-31 13:18:51 +0000
@@ -52,6 +52,7 @@
schema.setApiEndpoint( API_ENDPOINT );
schema.setMetadata( false );
schema.setShareable( true );
+ schema.setOrder( 1440 );
return schema;
}
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/MapLayerSchemaDescriptor.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/MapLayerSchemaDescriptor.java 2014-05-28 11:48:43 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/MapLayerSchemaDescriptor.java 2014-05-31 13:18:51 +0000
@@ -50,7 +50,7 @@
{
Schema schema = new Schema( MapLayer.class, SINGULAR, PLURAL );
schema.setApiEndpoint( API_ENDPOINT );
- schema.setOrder( 109 );
+ schema.setOrder( 1090 );
return schema;
}
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/MapLegendSchemaDescriptor.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/MapLegendSchemaDescriptor.java 2014-05-28 11:48:43 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/MapLegendSchemaDescriptor.java 2014-05-31 13:18:51 +0000
@@ -50,7 +50,7 @@
{
Schema schema = new Schema( MapLegend.class, SINGULAR, PLURAL );
schema.setApiEndpoint( API_ENDPOINT );
- schema.setOrder( 107 );
+ schema.setOrder( 1070 );
return schema;
}
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/MapLegendSetSchemaDescriptor.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/MapLegendSetSchemaDescriptor.java 2014-05-28 11:48:43 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/MapLegendSetSchemaDescriptor.java 2014-05-31 13:18:51 +0000
@@ -50,7 +50,7 @@
{
Schema schema = new Schema( MapLegendSet.class, SINGULAR, PLURAL );
schema.setApiEndpoint( API_ENDPOINT );
- schema.setOrder( 108 );
+ schema.setOrder( 1080 );
return schema;
}
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/MapSchemaDescriptor.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/MapSchemaDescriptor.java 2014-05-28 11:48:43 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/MapSchemaDescriptor.java 2014-05-31 13:18:51 +0000
@@ -54,7 +54,7 @@
Schema schema = new Schema( Map.class, SINGULAR, PLURAL );
schema.setApiEndpoint( API_ENDPOINT );
schema.setShareable( true );
- schema.setOrder( 143 );
+ schema.setOrder( 1420 );
schema.getAuthorities().add( new Authority( AuthorityType.CREATE_PUBLIC, Lists.newArrayList( "F_MAP_PUBLIC_ADD" ) ) );
schema.getAuthorities().add( new Authority( AuthorityType.EXTERNALIZE, Lists.newArrayList( "F_MAP_EXTERNAL" ) ) );
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/MapViewSchemaDescriptor.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/MapViewSchemaDescriptor.java 2014-05-28 11:48:43 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/MapViewSchemaDescriptor.java 2014-05-31 13:18:51 +0000
@@ -50,7 +50,7 @@
{
Schema schema = new Schema( MapView.class, SINGULAR, PLURAL );
schema.setApiEndpoint( API_ENDPOINT );
- schema.setOrder( 142 );
+ schema.setOrder( 1410 );
return schema;
}
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/MessageConversationSchemaDescriptor.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/MessageConversationSchemaDescriptor.java 2014-05-28 09:57:38 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/MessageConversationSchemaDescriptor.java 2014-05-31 13:18:51 +0000
@@ -51,6 +51,7 @@
Schema schema = new Schema( MessageConversation.class, SINGULAR, PLURAL );
schema.setApiEndpoint( API_ENDPOINT );
schema.setMetadata( false );
+ schema.setOrder( 1430 );
return schema;
}
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/OptionSetSchemaDescriptor.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/OptionSetSchemaDescriptor.java 2014-05-28 11:48:43 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/OptionSetSchemaDescriptor.java 2014-05-31 13:18:51 +0000
@@ -54,7 +54,7 @@
Schema schema = new Schema( OptionSet.class, SINGULAR, PLURAL );
schema.setApiEndpoint( API_ENDPOINT );
schema.setShareable( true );
- schema.setOrder( 105 );
+ schema.setOrder( 1050 );
schema.getAuthorities().add( new Authority( AuthorityType.CREATE_PUBLIC, Lists.newArrayList( "F_OPTIONSET_PUBLIC_ADD" ) ) );
schema.getAuthorities().add( new Authority( AuthorityType.CREATE_PRIVATE, Lists.newArrayList( "F_OPTIONSET_PRIVATE_ADD" ) ) );
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/OrganisationUnitGroupSchemaDescriptor.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/OrganisationUnitGroupSchemaDescriptor.java 2014-05-28 11:48:43 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/OrganisationUnitGroupSchemaDescriptor.java 2014-05-31 13:18:51 +0000
@@ -54,7 +54,7 @@
Schema schema = new Schema( OrganisationUnitGroup.class, SINGULAR, PLURAL );
schema.setApiEndpoint( API_ENDPOINT );
schema.setShareable( true );
- schema.setOrder( 112 );
+ schema.setOrder( 1120 );
schema.getAuthorities().add( new Authority( AuthorityType.CREATE_PUBLIC, Lists.newArrayList( "F_ORGUNITGROUP_PUBLIC_ADD" ) ) );
schema.getAuthorities().add( new Authority( AuthorityType.CREATE_PRIVATE, Lists.newArrayList( "F_ORGUNITGROUP_PRIVATE_ADD" ) ) );
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/OrganisationUnitGroupSetSchemaDescriptor.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/OrganisationUnitGroupSetSchemaDescriptor.java 2014-05-28 11:48:43 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/OrganisationUnitGroupSetSchemaDescriptor.java 2014-05-31 13:18:51 +0000
@@ -54,7 +54,7 @@
Schema schema = new Schema( OrganisationUnitGroupSet.class, SINGULAR, PLURAL );
schema.setApiEndpoint( API_ENDPOINT );
schema.setShareable( true );
- schema.setOrder( 113 );
+ schema.setOrder( 1130 );
schema.getAuthorities().add( new Authority( AuthorityType.CREATE_PUBLIC, Lists.newArrayList( "F_ORGUNITGROUPSET_PUBLIC_ADD" ) ) );
schema.getAuthorities().add( new Authority( AuthorityType.CREATE_PRIVATE, Lists.newArrayList( "F_ORGUNITGROUPSET_PRIVATE_ADD" ) ) );
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/OrganisationUnitLevelSchemaDescriptor.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/OrganisationUnitLevelSchemaDescriptor.java 2014-05-28 11:48:43 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/OrganisationUnitLevelSchemaDescriptor.java 2014-05-31 13:18:51 +0000
@@ -53,7 +53,7 @@
{
Schema schema = new Schema( OrganisationUnitLevel.class, SINGULAR, PLURAL );
schema.setApiEndpoint( API_ENDPOINT );
- schema.setOrder( 111 );
+ schema.setOrder( 1110 );
schema.getAuthorities().add( new Authority( AuthorityType.UPDATE, Lists.newArrayList( "F_ORGANISATIONUNITLEVEL_UPDATE" ) ) );
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/OrganisationUnitSchemaDescriptor.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/OrganisationUnitSchemaDescriptor.java 2014-05-28 11:48:43 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/OrganisationUnitSchemaDescriptor.java 2014-05-31 13:18:51 +0000
@@ -53,7 +53,7 @@
{
Schema schema = new Schema( OrganisationUnit.class, SINGULAR, PLURAL );
schema.setApiEndpoint( API_ENDPOINT );
- schema.setOrder( 110 );
+ schema.setOrder( 1100 );
schema.getAuthorities().add( new Authority( AuthorityType.CREATE, Lists.newArrayList( "F_ORGANISATIONUNIT_ADD" ) ) );
schema.getAuthorities().add( new Authority( AuthorityType.DELETE, Lists.newArrayList( "F_ORGANISATIONUNIT_DELETE" ) ) );
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/ProgramSchemaDescriptor.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/ProgramSchemaDescriptor.java 2014-05-28 16:54:51 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/ProgramSchemaDescriptor.java 2014-05-31 13:18:51 +0000
@@ -54,7 +54,7 @@
Schema schema = new Schema( Program.class, SINGULAR, PLURAL );
schema.setApiEndpoint( API_ENDPOINT );
schema.setShareable( true );
- schema.setOrder( 151 );
+ schema.setOrder( 1520 );
schema.getAuthorities().add( new Authority( AuthorityType.CREATE_PUBLIC, Lists.newArrayList( "F_PROGRAM_PUBLIC_ADD" ) ) );
schema.getAuthorities().add( new Authority( AuthorityType.CREATE_PRIVATE, Lists.newArrayList( "F_PROGRAM_PRIVATE_ADD" ) ) );
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/ProgramStageSchemaDescriptor.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/ProgramStageSchemaDescriptor.java 2014-05-28 16:54:51 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/ProgramStageSchemaDescriptor.java 2014-05-31 13:18:51 +0000
@@ -53,7 +53,7 @@
{
Schema schema = new Schema( ProgramStage.class, SINGULAR, PLURAL );
schema.setApiEndpoint( API_ENDPOINT );
- schema.setOrder( 150 );
+ schema.setOrder( 1510 );
schema.getAuthorities().add( new Authority( AuthorityType.CREATE, Lists.newArrayList( "F_PROGRAMSTAGE_ADD" ) ) );
schema.getAuthorities().add( new Authority( AuthorityType.DELETE, Lists.newArrayList( "F_PROGRAMSTAGE_DELETE" ) ) );
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/ProgramStageSectionSchemaDescriptor.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/ProgramStageSectionSchemaDescriptor.java 2014-05-28 11:48:43 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/ProgramStageSectionSchemaDescriptor.java 2014-05-31 13:18:51 +0000
@@ -105,7 +105,7 @@
public Schema getSchema()
{
Schema schema = new Schema( ProgramStageSection.class, SINGULAR, PLURAL );
- schema.setOrder( 146 );
+ schema.setOrder( 1470 );
return schema;
}
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/ProgramValidationSchemaDescriptor.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/ProgramValidationSchemaDescriptor.java 2014-05-28 16:54:51 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/ProgramValidationSchemaDescriptor.java 2014-05-31 13:18:51 +0000
@@ -80,7 +80,7 @@
public Schema getSchema()
{
Schema schema = new Schema( ProgramValidation.class, SINGULAR, PLURAL );
- schema.setOrder( 152 );
+ schema.setOrder( 1530 );
schema.getAuthorities().add( new Authority( AuthorityType.CREATE, Lists.newArrayList( "F_PROGRAM_VALIDATION" ) ) );
schema.getAuthorities().add( new Authority( AuthorityType.DELETE, Lists.newArrayList( "F_PROGRAM_VALIDATION" ) ) );
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/RelationshipTypeSchemaDescriptor.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/RelationshipTypeSchemaDescriptor.java 2014-05-28 11:48:43 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/RelationshipTypeSchemaDescriptor.java 2014-05-31 13:18:51 +0000
@@ -53,7 +53,7 @@
{
Schema schema = new Schema( RelationshipType.class, SINGULAR, PLURAL );
schema.setApiEndpoint( API_ENDPOINT );
- schema.setOrder( 144 );
+ schema.setOrder( 1450 );
schema.getAuthorities().add( new Authority( AuthorityType.CREATE, Lists.newArrayList( "F_RELATIONSHIPTYPE_ADD" ) ) );
schema.getAuthorities().add( new Authority( AuthorityType.DELETE, Lists.newArrayList( "F_RELATIONSHIPTYPE_DELETE" ) ) );
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/ReportSchemaDescriptor.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/ReportSchemaDescriptor.java 2014-05-28 11:48:43 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/ReportSchemaDescriptor.java 2014-05-31 13:18:51 +0000
@@ -54,7 +54,7 @@
Schema schema = new Schema( Report.class, SINGULAR, PLURAL );
schema.setApiEndpoint( API_ENDPOINT );
schema.setShareable( true );
- schema.setOrder( 135 );
+ schema.setOrder( 1350 );
schema.getAuthorities().add( new Authority( AuthorityType.CREATE_PUBLIC, Lists.newArrayList( "F_REPORT_PUBLIC_ADD" ) ) );
schema.getAuthorities().add( new Authority( AuthorityType.CREATE_PRIVATE, Lists.newArrayList( "F_REPORT_PRIVATE_ADD" ) ) );
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/ReportTableSchemaDescriptor.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/ReportTableSchemaDescriptor.java 2014-05-28 11:48:43 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/ReportTableSchemaDescriptor.java 2014-05-31 13:18:51 +0000
@@ -54,7 +54,7 @@
Schema schema = new Schema( ReportTable.class, SINGULAR, PLURAL );
schema.setApiEndpoint( API_ENDPOINT );
schema.setShareable( true );
- schema.setOrder( 134 );
+ schema.setOrder( 1340 );
schema.getAuthorities().add( new Authority( AuthorityType.CREATE_PUBLIC, Lists.newArrayList( "F_REPORTTABLE_PUBLIC_ADD" ) ) );
schema.getAuthorities().add( new Authority( AuthorityType.EXTERNALIZE, Lists.newArrayList( "F_REPORTTABLE_EXTERNAL" ) ) );
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/SectionSchemaDescriptor.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/SectionSchemaDescriptor.java 2014-05-28 11:48:43 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/SectionSchemaDescriptor.java 2014-05-31 13:18:51 +0000
@@ -53,7 +53,7 @@
{
Schema schema = new Schema( Section.class, SINGULAR, PLURAL );
schema.setApiEndpoint( API_ENDPOINT );
- schema.setOrder( 132 );
+ schema.setOrder( 1320 );
schema.getAuthorities().add( new Authority( AuthorityType.CREATE, Lists.newArrayList( "F_SECTION_ADD" ) ) );
schema.getAuthorities().add( new Authority( AuthorityType.DELETE, Lists.newArrayList( "F_SECTION_DELETE" ) ) );
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/SqlViewSchemaDescriptor.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/SqlViewSchemaDescriptor.java 2014-05-28 11:48:43 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/SqlViewSchemaDescriptor.java 2014-05-31 13:18:51 +0000
@@ -47,7 +47,7 @@
{
Schema schema = new Schema( SqlView.class, "sqlView", "sqlViews" );
schema.setShareable( true );
- schema.setOrder( 101 );
+ schema.setOrder( 1010 );
schema.getAuthorities().add( new Authority( AuthorityType.CREATE_PUBLIC, Lists.newArrayList( "F_SQLVIEW_PUBLIC_ADD" ) ) );
schema.getAuthorities().add( new Authority( AuthorityType.CREATE_PRIVATE, Lists.newArrayList( "F_SQLVIEW_PRIVATE_ADD" ) ) );
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/TrackedEntityAttributeGroupSchemaDescriptor.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/TrackedEntityAttributeGroupSchemaDescriptor.java 2014-05-28 16:54:51 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/TrackedEntityAttributeGroupSchemaDescriptor.java 2014-05-31 13:18:51 +0000
@@ -53,7 +53,7 @@
{
Schema schema = new Schema( TrackedEntityAttributeGroup.class, SINGULAR, PLURAL );
schema.setApiEndpoint( API_ENDPOINT );
- schema.setOrder( 149 );
+ schema.setOrder( 1500 );
schema.getAuthorities().add( new Authority( AuthorityType.CREATE,
Lists.newArrayList( "F_TRACKED_ENTITY_ATTRIBUTE_PUBLIC_ADD", "F_TRACKED_ENTITY_ATTRIBUTE_PRIVATE_ADD" ) ) );
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/TrackedEntityAttributeSchemaDescriptor.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/TrackedEntityAttributeSchemaDescriptor.java 2014-05-28 11:48:43 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/TrackedEntityAttributeSchemaDescriptor.java 2014-05-31 13:18:51 +0000
@@ -54,7 +54,7 @@
Schema schema = new Schema( TrackedEntityAttribute.class, SINGULAR, PLURAL );
schema.setApiEndpoint( API_ENDPOINT );
schema.setShareable( true );
- schema.setOrder( 148 );
+ schema.setOrder( 1490 );
schema.getAuthorities().add( new Authority( AuthorityType.CREATE_PUBLIC, Lists.newArrayList( "F_TRACKED_ENTITY_ATTRIBUTE_PUBLIC_ADD" ) ) );
schema.getAuthorities().add( new Authority( AuthorityType.CREATE_PRIVATE, Lists.newArrayList( "F_TRACKED_ENTITY_ATTRIBUTE_PRIVATE_ADD" ) ) );
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/TrackedEntitySchemaDescriptor.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/TrackedEntitySchemaDescriptor.java 2014-05-28 11:48:43 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/TrackedEntitySchemaDescriptor.java 2014-05-31 13:18:51 +0000
@@ -53,7 +53,7 @@
{
Schema schema = new Schema( TrackedEntity.class, SINGULAR, PLURAL );
schema.setApiEndpoint( API_ENDPOINT );
- schema.setOrder( 147 );
+ schema.setOrder( 1480 );
schema.getAuthorities().add( new Authority( AuthorityType.CREATE, Lists.newArrayList( "F_TRACKED_ENTITY_ADD" ) ) );
schema.getAuthorities().add( new Authority( AuthorityType.UPDATE, Lists.newArrayList( "F_TRACKED_ENTITY_UPDATE" ) ) );
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/UserGroupSchemaDescriptor.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/UserGroupSchemaDescriptor.java 2014-05-28 11:48:43 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/UserGroupSchemaDescriptor.java 2014-05-31 13:18:51 +0000
@@ -54,7 +54,7 @@
Schema schema = new Schema( UserGroup.class, SINGULAR, PLURAL );
schema.setApiEndpoint( API_ENDPOINT );
schema.setShareable( true );
- schema.setOrder( 130 );
+ schema.setOrder( 1300 );
schema.getAuthorities().add( new Authority( AuthorityType.CREATE_PUBLIC, Lists.newArrayList( "F_USERGROUP_PUBLIC_ADD" ) ) );
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/UserRoleSchemaDescriptor.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/UserRoleSchemaDescriptor.java 2014-05-28 11:48:43 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/UserRoleSchemaDescriptor.java 2014-05-31 13:18:51 +0000
@@ -54,7 +54,7 @@
Schema schema = new Schema( UserAuthorityGroup.class, SINGULAR, PLURAL );
schema.setApiEndpoint( API_ENDPOINT );
schema.setShareable( true );
- schema.setOrder( 133 );
+ schema.setOrder( 1330 );
schema.getAuthorities().add( new Authority( AuthorityType.CREATE_PUBLIC, Lists.newArrayList( "F_USERROLE_PUBLIC_ADD" ) ) );
schema.getAuthorities().add( new Authority( AuthorityType.CREATE_PRIVATE, Lists.newArrayList( "F_USERROLE_PRIVATE_ADD" ) ) );
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/UserSchemaDescriptor.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/UserSchemaDescriptor.java 2014-05-28 11:48:43 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/UserSchemaDescriptor.java 2014-05-31 13:18:51 +0000
@@ -53,7 +53,7 @@
{
Schema schema = new Schema( User.class, SINGULAR, PLURAL );
schema.setApiEndpoint( API_ENDPOINT );
- schema.setOrder( 129 );
+ schema.setOrder( 1290 );
schema.getAuthorities().add( new Authority( AuthorityType.CREATE, Lists.newArrayList( "F_USER_ADD" ) ) );
schema.getAuthorities().add( new Authority( AuthorityType.DELETE, Lists.newArrayList( "F_USER_DELETE" ) ) );
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/ValidationCriteriaSchemaDescriptor.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/ValidationCriteriaSchemaDescriptor.java 2014-05-28 11:48:43 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/ValidationCriteriaSchemaDescriptor.java 2014-05-31 13:18:51 +0000
@@ -77,7 +77,7 @@
public Schema getSchema()
{
Schema schema = new Schema( ValidationCriteria.class, SINGULAR, PLURAL );
- schema.setOrder( 145 );
+ schema.setOrder( 1460 );
return schema;
}
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/ValidationRuleGroupSchemaDescriptor.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/ValidationRuleGroupSchemaDescriptor.java 2014-05-28 11:48:43 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/ValidationRuleGroupSchemaDescriptor.java 2014-05-31 13:18:51 +0000
@@ -54,7 +54,7 @@
Schema schema = new Schema( ValidationRuleGroup.class, SINGULAR, PLURAL );
schema.setApiEndpoint( API_ENDPOINT );
schema.setShareable( true );
- schema.setOrder( 141 );
+ schema.setOrder( 1400 );
schema.getAuthorities().add( new Authority( AuthorityType.CREATE, Lists.newArrayList( "F_VALIDATIONRULEGROUP_PUBLIC_ADD" ) ) );
schema.getAuthorities().add( new Authority( AuthorityType.UPDATE, Lists.newArrayList( "F_VALIDATIONRULEGROUP_PRIVATE_ADD" ) ) );
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/ValidationRuleSchemaDescriptor.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/ValidationRuleSchemaDescriptor.java 2014-05-28 11:48:43 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/ValidationRuleSchemaDescriptor.java 2014-05-31 13:18:51 +0000
@@ -53,7 +53,7 @@
{
Schema schema = new Schema( ValidationRule.class, SINGULAR, PLURAL );
schema.setApiEndpoint( API_ENDPOINT );
- schema.setOrder( 140 );
+ schema.setOrder( 1390 );
schema.getAuthorities().add( new Authority( AuthorityType.CREATE, Lists.newArrayList( "F_VALIDATIONRULE_ADD" ) ) );
schema.getAuthorities().add( new Authority( AuthorityType.DELETE, Lists.newArrayList( "F_VALIDATIONRULE_DELETE" ) ) );
=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/ExchangeClasses.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/ExchangeClasses.java 2014-05-28 19:07:45 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/ExchangeClasses.java 2014-05-31 13:18:51 +0000
@@ -135,7 +135,6 @@
allExportClasses.put( DataElement.class, "dataElements" );
allExportClasses.put( DataElementGroup.class, "dataElementGroups" );
allExportClasses.put( DataElementGroupSet.class, "dataElementGroupSets" );
-
allExportClasses.put( DataElementOperand.class, "dataElementOperands" );
allExportClasses.put( IndicatorType.class, "indicatorTypes" );
=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/DataSetController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/DataSetController.java 2014-05-27 12:49:13 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/DataSetController.java 2014-05-31 13:18:51 +0000
@@ -60,10 +60,8 @@
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
-import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerConfigurationException;
import javax.xml.transform.TransformerException;
import javax.xml.transform.TransformerFactory;
import javax.xml.transform.stream.StreamResult;
@@ -117,7 +115,7 @@
@RequestMapping( produces = "application/dsd+xml" )
public void getStructureDefinition( @RequestParam Map<String, String> parameters, HttpServletResponse response )
- throws IOException, TransformerConfigurationException, TransformerException
+ throws IOException, TransformerException
{
WebOptions options = filterMetadataOptions();
@@ -139,7 +137,7 @@
{
DataSet dataSet = manager.get( DataSet.class, uid );
- Map<String, Integer> versionMap = new HashMap<String, Integer>();
+ Map<String, Integer> versionMap = new HashMap<>();
versionMap.put( "version", dataSet.getVersion() );
JacksonUtils.toJson( response.getOutputStream(), versionMap );
@@ -233,16 +231,6 @@
JacksonUtils.toXml( response.getOutputStream(), form );
}
- @RequestMapping( value = "/{uid}/form", method = RequestMethod.POST, consumes = "application/json" )
- public void postFormJson( @PathVariable( "uid" ) String uid, HttpServletRequest request, HttpServletResponse response )
- {
- }
-
- @RequestMapping( value = "/{uid}/form", method = RequestMethod.POST, consumes = { "application/xml", "text/xml" } )
- public void postFormXml( @PathVariable( "uid" ) String uid, HttpServletRequest request, HttpServletResponse response )
- {
- }
-
@RequestMapping( value = "/{uid}/customDataEntryForm", method = { RequestMethod.PUT, RequestMethod.POST }, consumes = "text/html" )
@PreAuthorize( "hasRole('ALL')" )
public void updateCustomDataEntryForm( @PathVariable( "uid" ) String uid,
