Merge remote-tracking branch 'refs/remotes/origin/master'

dist/pom.xml

@@ -21,11 +21,6 @@
 
     <name>midPoint Distribution</name>
 
-    <modules>
-        <module>midpoint-api</module>
-        <module>javadoc</module>
-    </modules>
-
     <dependencies>
         <dependency>
             <groupId>com.evolveum.midpoint.gui</groupId>
@@ -116,4 +111,17 @@
             </plugin>
         </plugins>
     </build>
+
+    <profiles>
+        <profile>
+            <id>docs</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <modules>
+                <module>midpoint-api</module>
+                <module>javadoc</module>
+            </modules>
+        </profile>
+    </profiles>
 </project>

infra/schema/src/main/java/com/evolveum/midpoint/schema/result/OperationResult.java

@@ -1790,16 +1790,16 @@ public static OperationResult createOperationResult(OperationResultType bean) {
         return result;
     }
 
-    public OperationResultType createOperationResultType() {
+    public @NotNull OperationResultType createOperationResultType() {
         return createOperationResultType(null);
     }
 
-    public OperationResultType createOperationResultType(Function<LocalizableMessage, String> resolveKeys) {
+    public @NotNull OperationResultType createOperationResultType(Function<LocalizableMessage, String> resolveKeys) {
         return createOperationResultBean(this, resolveKeys);
     }
 
-    private static OperationResultType createOperationResultBean(OperationResult opResult,
-            Function<LocalizableMessage, String> resolveKeys) {
+    private static @NotNull OperationResultType createOperationResultBean(
+            @NotNull OperationResult opResult, Function<LocalizableMessage, String> resolveKeys) {
         OperationResultType bean = new OperationResultType();
         bean.setOperationKind(opResult.getOperationKind());
         bean.setToken(opResult.getToken());
@@ -1845,7 +1845,9 @@ private static OperationResultType createOperationResultBean(OperationResult opR
         }
 
         if (opResult.getUserFriendlyMessage() != null) {
-            LocalizableMessageType msg = LocalizationUtil.createLocalizableMessageType(opResult.getUserFriendlyMessage(), resolveKeys);
+            LocalizableMessageType msg =
+                    LocalizationUtil.createLocalizableMessageType(
+                            opResult.getUserFriendlyMessage(), resolveKeys);
             bean.setUserFriendlyMessage(msg);
         }
 

pom.xml

@@ -23,12 +23,17 @@
     - Test JARs of some modules are created, installed/deployed and used downstream (search for test-jar).
 
     VARIOUS MVN COMMANDS (with rough times on average notebook)
-    Note: Javadoc takes long time but it's only part of the "dist" profile (active by default).
-    Hence, "-Dmaven.javadoc.skip" is not necessary with "-P -dist".
-    Javadoc skip can still be useful when we want to build distribution package faster.
 
-    Quick developer's run without any tests, skipping distribution (~6m):
+    Quick developer's run without any tests, skipping distribution and documentation build (~5m):
     mvn clean install -P -dist -DskipTests
+    After this, it's possible to run midPoint WAR with: java -jar gui/admin-gui/target/midpoint-executable.war
+
+    Quick build of distribution without running tests, skipping documentation (~6m):
+    mvn clean install -P -docs -DskipTests
+    Generated distribution archives (ZIP and tar.gz) are under dist/target.
+
+    Quick build of everything without tests, not often useful, javadoc + apidocs add quite a lot time (~9m):
+    mvn clean install -DskipTests
 
     "Quick" build with unit tests only and checkstyle (~30m):
     mvn clean install -P -dist -DskipITs
@@ -2060,9 +2065,7 @@
         <profile>
             <id>dist</id>
             <activation>
-                <property>
-                    <name>!skipDist</name>
-                </property>
+                <activeByDefault>true</activeByDefault>
             </activation>
             <modules>
                 <module>dist</module>

repo/system-init/src/main/resources/config.xml

@@ -37,6 +37,17 @@ to a file, not its content, is the actual value.
             <importFolder>${midpoint.home}/import</importFolder>
         </webApplication>
         <repository>
+            <!--
+            Uncomment this section to use the new Native repository (and comment the rest).
+            For more see: https://docs.evolveum.com/midpoint/reference/repository/configuration/
+            Don't forget to switch Sql/Sqale audit service factory accordingly (lower in this config).
+            <type>native</type>
+            <jdbcUrl>jdbc:postgresql://localhost:5432/midpoint</jdbcUrl>
+            <jdbcUsername>midpoint</jdbcUsername>
+            <jdbcPassword>password</jdbcPassword>
+            -->
+
+            <!-- Old Generic repository configured for embedded H2 for quick start. -->
             <repositoryServiceFactoryClass>com.evolveum.midpoint.repo.sql.SqlRepositoryFactory</repositoryServiceFactoryClass>
             <baseDir>${midpoint.home}</baseDir>
             <asServer>true</asServer>
@@ -46,7 +57,9 @@ to a file, not its content, is the actual value.
                 <auditServiceFactoryClass>com.evolveum.midpoint.audit.impl.LoggerAuditServiceFactory</auditServiceFactoryClass>
             </auditService>
             <auditService>
+                <!-- Use SqlAuditServiceFactory for old generic repository and SqaleAuditServiceFactory for new Native one. -->
                 <auditServiceFactoryClass>com.evolveum.midpoint.repo.sql.SqlAuditServiceFactory</auditServiceFactoryClass>
+                <!--<auditServiceFactoryClass>com.evolveum.midpoint.repo.sqale.audit.SqaleAuditServiceFactory</auditServiceFactoryClass>-->
             </auditService>
         </audit>
         <icf>