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

Evolveum · Oct 7, 2015 · 8c6b39a · 8c6b39a
2 parents ef1052a + 62a89e1
commit 8c6b39a
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 29 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageBase.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2013 Evolveum
+ * Copyright (c) 2010-2015 Evolveum
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -94,28 +94,40 @@ public abstract class PageBase extends PageTemplate {
 
     @SpringBean(name = "modelController")
     private ScriptingService scriptingService;
+
     @SpringBean(name = "modelController")
     private ModelService modelService;
-    @SpringBean(name = "modelController")
+
+    @SpringBean(name = "modelInteractionService")
     private ModelInteractionService modelInteractionService;
+
     @SpringBean(name = "modelController")
     private TaskService taskService;
+
     @SpringBean(name = "modelDiagController")
     private ModelDiagnosticService modelDiagnosticService;
+
     @SpringBean(name = "taskManager")
     private TaskManager taskManager;
+
     @SpringBean(name = "modelController")
     private WorkflowService workflowService;
+
     @SpringBean(name = "workflowManager")
     private WorkflowManager workflowManager;
+
     @SpringBean(name = "midpointConfiguration")
     private MidpointConfiguration midpointConfiguration;
+
     @SpringBean(name = "reportManager")
     private ReportManager reportManager;
+
     @SpringBean(name = "certificationManager")
     private CertificationManager certificationManager;
+
     @SpringBean(name = "accessDecisionManager")
     private SecurityEnforcer securityEnforcer;
+
     @SpringBean
     private MidpointFormValidatorRegistry formValidatorRegistry;
 

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageTemplate.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageTemplate.html
@@ -80,7 +80,6 @@
     </wicket:remove>
 
     <wicket:link>
-        <link href="../resource/img/favicon.ico" rel="shortcut icon" type="image/x-icon"/>
         <link href="../../../../../webjars/adminlte/2.3.0/bootstrap/css/bootstrap.min.css" rel="stylesheet" type="text/css" />
         <link href="../../../../../webjars/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet" type="text/css" />
         <link href="../../../../../webjars/ionicons/2.0.1/css/ionicons.min.css" rel="stylesheet" type="text/css" />

diff --git a/...src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDefinitions.java b/...src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDefinitions.java
@@ -102,17 +102,6 @@ private ObjectQuery createQuery() {
 
     //region Layout
 
-    @Override
-    protected IModel<String> createPageSubTitleModel(){
-        return new AbstractReadOnlyModel<String>() {
-
-            @Override
-            public String getObject() {
-                return createStringResource("page.subTitle").getString();
-            }
-        };
-    }
-
     private void initLayout() {
         Form mainForm = new Form(ID_MAIN_FORM);
         add(mainForm);

diff --git a/...n-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugView.java b/...n-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugView.java
@@ -107,7 +107,7 @@ protected IModel<String> createPageSubTitleModel() {
 
             @Override
             public String getObject() {
-                return createStringResource("page.subTitle", model.getObject().getName()).getString();
+                return createStringResource("PageDebugView.subTitle", model.getObject().getName()).getString();
             }
         };
     }

diff --git a/...in-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageCreatedReports.java b/...in-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageCreatedReports.java
@@ -159,17 +159,6 @@ protected ReportOutputSearchDto load() {
         initLayout();
     }
 
-    @Override
-    protected IModel<String> createPageSubTitleModel() {
-        return new AbstractReadOnlyModel<String>() {
-
-            @Override
-            public String getObject() {
-                return createStringResource("page.subTitle").getString();
-            }
-        };
-    }
-
     private void initLayout() {
         initSearchForm();
 

diff --git a/...gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/content/PageAccount.java b/...gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/content/PageAccount.java
@@ -189,7 +189,7 @@ protected String load() {
                 ResourceType resource = account.asObjectable().getResource();
                 String name = WebMiscUtil.getName(resource);
 
-                return new StringResourceModel("page.subTitle", PageAccount.this, null, null, name).getString();
+                return new StringResourceModel("PageAccount.subTitle", PageAccount.this, null, null, name).getString();
             }
         };
     }

diff --git a/...main/java/com/evolveum/midpoint/web/page/admin/resources/content/PageContentAccounts.java b/...main/java/com/evolveum/midpoint/web/page/admin/resources/content/PageContentAccounts.java
@@ -454,7 +454,7 @@ protected IModel<String> createPageSubTitleModel() {
             @Override
             protected String load() {
                 String name = WebMiscUtil.getName(resourceModel.getObject());
-                return new StringResourceModel("page.subTitle", PageContentAccounts.this, null, null, name).getString();
+                return new StringResourceModel("PageContentAccounts.subTitle", PageContentAccounts.this, null, null, name).getString();
             }
         };
     }

diff --git a/...src/main/java/com/evolveum/midpoint/model/impl/controller/ModelInterationServiceImpl.java b/...src/main/java/com/evolveum/midpoint/model/impl/controller/ModelInterationServiceImpl.java
@@ -104,7 +104,7 @@
  * @author semancik
  *
  */
-@Component
+@Component("modelInteractionService")
 public class ModelInterationServiceImpl implements ModelInteractionService {
 
 	private static final Trace LOGGER = TraceManager.getTrace(ModelInterationServiceImpl.class);