Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
@mederly
mederly committed Feb 5, 2020
2 parents 2810cb1 + 3bc2171 commit 83a66a9
Show file tree
Hide file tree
Showing 114 changed files with 2,686 additions and 873 deletions.
9 changes: 5 additions & 4 deletions dist/javadoc/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,12 @@

<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<artifactId>dist</artifactId>
<groupId>com.evolveum.midpoint</groupId>
<version>4.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>javadoc</artifactId>
Expand All @@ -21,11 +23,9 @@
<name>midPoint JavaDoc</name>

<properties>
<!--
module doesn't have main/src, without this we'd get:
The packaging for this project did not assign a file to the build artifact
-->
<!-- see notes in main midPoint POM -->
<maven.install.skip>true</maven.install.skip>
<maven.deploy.skip>true</maven.deploy.skip>
<maven.test.skip>true</maven.test.skip>
</properties>

Expand Down Expand Up @@ -106,6 +106,7 @@
</plugin>
</plugins>
</build>

<profiles>
<profile>
<id>java8</id>
Expand Down
1 change: 1 addition & 0 deletions dist/midpoint-api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
<artifactId>dist</artifactId>
<groupId>com.evolveum.midpoint</groupId>
<version>4.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>midpoint-api</artifactId>
Expand Down
34 changes: 18 additions & 16 deletions dist/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,13 @@

<name>midPoint Distribution</name>

<modules>
<module>midpoint-api</module>
<module>javadoc</module>
</modules>

<dependencies>
<dependency>
<dependency>
<groupId>com.evolveum.midpoint.gui</groupId>
<artifactId>admin-gui</artifactId>
<version>4.1-SNAPSHOT</version>
Expand Down Expand Up @@ -50,6 +55,7 @@
<scope>test</scope>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
Expand Down Expand Up @@ -92,26 +98,22 @@
<artifactId>maven-assembly-plugin</artifactId>
<inherited>false</inherited>
<configuration>
<descriptors>
<descriptor>src/main/assembly/dist.xml</descriptor>
</descriptors>
<finalName>midpoint-${project.version}</finalName>
<descriptors>
<descriptor>src/main/assembly/dist.xml</descriptor>
</descriptors>
<finalName>midpoint-${project.version}</finalName>
<tarLongFileMode>gnu</tarLongFileMode>
</configuration>
<executions>
<execution>
<id>dist-assembly</id>
<phase>package</phase> <!-- bind to the packaging phase -->
<goals>
<goal>single</goal>
</goals>
</execution>
<execution>
<id>dist-assembly</id>
<phase>package</phase> <!-- bind to the packaging phase -->
<goals>
<goal>single</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
<modules>
<module>midpoint-api</module>
<module>javadoc</module>
</modules>
</project>
200 changes: 100 additions & 100 deletions gui/admin-gui/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,18 @@

<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<name>midPoint User Interface - admin web gui</name>
<groupId>com.evolveum.midpoint.gui</groupId>
<artifactId>admin-gui</artifactId>
<packaging>war</packaging>

<parent>
<artifactId>gui</artifactId>
<groupId>com.evolveum.midpoint</groupId>
<groupId>com.evolveum.midpoint.gui</groupId>
<version>4.1-SNAPSHOT</version>
</parent>
<scm>
<connection>https://github.com/Evolveum/midpoint.git</connection>
<developerConnection>git@github.com:Evolveum/midpoint.git</developerConnection>
<url>https://fisheye.evolveum.com/browse/midPoint</url>
</scm>

<artifactId>admin-gui</artifactId>
<packaging>war</packaging>

<name>midPoint User Interface - admin web gui</name>

<properties>
<server.port></server.port>
<midpoint.host></midpoint.host>
Expand All @@ -29,87 +27,6 @@
<javax.net.ssl.trustStore></javax.net.ssl.trustStore>
<javax.net.ssl.trustStoreType></javax.net.ssl.trustStoreType>
</properties>
<build>
<finalName>midpoint</finalName>
<resources>
<resource>
<filtering>false</filtering>
<directory>src/main/resources</directory>
<excludes>
<exclude>**/org.identityconnectors.common.logging</exclude>
</excludes>
</resource>
<resource>
<filtering>true</filtering>
<directory>src/main/resources</directory>
<includes>
<include>banner.txt</include>
</includes>
</resource>
<!-- ICF LOGGING CONFIGURATION -->
<resource>
<targetPath>../midpoint/META-INF/services</targetPath>
<filtering>false</filtering>
<directory>src/main/resources</directory>
<includes>
<include>**/org.identityconnectors.common.logging</include>
</includes>
</resource>
<resource>
<filtering>false</filtering>
<directory>src/main/java</directory>
<excludes>
<exclude>**/*.java</exclude>
<exclude>**/*.properties</exclude>
</excludes>
</resource>
<resource>
<filtering>true</filtering>
<directory>src/main/java</directory>
<includes>
<include>**/*.properties</include>
</includes>
</resource>
</resources>
<testResources>
<testResource>
<filtering>false</filtering>
<directory>src/test/resources</directory>
</testResource>
<testResource>
<filtering>false</filtering>
<directory>src/test/java</directory>
<excludes>
<exclude>**/*.java</exclude>
<exclude>**/*.properties</exclude>
</excludes>
</testResource>
<testResource>
<filtering>true</filtering>
<directory>src/test/java</directory>
<includes>
<include>**/*.properties</include>
</includes>
</testResource>
</testResources>
<plugins>
<plugin>
<groupId>pl.project13.maven</groupId>
<artifactId>git-commit-id-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>revision</goal>
</goals>
</execution>
</executions>
<configuration>
<verbose>false</verbose>
<offline>true</offline>
</configuration>
</plugin>
</plugins>
</build>

