re base code

[sdc.git] / catalog-be / src / main / java / org / openecomp / sdc / config / CatalogBESpringConfig.java

diff --git a/catalog-be/src/main/java/org/openecomp/sdc/config/CatalogBESpringConfig.java b/catalog-be/src/main/java/org/openecomp/sdc/config/CatalogBESpringConfig.java
index 56527b6..6c6d2cb 100644 (file)
--- a/catalog-be/src/main/java/org/openecomp/sdc/config/CatalogBESpringConfig.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/config/CatalogBESpringConfig.java
@@ -1,11 +1,15 @@
 package org.openecomp.sdc.config;
 
+import org.openecomp.sdc.be.components.impl.ComponentLocker;
+import org.openecomp.sdc.be.components.impl.lock.ComponentLockAspect;
 import org.openecomp.sdc.be.components.lifecycle.LifecycleBusinessLogic;
 import org.openecomp.sdc.be.ecomp.converters.AssetMetadataConverter;
 import org.openecomp.sdc.common.transaction.mngr.TransactionManager;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.core.annotation.Order;
 
 @Configuration
 @ComponentScan({"org.openecomp.sdc.be.user",
@@ -19,9 +23,20 @@ import org.springframework.context.annotation.Configuration;
         "org.openecomp.sdc.be.components.path",
         "org.openecomp.sdc.be.components.merge",
         "org.openecomp.sdc.be.components.csar",
-        "org.openecomp.sdc.be.components.property"
+        "org.openecomp.sdc.be.components.property",
+        "org.openecomp.sdc.be.datamodel.utils",
+        "org.openecomp.sdc.be.components.upgrade"
 })
 public class CatalogBESpringConfig {
+
+    private static final int BEFORE_TRANSACTION_MANAGER = 0;
+    private final ComponentLocker componentLocker;
+
+    @Autowired
+    public CatalogBESpringConfig(ComponentLocker componentLocker) {
+        this.componentLocker = componentLocker;
+    }
+
     @Bean(name = "lifecycleBusinessLogic")
     public LifecycleBusinessLogic lifecycleBusinessLogic() {
         return new LifecycleBusinessLogic();
@@ -37,4 +52,11 @@ public class CatalogBESpringConfig {
         return new AssetMetadataConverter();
     }
 
+    @Bean(name = "componentLockAspect")
+    @Order(BEFORE_TRANSACTION_MANAGER)
+    public ComponentLockAspect componentLockAspect() {
+        return new ComponentLockAspect(componentLocker);
+    }
+
+
 }