Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/Evolveum/midpoint
Browse files Browse the repository at this point in the history
  • Loading branch information
@KaterynaHonchar
KaterynaHonchar committed Dec 17, 2018
2 parents b161a03 + 20bd3ac commit 9b8087f
Show file tree
Hide file tree
Showing 49 changed files with 1,126 additions and 168 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
View file
Expand Up @@ -24,6 +24,6 @@ env:
matrix:
include:
- name: JDK8 - Run all excluding model-intest
script: mvn install -T 1C -q -DskipTests; mvn verify -DskipModelIntTest=true -DskipModelUnitTest=true -Dfailsafe.rerunFailingTestsCount=2
script: mvn install -T 1C -q -DskipTests; mvn verify -DskipModelIntTest=true -DskipModelUnitTest=true -DtestsRetryCount=2
- name: JDK8 - Run only model-intest
script: mvn install -T 1C -q -DskipTests; mvn verify -pl :model-intest -Dfailsafe.rerunFailingTestsCount=2
script: mvn install -T 1C -q -DskipTests; travis_wait 120 mvn verify -pl :model-intest -DtestsRetryCount=2
238 changes: 106 additions & 132 deletions build-system/pom.xml
View file
Expand Up @@ -1404,139 +1404,7 @@
<jvmArgs>-Xdebug -Xrunjdwp:transport=dt_socket,address=5000,server=y,suspend=n</jvmArgs>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.version}</version>
<executions>
<execution>
<id>default-test</id> <!-- unit tests -->
<phase>test</phase>
<goals>
<goal>test</goal>
</goals>
<configuration>
<suiteXmlFiles>
<suiteXmlFile>testng-unit.xml</suiteXmlFile>
</suiteXmlFiles>
<properties>
<property>
<name>suitename</name>
<value>Unit</value>
</property>
</properties>
</configuration>
</execution>
<!--
<execution>
<id>integration-test</id>
<phase>integration-test</phase>
<goals>
<goal>test</goal>
</goals>
<configuration>
<suiteXmlFiles>
<suiteXmlFile>testng-integration.xml</suiteXmlFile>
</suiteXmlFiles>
<properties>
<property>
<name>suitename</name>
<value>Integration</value>
</property>
<property>
<name>usedefaultlisteners</name>
<value>false</value>
</property>
</properties>
</configuration>
</execution>
-->
</executions>
<configuration>
<parallel>false</parallel>
<forkCount>1</forkCount>
<reuseForks>true</reuseForks>
<!-- <runOrder>alphabetical</runOrder> -->
<redirectTestOutputToFile>true</redirectTestOutputToFile>
<!-- <threadCount>1</threadCount> -->
<!-- <perCoreThreadCount>false</perCoreThreadCount> -->
<!-- <reportFormat>plain</reportFormat> -->
<trimStackTrace>false</trimStackTrace>
<useSystemClassLoader>false</useSystemClassLoader> <!-- See https://issues.apache.org/jira/browse/SUREFIRE-1588 -->
<properties>
<property>
<name>listener</name>
<value>com.evolveum.midpoint.tools.testng.TestListener</value>
</property>
</properties>
<systemPropertyVariables>
<javax.net.ssl.trustStore>src/test/resources/truststore.jks</javax.net.ssl.trustStore>
<midpoint.home>target/midpoint-home</midpoint.home>
<java.util.logging.config.file>${project.build.directory}/test-classes/logging.properties</java.util.logging.config.file>
</systemPropertyVariables>
<argLine>-Xms1024m -Xmx4096m</argLine>
<!--<argLine>-agentpath:/usr/local/yjp-11.0.10/bin/linux-x86-64/libyjpagent.so=alloceach=10,allocsizelimit=1048576,sampling,walltimespec=/home/lazyman/.yjp/config/.walltime,noj2ee,profileruipath=/usr/local/yjp-11.0.10/bin/yjp.sh,onexit=snapshot
-Xms512m -Xmx1024m -XX:MaxPermSize=192m</argLine> -->

