Fixing ModelInterationService bean wiring

Evolveum · Oct 7, 2015 · 62a89e1 · 62a89e1
1 parent 52352c3
commit 62a89e1
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 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,27 +94,40 @@ public abstract class PageBase extends PageTemplate {
 
     @SpringBean(name = "modelController")
     private ScriptingService scriptingService;
+
     @SpringBean(name = "modelController")
     private ModelService modelService;
+
+    @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/...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);