Merge branch 'master' of https://github.com/Evolveum/midpoint

Evolveum · Jul 15, 2016 · 0e2f84b · 0e2f84b
2 parents b69093f + c00f607
commit 0e2f84b
Show file tree

Hide file tree

Showing 12 changed files with 413 additions and 198 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -22,13 +22,13 @@ script: mvn clean install
 
 addons:
   hostname: localhost # workaround for short hostname
-  #apt:
-   # packages:
-    #  - oracle-java8-installer # install newest JDK8
+  apt:
+    packages:
+      - oracle-java8-installer # install newest JDK8
       #- openjdk-8-jdk
 
 jdk:
   - openjdk7
   - oraclejdk7
   #- openjdk8
-  #- oraclejdk8
+  - oraclejdk8
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java
@@ -141,6 +141,7 @@
 import com.evolveum.midpoint.web.page.admin.reports.PageNewReport;
 import com.evolveum.midpoint.web.page.admin.reports.PageReport;
 import com.evolveum.midpoint.web.page.admin.reports.PageReports;
+import com.evolveum.midpoint.web.page.admin.resources.PageConnectorHosts;
 import com.evolveum.midpoint.web.page.admin.resources.PageImportResource;
 import com.evolveum.midpoint.web.page.admin.resources.PageResource;
 import com.evolveum.midpoint.web.page.admin.resources.PageResourceWizard;
@@ -1082,6 +1083,9 @@ private MainMenuItem createResourcesItems() {
 				PageImportResource.class);
 		submenu.add(n);
 
+		MenuItem connectorHostsList = new MenuItem(createStringResource("PageAdmin.menu.top.connectorHosts.list"),
+				PageConnectorHosts.class);
+		submenu.add(connectorHostsList);
 		return item;
 	}
 

diff --git a/...-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageAdminResources.java b/...-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageAdminResources.java
@@ -62,6 +62,10 @@ public class PageAdminResources extends PageAdmin {
     private static final String OPERATION_SAVE_SYNC_TASK = DOT_CLASS + "saveSyncTask";
 
     protected static final Trace LOGGER = TraceManager.getTrace(PageAdminResources.class);
+
+    public static final String AUTH_CONNECTOR_HOSTS_ALL = AuthorizationConstants.AUTZ_UI_CONNECTOR_HOSTS_ALL_URL;
+    public static final String AUTH_CONNECTOR_HOSTS_ALL_LABEL = "PageAdminResources.auth.connectorHostsAll.label";
+    public static final String AUTH_CONNECTOR_HOSTS_ALL_DESCRIPTION = "PageAdminResources.auth.connectorHostsAll.description";
 
     public static final String AUTH_RESOURCE_ALL = AuthorizationConstants.AUTZ_UI_RESOURCES_ALL_URL;
     public static final String AUTH_RESOURCE_ALL_LABEL = "PageAdminResources.auth.resourcesAll.label";

diff --git a/...-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageConnectorHosts.html b/...-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageConnectorHosts.html
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (c) 2010-2016 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.
+  -->
+
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
+<body>
+<wicket:extend>
+    <form wicket:id="mainForm" class="clearfix form-horizontal">
+         <div wicket:id="connectorTable"/>
+    </form>
+</wicket:extend>
+</body>
+</html>