<!-- it's used for bamboo build to load jdbc libraries which can not
be installed to public maven repository (MS SQL, ORACLE) -->
<additionalClasspathElements>
<additionalClasspathElement>/opt/jenkins_db_configs/ojdbc7.jar</additionalClasspathElement>
<!-- used running tests on windows machines -->
<additionalClasspathElement>c:\midpoint\jdbc-drivers\ojdbc7.jar</additionalClasspathElement>
</additionalClasspathElements>
</configuration>
<dependencies>
<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-testng</artifactId>
<version>${surefire.version}</version>
</dependency>
</dependencies>
</plugin>

<plugin>
<!--
<parallel>false</parallel>
<forkCount>1</forkCount>
<reuseForks>true</reuseForks>
-->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>${failsafe.version}</version>
<executions>
<execution>
<id>integration-test</id>
<phase>integration-test</phase>
<goals>
<goal>integration-test</goal>
<goal>verify</goal>
</goals>
<configuration>
<redirectTestOutputToFile>true</redirectTestOutputToFile>
<systemPropertyVariables>
<javax.net.ssl.trustStore>src/test/resources/truststore.jks</javax.net.ssl.trustStore>
<midpoint.home>target/midpoint-home</midpoint.home>
<java.util.logging.config.file>${project.build.directory}/test-classes/logging.properties</java.util.logging.config.file>
</systemPropertyVariables>
<argLine>-Xms1024m -Xmx4096m -Duser.language=en</argLine>
<suiteXmlFiles>
<suiteXmlFile>testng-integration.xml</suiteXmlFile>
</suiteXmlFiles>
<properties>
<property>
<name>suitename</name>
<value>Integration</value>
</property>
<property>
<name>usedefaultlisteners</name>
<value>false</value>
</property>
</properties>
</configuration>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.codehaus.mojo</groupId>
Expand Down Expand Up @@ -1635,6 +1503,112 @@
</executions>
</plugin>
</plugins>

<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.version}</version>
<executions>
<execution>
<id>default-test</id> <!-- unit tests -->
<phase>test</phase>
<goals>
<goal>test</goal>
</goals>
<configuration>
<suiteXmlFiles>
<suiteXmlFile>testng-unit.xml</suiteXmlFile>
</suiteXmlFiles>
<properties>
<property>
<name>suitename</name>
<value>Unit</value>
</property>
<property>
<name>listener</name>
<value>com.evolveum.midpoint.tools.testng.TestListener,com.evolveum.midpoint.tools.testng.RetryListener</value>
</property>
</properties>
</configuration>
</execution>
</executions>
<configuration>
<parallel>false</parallel>
<forkCount>1</forkCount>
<reuseForks>true</reuseForks>
<!-- <runOrder>alphabetical</runOrder> -->
<redirectTestOutputToFile>true</redirectTestOutputToFile>
<!-- <threadCount>1</threadCount> -->
<!-- <perCoreThreadCount>false</perCoreThreadCount> -->
<!-- <reportFormat>plain</reportFormat> -->
<trimStackTrace>false</trimStackTrace>
<useSystemClassLoader>false</useSystemClassLoader> <!-- See https://issues.apache.org/jira/browse/SUREFIRE-1588 -->
<systemPropertyVariables>
<javax.net.ssl.trustStore>src/test/resources/truststore.jks</javax.net.ssl.trustStore>
<midpoint.home>target/midpoint-home</midpoint.home>
<java.util.logging.config.file>${project.build.directory}/test-classes/logging.properties</java.util.logging.config.file>
</systemPropertyVariables>
<argLine>-Xms1024m -Xmx4096m</argLine>
<!--<argLine>-agentpath:/usr/local/yjp-11.0.10/bin/linux-x86-64/libyjpagent.so=alloceach=10,allocsizelimit=1048576,sampling,walltimespec=/home/lazyman/.yjp/config/.walltime,noj2ee,profileruipath=/usr/local/yjp-11.0.10/bin/yjp.sh,onexit=snapshot
-Xms512m -Xmx1024m -XX:MaxPermSize=192m</argLine> -->

