Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin'
Browse files Browse the repository at this point in the history
  • Loading branch information
@skublik
skublik committed Sep 7, 2018
2 parents 9a983c6 + 7dcb7c9 commit 01f7d8a
Show file tree
Hide file tree
Showing 16 changed files with 433 additions and 403 deletions.
1 change: 1 addition & 0 deletions dist/pom.xml
View file
Expand Up @@ -53,6 +53,7 @@
<artifactId>admin-gui</artifactId>
<version>3.9-SNAPSHOT</version>
<type>war</type>
<classifier>executable</classifier>
</dependency>
<dependency>
<groupId>com.evolveum.midpoint.tools</groupId>
Expand Down
72 changes: 41 additions & 31 deletions gui/admin-gui/pom.xml
View file
Expand Up @@ -104,35 +104,6 @@
</includes>
</testResource>
</testResources>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>${spring.boot.version}</version>
<configuration>
<fork>true</fork>
<skip>false</skip>
<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? -->
</configuration>
<executions>
<execution>
<goals>
<goal>repackage</goal>
</goals>
<configuration>
<layoutFactory implementation="com.evolveum.midpoint.tools.layout.MidPointWarLayoutFactory"/>
</configuration>
</execution>
</executions>
<dependencies>
<dependency>
<groupId>com.evolveum.midpoint</groupId>
<artifactId>midpoint-war-layout</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>

<dependencies>
Expand Down Expand Up @@ -911,13 +882,52 @@
<version>3.9-SNAPSHOT</version>
</dependency>
</dependencies>

<profiles>
<profile>
<id>tomcat</id>
<id>executable</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>${spring.boot.version}</version>
<configuration>
<fork>true</fork>
<skip>false</skip>
<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? -->
</configuration>
<executions>
<execution>
<goals>
<goal>repackage</goal>
</goals>
<configuration>
<classifier>executable</classifier>
<layoutFactory implementation="com.evolveum.midpoint.tools.layout.MidPointWarLayoutFactory"/>
</configuration>
</execution>
</executions>
<dependencies>
<dependency>
<groupId>com.evolveum.midpoint</groupId>
<artifactId>midpoint-war-layout</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>
</profile>

<profile>
<id>tomcat</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<dependencies>
<dependency>
<artifactId>jaxb-impl</artifactId>
Expand All @@ -934,8 +944,8 @@
<scope>runtime</scope>
</dependency>
</dependencies>

</profile>

