Merge branch 'master' of https://github.com/Evolveum/midpoint

.travis.yml

@@ -1,4 +1,4 @@
-sudo: false
+sudo: required
 dist: trusty
 language: java
 
@@ -15,20 +15,19 @@ before_install:
   - unzip -qq apache-maven-3.3.9-bin.zip
   - export M2_HOME=$PWD/apache-maven-3.3.9
   - export PATH=$M2_HOME/bin:$PATH
-  - export MAVEN_OPTS='-Xmx2g -XX:MaxPermSize=256m'
+  - export MAVEN_OPTS='-Xmx2g'
 
 # custom script is used so build and tests are done in one mvn command, separating it (as Travis does by default) leads to problem with ConnId (notably DummyResource)
 script: mvn clean install
 
 addons:
   hostname: localhost # workaround for short hostname
-  apt:
-    packages:
-      - oracle-java8-installer # install newest JDK8
-      #- openjdk-8-jdk
+  #apt:
+    #packages:
+      #- oracle-java8-installer # install newest JDK8
 
 jdk:
-  - openjdk7
-  - oraclejdk7
-  #- openjdk8
+  #- openjdk7
+  #- oraclejdk7
   - oraclejdk8
+  - openjdk8

samples/evolveum/role-catalog.xml

@@ -27,21 +27,21 @@
 
 	<org oid="00000000-ee88-6666-0000-c0000000a000">
 		<name>RA000</name>
-		<displayName>Testing Roles</displayName>
 		<parentOrgRef oid="00000000-ee88-6666-0000-c00000000000" type="c:OrgType"/>
 		<assignment>
 			<targetRef oid="00000000-ee88-6666-0000-c00000000000" type="c:OrgType"/>
 		</assignment>
+		<displayName>Testing Roles</displayName>
 		<orgType>roleCategory</orgType>
 	</org>
 
 	<org oid="00000000-ee88-6666-0000-c00000001000">
 		<name>R1000</name>
-		<displayName>Jira</displayName>
 		<parentOrgRef oid="00000000-ee88-6666-0000-c00000000000" type="c:OrgType"/>
 		<assignment>
 			<targetRef oid="00000000-ee88-6666-0000-c00000000000" type="c:OrgType"/>
 		</assignment>
+		<displayName>Jira</displayName>
 		<orgType>application</orgType>
 	</org>
 
@@ -81,12 +81,12 @@
 
 	<org oid="00000000-ee88-6666-0000-c00000002000">
 		<name>R2000</name>
-		<displayName>Confluence</displayName>
 		<description>Confluence Wiki</description>
 		<parentOrgRef oid="00000000-ee88-6666-0000-c00000000000" type="c:OrgType"/>
 		<assignment>
 			<targetRef oid="00000000-ee88-6666-0000-c00000000000" type="c:OrgType"/>
 		</assignment>
+		<displayName>Confluence</displayName>
 		<orgType>application</orgType>
 	</org>
 
@@ -136,11 +136,11 @@
 
 	<org oid="00000000-ee88-6666-0000-c00000003000">
 		<name>R3000</name>
-		<displayName>Gizmo</displayName>
 		<parentOrgRef oid="00000000-ee88-6666-0000-c00000000000" type="c:OrgType"/>
 		<assignment>
 			<targetRef oid="00000000-ee88-6666-0000-c00000000000" type="c:OrgType"/>
 		</assignment>
+		<displayName>Gizmo</displayName>
 		<orgType>application</orgType>
 	</org>