<dependencies>
<dependency>
Expand Down Expand Up @@ -139,7 +56,7 @@
</exclusions>
</dependency>
<dependency>
<groupId> org.springframework</groupId>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
</dependency>

Expand Down Expand Up @@ -178,11 +95,11 @@
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-actuator</artifactId>
<artifactId>spring-boot-starter-actuator</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-actuator-autoconfigure</artifactId>
<artifactId>spring-boot-actuator-autoconfigure</artifactId>
</dependency>

<!-- webjars -->
Expand Down Expand Up @@ -762,8 +679,8 @@
<artifactId>spring-boot-starter-test</artifactId>
<exclusions>
<exclusion>
<artifactId>asm</artifactId>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
<groupId>org.ow2.asm</groupId>
</exclusion>
</exclusions>
<scope>test</scope>
Expand Down Expand Up @@ -947,6 +864,88 @@
</dependency>
</dependencies>

<build>
<finalName>midpoint</finalName>
<resources>
<resource>
<filtering>false</filtering>
<directory>src/main/resources</directory>
<excludes>
<exclude>**/org.identityconnectors.common.logging</exclude>
</excludes>
</resource>
<resource>
<filtering>true</filtering>
<directory>src/main/resources</directory>
<includes>
<include>banner.txt</include>
</includes>
</resource>
<!-- ICF LOGGING CONFIGURATION -->
<resource>
<targetPath>../midpoint/META-INF/services</targetPath>
<filtering>false</filtering>
<directory>src/main/resources</directory>
<includes>
<include>**/org.identityconnectors.common.logging</include>
</includes>
</resource>
<resource>
<filtering>false</filtering>
<directory>src/main/java</directory>
<excludes>
<exclude>**/*.java</exclude>
<exclude>**/*.properties</exclude>
</excludes>
</resource>
<resource>
<filtering>true</filtering>
<directory>src/main/java</directory>
<includes>
<include>**/*.properties</include>
</includes>
</resource>
</resources>
<testResources>
<testResource>
<filtering>false</filtering>
<directory>src/test/resources</directory>
</testResource>
<testResource>
<filtering>false</filtering>
<directory>src/test/java</directory>
<excludes>
<exclude>**/*.java</exclude>
<exclude>**/*.properties</exclude>
</excludes>
</testResource>
<testResource>
<filtering>true</filtering>
<directory>src/test/java</directory>
<includes>
<include>**/*.properties</include>
</includes>
</testResource>
</testResources>
<plugins>
<plugin>
<groupId>pl.project13.maven</groupId>
<artifactId>git-commit-id-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>revision</goal>
</goals>
</execution>
</executions>
<configuration>
<verbose>false</verbose>
<offline>true</offline>
</configuration>
</plugin>
</plugins>
</build>

<profiles>
<profile>
<id>executable</id>
Expand All @@ -962,8 +961,9 @@
<configuration>
<fork>true</fork>
<skip>false</skip>
<!-- <jvmArguments>-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 -Dserver.port=${server.port} -Dmidpoint.home=${midpoint.home} -Dmidpoint.schrodinger=${midpoint.schrodinger} -Djavax.net.ssl.trustStore=${javax.net.ssl.trustStore} -Djavax.net.ssl.trustStoreType=${javax.net.ssl.trustStoreType}</jvmArguments> -->
<jvmArguments>-Dserver.port=${server.port} -Dmidpoint.home=${midpoint.home} -Dmidpoint.schrodinger=${midpoint.schrodinger} -Djavax.net.ssl.trustStore=${javax.net.ssl.trustStore} -Djavax.net.ssl.trustStoreType=${javax.net.ssl.trustStoreType}</jvmArguments><!-- TODO question: CAN this argument be active by default, or should be there a different profile defined for this? -->
<!-- <jvmArguments>-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 -Dserver.port=${server.port} -Dmidpoint.home=${midpoint.home} -Dmidpoint.schrodinger=${midpoint.schrodinger} -Djavax.net.ssl.trustStore=${javax.net.ssl.trustStore} -Djavax.net.ssl.trustStoreType=${javax.net.ssl.trustStoreType}</jvmArguments> -->
<!-- TODO question: CAN this argument be active by default, or should be there a different profile defined for this? -->
<jvmArguments>-Dserver.port=${server.port} -Dmidpoint.home=${midpoint.home} -Dmidpoint.schrodinger=${midpoint.schrodinger} -Djavax.net.ssl.trustStore=${javax.net.ssl.trustStore} -Djavax.net.ssl.trustStoreType=${javax.net.ssl.trustStoreType}</jvmArguments>
</configuration>
<executions>
<execution>
Expand All @@ -978,9 +978,9 @@
</executions>
<dependencies>
<dependency>
<groupId>com.evolveum.midpoint</groupId>
<groupId>com.evolveum.midpoint.tools</groupId>
<artifactId>midpoint-war-layout</artifactId>
<version>4.0-M2</version>
<version>${project.version}</version>
</dependency>
</dependencies>
</plugin>
Expand Down
3 changes: 2 additions & 1 deletion ...rc/main/java/com/evolveum/midpoint/gui/api/component/delta/ObjectDeltaOperationPanel.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@
</tr>
<tr>
<td><wicket:message key="ObjectDeltaOperationType.executionResult" /></td>
<td><span wicket:id="executionResult" /></td>
<td><div wicket:id="executionResult" class="pull-left"/>
<div wicket:id="fullResultLink" class="show-empty-button pull-right" /></td>
</tr>
</table>

Expand Down
Loading

0 comments on commit 83a66a9

Please sign in to comment.