Merge branch 'master' into feature/pre-inbounds

Evolveum · Feb 17, 2022 · e2dfe59 · e2dfe59
2 parents 6614b76 + 2404c54
commit e2dfe59
Show file tree

Hide file tree

Showing 75 changed files with 2,393 additions and 1,214 deletions.
diff --git a/...in-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/ContainerableListPanel.java b/...in-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/ContainerableListPanel.java
@@ -482,7 +482,7 @@ protected List<IColumn<PO, String>> getViewColumnsTransformed(List<GuiObjectColu
         return getViewColumnsTransformed(customColumns, true);
     }
 
-    protected List<IColumn<PO, String>> getViewColumnsTransformed(List<GuiObjectColumnType> customColumns, boolean shoudlCheckForNameColumn){
+    protected List<IColumn<PO, String>> getViewColumnsTransformed(List<GuiObjectColumnType> customColumns, boolean shouldCheckForNameColumn){
         List<IColumn<PO, String>> columns = new ArrayList<>();
         if (customColumns == null || customColumns.isEmpty()) {
             return columns;
@@ -501,7 +501,7 @@ protected List<IColumn<PO, String>> getViewColumnsTransformed(List<GuiObjectColu
 
             if (WebComponentUtil.getElementVisibility(customColumn.getVisibility())) {
                 IModel<String> columnDisplayModel = createColumnDisplayModel(customColumn);
-                if (customColumns.indexOf(customColumn) == 0 && shoudlCheckForNameColumn) {
+                if (customColumns.indexOf(customColumn) == 0 && shouldCheckForNameColumn) {
                     column = createNameColumn(columnDisplayModel, customColumn, columnPath, expression);
                 } else {
                     column = createCustomExportableColumn(columnDisplayModel, customColumn, columnPath, expression);

diff --git a/...ava/com/evolveum/midpoint/gui/impl/factory/wrapper/LoggingAppenderWrapperFactoryImpl.java b/...ava/com/evolveum/midpoint/gui/impl/factory/wrapper/LoggingAppenderWrapperFactoryImpl.java
@@ -62,7 +62,9 @@ protected LookupTableType getPredefinedValues(PrismProperty<T> item, WrapperCont
             String name = appender.getName();
             row.setKey(name);
             row.setValue(name);
-            row.setLabel(new PolyStringType(name));
+            if (name != null) {
+                row.setLabel(new PolyStringType(name));
+            }
             list.add(row);
         }
         return lookupTable;

diff --git a/...va/com/evolveum/midpoint/gui/impl/page/admin/messagetemplate/LocalizedContentCounter.java b/...va/com/evolveum/midpoint/gui/impl/page/admin/messagetemplate/LocalizedContentCounter.java
@@ -1,17 +1,8 @@
 /*
- * Copyright (c) 2010-2022 Evolveum
+ * Copyright (c) 2022 Evolveum and contributors
  *
- * 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.
+ * This work is dual-licensed under the Apache License 2.0
+ * and European Union Public License. See LICENSE file for details.
  */
 
 package com.evolveum.midpoint.gui.impl.page.admin.messagetemplate;

diff --git a/...om/evolveum/midpoint/gui/impl/page/admin/messagetemplate/MessageTemplateContentPanel.html b/...om/evolveum/midpoint/gui/impl/page/admin/messagetemplate/MessageTemplateContentPanel.html
@@ -1,17 +1,8 @@
 <!--
-  ~ Copyright (c) 2010-2022 Evolveum
+  ~ Copyright (c) 2022 Evolveum and contributors
   ~
-  ~ 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.
+  ~ This work is dual-licensed under the Apache License 2.0
+  ~ and European Union Public License. See LICENSE file for details.
   -->
 <html xmlns="http://www.w3.org/1999/xhtml"
         xmlns:wicket="http://wicket.apache.org">

diff --git a/...om/evolveum/midpoint/gui/impl/page/admin/messagetemplate/MessageTemplateContentPanel.java b/...om/evolveum/midpoint/gui/impl/page/admin/messagetemplate/MessageTemplateContentPanel.java
@@ -1,17 +1,8 @@
 /*
- * Copyright (c) 2010-2022 Evolveum
+ * Copyright (c) 2022 Evolveum and contributors
  *
- * 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.
+ * This work is dual-licensed under the Apache License 2.0
+ * and European Union Public License. See LICENSE file for details.
  */
 
 package com.evolveum.midpoint.gui.impl.page.admin.messagetemplate;

diff --git a/...um/midpoint/gui/impl/page/admin/messagetemplate/MessageTemplateLocalizedContentPanel.java b/...um/midpoint/gui/impl/page/admin/messagetemplate/MessageTemplateLocalizedContentPanel.java
@@ -1,17 +1,8 @@
 /*
- * Copyright (c) 2010-2022 Evolveum
+ * Copyright (c) 2022 Evolveum and contributors
  *
- * 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.
+ * This work is dual-licensed under the Apache License 2.0
+ * and European Union Public License. See LICENSE file for details.
  */
 
 package com.evolveum.midpoint.gui.impl.page.admin.messagetemplate;

diff --git a/.../java/com/evolveum/midpoint/gui/impl/page/admin/messagetemplate/MessageTemplateModel.java b/.../java/com/evolveum/midpoint/gui/impl/page/admin/messagetemplate/MessageTemplateModel.java
@@ -1,17 +1,8 @@
 /*
- * Copyright (c) 2010-2022 Evolveum
+ * Copyright (c) 2022 Evolveum and contributors
  *
- * 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.
+ * This work is dual-licensed under the Apache License 2.0
+ * and European Union Public License. See LICENSE file for details.
  */
 
 package com.evolveum.midpoint.gui.impl.page.admin.messagetemplate;

diff --git a/...om/evolveum/midpoint/gui/impl/page/admin/messagetemplate/MessageTemplateSummaryPanel.java b/...om/evolveum/midpoint/gui/impl/page/admin/messagetemplate/MessageTemplateSummaryPanel.java
@@ -1,17 +1,8 @@
 /*
- * Copyright (c) 2010-2022 Evolveum
+ * Copyright (c) 2022 Evolveum and contributors
  *
- * 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.
+ * This work is dual-licensed under the Apache License 2.0
+ * and European Union Public License. See LICENSE file for details.
  */
 
 package com.evolveum.midpoint.gui.impl.page.admin.messagetemplate;

diff --git a/...n/java/com/evolveum/midpoint/gui/impl/page/admin/messagetemplate/PageMessageTemplate.java b/...n/java/com/evolveum/midpoint/gui/impl/page/admin/messagetemplate/PageMessageTemplate.java
@@ -1,17 +1,8 @@
 /*
- * Copyright (c) 2010-2022 Evolveum
+ * Copyright (c) 2022 Evolveum and contributors
  *
- * 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.
+ * This work is dual-licensed under the Apache License 2.0
+ * and European Union Public License. See LICENSE file for details.
  */
 package com.evolveum.midpoint.gui.impl.page.admin.messagetemplate;
 

diff --git a/.../java/com/evolveum/midpoint/gui/impl/page/admin/messagetemplate/PageMessageTemplates.html b/.../java/com/evolveum/midpoint/gui/impl/page/admin/messagetemplate/PageMessageTemplates.html
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2010-2018 Evolveum
+  ~ Copyright (c) 2022 Evolveum and contributors
   ~
   ~ This work is dual-licensed under the Apache License 2.0
   ~ and European Union Public License. See LICENSE file for details.

diff --git a/.../java/com/evolveum/midpoint/gui/impl/page/admin/messagetemplate/PageMessageTemplates.java b/.../java/com/evolveum/midpoint/gui/impl/page/admin/messagetemplate/PageMessageTemplates.java
@@ -1,17 +1,8 @@
 /*
- * Copyright (c) 2010-2022 Evolveum
+ * Copyright (c) 2022 Evolveum and contributors
  *
- * 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.
+ * This work is dual-licensed under the Apache License 2.0
+ * and European Union Public License. See LICENSE file for details.
  */
 package com.evolveum.midpoint.gui.impl.page.admin.messagetemplate;
 

diff --git a/...om/evolveum/midpoint/gui/impl/page/admin/messagetemplate/TemplateContentDetailsPanel.java b/...om/evolveum/midpoint/gui/impl/page/admin/messagetemplate/TemplateContentDetailsPanel.java
@@ -1,17 +1,8 @@
 /*
- * Copyright (c) 2010-2022 Evolveum
+ * Copyright (c) 2022 Evolveum and contributors
  *
- * 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.
+ * This work is dual-licensed under the Apache License 2.0
+ * and European Union Public License. See LICENSE file for details.
  */
 
 package com.evolveum.midpoint.gui.impl.page.admin.messagetemplate;

diff --git a/...iguration/PageSystemConfigurationNew.html → ...onfiguration/PageSystemConfiguration.html b/...iguration/PageSystemConfigurationNew.html → ...onfiguration/PageSystemConfiguration.html
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2010-2013 Evolveum
+  ~ Copyright (c) 2022 Evolveum and contributors
   ~
   ~ This work is dual-licensed under the Apache License 2.0
   ~ and European Union Public License. See LICENSE file for details.
   -->
 
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
-    <body>
-        <wicket:extend>
-           <div class="row">
-               <div class="col-md-12">
-                   <div wicket:id="container" />
-               </div>
-           </div>
+<body>
+<wicket:extend>
+    <div class="row">
+        <div class="col-md-12">
+            <div wicket:id="container"/>
+        </div>
+    </div>
 </wicket:extend>
-    </body>
+</body>
 </html>
diff --git a/...iguration/PageSystemConfigurationNew.java → ...onfiguration/PageSystemConfiguration.java b/...iguration/PageSystemConfigurationNew.java → ...onfiguration/PageSystemConfiguration.java
@@ -1,11 +1,11 @@
 /*
- * Copyright (c) 2018 Evolveum and contributors
+ * Copyright (c) 2022 Evolveum and contributors
  *
  * This work is dual-licensed under the Apache License 2.0
  * and European Union Public License. See LICENSE file for details.
  */
 
-package com.evolveum.midpoint.web.page.admin.configuration;
+package com.evolveum.midpoint.gui.impl.page.admin.systemconfiguration;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -14,12 +14,15 @@
 import com.evolveum.midpoint.gui.api.page.PageBase;
 import com.evolveum.midpoint.gui.impl.component.icon.CompositedIconBuilder;
 import com.evolveum.midpoint.gui.impl.component.icon.IconCssStyle;
+import com.evolveum.midpoint.gui.impl.page.admin.systemconfiguration.page.PageAdminGui;
+import com.evolveum.midpoint.gui.impl.page.admin.systemconfiguration.page.PageLogging;
 import com.evolveum.midpoint.model.api.AssignmentObjectRelation;
 import com.evolveum.midpoint.model.api.authentication.CompiledObjectCollectionView;
 import com.evolveum.midpoint.authentication.api.util.AuthConstants;
 import com.evolveum.midpoint.web.component.CompositedIconButtonDto;
 import com.evolveum.midpoint.web.component.MultiCompositedButtonPanel;
 
+import com.evolveum.midpoint.web.page.admin.configuration.PageInternals;
 import com.evolveum.midpoint.web.page.admin.configuration.system.*;
 import com.evolveum.prism.xml.ns._public.types_3.PolyStringType;
 
@@ -42,7 +45,7 @@
  */
 @PageDescriptor(
         urls = {
-                @Url(mountUrl = "/admin/config/system2", matchUrlForSecurity = "/admin/config/system2"),
+                @Url(mountUrl = "/admin/config/system2"),
         },
         action = {
                 @AuthorizationAction(actionUri = AuthConstants.AUTH_CONFIGURATION_ALL,
@@ -52,18 +55,17 @@
                         label = "PageSystemConfiguration.auth.configSystemConfiguration.label",
                         description = "PageSystemConfiguration.auth.configSystemConfiguration.description")
         })
-public class PageSystemConfigurationNew extends PageBase {
+public class PageSystemConfiguration extends PageBase {
 
     private static final long serialVersionUID = 1L;
 
-    private static final String DOT_CLASS = PageSystemConfigurationNew.class.getName() + ".";
+    private static final String DOT_CLASS = PageSystemConfiguration.class.getName() + ".";
 
-    private static final Trace LOGGER = TraceManager.getTrace(PageSystemConfigurationNew.class);
+    private static final Trace LOGGER = TraceManager.getTrace(PageSystemConfiguration.class);
 
     private static final String ID_CONTAINER = "container";
 
-
-    public PageSystemConfigurationNew() {
+    public PageSystemConfiguration() {
         initLayout();
     }
 
@@ -80,7 +82,7 @@ protected List<CompositedIconButtonDto> load() {
                 buttons.add(createCompositedButton("Notifications", "fa fa-envelope", PageNotificationConfiguration.class));
                 buttons.add(createCompositedButton("Logging", "fa fa-file-text", PageLogging.class));
                 buttons.add(createCompositedButton("Profiling", "fa fa-camera", PageProfiling.class));
-                buttons.add(createCompositedButton("Admin GUI configuration", "fa fa-camera", PageAdminGuiConfiguration.class));
+                buttons.add(createCompositedButton("Admin GUI configuration", "fa fa-camera", PageAdminGui.class));
                 buttons.add(createCompositedButton("Workflow configuration", "fa fa-camera", PageWorkflowConfiguration.class));
                 buttons.add(createCompositedButton("Role management", "fa fa-camera", PageRoleManagement.class));
                 buttons.add(createCompositedButton("Internals", "fa fa-camera", PageInternals.class));
@@ -94,6 +96,7 @@ protected List<CompositedIconButtonDto> load() {
             }
         };
         MultiCompositedButtonPanel panel = new MultiCompositedButtonPanel(ID_CONTAINER, model) {
+
             @Override
             protected void buttonClickPerformed(AjaxRequestTarget target, AssignmentObjectRelation relationSpec, CompiledObjectCollectionView collectionViews, Class<? extends WebPage> page) {
                 navigateToNext(page);
@@ -114,6 +117,7 @@ private CompositedIconButtonDto createCompositedButton(String type, String icon,
         displayType.setLabel(new PolyStringType(type));
         button.setAdditionalButtonDisplayType(displayType);
         button.setPage(page);
+
         return button;
     }