=== 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-13 16:43:37 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/schema/descriptors/CategoryOptionGroupSetSchemaDescriptor.java	2014-03-14 09:14:00 +0000
@@ -42,6 +42,6 @@
     @Override
     public Schema getSchema()
     {
-        return new Schema( CategoryOptionGroupSet.class, "categoryOptionGroupSet", "categoryOptionGroupSets", true, true, true );
+        return new Schema( CategoryOptionGroupSet.class, "categoryOptionGroupSet", "categoryOptionGroupSets", false, false, true );
     }
 }

=== 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-13 17:00:18 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/schema/descriptors/DashboardSchemaDescriptor.java	2014-03-14 09:14:00 +0000
@@ -42,6 +42,6 @@
     @Override
     public Schema getSchema()
     {
-        return new Schema( Dashboard.class, "dashboard", "dashboards", true, true, true );
+        return new Schema( Dashboard.class, "dashboard", "dashboards", false, false, true );
     }
 }

=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/schema/descriptors/DataElementOperandSchemaDescriptor.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/schema/descriptors/DataElementOperandSchemaDescriptor.java	2014-03-13 16:43:37 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/schema/descriptors/DataElementOperandSchemaDescriptor.java	2014-03-14 09:14:00 +0000
@@ -42,6 +42,6 @@
     @Override
     public Schema getSchema()
     {
-        return new Schema( DataElementOperand.class, "dataElementOperand", "dataElementOperands", true, true, true );
+        return new Schema( DataElementOperand.class, "dataElementOperand", "dataElementOperands", false, false, true );
     }
 }

=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/schema/descriptors/MessageConversationSchemaDescriptor.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/schema/descriptors/MessageConversationSchemaDescriptor.java	2014-03-13 17:00:18 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/schema/descriptors/MessageConversationSchemaDescriptor.java	2014-03-14 09:14:00 +0000
@@ -42,6 +42,6 @@
     @Override
     public Schema getSchema()
     {
-        return new Schema( MessageConversation.class, "messageConversation", "messageConversations", true, true, true );
+        return new Schema( MessageConversation.class, "messageConversation", "messageConversations", false, false, true );
     }
 }

=== 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-13 17:00:18 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/schema/descriptors/ProgramSchemaDescriptor.java	2014-03-14 09:14:00 +0000
@@ -42,6 +42,6 @@
     @Override
     public Schema getSchema()
     {
-        return new Schema( Program.class, "program", "programs", true, true, true );
+        return new Schema( Program.class, "program", "programs", false, false, true );
     }
 }

=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/schema/descriptors/ProgramStageSchemaDescriptor.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/schema/descriptors/ProgramStageSchemaDescriptor.java	2014-03-13 17:00:18 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/schema/descriptors/ProgramStageSchemaDescriptor.java	2014-03-14 09:14:00 +0000
@@ -42,6 +42,6 @@
     @Override
     public Schema getSchema()
     {
-        return new Schema( ProgramStage.class, "programStage", "programStages", true, true, true );
+        return new Schema( ProgramStage.class, "programStage", "programStages", false, false, true );
     }
 }

=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/schema/descriptors/RelationshipTypeSchemaDescriptor.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/schema/descriptors/RelationshipTypeSchemaDescriptor.java	2014-03-13 17:00:18 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/schema/descriptors/RelationshipTypeSchemaDescriptor.java	2014-03-14 09:14:00 +0000
@@ -42,6 +42,6 @@
     @Override
     public Schema getSchema()
     {
-        return new Schema( RelationshipType.class, "relationshipType", "relationshipTypes", true, true, true );
+        return new Schema( RelationshipType.class, "relationshipType", "relationshipTypes", false, false, true );
     }
 }