<!-- it's used for bamboo build to load jdbc libraries which can not
be installed to public maven repository (MS SQL, ORACLE) -->
<additionalClasspathElements>
<additionalClasspathElement>/opt/jenkins_db_configs/ojdbc7.jar</additionalClasspathElement>
<!-- used running tests on windows machines -->
<additionalClasspathElement>c:\midpoint\jdbc-drivers\ojdbc7.jar</additionalClasspathElement>
</additionalClasspathElements>
</configuration>
<dependencies>
<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-testng</artifactId>
<version>${surefire.version}</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>${failsafe.version}</version>
<executions>
<execution>
<id>integration-test</id>
<phase>integration-test</phase>
<goals>
<goal>integration-test</goal>
<goal>verify</goal>
</goals>
<configuration>
<redirectTestOutputToFile>true</redirectTestOutputToFile>
<systemPropertyVariables>
<javax.net.ssl.trustStore>src/test/resources/truststore.jks</javax.net.ssl.trustStore>
<midpoint.home>target/midpoint-home</midpoint.home>
<java.util.logging.config.file>${project.build.directory}/test-classes/logging.properties</java.util.logging.config.file>
</systemPropertyVariables>
<argLine>-Xms1024m -Xmx4096m -Duser.language=en</argLine>
<suiteXmlFiles>
<suiteXmlFile>testng-integration.xml</suiteXmlFile>
</suiteXmlFiles>
<properties>
<property>
<name>suitename</name>
<value>Integration</value>
</property>
<property>
<name>listener</name>
<value>com.evolveum.midpoint.tools.testng.TestListener,com.evolveum.midpoint.tools.testng.RetryListener</value>
</property>
</properties>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</pluginManagement>
</build>

<reporting>
Expand Down
19 changes: 19 additions & 0 deletions custom/pom.xml
View file
Expand Up @@ -51,11 +51,30 @@
<module>custom-foo</module>
-->
</modules>
<build>
<plugins>
<!-- reference failsafe and surefire from build-system plugin management in order for tests to be running -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
</plugin>
</plugins>
</build>
<dependencies> <!-- Not used, but required for surefire plugin not to complain -->
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.evolveum.midpoint.tools</groupId>
<artifactId>test-ng</artifactId>
<version>4.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
</project>
6 changes: 6 additions & 0 deletions dist/pom.xml
View file
Expand Up @@ -65,6 +65,12 @@
<artifactId>testng</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.evolveum.midpoint.tools</groupId>
<artifactId>test-ng</artifactId>
<version>4.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
Expand Down
17 changes: 17 additions & 0 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/GuiStyleConstants.java
View file
Expand Up @@ -173,4 +173,21 @@ public class GuiStyleConstants {
public static final String CLASS_ADD_NEW_OBJECT = "fa fa-plus";
public static final String CLASS_UPLOAD = "fa fa-upload";
public static final String CLASS_CREATE_FOCUS = "fa fa-user-plus";

public static final String EVO_CROW_ICON = "fe fe-crown-object";
public static final String EVO_ASSIGNMENT_ICON = "fe fe-assignment";
public static final String EVO_OFFICER_CAP_ICON = "fe fe-officer-cap-object";
public static final String EVO_ASSIGNMENT_STRAIGHT_THICKER_ICON = "fe fe-assignment-straight-thicker-object";
public static final String EVO_ASSIGNMENT_STRAIGHT_ICON = "fe fe-assignment-straight-object";
public static final String EVO_UNEMPLOYER_ICON = "fe fe-unemployer-icon";
public static final String EVO_EMPLOYER_ICON = "fe fe-employer-icon";
public static final String EVO_APPROVER_ICON = "fe fe-approver-object";
public static final String EVO_MP_SHORTER_LINES = "fe fe-midpoint-shorter-lines";
public static final String EVO_MP_WHEEL_ICON = "fe fe-midpoint-wheel";
public static final String EVO_MP_WITH_LINES_ICON = "fe fe-midpoint-with-lines";
public static final String EVO_ROLE_HAT_ICON = "fe fe-role-hat";
public static final String EVO_ROLE_TIE_ICON = "fe fe-role-tie";
public static final String EVO_ROLE_TOP_HAT_ICON = "fe fe-role-top-hat";
public static final String EVO_ASSIGNMENT_THICKER_ICON = "fe assignment-thicker";

}

0 comments on commit 9b8087f

Please sign in to comment.