dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #28780
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 14421: removed importer info from descriptors, was a bad idea.. will be replaced by a separate authoriti...
------------------------------------------------------------
revno: 14421
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2014-03-26 10:23:47 +0100
message:
removed importer info from descriptors, was a bad idea.. will be replaced by a separate authorities class in the schema
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/Schema.java
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/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/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/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/TrackedEntityInstanceSchemaDescriptor.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/ValidationRuleGroupSchemaDescriptor.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/ValidationRuleSchemaDescriptor.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/Schema.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/Schema.java 2014-03-26 08:47:19 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/Schema.java 2014-03-26 09:23:47 +0000
@@ -63,12 +63,6 @@
private List<String> externalAuthorities = Lists.newArrayList();
- private boolean importable;
-
- private boolean exportable;
-
- private boolean deletable;
-
private List<Property> properties = Lists.newArrayList();
public Schema( Class<?> klass, String singular, String plural )
@@ -80,14 +74,6 @@
this.plural = plural;
}
- public Schema( Class<?> klass, String singular, String plural, boolean importable, boolean exportable, boolean deletable )
- {
- this( klass, singular, plural );
- this.importable = importable;
- this.exportable = exportable;
- this.deletable = deletable;
- }
-
@JsonProperty
@JacksonXmlProperty( isAttribute = true )
public Class<?> getKlass()
@@ -190,42 +176,6 @@
}
@JsonProperty
- @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
- public boolean isImportable()
- {
- return importable;
- }
-
- public void setImportable( boolean importable )
- {
- this.importable = importable;
- }
-
- @JsonProperty
- @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
- public boolean isExportable()
- {
- return exportable;
- }
-
- public void setExportable( boolean exportable )
- {
- this.exportable = exportable;
- }
-
- @JsonProperty
- @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
- public boolean isDeletable()
- {
- return deletable;
- }
-
- public void setDeletable( boolean deletable )
- {
- this.deletable = deletable;
- }
-
- @JsonProperty
@JacksonXmlElementWrapper( localName = "properties", namespace = DxfNamespaces.DXF_2_0 )
@JacksonXmlProperty( localName = "property", namespace = DxfNamespaces.DXF_2_0 )
public List<Property> getProperties()
@@ -243,11 +193,14 @@
{
return "Schema{" +
"klass=" + klass +
+ ", identifiableObject=" + identifiableObject +
+ ", nameableObject=" + nameableObject +
", singular='" + singular + '\'' +
", plural='" + plural + '\'' +
- ", importable=" + importable +
- ", exportable=" + exportable +
- ", deletable=" + deletable +
+ ", shareable=" + shareable +
+ ", publicAuthorities=" + publicAuthorities +
+ ", privateAuthorities=" + privateAuthorities +
+ ", externalAuthorities=" + externalAuthorities +
", properties=" + properties +
'}';
}
=== 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-03-21 09:35:30 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/AttributeSchemaDescriptor.java 2014-03-26 09:23:47 +0000
@@ -42,6 +42,6 @@
@Override
public Schema getSchema()
{
- return new Schema( Attribute.class, "attribute", "attributes", true, true, true );
+ return new Schema( Attribute.class, "attribute", "attributes" );
}
}
=== 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-03-24 20:17:41 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/CategoryComboSchemaDescriptor.java 2014-03-26 09:23:47 +0000
@@ -43,7 +43,7 @@
@Override
public Schema getSchema()
{
- Schema schema = new Schema( DataElementCategoryCombo.class, "categoryCombo", "categoryCombos", true, true, true );
+ Schema schema = new Schema( DataElementCategoryCombo.class, "categoryCombo", "categoryCombos" );
schema.setShareable( true );
schema.setPublicAuthorities( Lists.newArrayList( "F_CATEGORY_COMBO_PUBLIC_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-03-21 09:35:30 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/CategoryOptionComboSchemaDescriptor.java 2014-03-26 09:23:47 +0000
@@ -43,7 +43,7 @@
@Override
public Schema getSchema()
{
- Schema schema = new Schema( DataElementCategoryOptionCombo.class, "categoryOptionCombo", "categoryOptionCombos", true, true, true );
+ Schema schema = new Schema( DataElementCategoryOptionCombo.class, "categoryOptionCombo", "categoryOptionCombos" );
schema.setShareable( true );
schema.setPublicAuthorities( Lists.newArrayList( "F_CATEGORY_COMBO_PUBLIC_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-03-21 09:35:30 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/CategoryOptionGroupSchemaDescriptor.java 2014-03-26 09:23:47 +0000
@@ -43,7 +43,7 @@
@Override
public Schema getSchema()
{
- Schema schema = new Schema( CategoryOptionGroup.class, "categoryOptionGroup", "categoryOptionGroups", true, true, true );
+ Schema schema = new Schema( CategoryOptionGroup.class, "categoryOptionGroup", "categoryOptionGroups" );
schema.setShareable( true );
schema.setPublicAuthorities( Lists.newArrayList( "F_CATEGORY_OPTION_GROUP_PUBLIC_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-03-21 09:35:30 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/CategoryOptionGroupSetSchemaDescriptor.java 2014-03-26 09:23:47 +0000
@@ -43,7 +43,7 @@
@Override
public Schema getSchema()
{
- Schema schema = new Schema( CategoryOptionGroupSet.class, "categoryOptionGroupSet", "categoryOptionGroupSets", false, false, true );
+ Schema schema = new Schema( CategoryOptionGroupSet.class, "categoryOptionGroupSet", "categoryOptionGroupSets" );
schema.setShareable( true );
schema.setPublicAuthorities( Lists.newArrayList( "F_CATEGORY_OPTION_GROUP_SET_PUBLIC_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-03-21 09:35:30 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/CategoryOptionSchemaDescriptor.java 2014-03-26 09:23:47 +0000
@@ -43,7 +43,7 @@
@Override
public Schema getSchema()
{
- Schema schema = new Schema( DataElementCategoryOption.class, "categoryOption", "categoryOptions", true, true, true );
+ Schema schema = new Schema( DataElementCategoryOption.class, "categoryOption", "categoryOptions" );
schema.setShareable( true );
schema.setPublicAuthorities( Lists.newArrayList( "F_CATEGORY_OPTION_PUBLIC_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-03-21 09:35:30 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/CategorySchemaDescriptor.java 2014-03-26 09:23:47 +0000
@@ -43,7 +43,7 @@
@Override
public Schema getSchema()
{
- Schema schema = new Schema( DataElementCategory.class, "category", "categories", true, true, true );
+ Schema schema = new Schema( DataElementCategory.class, "category", "categories" );
schema.setShareable( true );
schema.setPublicAuthorities( Lists.newArrayList( "F_CATEGORY_PUBLIC_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-03-21 09:35:30 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/ChartSchemaDescriptor.java 2014-03-26 09:23:47 +0000
@@ -43,7 +43,7 @@
@Override
public Schema getSchema()
{
- Schema schema = new Schema( Chart.class, "chart", "charts", true, true, true );
+ Schema schema = new Schema( Chart.class, "chart", "charts" );
schema.setShareable( true );
schema.setPublicAuthorities( Lists.newArrayList( "F_CHART_PUBLIC_ADD" ) );
=== 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-03-21 09:35:30 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/ConceptSchemaDescriptor.java 2014-03-26 09:23:47 +0000
@@ -42,6 +42,6 @@
@Override
public Schema getSchema()
{
- return new Schema( Concept.class, "concept", "concepts", true, true, true );
+ return new Schema( Concept.class, "concept", "concepts" );
}
}
=== 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-03-21 09:35:30 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/ConstantSchemaDescriptor.java 2014-03-26 09:23:47 +0000
@@ -42,6 +42,6 @@
@Override
public Schema getSchema()
{
- return new Schema( Constant.class, "constant", "constants", true, true, true );
+ return new Schema( Constant.class, "constant", "constants" );
}
}
=== 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-03-21 09:35:30 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/DashboardSchemaDescriptor.java 2014-03-26 09:23:47 +0000
@@ -43,7 +43,7 @@
@Override
public Schema getSchema()
{
- Schema schema = new Schema( Dashboard.class, "dashboard", "dashboards", false, false, true );
+ Schema schema = new Schema( Dashboard.class, "dashboard", "dashboards" );
schema.setShareable( true );
schema.setPublicAuthorities( Lists.newArrayList( "F_DASHBOARD_PUBLIC_ADD" ) );
=== 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-03-21 09:35:30 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/DataDictionarySchemaDescriptor.java 2014-03-26 09:23:47 +0000
@@ -43,7 +43,7 @@
@Override
public Schema getSchema()
{
- Schema schema = new Schema( DataDictionary.class, "dataDictionary", "dataDictionaries", true, true, true );
+ Schema schema = new Schema( DataDictionary.class, "dataDictionary", "dataDictionaries" );
schema.setShareable( true );
schema.setPublicAuthorities( Lists.newArrayList( "F_DATADICTIONARY_PUBLIC_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-03-25 15:25:53 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/DataElementGroupSchemaDescriptor.java 2014-03-26 09:23:47 +0000
@@ -43,7 +43,7 @@
@Override
public Schema getSchema()
{
- Schema schema = new Schema( DataElementGroup.class, "dataElementGroup", "dataElementGroups", true, true, true );
+ Schema schema = new Schema( DataElementGroup.class, "dataElementGroup", "dataElementGroups" );
schema.setShareable( true );
schema.setPublicAuthorities( Lists.newArrayList( "F_DATAELEMENTGROUP_PUBLIC_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-03-24 20:17:41 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/DataElementGroupSetSchemaDescriptor.java 2014-03-26 09:23:47 +0000
@@ -43,7 +43,7 @@
@Override
public Schema getSchema()
{
- Schema schema = new Schema( DataElementGroupSet.class, "dataElementGroupSet", "dataElementGroupSets", true, true, true );
+ Schema schema = new Schema( DataElementGroupSet.class, "dataElementGroupSet", "dataElementGroupSets" );
schema.setShareable( true );
schema.setPublicAuthorities( Lists.newArrayList( "F_DATAELEMENTGROUPSET_PUBLIC_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-03-21 09:35:30 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/DataElementOperandSchemaDescriptor.java 2014-03-26 09:23:47 +0000
@@ -42,6 +42,6 @@
@Override
public Schema getSchema()
{
- return new Schema( DataElementOperand.class, "dataElementOperand", "dataElementOperands", false, false, true );
+ return new Schema( DataElementOperand.class, "dataElementOperand", "dataElementOperands" );
}
}
=== 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-03-21 09:35:30 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/DataElementSchemaDescriptor.java 2014-03-26 09:23:47 +0000
@@ -43,7 +43,7 @@
@Override
public Schema getSchema()
{
- Schema schema = new Schema( DataElement.class, "dataElement", "dataElements", true, true, true );
+ Schema schema = new Schema( DataElement.class, "dataElement", "dataElements" );
schema.setShareable( true );
schema.setPublicAuthorities( Lists.newArrayList( "F_DATAELEMENT_PUBLIC_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-03-21 09:35:30 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/DataSetSchemaDescriptor.java 2014-03-26 09:23:47 +0000
@@ -43,7 +43,7 @@
@Override
public Schema getSchema()
{
- Schema schema = new Schema( DataSet.class, "dataSet", "dataSets", true, true, true );
+ Schema schema = new Schema( DataSet.class, "dataSet", "dataSets" );
schema.setShareable( true );
schema.setPublicAuthorities( Lists.newArrayList( "F_DATASET_PUBLIC_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-03-21 09:35:30 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/DocumentSchemaDescriptor.java 2014-03-26 09:23:47 +0000
@@ -43,7 +43,7 @@
@Override
public Schema getSchema()
{
- Schema schema = new Schema( Document.class, "document", "documents", true, true, true );
+ Schema schema = new Schema( Document.class, "document", "documents" );
schema.setShareable( true );
schema.setPublicAuthorities( Lists.newArrayList( "F_DOCUMENT_PUBLIC_ADD" ) );
=== 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-03-25 15:21:45 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/IndicatorGroupSchemaDescriptor.java 2014-03-26 09:23:47 +0000
@@ -29,9 +29,9 @@
*/
import com.google.common.collect.Lists;
+import org.hisp.dhis.indicator.IndicatorGroup;
import org.hisp.dhis.schema.Schema;
import org.hisp.dhis.schema.SchemaDescriptor;
-import org.hisp.dhis.indicator.IndicatorGroup;
import org.springframework.stereotype.Component;
/**
@@ -43,7 +43,7 @@
@Override
public Schema getSchema()
{
- Schema schema = new Schema( IndicatorGroup.class, "indicatorGroup", "indicatorGroups", true, true, true );
+ Schema schema = new Schema( IndicatorGroup.class, "indicatorGroup", "indicatorGroups" );
schema.setShareable( true );
schema.setPublicAuthorities( Lists.newArrayList( "F_INDICATORGROUP_PUBLIC_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-03-21 09:35:30 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/IndicatorGroupSetSchemaDescriptor.java 2014-03-26 09:23:47 +0000
@@ -29,9 +29,9 @@
*/
import com.google.common.collect.Lists;
+import org.hisp.dhis.indicator.IndicatorGroupSet;
import org.hisp.dhis.schema.Schema;
import org.hisp.dhis.schema.SchemaDescriptor;
-import org.hisp.dhis.indicator.IndicatorGroupSet;
import org.springframework.stereotype.Component;
/**
@@ -43,7 +43,7 @@
@Override
public Schema getSchema()
{
- Schema schema = new Schema( IndicatorGroupSet.class, "indicatorGroupSet", "indicatorGroupSets", true, true, true );
+ Schema schema = new Schema( IndicatorGroupSet.class, "indicatorGroupSet", "indicatorGroupSets" );
schema.setShareable( true );
schema.setPublicAuthorities( Lists.newArrayList( "F_INDICATORGROUPSET_PUBLIC_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-03-21 09:35:30 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/IndicatorSchemaDescriptor.java 2014-03-26 09:23:47 +0000
@@ -29,9 +29,9 @@
*/
import com.google.common.collect.Lists;
+import org.hisp.dhis.indicator.Indicator;
import org.hisp.dhis.schema.Schema;
import org.hisp.dhis.schema.SchemaDescriptor;
-import org.hisp.dhis.indicator.Indicator;
import org.springframework.stereotype.Component;
/**
@@ -43,7 +43,7 @@
@Override
public Schema getSchema()
{
- Schema schema = new Schema( Indicator.class, "indicator", "indicators", true, true, true );
+ Schema schema = new Schema( Indicator.class, "indicator", "indicators" );
schema.setShareable( true );
schema.setPublicAuthorities( Lists.newArrayList( "F_INDICATOR_PUBLIC_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-03-21 09:35:30 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/IndicatorTypeSchemaDescriptor.java 2014-03-26 09:23:47 +0000
@@ -28,9 +28,9 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+import org.hisp.dhis.indicator.IndicatorType;
import org.hisp.dhis.schema.Schema;
import org.hisp.dhis.schema.SchemaDescriptor;
-import org.hisp.dhis.indicator.IndicatorType;
import org.springframework.stereotype.Component;
/**
@@ -42,6 +42,6 @@
@Override
public Schema getSchema()
{
- return new Schema( IndicatorType.class, "indicatorType", "indicatorTypes", true, true, true );
+ return new Schema( IndicatorType.class, "indicatorType", "indicatorTypes" );
}
}
=== 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-03-21 09:35:30 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/InterpretationSchemaDescriptor.java 2014-03-26 09:23:47 +0000
@@ -28,9 +28,9 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+import org.hisp.dhis.interpretation.Interpretation;
import org.hisp.dhis.schema.Schema;
import org.hisp.dhis.schema.SchemaDescriptor;
-import org.hisp.dhis.interpretation.Interpretation;
import org.springframework.stereotype.Component;
/**
@@ -42,7 +42,7 @@
@Override
public Schema getSchema()
{
- Schema schema = new Schema( Interpretation.class, "interpretation", "interpretations", true, true, true );
+ Schema schema = new Schema( Interpretation.class, "interpretation", "interpretations" );
schema.setShareable( true );
=== 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-03-21 09:35:30 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/MapLayerSchemaDescriptor.java 2014-03-26 09:23:47 +0000
@@ -28,9 +28,9 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+import org.hisp.dhis.mapping.MapLayer;
import org.hisp.dhis.schema.Schema;
import org.hisp.dhis.schema.SchemaDescriptor;
-import org.hisp.dhis.mapping.MapLayer;
import org.springframework.stereotype.Component;
/**
@@ -42,6 +42,6 @@
@Override
public Schema getSchema()
{
- return new Schema( MapLayer.class, "mapLayer", "mapLayers", true, true, true );
+ return new Schema( MapLayer.class, "mapLayer", "mapLayers" );
}
}
=== 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-03-21 09:35:30 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/MapLegendSchemaDescriptor.java 2014-03-26 09:23:47 +0000
@@ -28,9 +28,9 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+import org.hisp.dhis.mapping.MapLegend;
import org.hisp.dhis.schema.Schema;
import org.hisp.dhis.schema.SchemaDescriptor;
-import org.hisp.dhis.mapping.MapLegend;
import org.springframework.stereotype.Component;
/**
@@ -42,6 +42,6 @@
@Override
public Schema getSchema()
{
- return new Schema( MapLegend.class, "mapLegend", "mapLegends", true, true, true );
+ return new Schema( MapLegend.class, "mapLegend", "mapLegends" );
}
}
=== 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-03-21 09:35:30 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/MapLegendSetSchemaDescriptor.java 2014-03-26 09:23:47 +0000
@@ -28,9 +28,9 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+import org.hisp.dhis.mapping.MapLegendSet;
import org.hisp.dhis.schema.Schema;
import org.hisp.dhis.schema.SchemaDescriptor;
-import org.hisp.dhis.mapping.MapLegendSet;
import org.springframework.stereotype.Component;
/**
@@ -42,6 +42,6 @@
@Override
public Schema getSchema()
{
- return new Schema( MapLegendSet.class, "mapLegendSet", "mapLegendSets", true, true, true );
+ return new Schema( MapLegendSet.class, "mapLegendSet", "mapLegendSets" );
}
}
=== 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-03-21 09:35:30 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/MapSchemaDescriptor.java 2014-03-26 09:23:47 +0000
@@ -29,9 +29,9 @@
*/
import com.google.common.collect.Lists;
+import org.hisp.dhis.mapping.Map;
import org.hisp.dhis.schema.Schema;
import org.hisp.dhis.schema.SchemaDescriptor;
-import org.hisp.dhis.mapping.Map;
import org.springframework.stereotype.Component;
/**
@@ -43,7 +43,7 @@
@Override
public Schema getSchema()
{
- Schema schema = new Schema( Map.class, "map", "maps", true, true, true );
+ Schema schema = new Schema( Map.class, "map", "maps" );
schema.setShareable( true );
schema.setPublicAuthorities( Lists.newArrayList( "F_MAP_PUBLIC_ADD" ) );
=== 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-03-21 09:35:30 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/MapViewSchemaDescriptor.java 2014-03-26 09:23:47 +0000
@@ -28,9 +28,9 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+import org.hisp.dhis.mapping.MapView;
import org.hisp.dhis.schema.Schema;
import org.hisp.dhis.schema.SchemaDescriptor;
-import org.hisp.dhis.mapping.MapView;
import org.springframework.stereotype.Component;
/**
@@ -42,6 +42,6 @@
@Override
public Schema getSchema()
{
- return new Schema( MapView.class, "mapView", "mapViews", true, true, true );
+ return new Schema( MapView.class, "mapView", "mapViews" );
}
}
=== 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-03-21 09:35:30 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/MessageConversationSchemaDescriptor.java 2014-03-26 09:23:47 +0000
@@ -28,9 +28,9 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+import org.hisp.dhis.message.MessageConversation;
import org.hisp.dhis.schema.Schema;
import org.hisp.dhis.schema.SchemaDescriptor;
-import org.hisp.dhis.message.MessageConversation;
import org.springframework.stereotype.Component;
/**
@@ -42,6 +42,6 @@
@Override
public Schema getSchema()
{
- return new Schema( MessageConversation.class, "messageConversation", "messageConversations", false, false, true );
+ return new Schema( MessageConversation.class, "messageConversation", "messageConversations" );
}
}
=== 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-03-24 20:17:41 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/OptionSetSchemaDescriptor.java 2014-03-26 09:23:47 +0000
@@ -43,7 +43,7 @@
@Override
public Schema getSchema()
{
- Schema schema = new Schema( OptionSet.class, "optionSet", "optionSets", true, true, true );
+ Schema schema = new Schema( OptionSet.class, "optionSet", "optionSets" );
schema.setShareable( true );
schema.setPublicAuthorities( Lists.newArrayList( "F_OPTIONSET_PUBLIC_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-03-21 09:35:30 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/OrganisationUnitGroupSchemaDescriptor.java 2014-03-26 09:23:47 +0000
@@ -29,9 +29,9 @@
*/
import com.google.common.collect.Lists;
+import org.hisp.dhis.organisationunit.OrganisationUnitGroup;
import org.hisp.dhis.schema.Schema;
import org.hisp.dhis.schema.SchemaDescriptor;
-import org.hisp.dhis.organisationunit.OrganisationUnitGroup;
import org.springframework.stereotype.Component;
/**
@@ -43,7 +43,7 @@
@Override
public Schema getSchema()
{
- Schema schema = new Schema( OrganisationUnitGroup.class, "organisationUnitGroup", "organisationUnitGroups", true, true, true );
+ Schema schema = new Schema( OrganisationUnitGroup.class, "organisationUnitGroup", "organisationUnitGroups" );
schema.setShareable( true );
schema.setPublicAuthorities( Lists.newArrayList( "F_ORGUNITGROUP_PUBLIC_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-03-24 20:17:41 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/OrganisationUnitGroupSetSchemaDescriptor.java 2014-03-26 09:23:47 +0000
@@ -43,7 +43,7 @@
@Override
public Schema getSchema()
{
- Schema schema = new Schema( OrganisationUnitGroupSet.class, "organisationUnitGroupSet", "organisationUnitGroupSets", true, true, true );
+ Schema schema = new Schema( OrganisationUnitGroupSet.class, "organisationUnitGroupSet", "organisationUnitGroupSets" );
schema.setShareable( true );
schema.setPublicAuthorities( Lists.newArrayList( "F_ORGUNITGROUPSET_PUBLIC_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-03-21 09:35:30 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/OrganisationUnitLevelSchemaDescriptor.java 2014-03-26 09:23:47 +0000
@@ -28,9 +28,9 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+import org.hisp.dhis.organisationunit.OrganisationUnitLevel;
import org.hisp.dhis.schema.Schema;
import org.hisp.dhis.schema.SchemaDescriptor;
-import org.hisp.dhis.organisationunit.OrganisationUnitLevel;
import org.springframework.stereotype.Component;
/**
@@ -42,6 +42,6 @@
@Override
public Schema getSchema()
{
- return new Schema( OrganisationUnitLevel.class, "organisationUnitLevel", "organisationUnitLevels", true, true, true );
+ return new Schema( OrganisationUnitLevel.class, "organisationUnitLevel", "organisationUnitLevels" );
}
}
=== 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-03-21 09:35:30 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/OrganisationUnitSchemaDescriptor.java 2014-03-26 09:23:47 +0000
@@ -28,9 +28,9 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+import org.hisp.dhis.organisationunit.OrganisationUnit;
import org.hisp.dhis.schema.Schema;
import org.hisp.dhis.schema.SchemaDescriptor;
-import org.hisp.dhis.organisationunit.OrganisationUnit;
import org.springframework.stereotype.Component;
/**
@@ -42,6 +42,6 @@
@Override
public Schema getSchema()
{
- return new Schema( OrganisationUnit.class, "organisationUnit", "organisationUnits", true, true, true );
+ return new Schema( OrganisationUnit.class, "organisationUnit", "organisationUnits" );
}
}
=== 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-03-21 09:35:30 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/ProgramSchemaDescriptor.java 2014-03-26 09:23:47 +0000
@@ -29,9 +29,9 @@
*/
import com.google.common.collect.Lists;
+import org.hisp.dhis.program.Program;
import org.hisp.dhis.schema.Schema;
import org.hisp.dhis.schema.SchemaDescriptor;
-import org.hisp.dhis.program.Program;
import org.springframework.stereotype.Component;
/**
@@ -43,7 +43,7 @@
@Override
public Schema getSchema()
{
- Schema schema = new Schema( Program.class, "program", "programs", false, false, true );
+ Schema schema = new Schema( Program.class, "program", "programs" );
schema.setShareable( true );
schema.setPublicAuthorities( Lists.newArrayList( "F_PROGRAM_PUBLIC_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-03-21 09:35:30 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/ProgramStageSchemaDescriptor.java 2014-03-26 09:23:47 +0000
@@ -28,9 +28,9 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+import org.hisp.dhis.program.ProgramStage;
import org.hisp.dhis.schema.Schema;
import org.hisp.dhis.schema.SchemaDescriptor;
-import org.hisp.dhis.program.ProgramStage;
import org.springframework.stereotype.Component;
/**
@@ -42,6 +42,6 @@
@Override
public Schema getSchema()
{
- return new Schema( ProgramStage.class, "programStage", "programStages", false, false, true );
+ return new Schema( ProgramStage.class, "programStage", "programStages" );
}
}
=== 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-03-21 09:35:30 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/RelationshipTypeSchemaDescriptor.java 2014-03-26 09:23:47 +0000
@@ -28,9 +28,9 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+import org.hisp.dhis.relationship.RelationshipType;
import org.hisp.dhis.schema.Schema;
import org.hisp.dhis.schema.SchemaDescriptor;
-import org.hisp.dhis.relationship.RelationshipType;
import org.springframework.stereotype.Component;
/**
@@ -42,6 +42,6 @@
@Override
public Schema getSchema()
{
- return new Schema( RelationshipType.class, "relationshipType", "relationshipTypes", false, false, true );
+ return new Schema( RelationshipType.class, "relationshipType", "relationshipTypes" );
}
}
=== 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-03-21 09:35:30 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/ReportSchemaDescriptor.java 2014-03-26 09:23:47 +0000
@@ -29,9 +29,9 @@
*/
import com.google.common.collect.Lists;
+import org.hisp.dhis.report.Report;
import org.hisp.dhis.schema.Schema;
import org.hisp.dhis.schema.SchemaDescriptor;
-import org.hisp.dhis.report.Report;
import org.springframework.stereotype.Component;
/**
@@ -43,7 +43,7 @@
@Override
public Schema getSchema()
{
- Schema schema = new Schema( Report.class, "report", "reports", true, true, true );
+ Schema schema = new Schema( Report.class, "report", "reports" );
schema.setShareable( true );
schema.setPublicAuthorities( Lists.newArrayList( "F_REPORT_PUBLIC_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-03-21 09:35:30 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/ReportTableSchemaDescriptor.java 2014-03-26 09:23:47 +0000
@@ -29,9 +29,9 @@
*/
import com.google.common.collect.Lists;
+import org.hisp.dhis.reporttable.ReportTable;
import org.hisp.dhis.schema.Schema;
import org.hisp.dhis.schema.SchemaDescriptor;
-import org.hisp.dhis.reporttable.ReportTable;
import org.springframework.stereotype.Component;
/**
@@ -43,7 +43,7 @@
@Override
public Schema getSchema()
{
- Schema schema = new Schema( ReportTable.class, "reportTable", "reportTables", true, true, true );
+ Schema schema = new Schema( ReportTable.class, "reportTable", "reportTables" );
schema.setShareable( true );
schema.setPublicAuthorities( Lists.newArrayList( "F_REPORTTABLE_PUBLIC_ADD" ) );
=== 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-03-21 09:35:30 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/SectionSchemaDescriptor.java 2014-03-26 09:23:47 +0000
@@ -42,6 +42,6 @@
@Override
public Schema getSchema()
{
- return new Schema( Section.class, "section", "sections", true, true, true );
+ return new Schema( Section.class, "section", "sections" );
}
}
=== 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-03-24 20:17:41 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/SqlViewSchemaDescriptor.java 2014-03-26 09:23:47 +0000
@@ -43,7 +43,7 @@
@Override
public Schema getSchema()
{
- Schema schema = new Schema( SqlView.class, "sqlView", "sqlViews", true, true, true );
+ Schema schema = new Schema( SqlView.class, "sqlView", "sqlViews" );
schema.setShareable( true );
schema.setPublicAuthorities( Lists.newArrayList( "F_SQLVIEW_PUBLIC_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-03-21 09:35:30 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/TrackedEntityAttributeGroupSchemaDescriptor.java 2014-03-26 09:23:47 +0000
@@ -42,6 +42,6 @@
@Override
public Schema getSchema()
{
- return new Schema( TrackedEntityAttributeGroup.class, "trackedEntityAttributeGroup", "trackedEntityAttributeGroups", false, false, true );
+ return new Schema( TrackedEntityAttributeGroup.class, "trackedEntityAttributeGroup", "trackedEntityAttributeGroups" );
}
}
=== 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-03-24 20:17:41 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/TrackedEntityAttributeSchemaDescriptor.java 2014-03-26 09:23:47 +0000
@@ -43,7 +43,7 @@
@Override
public Schema getSchema()
{
- Schema schema = new Schema( TrackedEntityAttribute.class, "trackedEntityAttribute", "trackedEntityAttributes", false, false, true );
+ Schema schema = new Schema( TrackedEntityAttribute.class, "trackedEntityAttribute", "trackedEntityAttributes" );
schema.setShareable( true );
schema.setPublicAuthorities( Lists.newArrayList( "F_TRACKED_ENTITY_ATTRIBUTE_PUBLIC_ADD" ) );
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/TrackedEntityInstanceSchemaDescriptor.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/TrackedEntityInstanceSchemaDescriptor.java 2014-03-21 09:35:30 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/TrackedEntityInstanceSchemaDescriptor.java 2014-03-26 09:23:47 +0000
@@ -42,6 +42,6 @@
@Override
public Schema getSchema()
{
- return new Schema( TrackedEntityInstance.class, "trackedEntityInstance", "trackedEntityInstances", false, false, true );
+ return new Schema( TrackedEntityInstance.class, "trackedEntityInstance", "trackedEntityInstances" );
}
}
=== 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-03-21 09:35:30 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/TrackedEntitySchemaDescriptor.java 2014-03-26 09:23:47 +0000
@@ -42,6 +42,6 @@
@Override
public Schema getSchema()
{
- return new Schema( TrackedEntity.class, "trackedEntity", "trackedEntities", false, false, true );
+ return new Schema( TrackedEntity.class, "trackedEntity", "trackedEntities" );
}
}
=== 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-03-21 09:35:30 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/UserGroupSchemaDescriptor.java 2014-03-26 09:23:47 +0000
@@ -43,7 +43,7 @@
@Override
public Schema getSchema()
{
- Schema schema = new Schema( UserGroup.class, "userGroup", "userGroups", true, true, false );
+ Schema schema = new Schema( UserGroup.class, "userGroup", "userGroups" );
schema.setShareable( true );
schema.setPublicAuthorities( 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-03-24 20:17:41 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/UserRoleSchemaDescriptor.java 2014-03-26 09:23:47 +0000
@@ -43,7 +43,7 @@
@Override
public Schema getSchema()
{
- Schema schema = new Schema( UserAuthorityGroup.class, "userRole", "userRoles", true, true, false );
+ Schema schema = new Schema( UserAuthorityGroup.class, "userRole", "userRoles" );
schema.setShareable( true );
schema.setPublicAuthorities( Lists.newArrayList( "F_USERROLE_PUBLIC_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-03-21 09:35:30 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/UserSchemaDescriptor.java 2014-03-26 09:23:47 +0000
@@ -42,6 +42,6 @@
@Override
public Schema getSchema()
{
- return new Schema( User.class, "user", "users", true, true, false );
+ return new Schema( User.class, "user", "users" );
}
}
=== 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-03-24 20:17:41 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/ValidationRuleGroupSchemaDescriptor.java 2014-03-26 09:23:47 +0000
@@ -43,7 +43,7 @@
@Override
public Schema getSchema()
{
- Schema schema = new Schema( ValidationRuleGroup.class, "validationRuleGroup", "validationRuleGroups", true, true, true );
+ Schema schema = new Schema( ValidationRuleGroup.class, "validationRuleGroup", "validationRuleGroups" );
schema.setShareable( true );
schema.setPublicAuthorities( Lists.newArrayList( "F_VALIDATIONRULEGROUP_PUBLIC_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-03-21 09:35:30 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/ValidationRuleSchemaDescriptor.java 2014-03-26 09:23:47 +0000
@@ -42,6 +42,6 @@
@Override
public Schema getSchema()
{
- return new Schema( ValidationRule.class, "validationRule", "validationRules", true, true, true );
+ return new Schema( ValidationRule.class, "validationRule", "validationRules" );
}
}
