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

INSTALL

@@ -9,8 +9,7 @@ https://wiki.evolveum.com/display/midPoint/midPoint+Development+Snapshot
 
     1. Java (JDK) 8
     2. Apache Maven 3
-    3. Apache Tomcat 8.x (or another supported web container)
-    4. midPoint source code retrieved via Git or alternative mechanism
+    3. midPoint source code retrieved via Git
 
 2. Compile sources
 
@@ -26,30 +25,29 @@ Note: building midPoint with the tests takes considerably long time (approx. 1 h
 
    mvn install -DskipTests=true
 
-2.3 Compiled war file
+2.3 Compiled distribution package
 
 After the build is complete the distribution archives are available in:
 
    dist/target/
 
-The war file is also located in the following place:
+2.4 Insall the distribution
 
-   gui/admin-gui/target/midpoint.war
+Unpack the distribution package to a convenient place (e.g. /opt/midpoint)
 
-2.4 Deploy war file
+2.5 Start midPoint server
 
-Please deploy it to your Tomcat application server (copying midpoint.war to
-<tomcat>/webapps should do the trick) or to other supported web container.
+Use the start.sh (or start.bat) script in the bin directory:
 
-2.5 Access the GUI
+   bin/start.sh
+
+2.6 Access the GUI
 
 MidPoint web GUI should be accessible few moments after the web container
 starts and the application initialization is done. It is accessible on following
 URL by default:
 
-  http://<hostname>:<port>/midpoint
-
-where <hostname> and <port> are the hostname and port number of the web container.
+  http://localhost:8080/
 
 Login: administrator
 Password 5ecr3t

INSTALL-dist

@@ -8,30 +8,25 @@ and release notes can be found at:
 
 1. Pre-requisities:
 
-    1. Java (JRE) 8
-    2. Apache Tomcat 8.x (or another supported web container)
+    Java (JRE) 8
 
-2. Install Apache Tomcat
+2. Install midPoint
 
-Install Apache Tomcat or another supported web container according to
-the web container documentation.
-
-3. Deploy midPoint
+Unpack the distribution package to a convenient place (e.g. /opt/midpoint)
 
-Locate the midpoint.war file in the distribution archive in the /war directory.
-Deploy the WAR file according to the web container documentation.
-For Apache Tomcat the deployment is simple copying of the WAR file to webapps
-directory of the Tomcat installation and starting Tomcat.
+3. Start midPoint server
 
-4. Access midPoint GUI
+Use the start.sh (or start.bat) script in the bin directory:
+
+   bin/start.sh
+
+4. Access the GUI
 
 MidPoint web GUI should be accessible few moments after the web container
 starts and the application initialization is done. It is accessible on following
 URL by default:
 
-  http://<hostname>:<port>/midpoint
-
-where <hostname> and <port> are the hostname and port number of the web container.
+  http://localhost:8080/
 
 Login: administrator
-Password: 5ecr3t
+Password 5ecr3t

NEWS

@@ -1,28 +1,21 @@
-midPoint 3.6 "Comenius"
+midPoint 3.7 "Darwin"
 ----------------------------------
 
-Release 3.6 is twenty first midPoint release code-named Comenius.
-The 3.6 release brings numerous new features especially in the
-field of identity governance, password management and identity
-connectors.
+Release 3.7 is a twenty third midPoint release code-named Darwin.
+The 3.7 release brings new deployment model and numerous gradual improvements.
+There are improvements of identity governance features, improvements of user
+interface and internal improvements.
 
-Release date: 4th July 2017
+Release date: 14th December 2017
 
-Changes with respect to version 3.5.1:
-    Major SoD improvements
-    Certificaiton improvements
-    Escalation
-    Other identity governance features
-    Password hashing
-    Manual connectors by ITSM integration
-    Important improvements to mappings, expressions, object templates and other mechanisms
-    Custom forms
-    Quasi-fulltext search
-    Shopping cart and role catalog improvements
-    Numerous GUI improvements
-    Significantly improved Powershell support
-    New CSV connector
-    Other connector improvements
+Changes with respect to version 3.6.1:
+    Stand-alone deployment based on Spring Boot
+    User interface improvements
+    Governance improvements
+    Expression, mapping and bulk action improvements
+    Security improvements
+    Task improvements
+    Miscellaneous improvements
 
 Java 7 environment is no longer supported.
 XPath2 scripting is no longer supported.

README

@@ -1,4 +1,4 @@
-midPoint 3.6 "Comenius"
+midPoint 3.7 "Darwin"
 ------------------------------------
 
 General information:

README.md

@@ -1,6 +1,6 @@
 Status: [![Build Status](https://travis-ci.org/Evolveum/midpoint.svg?branch=master)](https://travis-ci.org/Evolveum/midpoint)
 
-midPoint 3.6 "Comenius"
+midPoint 3.7 "Darwin"
 ------------------------------------
 
 General information:

RELEASE-NOTES

@@ -1,4 +1,4 @@
 To see actual releases notes please go to:
 
-https://wiki.evolveum.com/display/midPoint/Release+3.6
+https://wiki.evolveum.com/display/midPoint/Release+3.7
 

dist/src/main/bin/midpoint.sh

@@ -17,17 +17,6 @@
 
 SCRIPT_PATH=$(cd $(dirname "$0") && pwd -P)/$(basename "$2")
 USE_NOHUP="true"
-if [ -z "$MIDPOINT_HOME" ] ; then
-	MIDPOINT_HOME="$SCRIPT_PATH../var"
-fi
-JAVA_OPTS="$JAVA_OPTS
--Xms2048M
--Xmx2048M
--Dpython.cachedir=$MIDPOINT_HOME/tmp
--Djavax.net.ssl.trustStore=$MIDPOINT_HOME/keystore.jceks
--Djavax.net.ssl.trustStoreType=jceks
--Dmidpoint.home=$MIDPOINT_HOME"
-
 # resolve links - $0 may be a softlink
 PRG="$0"
 
@@ -56,6 +45,17 @@ if [ ! -d var/log ] ; then
 	mkdir var/log
 fi
 
+if [ -z "$MIDPOINT_HOME" ] ; then
+	MIDPOINT_HOME=$(cd "$SCRIPT_PATH../var"; pwd)
+fi
+JAVA_OPTS="$JAVA_OPTS
+-Xms2048M
+-Xmx2048M
+-Dpython.cachedir=$MIDPOINT_HOME/tmp
+-Djavax.net.ssl.trustStore=$MIDPOINT_HOME/keystore.jceks
+-Djavax.net.ssl.trustStoreType=jceks
+-Dmidpoint.home=$MIDPOINT_HOME"
+
 if [ -z "$BOOT_OUT" ] ; then  
   BOOT_OUT="$SCRIPT_PATH"../var/log/midpoint.out
 fi

gui/admin-gui/pom.xml

@@ -131,14 +131,23 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-autoconfigure</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-tomcat</artifactId>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>org.apache.tomcat.embed</groupId>
             <artifactId>tomcat-embed-core</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tomcat</groupId>
             <artifactId>tomcat-annotations-api</artifactId>
+            <scope>provided</scope>
         </dependency>
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot</artifactId>

gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerValueWrapper.java

@@ -17,6 +17,7 @@
 package com.evolveum.midpoint.web.component.prism;
 
 import java.io.Serializable;
+import java.text.Collator;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -281,6 +282,9 @@ public void setSelected(boolean selected) {
 
 	public void sort(final PageBase pageBase) {
 		if (isSorted()) {
+			Collator collator = Collator.getInstance(pageBase.getLocale());
+			collator.setStrength(Collator.SECONDARY);       // e.g. "a" should be different from "á"
+			collator.setDecomposition(Collator.FULL_DECOMPOSITION);     // slower but more precise
 			Collections.sort(properties, new Comparator<ItemWrapper>() {
 				@Override
 				public int compare(ItemWrapper pw1, ItemWrapper pw2) {
@@ -300,7 +304,8 @@ public int compare(ItemWrapper pw1, ItemWrapper pw2) {
 											: id2.getDisplayName())
 							: (id2.getName() != null && id2.getName().getLocalPart() != null ? id2.getName().getLocalPart() : ""))
 							: "");
-					return str1.compareToIgnoreCase(str2);
+					//return str1.compareToIgnoreCase(str2);
+					return collator.compare(str1, str2);
 				}
 			});
 		} else {

gui/admin-gui/src/main/resources/application.yml

@@ -9,6 +9,7 @@ server:
                  # as minutes - so we end up with never expiring session.
   tomcat:
     basedir: ${midpoint.home}
+    max-http-post-size: 104857600
 
 auth:
   logout:

infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ValueDisplayUtil.java

@@ -151,8 +151,8 @@ public static String toStringValue(PrismPropertyValue propertyValue) {
                         if (evaluatorValue.getFilter() != null) {
                             DebugUtil.debugDumpMapMultiLine(expressionString, evaluatorValue.getFilter().getFilterClauseXNode(),
                                     0, false, null);
-//                            expressionString.append(evaluatorValue.getFilter().getFilterClauseXNode().debugDump(0));
-//                            expressionString.append("; ");
+
+                            //TODO temporary hack: removing namespace part of the QName
                             while (expressionString.indexOf("}") >= 0 && expressionString.indexOf("{") >= 0 &&
                                     expressionString.indexOf("}") - expressionString.indexOf("{") > 0){
                                 expressionString.replace(expressionString.indexOf("{"), expressionString.indexOf("}") + 1, "");

infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd

@@ -3293,6 +3293,7 @@
                     </xsd:documentation>
 					<xsd:appinfo>
 						<a:displayName>AbstractCredentialType.forceChange</a:displayName>
+						<a:operational>true</a:operational>
 					</xsd:appinfo>
 				</xsd:annotation>
             </xsd:element>

testing/wstest/pom.xml

@@ -71,6 +71,10 @@
 			<groupId>org.apache.wss4j</groupId>
 			<artifactId>wss4j-ws-security-common</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.apache.wss4j</groupId>
+			<artifactId>wss4j-ws-security-dom</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>commons-lang</groupId>
 			<artifactId>commons-lang</artifactId>

testing/wstest/src/test/java/com/evolveum/midpoint/testing/wstest/AbstractWebserviceTest.java

@@ -190,7 +190,7 @@ public abstract class AbstractWebserviceTest {
     protected static ModelPortType modelPort;
     protected static SystemConfigurationType configurationType;
 
-	private static final File DEFAULT_SERVER_LOG_FILE = new File("/opt/tomcat/logs/idm.log");
+	private static final String SERVER_LOG_FILE_SUFFIX = "log/midpoint.log";
 	private static final String AUDIT_LOGGER_NAME = "com.evolveum.midpoint.audit.log";
 
 	private File serverLogFile = null;
@@ -287,8 +287,12 @@ private File getServerLogFile() {
 		if (serverLogFile == null) {
 			if (System.getProperty("midpoint.serverLogFile") != null) {
 				serverLogFile = new File(System.getProperty("midpoint.serverLogFile"));
+	    	} else if (System.getenv("MIDPOINT_HOME") != null) {
+	    		serverLogFile = new File(System.getenv("MIDPOINT_HOME"), SERVER_LOG_FILE_SUFFIX);
+	    	} else if (System.getProperty("midpoint.home") != null) {
+	    		serverLogFile = new File(System.getProperty("midpoint.home"), SERVER_LOG_FILE_SUFFIX);
 	    	} else {
-	    		serverLogFile = DEFAULT_SERVER_LOG_FILE;
+	    		throw new IllegalStateException("Cannot determine server log file");
 	    	}
 		}
 		return serverLogFile;