<profile>
<!-- can be used for development e.g. in Intellij Idea -->
<id>ide</id>
Expand Down
4 changes: 3 additions & 1 deletion ...c/main/java/com/evolveum/midpoint/web/component/prism/PrismContainerValueHeaderPanel.java
View file
Expand Up @@ -168,9 +168,11 @@ public boolean isVisible(){
childContainersSelectorPanel.setOutputMarkupId(true);
add(childContainersSelectorPanel);


Class<C> compileTimeClass = getModelObject().getContainerValue().getCompileTimeClass();
DropDownChoicePanel multivalueContainersList = new DropDownChoicePanel<>(ID_CHILD_CONTAINERS_LIST,
Model.of(pathsList.size() > 0 ? pathsList.get(0) : null), Model.ofList(pathsList),
new QNameIChoiceRenderer(getModelObject().getContainerValue().getValue().getClass().getSimpleName()));
new QNameIChoiceRenderer(compileTimeClass != null ? compileTimeClass.getSimpleName() : ""));
multivalueContainersList.setOutputMarkupId(true);
multivalueContainersList.getBaseFormComponent().add(new EmptyOnBlurAjaxFormUpdatingBehaviour());
childContainersSelectorPanel.add(multivalueContainersList);
Expand Down
4 changes: 3 additions & 1 deletion gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismWrapper.java
View file
Expand Up @@ -4,7 +4,9 @@ public abstract class PrismWrapper {


private boolean showEmpty;
private boolean minimalized;

@Deprecated //used only for projections, after switching projection to table, remove it.
private boolean minimalized=true;
private boolean sorted;
private boolean showMetadata;
private boolean expanded = true;
Expand Down
87 changes: 56 additions & 31 deletions ...n-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugView.html
View file
Expand Up @@ -19,39 +19,59 @@
<body>
<wicket:extend>
<form wicket:id="mainForm" class="form-horizontal">
<div class="row form-group">
<div class="col-lg-2" wicket:id="viewButtonPanel" ></div>
<label class="col-lg-2 control-label"><wicket:message key="pageDebugView.options"/></label>

<div class="col-lg-8">
<div class="container">
<label class="col-lg-3 checkbox-inline">
<input type="checkbox" wicket:id="encrypt">
<wicket:message key="pageDebugView.encrypt"/>
</label>
<label class="col-lg-3 checkbox-inline">
<input type="checkbox" wicket:id="validateSchema">
<wicket:message key="pageDebugView.validateSchema"/>
</label>
<label class="col-lg-3 checkbox-inline">
<input type="checkbox" wicket:id="saveAsRaw">
<wicket:message key="pageDebugView.saveAsRaw"/>
</label>
</div>
<div class="container">
<label class="col-lg-3 checkbox-inline">
<input type="checkbox" wicket:id="reevaluateSearchFilters">
<wicket:message key="pageDebugView.reevaluateSearchFilters"/>
</label>
<label class="col-lg-3 checkbox-inline">
<input type="checkbox" wicket:id="switchToPlainText">
<wicket:message key="pageDebugView.switchToPlainText"/>
</label>
</div>
</div>

<div class="box">
<div class="box-header with-border">
<h3 class="box-title"><wicket:message key="pageDebugView.options"/></h3>
</div>
<div class="box-body">
<div class="option-checkbox" wicket:id="encrypt"/>
<div class="option-checkbox" wicket:id="validateSchema"/>
<div class="option-checkbox" wicket:id="saveAsRaw"/>
<div class="option-checkbox" wicket:id="reevaluateSearchFilters"/>
<div class="option-checkbox" wicket:id="switchToPlainText"/>
</div>
</div>
<!-- <div class="row form-group"> -->

<!-- <label class="col-lg-2 control-label"><wicket:message key="pageDebugView.options"/></label> -->

<div class="form-group">
<!-- <div class="col-lg-8"> -->
<!-- <div class="container"> -->
<!-- <label class="col-lg-3 checkbox-inline"> -->
<!-- <input type="checkbox" wicket:id="encrypt"> -->
<!-- <wicket:message key="pageDebugView.encrypt"/> -->
<!-- </label> -->
<!-- <label class="col-lg-3 checkbox-inline"> -->
<!-- <input type="checkbox" wicket:id="validateSchema"> -->
<!-- <wicket:message key="pageDebugView.validateSchema"/> -->
<!-- </label> -->
<!-- <label class="col-lg-3 checkbox-inline"> -->
<!-- <input type="checkbox" wicket:id="saveAsRaw"> -->
<!-- <wicket:message key="pageDebugView.saveAsRaw"/> -->
<!-- </label> -->
<!-- </div> -->
<!-- <div class="container"> -->
<!-- <label class="col-lg-3 checkbox-inline"> -->
<!-- <input type="checkbox" wicket:id="reevaluateSearchFilters"> -->
<!-- <wicket:message key="pageDebugView.reevaluateSearchFilters"/> -->
<!-- </label> -->
<!-- <label class="col-lg-3 checkbox-inline"> -->
<!-- <input type="checkbox" wicket:id="switchToPlainText"> -->
<!-- <wicket:message key="pageDebugView.switchToPlainText"/> -->
<!-- </label> -->
<!-- </div> -->
<!-- </div> -->
<!-- </div> -->

<div class="box">
<div class="box-header with-border">
<div class="form-group">
<div class="col-lg-2" wicket:id="viewButtonPanel" ></div>
</div>
</div>
<div class="box-body">
<div class="form-group">
<div class="col-lg-12">
<textarea wicket:id="aceEditor"></textarea>
</div>
Expand All @@ -61,6 +81,11 @@
<textarea class="text-area" wicket:id="plain-textarea"/>
</div>
</div>
</div>
</div>




<div class="main-button-bar">
<span class="button-group">
Expand Down

0 comments on commit 01f7d8a

Please sign in to comment.