=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/schema/descriptors/CategoryOptionComboSchemaDescriptor.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/schema/descriptors/CategoryOptionComboSchemaDescriptor.java 2014-03-18 08:10:10 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/schema/descriptors/CategoryOptionComboSchemaDescriptor.java 2014-03-21 09:13:17 +0000 @@ -28,6 +28,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +import com.google.common.collect.Lists; import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo; import org.hisp.dhis.dxf2.schema.Schema; import org.hisp.dhis.dxf2.schema.SchemaDescriptor; @@ -42,6 +43,12 @@ @Override public Schema getSchema() { - return new Schema( DataElementCategoryOptionCombo.class, "categoryOptionCombo", "categoryOptionCombos", true, true, true ); + Schema schema = new Schema( DataElementCategoryOptionCombo.class, "categoryOptionCombo", "categoryOptionCombos", true, true, true ); + + schema.setShareable( true ); + schema.setPublicAuthorities( Lists.newArrayList( "F_CATEGORY_COMBO_PUBLIC_ADD" ) ); + schema.setPrivateAuthorities( Lists.newArrayList( "F_CATEGORY_COMBO_PRIVATE_ADD" ) ); + + return schema; } } === modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/schema/descriptors/CategoryOptionGroupSchemaDescriptor.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/schema/descriptors/CategoryOptionGroupSchemaDescriptor.java 2014-03-18 08:10:10 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/schema/descriptors/CategoryOptionGroupSchemaDescriptor.java 2014-03-21 09:13:17 +0000 @@ -28,6 +28,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +import com.google.common.collect.Lists; import org.hisp.dhis.dataelement.CategoryOptionGroup; import org.hisp.dhis.dxf2.schema.Schema; import org.hisp.dhis.dxf2.schema.SchemaDescriptor; @@ -42,6 +43,12 @@ @Override public Schema getSchema() { - return new Schema( CategoryOptionGroup.class, "categoryOptionGroup", "categoryOptionGroups", true, true, true ); + Schema schema = new Schema( CategoryOptionGroup.class, "categoryOptionGroup", "categoryOptionGroups", true, true, true ); + + schema.setShareable( true ); + schema.setPublicAuthorities( Lists.newArrayList( "F_CATEGORY_OPTION_GROUP_PUBLIC_ADD" ) ); + schema.setPrivateAuthorities( Lists.newArrayList( "F_CATEGORY_OPTION_GROUP_PRIVATE_ADD" ) ); + + return schema; } } === modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/schema/descriptors/CategoryOptionGroupSetSchemaDescriptor.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/schema/descriptors/CategoryOptionGroupSetSchemaDescriptor.java 2014-03-18 08:10:10 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/schema/descriptors/CategoryOptionGroupSetSchemaDescriptor.java 2014-03-21 09:13:17 +0000 @@ -28,6 +28,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +import com.google.common.collect.Lists; import org.hisp.dhis.dataelement.CategoryOptionGroupSet; import org.hisp.dhis.dxf2.schema.Schema; import org.hisp.dhis.dxf2.schema.SchemaDescriptor; @@ -42,6 +43,12 @@ @Override public Schema getSchema() { - return new Schema( CategoryOptionGroupSet.class, "categoryOptionGroupSet", "categoryOptionGroupSets", false, false, true ); + Schema schema = new Schema( CategoryOptionGroupSet.class, "categoryOptionGroupSet", "categoryOptionGroupSets", false, false, true ); + + schema.setShareable( true ); + schema.setPublicAuthorities( Lists.newArrayList( "F_CATEGORY_OPTION_GROUP_SET_PUBLIC_ADD" ) ); + schema.setPrivateAuthorities( Lists.newArrayList( "F_CATEGORY_OPTION_GROUP_SET_PRIVATE_ADD" ) ); + + return schema; } } === modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/schema/descriptors/CategoryOptionSchemaDescriptor.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/schema/descriptors/CategoryOptionSchemaDescriptor.java 2014-03-18 08:10:10 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/schema/descriptors/CategoryOptionSchemaDescriptor.java 2014-03-21 09:13:17 +0000 @@ -28,6 +28,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +import com.google.common.collect.Lists; import org.hisp.dhis.dataelement.DataElementCategoryOption; import org.hisp.dhis.dxf2.schema.Schema; import org.hisp.dhis.dxf2.schema.SchemaDescriptor; @@ -42,6 +43,12 @@ @Override public Schema getSchema() { - return new Schema( DataElementCategoryOption.class, "categoryOption", "categoryOptions", true, true, true ); + Schema schema = new Schema( DataElementCategoryOption.class, "categoryOption", "categoryOptions", true, true, true ); + + schema.setShareable( true ); + schema.setPublicAuthorities( Lists.newArrayList( "F_CATEGORY_OPTION_PUBLIC_ADD" ) ); + schema.setPrivateAuthorities( Lists.newArrayList( "F_CATEGORY_OPTION_PRIVATE_ADD" ) ); + + return schema; } } === modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/schema/descriptors/CategorySchemaDescriptor.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/schema/descriptors/CategorySchemaDescriptor.java 2014-03-18 08:10:10 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/schema/descriptors/CategorySchemaDescriptor.java 2014-03-21 09:13:17 +0000 @@ -28,6 +28,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +import com.google.common.collect.Lists; import org.hisp.dhis.dataelement.DataElementCategory; import org.hisp.dhis.dxf2.schema.Schema; import org.hisp.dhis.dxf2.schema.SchemaDescriptor; @@ -42,6 +43,12 @@ @Override public Schema getSchema() { - return new Schema( DataElementCategory.class, "category", "categories", true, true, true ); + Schema schema = new Schema( DataElementCategory.class, "category", "categories", true, true, true ); + + schema.setShareable( true ); + schema.setPublicAuthorities( Lists.newArrayList( "F_CATEGORY_PUBLIC_ADD" ) ); + schema.setPrivateAuthorities( Lists.newArrayList( "F_CATEGORY_PRIVATE_ADD" ) ); + + return schema; } } === modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/schema/descriptors/ChartSchemaDescriptor.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/schema/descriptors/ChartSchemaDescriptor.java 2014-03-18 08:10:10 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/schema/descriptors/ChartSchemaDescriptor.java 2014-03-21 09:13:17 +0000 @@ -28,6 +28,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +import com.google.common.collect.Lists; import org.hisp.dhis.chart.Chart; import org.hisp.dhis.dxf2.schema.Schema; import org.hisp.dhis.dxf2.schema.SchemaDescriptor; @@ -42,6 +43,12 @@ @Override public Schema getSchema() { - return new Schema( Chart.class, "chart", "charts", true, true, true ); + Schema schema = new Schema( Chart.class, "chart", "charts", true, true, true ); + + schema.setShareable( true ); + schema.setPublicAuthorities( Lists.newArrayList( "F_CHART_PUBLIC_ADD" ) ); + schema.setExternalAuthorities( Lists.newArrayList( "F_CHART_EXTERNAL" ) ); + + return schema; } } === modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/schema/descriptors/DashboardSchemaDescriptor.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/schema/descriptors/DashboardSchemaDescriptor.java 2014-03-18 08:10:10 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/schema/descriptors/DashboardSchemaDescriptor.java 2014-03-21 09:13:17 +0000 @@ -28,6 +28,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +import com.google.common.collect.Lists; import org.hisp.dhis.dashboard.Dashboard; import org.hisp.dhis.dxf2.schema.Schema; import org.hisp.dhis.dxf2.schema.SchemaDescriptor; @@ -42,6 +43,11 @@ @Override public Schema getSchema() { - return new Schema( Dashboard.class, "dashboard", "dashboards", false, false, true ); + Schema schema = new Schema( Dashboard.class, "dashboard", "dashboards", false, false, true ); + + schema.setShareable( true ); + schema.setPublicAuthorities( Lists.newArrayList( "F_DASHBOARD_PUBLIC_ADD" ) ); + + return schema; } } === modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/schema/descriptors/DataDictionarySchemaDescriptor.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/schema/descriptors/DataDictionarySchemaDescriptor.java 2014-03-18 08:10:10 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/schema/descriptors/DataDictionarySchemaDescriptor.java 2014-03-21 09:13:17 +0000 @@ -28,6 +28,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +import com.google.common.collect.Lists; import org.hisp.dhis.datadictionary.DataDictionary; import org.hisp.dhis.dxf2.schema.Schema; import org.hisp.dhis.dxf2.schema.SchemaDescriptor; @@ -42,6 +43,12 @@ @Override public Schema getSchema() { - return new Schema( DataDictionary.class, "dataDictionary", "dataDictionaries", true, true, true ); + Schema schema = new Schema( DataDictionary.class, "dataDictionary", "dataDictionaries", true, true, true ); + + schema.setShareable( true ); + schema.setPublicAuthorities( Lists.newArrayList( "F_DATADICTIONARY_PUBLIC_ADD" ) ); + schema.setPrivateAuthorities( Lists.newArrayList( "F_DATADICTIONARY_PRIVATE_ADD" ) ); + + return schema; } } === modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/schema/descriptors/DataElementSchemaDescriptor.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/schema/descriptors/DataElementSchemaDescriptor.java 2014-03-18 08:10:10 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/schema/descriptors/DataElementSchemaDescriptor.java 2014-03-21 09:13:17 +0000 @@ -28,6 +28,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +import com.google.common.collect.Lists; import org.hisp.dhis.dataelement.DataElement; import org.hisp.dhis.dxf2.schema.Schema; import org.hisp.dhis.dxf2.schema.SchemaDescriptor; @@ -42,6 +43,12 @@ @Override public Schema getSchema() { - return new Schema( DataElement.class, "dataElement", "dataElements", true, true, true ); + Schema schema = new Schema( DataElement.class, "dataElement", "dataElements", true, true, true ); + + schema.setShareable( true ); + schema.setPublicAuthorities( Lists.newArrayList( "F_DATAELEMENT_PUBLIC_ADD" ) ); + schema.setPrivateAuthorities( Lists.newArrayList( "F_DATAELEMENT_PRIVATE_ADD" ) ); + + return schema; } } === modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/schema/descriptors/DataSetSchemaDescriptor.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/schema/descriptors/DataSetSchemaDescriptor.java 2014-03-18 08:10:10 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/schema/descriptors/DataSetSchemaDescriptor.java 2014-03-21 09:13:17 +0000 @@ -28,6 +28,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +import com.google.common.collect.Lists; import org.hisp.dhis.dataset.DataSet; import org.hisp.dhis.dxf2.schema.Schema; import org.hisp.dhis.dxf2.schema.SchemaDescriptor; @@ -42,6 +43,12 @@ @Override public Schema getSchema() { - return new Schema( DataSet.class, "dataSet", "dataSets", true, true, true ); + Schema schema = new Schema( DataSet.class, "dataSet", "dataSets", true, true, true ); + + schema.setShareable( true ); + schema.setPublicAuthorities( Lists.newArrayList( "F_DATASET_PUBLIC_ADD" ) ); + schema.setPrivateAuthorities( Lists.newArrayList( "F_DATASET_PRIVATE_ADD" ) ); + + return schema; } } === modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/schema/descriptors/DocumentSchemaDescriptor.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/schema/descriptors/DocumentSchemaDescriptor.java 2014-03-18 08:10:10 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/schema/descriptors/DocumentSchemaDescriptor.java 2014-03-21 09:13:17 +0000 @@ -28,6 +28,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +import com.google.common.collect.Lists; import org.hisp.dhis.document.Document; import org.hisp.dhis.dxf2.schema.Schema; import org.hisp.dhis.dxf2.schema.SchemaDescriptor; @@ -42,6 +43,13 @@ @Override public Schema getSchema() { - return new Schema( Document.class, "document", "documents", true, true, true ); + Schema schema = new Schema( Document.class, "document", "documents", true, true, true ); + + schema.setShareable( true ); + schema.setPublicAuthorities( Lists.newArrayList( "F_DOCUMENT_PUBLIC_ADD" ) ); + schema.setPrivateAuthorities( Lists.newArrayList( "F_DOCUMENT_PRIVATE_ADD" ) ); + schema.setExternalAuthorities( Lists.newArrayList( "F_DOCUMENT_EXTERNAL" ) ); + + return schema; } } === modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/schema/descriptors/IndicatorGroupSchemaDescriptor.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/schema/descriptors/IndicatorGroupSchemaDescriptor.java 2014-03-18 08:10:10 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/schema/descriptors/IndicatorGroupSchemaDescriptor.java 2014-03-21 09:13:17 +0000 @@ -28,6 +28,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +import com.google.common.collect.Lists; import org.hisp.dhis.dxf2.schema.Schema; import org.hisp.dhis.dxf2.schema.SchemaDescriptor; import org.hisp.dhis.indicator.IndicatorGroup; @@ -42,6 +43,12 @@ @Override public Schema getSchema() { - return new Schema( IndicatorGroup.class, "indicatorGroup", "indicatorsGroups", true, true, true ); + Schema schema = new Schema( IndicatorGroup.class, "indicatorGroup", "indicatorsGroups", true, true, true ); + + schema.setShareable( true ); + schema.setPublicAuthorities( Lists.newArrayList( "F_INDICATORGROUP_PUBLIC_ADD" ) ); + schema.setPrivateAuthorities( Lists.newArrayList( "F_INDICATORGROUP_PRIVATE_ADD" ) ); + + return schema; } } === modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/schema/descriptors/IndicatorGroupSetSchemaDescriptor.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/schema/descriptors/IndicatorGroupSetSchemaDescriptor.java 2014-03-18 08:10:10 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/schema/descriptors/IndicatorGroupSetSchemaDescriptor.java 2014-03-21 09:13:17 +0000 @@ -28,6 +28,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +import com.google.common.collect.Lists; import org.hisp.dhis.dxf2.schema.Schema; import org.hisp.dhis.dxf2.schema.SchemaDescriptor; import org.hisp.dhis.indicator.IndicatorGroupSet; @@ -42,6 +43,12 @@ @Override public Schema getSchema() { - return new Schema( IndicatorGroupSet.class, "indicatorGroupSet", "indicatorGroupSets", true, true, true ); + Schema schema = new Schema( IndicatorGroupSet.class, "indicatorGroupSet", "indicatorGroupSets", true, true, true ); + + schema.setShareable( true ); + schema.setPublicAuthorities( Lists.newArrayList( "F_INDICATORGROUPSET_PUBLIC_ADD" ) ); + schema.setPrivateAuthorities( Lists.newArrayList( "F_INDICATORGROUPSET_PRIVATE_ADD" ) ); + + return schema; } } === modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/schema/descriptors/IndicatorSchemaDescriptor.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/schema/descriptors/IndicatorSchemaDescriptor.java 2014-03-18 08:10:10 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/schema/descriptors/IndicatorSchemaDescriptor.java 2014-03-21 09:13:17 +0000 @@ -28,6 +28,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +import com.google.common.collect.Lists; import org.hisp.dhis.dxf2.schema.Schema; import org.hisp.dhis.dxf2.schema.SchemaDescriptor; import org.hisp.dhis.indicator.Indicator; @@ -42,6 +43,12 @@ @Override public Schema getSchema() { - return new Schema( Indicator.class, "indicator", "indicators", true, true, true ); + Schema schema = new Schema( Indicator.class, "indicator", "indicators", true, true, true ); + + schema.setShareable( true ); + schema.setPublicAuthorities( Lists.newArrayList( "F_INDICATOR_PUBLIC_ADD" ) ); + schema.setPrivateAuthorities( Lists.newArrayList( "F_INDICATOR_PRIVATE_ADD" ) ); + + return schema; } } === modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/schema/descriptors/InterpretationSchemaDescriptor.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/schema/descriptors/InterpretationSchemaDescriptor.java 2014-03-18 08:10:10 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/schema/descriptors/InterpretationSchemaDescriptor.java 2014-03-21 09:13:17 +0000 @@ -42,6 +42,10 @@ @Override public Schema getSchema() { - return new Schema( Interpretation.class, "interpretation", "interpretations", true, true, true ); + Schema schema = new Schema( Interpretation.class, "interpretation", "interpretations", true, true, true ); + + schema.setShareable( true ); + + return schema; } } === modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/schema/descriptors/MapSchemaDescriptor.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/schema/descriptors/MapSchemaDescriptor.java 2014-03-18 08:10:10 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/schema/descriptors/MapSchemaDescriptor.java 2014-03-21 09:13:17 +0000 @@ -28,6 +28,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +import com.google.common.collect.Lists; import org.hisp.dhis.dxf2.schema.Schema; import org.hisp.dhis.dxf2.schema.SchemaDescriptor; import org.hisp.dhis.mapping.Map; @@ -42,6 +43,12 @@ @Override public Schema getSchema() { - return new Schema( Map.class, "map", "maps", true, true, true ); + Schema schema = new Schema( Map.class, "map", "maps", true, true, true ); + + schema.setShareable( true ); + schema.setPublicAuthorities( Lists.newArrayList( "F_MAP_PUBLIC_ADD" ) ); + schema.setExternalAuthorities( Lists.newArrayList( "F_MAP_EXTERNAL" ) ); + + return schema; } } === modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/schema/descriptors/OrganisationUnitGroupSchemaDescriptor.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/schema/descriptors/OrganisationUnitGroupSchemaDescriptor.java 2014-03-18 08:10:10 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/schema/descriptors/OrganisationUnitGroupSchemaDescriptor.java 2014-03-21 09:13:17 +0000 @@ -28,6 +28,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +import com.google.common.collect.Lists; import org.hisp.dhis.dxf2.schema.Schema; import org.hisp.dhis.dxf2.schema.SchemaDescriptor; import org.hisp.dhis.organisationunit.OrganisationUnitGroup; @@ -42,6 +43,12 @@ @Override public Schema getSchema() { - return new Schema( OrganisationUnitGroup.class, "organisationUnitGroup", "organisationUnitGroups", true, true, true ); + Schema schema = new Schema( OrganisationUnitGroup.class, "organisationUnitGroup", "organisationUnitGroups", true, true, true ); + + schema.setShareable( true ); + schema.setPublicAuthorities( Lists.newArrayList( "F_ORGUNITGROUP_PUBLIC_ADD" ) ); + schema.setPrivateAuthorities( Lists.newArrayList( "F_ORGUNITGROUP_PRIVATE_ADD" ) ); + + return schema; } } === modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/schema/descriptors/ProgramSchemaDescriptor.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/schema/descriptors/ProgramSchemaDescriptor.java 2014-03-18 08:10:10 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/schema/descriptors/ProgramSchemaDescriptor.java 2014-03-21 09:13:17 +0000 @@ -28,6 +28,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +import com.google.common.collect.Lists; import org.hisp.dhis.dxf2.schema.Schema; import org.hisp.dhis.dxf2.schema.SchemaDescriptor; import org.hisp.dhis.program.Program; @@ -42,6 +43,12 @@ @Override public Schema getSchema() { - return new Schema( Program.class, "program", "programs", false, false, true ); + Schema schema = new Schema( Program.class, "program", "programs", false, false, true ); + + schema.setShareable( true ); + schema.setPublicAuthorities( Lists.newArrayList( "F_PROGRAM_PUBLIC_ADD" ) ); + schema.setPrivateAuthorities( Lists.newArrayList( "F_PROGRAM_PRIVATE_ADD" ) ); + + return schema; } } === modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/schema/descriptors/ReportSchemaDescriptor.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/schema/descriptors/ReportSchemaDescriptor.java 2014-03-18 08:10:10 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/schema/descriptors/ReportSchemaDescriptor.java 2014-03-21 09:13:17 +0000 @@ -28,6 +28,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +import com.google.common.collect.Lists; import org.hisp.dhis.dxf2.schema.Schema; import org.hisp.dhis.dxf2.schema.SchemaDescriptor; import org.hisp.dhis.report.Report; @@ -42,6 +43,13 @@ @Override public Schema getSchema() { - return new Schema( Report.class, "report", "reports", true, true, true ); + Schema schema = new Schema( Report.class, "report", "reports", true, true, true ); + + schema.setShareable( true ); + schema.setPublicAuthorities( Lists.newArrayList( "F_REPORT_PUBLIC_ADD" ) ); + schema.setPrivateAuthorities( Lists.newArrayList( "F_REPORT_PRIVATE_ADD" ) ); + schema.setExternalAuthorities( Lists.newArrayList( "F_REPORT_EXTERNAL" ) ); + + return schema; } -} +} \ No newline at end of file === modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/schema/descriptors/ReportTableSchemaDescriptor.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/schema/descriptors/ReportTableSchemaDescriptor.java 2014-03-18 08:10:10 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/schema/descriptors/ReportTableSchemaDescriptor.java 2014-03-21 09:13:17 +0000 @@ -28,6 +28,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +import com.google.common.collect.Lists; import org.hisp.dhis.dxf2.schema.Schema; import org.hisp.dhis.dxf2.schema.SchemaDescriptor; import org.hisp.dhis.reporttable.ReportTable; @@ -42,6 +43,12 @@ @Override public Schema getSchema() { - return new Schema( ReportTable.class, "reportTable", "reportTables", true, true, true ); + Schema schema = new Schema( ReportTable.class, "reportTable", "reportTables", true, true, true ); + + schema.setShareable( true ); + schema.setPublicAuthorities( Lists.newArrayList( "F_REPORTTABLE_PUBLIC_ADD" ) ); + schema.setExternalAuthorities( Lists.newArrayList( "F_REPORTTABLE_EXTERNAL" ) ); + + return schema; } } === modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/schema/descriptors/UserGroupSchemaDescriptor.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/schema/descriptors/UserGroupSchemaDescriptor.java 2014-03-18 08:10:10 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/schema/descriptors/UserGroupSchemaDescriptor.java 2014-03-21 09:13:17 +0000 @@ -28,6 +28,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +import com.google.common.collect.Lists; import org.hisp.dhis.dxf2.schema.Schema; import org.hisp.dhis.dxf2.schema.SchemaDescriptor; import org.hisp.dhis.user.UserGroup; @@ -42,6 +43,11 @@ @Override public Schema getSchema() { - return new Schema( UserGroup.class, "userGroup", "userGroups", true, true, false ); + Schema schema = new Schema( UserGroup.class, "userGroup", "userGroups", true, true, false ); + + schema.setShareable( true ); + schema.setPublicAuthorities( Lists.newArrayList( "F_USERGROUP_PUBLIC_ADD" ) ); + + return schema; } }