Merge branch 'master' of git.evolveum.com:/srv/git/projects/midpoint

Evolveum · Mar 4, 2014 · b312708 · b312708
2 parents 3d43593 + 2966e27
commit b312708
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/...admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.properties b/...admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.properties
@@ -147,6 +147,12 @@ NodeExecutionStatus.DOWN=Turned off
 NodeExecutionStatus.ERROR=Error
 NodeExecutionStatus.COMMUNICATION_ERROR=Unreachable
 
+NodeExecutionStatusType.RUNNING=Running
+NodeExecutionStatusType.PAUSED=Stopped
+NodeExecutionStatusType.DOWN=Turned off
+NodeExecutionStatusType.ERROR=Error
+NodeExecutionStatusType.COMMUNICATION_ERROR=Unreachable
+
 ResourceStatus.NOT_TESTED=Not tested
 ResourceStatus.ERROR=Error
 ResourceStatus.SUCCESS=Success

diff --git a/infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/ObjectTypes.java b/infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/ObjectTypes.java
@@ -57,8 +57,6 @@ public enum ObjectTypes {
 
     SHADOW(SchemaConstants.C_SHADOW_TYPE, SchemaConstants.C_SHADOW, ShadowType.class, ObjectManager.PROVISIONING, "shadows"),
 
-    OBJECT(SchemaConstants.C_OBJECT_TYPE, SchemaConstants.C_OBJECT, ObjectType.class, ObjectManager.MODEL, "objects"),
-
     ROLE(RoleType.COMPLEX_TYPE, SchemaConstantsGenerated.C_ROLE, RoleType.class, ObjectManager.MODEL, "roles"),
 
     PASSWORD_POLICY(ValuePolicyType.COMPLEX_TYPE, SchemaConstantsGenerated.C_VALUE_POLICY, ValuePolicyType.class,
@@ -76,7 +74,10 @@ public enum ObjectTypes {
     REPORT(ReportType.COMPLEX_TYPE, SchemaConstants.C_REPORT, ReportType.class, ObjectManager.MODEL, "reports"),
 
     REPORT_OUTPUT(ReportOutputType.COMPLEX_TYPE, SchemaConstants.C_REPORT_OUTPUT, ReportOutputType.class,
-                  ObjectManager.MODEL, "reportOutputs");
+                  ObjectManager.MODEL, "reportOutputs"),
+
+    // this should be at end, because otherwise it presents itself as entry for all subtypes of ObjectType
+    OBJECT(SchemaConstants.C_OBJECT_TYPE, SchemaConstants.C_OBJECT, ObjectType.class, ObjectManager.MODEL, "objects");
 
     public static enum ObjectManager {
         PROVISIONING, TASK_MANAGER, WORKFLOW, MODEL, REPOSITORY;