Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into feature/orgtree
Browse files Browse the repository at this point in the history
  • Loading branch information
katkav committed Aug 28, 2019
2 parents dc27623 + 892cfd0 commit 6d9b693
Show file tree
Hide file tree
Showing 369 changed files with 3,858 additions and 2,489 deletions.
23 changes: 15 additions & 8 deletions build-system/pom.xml
Expand Up @@ -305,6 +305,11 @@
<artifactId>xercesImpl</artifactId>
<version>2.12.0</version>
</dependency>
<dependency>
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
<version>2.7.2</version>
</dependency>
<dependency>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
Expand Down Expand Up @@ -1443,6 +1448,10 @@
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.1.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
Expand Down Expand Up @@ -1530,14 +1539,8 @@
<plugin>
<groupId>pl.project13.maven</groupId>
<artifactId>git-commit-id-plugin</artifactId>
<version>3.0.0</version>
<executions>
<execution>
<goals>
<goal>revision</goal>
</goals>
</execution>
</executions>
<version>3.0.1</version>
<!-- Used in system-init module. -->
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down Expand Up @@ -1621,6 +1624,10 @@
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.1.1</version>
</plugin>
</plugins>

<pluginManagement>
Expand Down
175 changes: 175 additions & 0 deletions dist/javadoc/pom.xml
@@ -0,0 +1,175 @@
<?xml version="1.0" encoding="UTF-8"?>

<!--
~ Copyright (c) 2010-2019 Evolveum
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->

<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>
<name>midPoint JavaDoc</name>
<artifactId>javadoc</artifactId>
<packaging>jar</packaging>
<parent>
<artifactId>parent</artifactId>
<groupId>com.evolveum.midpoint</groupId>
<version>4.0-SNAPSHOT</version>
<relativePath>../../build-system/pom.xml</relativePath>
</parent>
<organization>
<name>Evolveum</name>
<url>http://www.evolveum.com</url>
</organization>
<licenses>
<license>
<name>Apache License v2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
<distribution>repo</distribution>
</license>
</licenses>
<issueManagement>
<system>Atlassian JIRA</system>
<url>http://jira.evolveum.com/</url>
</issueManagement>
<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>
<dependencies>
<dependency>
<groupId>com.evolveum.midpoint.gui</groupId>
<artifactId>admin-gui</artifactId>
<version>4.0-SNAPSHOT</version>
<type>war</type>
<scope>compile</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>com.evolveum.midpoint.model</groupId>
<artifactId>model-impl</artifactId>
<version>4.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<executions>
<execution>
<!-- Default (main) jar is empty. We do not want to build it. -->
<id>default-jar</id>
<phase>none</phase>
</execution>
<execution>
<!-- Test jar is empty. We do not want to build it. -->
<id>test-jar</id>
<phase>none</phase>
<configuration>
<skipIfEmpty>true</skipIfEmpty>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<includeDependencySources>true</includeDependencySources>
<includeTransitiveDependencySources>true</includeTransitiveDependencySources>
<dependencySourceIncludes>
<dependencySourceInclude>com.evolveum.*:*</dependencySourceInclude>
</dependencySourceIncludes>
<isOffline>true</isOffline>
<doctitle>midPoint Aggregate JavaDoc</doctitle>
<windowtitle>midPoint Aggregate JavaDoc</windowtitle>
<doclint>none</doclint>
<quiet>true</quiet>
<debug>false</debug>
</configuration>
<executions>
<execution>
<id>javadoc-jar</id>
<phase>package</phase>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<artifactId>maven-enforcer-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>
<profiles>
<profile>
<id>java8</id>
<activation>
<jdk>(,1.8]</jdk>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<executions>
<execution>
<id>javadoc-jar</id>
<phase>none</phase>
<goals>
<goal>jar</goal>
</goals>
<configuration>
<skip>true</skip>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
30 changes: 21 additions & 9 deletions dist/midpoint-api/pom.xml
Expand Up @@ -88,7 +88,6 @@
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.4</version>
<configuration>
<descriptorRefs>
<descriptorRef>jar-with-dependencies</descriptorRef>
Expand All @@ -105,19 +104,33 @@
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<executions>
<execution>
<!-- Default (main) jar is empty. We do not want to build it. -->
<id>default-jar</id>
<phase>none</phase>
</execution>
<execution>
<!-- Test jar is empty. We do not want to build it. -->
<id>test-jar</id>
<phase>none</phase>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.0.0-M1</version>
<configuration>
<includeDependencySources>true</includeDependencySources>
<dependencySourceIncludes>
<dependencySourceInclude>com.evolveum.*:*</dependencySourceInclude>
</dependencySourceIncludes>
<quiet>false</quiet>
<debug>true</debug>
<debug>false</debug>
<doclint>none</doclint>
</configuration>

<executions>
<execution>
<id>javadoc-jar</id>
Expand Down Expand Up @@ -159,7 +172,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.0.0-M1</version>
<executions>
<execution>
<id>javadoc-jar</id>
Expand All @@ -173,9 +185,9 @@
<dependencySourceInclude>com.evolveum.*:*</dependencySourceInclude>
</dependencySourceIncludes>
<quiet>false</quiet>
<debug>true</debug>
<additionalparam>-Xdoclint:none</additionalparam>
<failOnError>false</failOnError>
<debug>false</debug>
<doclint>none</doclint>
<failOnError>true</failOnError>
</configuration>
</execution>
</executions>
Expand Down
2 changes: 1 addition & 1 deletion dist/pom.xml
Expand Up @@ -117,7 +117,6 @@
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.4</version>
<configuration>
<descriptors>
<descriptor>src/main/assembly/dist.xml</descriptor>
Expand All @@ -138,5 +137,6 @@
</build>
<modules>
<module>midpoint-api</module>
<module>javadoc</module>
</modules>
</project>
17 changes: 17 additions & 0 deletions gui/admin-gui/pom.xml
Expand Up @@ -102,6 +102,23 @@
</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>
Expand Down
Expand Up @@ -31,7 +31,7 @@ public class GuiStyleConstants {
public static final String CLASS_OBJECT_USER_BOX_CSS_CLASSES = "object-user-box";
public static final String CLASS_OBJECT_USER_BOX_THIN_CSS_CLASSES = "object-user-box-thin";

public static final String CLASS_OBJECT_ROLE_ICON = "fa fa-street-view";
public static final String CLASS_OBJECT_ROLE_ICON = "fe fe-role_icon";
public static final String CLASS_OBJECT_ROLE_BG = "object-role-bg";
public static final String CLASS_DISABLED_OBJECT_ROLE_BG = "object-disabled-bg";
public static final String CLASS_OBJECT_ROLE_ICON_COLORED = CLASS_OBJECT_ROLE_ICON + " object-role-color";
Expand Down
Expand Up @@ -52,7 +52,7 @@ ID_INPUT, itemDefinitionAsStringModel, String.class, createAutoCompleteSettings(
protected Iterator<String> getChoices(String input) {
List<String> defsAsString = new ArrayList<>();
for (ItemDefinition<?> def : listChoices(input).values()) {
defsAsString.add(def.getName().getLocalPart());
defsAsString.add(def.getItemName().getLocalPart());
}
return defsAsString.iterator();

Expand Down
Expand Up @@ -12,7 +12,7 @@ public class AutoCompleteItemDefinitionRenderer extends AbstractAutoCompleteRend

@Override
protected String getTextValue(ItemDefinition<?> object) {
return object.getName().getLocalPart();
return object.getItemName().getLocalPart();
}

@Override
Expand Down

0 comments on commit 6d9b693

Please sign in to comment.