diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java index b4cf846e2..e294eefe4 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java @@ -79,9 +79,6 @@ import org.navalplanner.web.planner.tabs.MultipleTabsPlannerController; import org.navalplanner.web.print.CutyPrint; import org.navalplanner.web.security.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.config.BeanDefinition; -import org.springframework.context.annotation.Scope; -import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; import org.zkforge.timeplot.Plotinfo; import org.zkforge.timeplot.Timeplot; @@ -126,8 +123,7 @@ import org.zkoss.zul.Vbox; * * @author Manuel Rego Casasnovas */ -@Component -@Scope(BeanDefinition.SCOPE_SINGLETON) +// This bean is defined at navalplanner-webapp-spring-config.xml public abstract class CompanyPlanningModel implements ICompanyPlanningModel { public static final String COLOR_CAPABILITY_LINE = "#000000"; // Black diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java index 59b19b830..953212841 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java @@ -99,9 +99,6 @@ import org.navalplanner.web.planner.taskedition.ITaskPropertiesCommand; import org.navalplanner.web.print.CutyPrint; import org.navalplanner.web.security.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.config.BeanDefinition; -import org.springframework.context.annotation.Scope; -import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; import org.zkforge.timeplot.Plotinfo; import org.zkforge.timeplot.Timeplot; @@ -148,8 +145,7 @@ import org.zkoss.zul.Vbox; /** * @author Óscar González Fernández */ -@Component -@Scope(BeanDefinition.SCOPE_SINGLETON) +// This bean is defined at navalplanner-webapp-spring-config.xml public abstract class OrderPlanningModel implements IOrderPlanningModel { public static final String COLOR_CAPABILITY_LINE = "#000000"; // Black