Merge remote-tracking branch 'refs/remotes/origin/master'

gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.html

@@ -26,6 +26,7 @@
     <link rel="shortcut icon" type="image/x-icon" href="img/favicon.ico"/>
 
     <link href="css/fonts.css" type="text/css" rel="stylesheet"/>
+    <link href="css/font-midpoint.css" type="text/css" rel="stylesheet"/>
 
     <wicket:link>
         <link href="../../../../../../webjars/adminlte/2.3.11/bootstrap/css/bootstrap.min.css" rel="stylesheet" type="text/css" />

gui/admin-gui/src/main/resources/static/css/font-midpoint.css

@@ -0,0 +1,43 @@
+@charset "UTF-8";
+
+@font-face {
+  font-family: 'font-midpoint';
+  src:  url('../fonts/font-midpoint.eot?ec0kj0');
+  src:  url('../fonts/font-midpoint.eot?ec0kj0#iefix') format('embedded-opentype'),
+  url('../fonts/font-midpoint.ttf?ec0kj0') format('truetype'),
+  url('../fonts/font-midpoint.woff?ec0kj0') format('woff'),
+  url('../fonts/font-midpoint.svg?ec0kj0#font-midpoint') format('svg');
+  font-weight: normal;
+  font-style: normal;
+}
+
+.fm {
+  display: inline-block;
+  font: normal normal normal 14px/1 font-midpoint;
+  font-size: inherit;
+  text-rendering: auto;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.fm-assignment:before {
+  content: "\e900";
+}
+.fm-midpoint-shorter-lines:before {
+  content: "\e901";
+}
+.fm-midpoint-wheel:before {
+  content: "\e902";
+}
+.fm-midpoint-with-lines:before {
+  content: "\e903";
+}
+.fm-role-hat:before {
+  content: "\e904";
+}
+.fm-role-tie:before {
+  content: "\e905";
+}
+.fm-role-top-hat:before {
+  content: "\e906";
+}

gui/admin-gui/src/main/resources/static/less/midpoint-theme.less

@@ -118,6 +118,7 @@ th.cog, td.cog {
 }
 
 .sidebar-menu .treeview-menu > li > span > .fa,
+.sidebar-menu .treeview-menu > li > span > .fm,
 .sidebar-menu .treeview-menu > li > span > .glyphicon,
 .sidebar-menu .treeview-menu > li > span > .ion {
   width: 20px;
@@ -128,11 +129,15 @@ th.cog, td.cog {
 	white-space: normal !important;
 }
 
+.sidebar-menu > li > a > .fm {
+	width: 20px;
+}
+
 .sidebar-form, .sidebar-menu > li.header {
 	padding: 10px 20px 10px 15px;
 	text-transform: uppercase;
 
-	& i.fa {
+	& i.fa, & i.fm {
 		margin-top: 2px;
 	}
 }
@@ -760,7 +765,7 @@ body .treeview-menu > li > span:hover {
     text-decoration: none;
     display: inline-block;
 
-    > .fa, > .glyphicon, > .ion {
+    > .fa, > .glyphicon, > .ion, > .fm {
       margin-right: 5px;
     }
   }

gui/admin-gui/src/test/java/com/evolveum/midpoint/web/AbstractGuiIntegrationTest.java

@@ -54,8 +54,11 @@
 import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
 import org.springframework.mock.web.MockFilterConfig;
 import org.springframework.mock.web.MockServletContext;
+import org.springframework.test.context.ContextConfiguration;
 import org.springframework.web.context.WebApplicationContext;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.AfterMethod;
@@ -107,7 +110,7 @@ public abstract class AbstractGuiIntegrationTest extends AbstractModelIntegratio
 	protected static final String ORG_SAVE_ELAINE_OID = "00000000-8888-6666-0000-200000000001";
 	protected static final String ORG_KIDNAP_AND_MARRY_ELAINE_OID = "00000000-8888-6666-0000-200000000002";
 
-    private MidPointApplication application;
+    @Autowired private MidPointApplication application;
 
     @Autowired private ApplicationContext appContext;
     @Autowired protected PrismContext prismContext;
@@ -129,14 +132,15 @@ public void setupApplication() throws ServletException {
     		display("App "+key, Application.get(key));
     	}
 
-    	application = (MidPointApplication) Application.get("midpoint");
-    	if (application == null) {
+//    	application = (MidPointApplication) Application.get("midpoint");
+//    	if (application == null) {
     		application = createInitializedMidPointApplication();
-    	}
+//    	}
     }
 
     private MidPointApplication createInitializedMidPointApplication() throws ServletException {
-		MidPointApplication application = new MidPointApplication();
+//		MidPointApplication application = new MidPointApplication();
+//		application.setApplicationContext(appContext);
     	WicketFilter wicketFilter = new WicketFilter(application);
     	MockServletContext servletContext = new MockServletContext();
     	WebApplicationContext wac = new MockWebApplicationContext(appContext, servletContext);

gui/admin-gui/src/test/java/com/evolveum/midpoint/web/ObjectWrapperTest.java

@@ -36,7 +36,7 @@
 /**
  * @author lazyman
  */
-@ContextConfiguration(locations = {"../../../../ctx-test.xml"})
+@ContextConfiguration(locations = {"classpath:ctx-admin-gui-test-main.xml"})
 @DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_CLASS)
 public class ObjectWrapperTest extends AbstractGuiIntegrationTest {
 

gui/admin-gui/src/test/resources/ctx-admin-gui-test-main.xml

@@ -39,4 +39,8 @@
     <import resource="classpath:ctx-certification.xml" />
     <import resource="classpath:ctx-init.xml" />
     <!--<import resource="classpath:ctx-webapp.xml" />-->
+
+    <bean id="midPointApplication" class="com.evolveum.midpoint.web.security.MidPointApplication"/>
+
+    <bean id="asyncWebProcessManager" class="com.evolveum.midpoint.web.application.AsyncWebProcessManagerImpl"/>
 </beans>