=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/schema/descriptors/TrackedEntityAttributeGroupSchemaDescriptor.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/schema/descriptors/TrackedEntityAttributeGroupSchemaDescriptor.java	2014-03-13 17:00:18 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/schema/descriptors/TrackedEntityAttributeGroupSchemaDescriptor.java	2014-03-14 09:14:00 +0000
@@ -42,6 +42,6 @@
     @Override
     public Schema getSchema()
     {
-        return new Schema( TrackedEntityAttributeGroup.class, "trackedEntityAttributeGroup", "trackedEntityAttributeGroups", true, true, true );
+        return new Schema( TrackedEntityAttributeGroup.class, "trackedEntityAttributeGroup", "trackedEntityAttributeGroups", false, false, true );
     }
 }

=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/schema/descriptors/TrackedEntityAttributeSchemaDescriptor.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/schema/descriptors/TrackedEntityAttributeSchemaDescriptor.java	2014-03-13 17:00:18 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/schema/descriptors/TrackedEntityAttributeSchemaDescriptor.java	2014-03-14 09:14:00 +0000
@@ -42,6 +42,6 @@
     @Override
     public Schema getSchema()
     {
-        return new Schema( TrackedEntityAttribute.class, "trackedEntityAttribute", "trackedEntityAttributes", true, true, true );
+        return new Schema( TrackedEntityAttribute.class, "trackedEntityAttribute", "trackedEntityAttributes", false, false, true );
     }
 }

=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/schema/descriptors/TrackedEntityInstanceSchemaDescriptor.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/schema/descriptors/TrackedEntityInstanceSchemaDescriptor.java	2014-03-13 17:00:18 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/schema/descriptors/TrackedEntityInstanceSchemaDescriptor.java	2014-03-14 09:14:00 +0000
@@ -42,6 +42,6 @@
     @Override
     public Schema getSchema()
     {
-        return new Schema( TrackedEntityInstance.class, "trackedEntityInstance", "trackedEntityInstances", true, true, true );
+        return new Schema( TrackedEntityInstance.class, "trackedEntityInstance", "trackedEntityInstances", false, false, true );
     }
 }

=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/schema/descriptors/TrackedEntitySchemaDescriptor.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/schema/descriptors/TrackedEntitySchemaDescriptor.java	2014-03-13 17:00:18 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/schema/descriptors/TrackedEntitySchemaDescriptor.java	2014-03-14 09:14:00 +0000
@@ -42,6 +42,6 @@
     @Override
     public Schema getSchema()
     {
-        return new Schema( TrackedEntity.class, "trackedEntity", "trackedEntities", true, true, true );
+        return new Schema( TrackedEntity.class, "trackedEntity", "trackedEntities", false, false, true );
     }
 }

=== 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-13 17:00:18 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/schema/descriptors/UserGroupSchemaDescriptor.java	2014-03-14 09:14:00 +0000
@@ -42,6 +42,6 @@
     @Override
     public Schema getSchema()
     {
-        return new Schema( UserGroup.class, "userGroup", "userGroups", true, true, true );
+        return new Schema( UserGroup.class, "userGroup", "userGroups", true, true, false );
     }
 }

=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/schema/descriptors/UserRoleSchemaDescriptor.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/schema/descriptors/UserRoleSchemaDescriptor.java	2014-03-13 17:00:18 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/schema/descriptors/UserRoleSchemaDescriptor.java	2014-03-14 09:14:00 +0000
@@ -42,6 +42,6 @@
     @Override
     public Schema getSchema()
     {
-        return new Schema( UserAuthorityGroup.class, "userRole", "userRoles", true, true, true );
+        return new Schema( UserAuthorityGroup.class, "userRole", "userRoles", true, true, false );
     }
 }

=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/schema/descriptors/UserSchemaDescriptor.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/schema/descriptors/UserSchemaDescriptor.java	2014-03-13 17:00:18 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/schema/descriptors/UserSchemaDescriptor.java	2014-03-14 09:14:00 +0000
@@ -42,6 +42,6 @@
     @Override
     public Schema getSchema()
     {
-        return new Schema( User.class, "user", "users", true, true, true );
+        return new Schema( User.class, "user", "users", true, true, false );
     }
 }