Merge branch 'master' into transifex

Conflicts: gui/admin-gui/src/main/resources/localization/Midpoint_en_US.properties
Evolveum · Nov 5, 2015 · a107b2f · a107b2f
2 parents 69cc60e + 9f6d92c
commit a107b2f
Show file tree

Hide file tree

Showing 92 changed files with 1,842 additions and 1,077 deletions.
diff --git a/build-system/pom.xml b/build-system/pom.xml
@@ -79,6 +79,7 @@
         <derby.version>10.11.1.1</derby.version>
         <wro4j.version>1.7.1</wro4j.version>
         <jackson.version>2.3.3</jackson.version>
+        <surefire.version>2.19</surefire.version>
     </properties>
     <dependencyManagement>
         <dependencies>
@@ -1052,7 +1053,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-surefire-plugin</artifactId>
-                        <version>2.18.1</version>
+                        <version>${surefire.version}</version>
                         <executions>
                         	<execution>
                         		<id>default-test</id> <!-- unit tests -->
@@ -1127,7 +1128,7 @@
                             <dependency>
                                 <groupId>org.apache.maven.surefire</groupId>
                                 <artifactId>surefire-testng</artifactId>
-                                <version>2.17</version>
+                                <version>${surefire.version}</version>
                             </dependency>
                         </dependencies>
                     </plugin>
@@ -1296,6 +1297,7 @@
 					<plugin>
 					  <!-- Skip all tests by default. We only want selected tests to run. -->
 					  <artifactId>maven-surefire-plugin</artifactId>
+					  <version>${surefire.version}</version>
 					  <configuration>
 					    <skip>true</skip>
 					  </configuration>
@@ -1310,6 +1312,7 @@
 					<plugin>
 					  <!-- Skip all tests by default. We only want selected tests to run. -->
 					  <artifactId>maven-surefire-plugin</artifactId>
+					  <version>${surefire.version}</version>
 					  <configuration>
 					    <skip>true</skip>
 					  </configuration>
@@ -1324,6 +1327,7 @@
 					<plugin>
 					  <!-- Skip all tests by default. We only want selected tests to run. -->
 					  <artifactId>maven-surefire-plugin</artifactId>
+					  <version>${surefire.version}</version>
 					  <configuration>
 					    <skip>true</skip>
 					  </configuration>
@@ -1338,13 +1342,38 @@
 					<plugin>
 					  <!-- Skip all tests by default. We only want selected tests to run. -->
 					  <artifactId>maven-surefire-plugin</artifactId>
+					  <version>${surefire.version}</version>
 					  <configuration>
 					    <skip>true</skip>
 					  </configuration>
 					</plugin>
 				</plugins>
 			</build>
 		</profile>
+		<profile>
+			<id>java8</id>
+			<build>
+				<plugins>
+					<plugin>
+					  <groupId>org.apache.maven.plugins</groupId>
+					  <artifactId>maven-javadoc-plugin</artifactId>
+					  <version>2.10.3</version>
+					  <executions>
+				        <execution>
+				            <id>javadoc-jar</id>
+				            <goals>
+				                <goal>jar</goal>
+				            </goals>
+				            <configuration>
+				                <additionalparam>-Xdoclint:none</additionalparam>
+				                <failOnError>false</failOnError>
+				            </configuration>
+				        </execution>
+				    </executions>
+				</plugin>
+				</plugins>
+			</build>
+		</profile>
     </profiles>
     <dependencies>
         <dependency>

diff --git a/config/initial-objects/100-report-reconciliation.xml b/config/initial-objects/100-report-reconciliation.xml
diff --git a/config/initial-objects/110-report-user-list.xml b/config/initial-objects/110-report-user-list.xml
diff --git a/dist/midpoint-api/pom.xml b/dist/midpoint-api/pom.xml
@@ -94,7 +94,7 @@
 
             <plugin>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.9.1</version>
+                <version>2.10.3</version>
                 <configuration>
                         <includeDependencySources>true</includeDependencySources>
                         <dependencySourceIncludes>

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/BasicSearchPanel.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/BasicSearchPanel.html
@@ -18,7 +18,7 @@
     <div class="form-group" style="max-width: 250px;">
         <label class="sr-only" wicket:id="label"/>
         <div class="input-group">
-            <input class="form-control input-sm" wicket:id="searchText" />
+            <input class="form-control input-sm" wicket:id="searchText" about="searchText"/>
             <span class="input-group-btn">
                 <a class="btn btn-danger btn-sm" wicket:id="clearSearch"
                    wicket:message="title:BasicSearchPanel.clear">

diff --git a/...ui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentTablePanel.html b/...ui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentTablePanel.html
@@ -21,7 +21,7 @@
     <div wicket:id="assignableOrgPopup" />
     <div wicket:id="deleteAssignmentPopup" />
 
-    <div wicket:id="assignments">
+    <div wicket:id="assignments" about="assignments">
         <div class="row assignable-header">
 
             <div class="col-xs-10">

diff --git a/...-gui/src/main/java/com/evolveum/midpoint/web/component/data/BaseSortableDataProvider.java b/...-gui/src/main/java/com/evolveum/midpoint/web/component/data/BaseSortableDataProvider.java
@@ -223,7 +223,7 @@ public long size() {
             addCachedSize(cache, new CachedSize(size, System.currentTimeMillis()));
         }
 
-        LOGGER.trace("end::size()");
+        LOGGER.trace("end::size(): {}", size);
         return size;
     }
 

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/ObjectDataProvider.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/ObjectDataProvider.java
@@ -116,9 +116,16 @@ public Iterator<W> internalIterator(long first, long count) {
             }
             query.setPaging(paging);
 
-            LOGGER.trace("Query {} with {}", type.getSimpleName(), query.debugDump());
+            if (LOGGER.isTraceEnabled()) {
+            	LOGGER.trace("Query {} with {}", type.getSimpleName(), query.debugDump());
+            }
 
             List<PrismObject<T>> list = getModel().searchObjects(type, query, options, task, result);
+
+            if (LOGGER.isTraceEnabled()) {
+            	LOGGER.trace("Query {} resulted in {} objects", type.getSimpleName(), list.size());
+            }
+
             for (PrismObject<T> object : list) {
                 getAvailableData().add(createDataObjectWrapper(object));
             }
@@ -170,7 +177,7 @@ protected int internalSize() {
             throw new RestartResponseException(PageError.class);
         }
 
-        LOGGER.trace("end::internalSize()");
+        LOGGER.trace("end::internalSize(): {}", count);
         return count;
     }
 

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/org/OrgTreeTablePanel.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/org/OrgTreeTablePanel.html
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
 <!--
-  ~ Copyright (c) 2010-2013 Evolveum
+  ~ Copyright (c) 2010-2015 Evolveum
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -21,6 +21,9 @@
     <div class="row">
         <div class="col-md-12 clearfix">
             <form class="form-inline pull-right search-form" wicket:id="searchForm">
+            	<div class="form-group">
+	                <select class="form-control input-sm" wicket:id="searchScope"/>
+	            </div>
                 <div wicket:id="basicSearch"/>
             </form>
         </div>