summaryrefslogtreecommitdiffstats
path: root/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl
diff options
context:
space:
mode:
Diffstat (limited to 'appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl')
-rw-r--r--appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/pom.xml14
-rw-r--r--appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/main/java/org/openecomp/appc/lockmanager/impl/inmemory/LockManagerInMemoryImpl.java6
-rw-r--r--appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/main/java/org/openecomp/appc/lockmanager/impl/inmemory/LockValue.java2
-rw-r--r--appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/main/java/org/openecomp/appc/lockmanager/impl/sql/JdbcLockManager.java6
-rw-r--r--appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/main/java/org/openecomp/appc/lockmanager/impl/sql/Messages.java2
-rw-r--r--appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/main/java/org/openecomp/appc/lockmanager/impl/sql/MySqlConnectionFactory.java4
-rw-r--r--appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/main/java/org/openecomp/appc/lockmanager/impl/sql/optimistic/LockRecord.java2
-rw-r--r--appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/main/java/org/openecomp/appc/lockmanager/impl/sql/optimistic/MySqlLockManager.java2
-rw-r--r--appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/main/java/org/openecomp/appc/lockmanager/impl/sql/optimistic/SqlLockManager.java10
-rw-r--r--appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/main/java/org/openecomp/appc/lockmanager/impl/sql/pessimistic/LockRecord.java2
-rw-r--r--appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/main/java/org/openecomp/appc/lockmanager/impl/sql/pessimistic/MySqlLockManager.java4
-rw-r--r--appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/main/java/org/openecomp/appc/lockmanager/impl/sql/pessimistic/SqlLockManager.java10
-rw-r--r--appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/main/resources/OSGI-INF/blueprint/blueprint.xml10
-rw-r--r--appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/test/java/org/openecomp/appc/lockmanager/api/LockManagerBaseTests.java6
-rw-r--r--appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/test/java/org/openecomp/appc/lockmanager/impl/inmemory/LockManagerInMemoryImplTest.java8
-rw-r--r--appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/test/java/org/openecomp/appc/lockmanager/impl/sql/MySqlLockManagerBaseTests.java12
-rw-r--r--appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/test/java/org/openecomp/appc/lockmanager/impl/sql/Synchronizer.java2
-rw-r--r--appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/test/java/org/openecomp/appc/lockmanager/impl/sql/SynchronizerReceiver.java2
-rw-r--r--appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/test/java/org/openecomp/appc/lockmanager/impl/sql/optimistic/MySqlLockManagerMock.java10
-rw-r--r--appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/test/java/org/openecomp/appc/lockmanager/impl/sql/optimistic/TestMySqlLockManager.java10
-rw-r--r--appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/test/java/org/openecomp/appc/lockmanager/impl/sql/pessimistic/MySqlLockManagerMock.java12
-rw-r--r--appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/test/java/org/openecomp/appc/lockmanager/impl/sql/pessimistic/TestMySqlLockManager.java14
22 files changed, 75 insertions, 75 deletions
diff --git a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/pom.xml b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/pom.xml
index 05866f635..a4334a2e0 100644
--- a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/pom.xml
+++ b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>lock-manager-lib</artifactId>
- <groupId>org.openecomp.appc</groupId>
+ <groupId>org.onap.appc</groupId>
<version>1.3.0-SNAPSHOT</version>
</parent>
@@ -12,7 +12,7 @@
<dependencies>
<dependency>
- <groupId>org.openecomp.appc</groupId>
+ <groupId>org.onap.appc</groupId>
<artifactId>lock-manager-api</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
@@ -22,7 +22,7 @@
<artifactId>mariadb-java-client</artifactId>
</dependency>
<dependency>
- <groupId>org.openecomp.appc</groupId>
+ <groupId>org.onap.appc</groupId>
<artifactId>appc-data-access-lib</artifactId>
<version>${project.version}</version>
</dependency>
@@ -43,12 +43,12 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
- <Export-Service>org.openecomp.appc.lockmanager.api.LockManager</Export-Service>
+ <Export-Service>org.onap.appc.lockmanager.api.LockManager</Export-Service>
<Import-Package>
- org.openecomp.appc.lockmanager.api.*,
- org.openecomp.appc.dao.util,com.att.eelf.configuration, *;resolution:=optional
+ org.onap.appc.lockmanager.api.*,
+ org.onap.appc.dao.util,com.att.eelf.configuration, *;resolution:=optional
</Import-Package>
- <Private-Package>org.openecomp.appc.lockmanager.impl.*</Private-Package>
+ <Private-Package>org.onap.appc.lockmanager.impl.*</Private-Package>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Bundle-Version>${project.version}</Bundle-Version>
</instructions>
diff --git a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/main/java/org/openecomp/appc/lockmanager/impl/inmemory/LockManagerInMemoryImpl.java b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/main/java/org/openecomp/appc/lockmanager/impl/inmemory/LockManagerInMemoryImpl.java
index 33172a2da..b141d9607 100644
--- a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/main/java/org/openecomp/appc/lockmanager/impl/inmemory/LockManagerInMemoryImpl.java
+++ b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/main/java/org/openecomp/appc/lockmanager/impl/inmemory/LockManagerInMemoryImpl.java
@@ -22,13 +22,13 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.lockmanager.impl.inmemory;
+package org.onap.appc.lockmanager.impl.inmemory;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-import org.openecomp.appc.lockmanager.api.LockException;
-import org.openecomp.appc.lockmanager.api.LockManager;
+import org.onap.appc.lockmanager.api.LockException;
+import org.onap.appc.lockmanager.api.LockManager;
import com.att.eelf.configuration.EELFLogger;
import com.att.eelf.configuration.EELFManager;
diff --git a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/main/java/org/openecomp/appc/lockmanager/impl/inmemory/LockValue.java b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/main/java/org/openecomp/appc/lockmanager/impl/inmemory/LockValue.java
index d0bef626b..d83192c5a 100644
--- a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/main/java/org/openecomp/appc/lockmanager/impl/inmemory/LockValue.java
+++ b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/main/java/org/openecomp/appc/lockmanager/impl/inmemory/LockValue.java
@@ -22,7 +22,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.lockmanager.impl.inmemory;
+package org.onap.appc.lockmanager.impl.inmemory;
public class LockValue {
diff --git a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/main/java/org/openecomp/appc/lockmanager/impl/sql/JdbcLockManager.java b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/main/java/org/openecomp/appc/lockmanager/impl/sql/JdbcLockManager.java
index 880b07ff9..9b2083101 100644
--- a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/main/java/org/openecomp/appc/lockmanager/impl/sql/JdbcLockManager.java
+++ b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/main/java/org/openecomp/appc/lockmanager/impl/sql/JdbcLockManager.java
@@ -22,12 +22,12 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.lockmanager.impl.sql;
+package org.onap.appc.lockmanager.impl.sql;
import java.sql.Connection;
-import org.openecomp.appc.dao.util.JdbcConnectionFactory;
-import org.openecomp.appc.lockmanager.api.LockManager;
+import org.onap.appc.dao.util.JdbcConnectionFactory;
+import org.onap.appc.lockmanager.api.LockManager;
public abstract class JdbcLockManager implements LockManager {
diff --git a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/main/java/org/openecomp/appc/lockmanager/impl/sql/Messages.java b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/main/java/org/openecomp/appc/lockmanager/impl/sql/Messages.java
index f40a8134e..769d94257 100644
--- a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/main/java/org/openecomp/appc/lockmanager/impl/sql/Messages.java
+++ b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/main/java/org/openecomp/appc/lockmanager/impl/sql/Messages.java
@@ -22,7 +22,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.lockmanager.impl.sql;
+package org.onap.appc.lockmanager.impl.sql;
public enum Messages {
diff --git a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/main/java/org/openecomp/appc/lockmanager/impl/sql/MySqlConnectionFactory.java b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/main/java/org/openecomp/appc/lockmanager/impl/sql/MySqlConnectionFactory.java
index c9af310e7..4df89541d 100644
--- a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/main/java/org/openecomp/appc/lockmanager/impl/sql/MySqlConnectionFactory.java
+++ b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/main/java/org/openecomp/appc/lockmanager/impl/sql/MySqlConnectionFactory.java
@@ -22,12 +22,12 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.lockmanager.impl.sql;
+package org.onap.appc.lockmanager.impl.sql;
import java.sql.DriverManager;
import java.sql.SQLException;
-import org.openecomp.appc.dao.util.DefaultJdbcConnectionFactory;
+import org.onap.appc.dao.util.DefaultJdbcConnectionFactory;
public class MySqlConnectionFactory extends DefaultJdbcConnectionFactory {
diff --git a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/main/java/org/openecomp/appc/lockmanager/impl/sql/optimistic/LockRecord.java b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/main/java/org/openecomp/appc/lockmanager/impl/sql/optimistic/LockRecord.java
index 250e75983..ff0e63b8d 100644
--- a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/main/java/org/openecomp/appc/lockmanager/impl/sql/optimistic/LockRecord.java
+++ b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/main/java/org/openecomp/appc/lockmanager/impl/sql/optimistic/LockRecord.java
@@ -22,7 +22,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.lockmanager.impl.sql.optimistic;
+package org.onap.appc.lockmanager.impl.sql.optimistic;
class LockRecord {
diff --git a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/main/java/org/openecomp/appc/lockmanager/impl/sql/optimistic/MySqlLockManager.java b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/main/java/org/openecomp/appc/lockmanager/impl/sql/optimistic/MySqlLockManager.java
index da75fb344..d1dd2c5a3 100644
--- a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/main/java/org/openecomp/appc/lockmanager/impl/sql/optimistic/MySqlLockManager.java
+++ b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/main/java/org/openecomp/appc/lockmanager/impl/sql/optimistic/MySqlLockManager.java
@@ -22,7 +22,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.lockmanager.impl.sql.optimistic;
+package org.onap.appc.lockmanager.impl.sql.optimistic;
import java.sql.SQLException;
diff --git a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/main/java/org/openecomp/appc/lockmanager/impl/sql/optimistic/SqlLockManager.java b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/main/java/org/openecomp/appc/lockmanager/impl/sql/optimistic/SqlLockManager.java
index d4fb7d155..26ec6a274 100644
--- a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/main/java/org/openecomp/appc/lockmanager/impl/sql/optimistic/SqlLockManager.java
+++ b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/main/java/org/openecomp/appc/lockmanager/impl/sql/optimistic/SqlLockManager.java
@@ -22,17 +22,17 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.lockmanager.impl.sql.optimistic;
+package org.onap.appc.lockmanager.impl.sql.optimistic;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
-import org.openecomp.appc.lockmanager.api.LockException;
-import org.openecomp.appc.lockmanager.api.LockRuntimeException;
-import org.openecomp.appc.lockmanager.impl.sql.JdbcLockManager;
-import org.openecomp.appc.lockmanager.impl.sql.Messages;
+import org.onap.appc.lockmanager.api.LockException;
+import org.onap.appc.lockmanager.api.LockRuntimeException;
+import org.onap.appc.lockmanager.impl.sql.JdbcLockManager;
+import org.onap.appc.lockmanager.impl.sql.Messages;
abstract class SqlLockManager extends JdbcLockManager {
diff --git a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/main/java/org/openecomp/appc/lockmanager/impl/sql/pessimistic/LockRecord.java b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/main/java/org/openecomp/appc/lockmanager/impl/sql/pessimistic/LockRecord.java
index 45f974737..1960ba9a3 100644
--- a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/main/java/org/openecomp/appc/lockmanager/impl/sql/pessimistic/LockRecord.java
+++ b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/main/java/org/openecomp/appc/lockmanager/impl/sql/pessimistic/LockRecord.java
@@ -22,7 +22,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.lockmanager.impl.sql.pessimistic;
+package org.onap.appc.lockmanager.impl.sql.pessimistic;
class LockRecord {
diff --git a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/main/java/org/openecomp/appc/lockmanager/impl/sql/pessimistic/MySqlLockManager.java b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/main/java/org/openecomp/appc/lockmanager/impl/sql/pessimistic/MySqlLockManager.java
index b54e3e622..b76f15c8f 100644
--- a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/main/java/org/openecomp/appc/lockmanager/impl/sql/pessimistic/MySqlLockManager.java
+++ b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/main/java/org/openecomp/appc/lockmanager/impl/sql/pessimistic/MySqlLockManager.java
@@ -22,14 +22,14 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.lockmanager.impl.sql.pessimistic;
+package org.onap.appc.lockmanager.impl.sql.pessimistic;
import java.sql.CallableStatement;
import java.sql.Connection;
import java.sql.ResultSet;
import java.sql.SQLException;
-import org.openecomp.appc.lockmanager.api.LockRuntimeException;
+import org.onap.appc.lockmanager.api.LockRuntimeException;
public class MySqlLockManager extends SqlLockManager {
diff --git a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/main/java/org/openecomp/appc/lockmanager/impl/sql/pessimistic/SqlLockManager.java b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/main/java/org/openecomp/appc/lockmanager/impl/sql/pessimistic/SqlLockManager.java
index 68fa38b92..a1536d969 100644
--- a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/main/java/org/openecomp/appc/lockmanager/impl/sql/pessimistic/SqlLockManager.java
+++ b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/main/java/org/openecomp/appc/lockmanager/impl/sql/pessimistic/SqlLockManager.java
@@ -22,17 +22,17 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.lockmanager.impl.sql.pessimistic;
+package org.onap.appc.lockmanager.impl.sql.pessimistic;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
-import org.openecomp.appc.lockmanager.api.LockException;
-import org.openecomp.appc.lockmanager.api.LockRuntimeException;
-import org.openecomp.appc.lockmanager.impl.sql.JdbcLockManager;
-import org.openecomp.appc.lockmanager.impl.sql.Messages;
+import org.onap.appc.lockmanager.api.LockException;
+import org.onap.appc.lockmanager.api.LockRuntimeException;
+import org.onap.appc.lockmanager.impl.sql.JdbcLockManager;
+import org.onap.appc.lockmanager.impl.sql.Messages;
abstract class SqlLockManager extends JdbcLockManager {
diff --git a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/main/resources/OSGI-INF/blueprint/blueprint.xml
index 1fc105611..34383cbb7 100644
--- a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/main/resources/OSGI-INF/blueprint/blueprint.xml
+++ b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@@ -28,13 +28,13 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0 http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd">
- <!--<bean id="lockManagerInMemoryBean" class="org.openecomp.appc.lockmanager.impl.inmemory.LockManagerInMemoryImpl" factory-method="getLockManager" scope="singleton"/>-->
- <!--<service id="lockManagerInMemoryService" interface="org.openecomp.appc.lockmanager.api.LockManager" ref="lockManagerInMemoryBean"/>-->
+ <!--<bean id="lockManagerInMemoryBean" class="org.onap.appc.lockmanager.impl.inmemory.LockManagerInMemoryImpl" factory-method="getLockManager" scope="singleton"/>-->
+ <!--<service id="lockManagerInMemoryService" interface="org.onap.appc.lockmanager.api.LockManager" ref="lockManagerInMemoryBean"/>-->
- <service id="lockManagerMySqlOptimisticService" interface="org.openecomp.appc.lockmanager.api.LockManager">
- <bean class="org.openecomp.appc.lockmanager.impl.sql.optimistic.MySqlLockManager">
+ <service id="lockManagerMySqlOptimisticService" interface="org.onap.appc.lockmanager.api.LockManager">
+ <bean class="org.onap.appc.lockmanager.impl.sql.optimistic.MySqlLockManager">
<property name="connectionFactory">
- <bean class="org.openecomp.appc.dao.util.AppcJdbcConnectionFactory">
+ <bean class="org.onap.appc.dao.util.AppcJdbcConnectionFactory">
<property name="schema" value="sdnctl"/>
</bean>
</property>
diff --git a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/test/java/org/openecomp/appc/lockmanager/api/LockManagerBaseTests.java b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/test/java/org/openecomp/appc/lockmanager/api/LockManagerBaseTests.java
index aba6889e5..9f7e84c43 100644
--- a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/test/java/org/openecomp/appc/lockmanager/api/LockManagerBaseTests.java
+++ b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/test/java/org/openecomp/appc/lockmanager/api/LockManagerBaseTests.java
@@ -22,13 +22,13 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.lockmanager.api;
+package org.onap.appc.lockmanager.api;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-import org.openecomp.appc.lockmanager.api.LockException;
-import org.openecomp.appc.lockmanager.api.LockManager;
+import org.onap.appc.lockmanager.api.LockException;
+import org.onap.appc.lockmanager.api.LockManager;
public abstract class LockManagerBaseTests {
diff --git a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/test/java/org/openecomp/appc/lockmanager/impl/inmemory/LockManagerInMemoryImplTest.java b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/test/java/org/openecomp/appc/lockmanager/impl/inmemory/LockManagerInMemoryImplTest.java
index dd9b9d80c..8d2dd7516 100644
--- a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/test/java/org/openecomp/appc/lockmanager/impl/inmemory/LockManagerInMemoryImplTest.java
+++ b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/test/java/org/openecomp/appc/lockmanager/impl/inmemory/LockManagerInMemoryImplTest.java
@@ -22,11 +22,11 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.lockmanager.impl.inmemory;
+package org.onap.appc.lockmanager.impl.inmemory;
-import org.openecomp.appc.lockmanager.api.LockManager;
-import org.openecomp.appc.lockmanager.api.LockManagerBaseTests;
-import org.openecomp.appc.lockmanager.impl.inmemory.LockManagerInMemoryImpl;
+import org.onap.appc.lockmanager.api.LockManager;
+import org.onap.appc.lockmanager.api.LockManagerBaseTests;
+import org.onap.appc.lockmanager.impl.inmemory.LockManagerInMemoryImpl;
public class LockManagerInMemoryImplTest extends LockManagerBaseTests {
diff --git a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/test/java/org/openecomp/appc/lockmanager/impl/sql/MySqlLockManagerBaseTests.java b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/test/java/org/openecomp/appc/lockmanager/impl/sql/MySqlLockManagerBaseTests.java
index 2691b6a74..b8cd95b94 100644
--- a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/test/java/org/openecomp/appc/lockmanager/impl/sql/MySqlLockManagerBaseTests.java
+++ b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/test/java/org/openecomp/appc/lockmanager/impl/sql/MySqlLockManagerBaseTests.java
@@ -22,15 +22,15 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.lockmanager.impl.sql;
+package org.onap.appc.lockmanager.impl.sql;
import org.junit.Rule;
import org.junit.rules.TestName;
-import org.openecomp.appc.dao.util.DefaultJdbcConnectionFactory;
-import org.openecomp.appc.lockmanager.api.LockManager;
-import org.openecomp.appc.lockmanager.api.LockManagerBaseTests;
-import org.openecomp.appc.lockmanager.impl.sql.JdbcLockManager;
-import org.openecomp.appc.lockmanager.impl.sql.MySqlConnectionFactory;
+import org.onap.appc.dao.util.DefaultJdbcConnectionFactory;
+import org.onap.appc.lockmanager.api.LockManager;
+import org.onap.appc.lockmanager.api.LockManagerBaseTests;
+import org.onap.appc.lockmanager.impl.sql.JdbcLockManager;
+import org.onap.appc.lockmanager.impl.sql.MySqlConnectionFactory;
import java.sql.Connection;
import java.sql.PreparedStatement;
diff --git a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/test/java/org/openecomp/appc/lockmanager/impl/sql/Synchronizer.java b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/test/java/org/openecomp/appc/lockmanager/impl/sql/Synchronizer.java
index 8697c374c..ae92a4a9d 100644
--- a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/test/java/org/openecomp/appc/lockmanager/impl/sql/Synchronizer.java
+++ b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/test/java/org/openecomp/appc/lockmanager/impl/sql/Synchronizer.java
@@ -22,7 +22,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.lockmanager.impl.sql;
+package org.onap.appc.lockmanager.impl.sql;
public class Synchronizer {
diff --git a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/test/java/org/openecomp/appc/lockmanager/impl/sql/SynchronizerReceiver.java b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/test/java/org/openecomp/appc/lockmanager/impl/sql/SynchronizerReceiver.java
index de6a20cd0..e6caad564 100644
--- a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/test/java/org/openecomp/appc/lockmanager/impl/sql/SynchronizerReceiver.java
+++ b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/test/java/org/openecomp/appc/lockmanager/impl/sql/SynchronizerReceiver.java
@@ -22,7 +22,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.lockmanager.impl.sql;
+package org.onap.appc.lockmanager.impl.sql;
public interface SynchronizerReceiver {
diff --git a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/test/java/org/openecomp/appc/lockmanager/impl/sql/optimistic/MySqlLockManagerMock.java b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/test/java/org/openecomp/appc/lockmanager/impl/sql/optimistic/MySqlLockManagerMock.java
index a2a9a5ffd..f9c072e6c 100644
--- a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/test/java/org/openecomp/appc/lockmanager/impl/sql/optimistic/MySqlLockManagerMock.java
+++ b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/test/java/org/openecomp/appc/lockmanager/impl/sql/optimistic/MySqlLockManagerMock.java
@@ -22,17 +22,17 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.lockmanager.impl.sql.optimistic;
+package org.onap.appc.lockmanager.impl.sql.optimistic;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
-import org.openecomp.appc.lockmanager.impl.sql.Synchronizer;
-import org.openecomp.appc.lockmanager.impl.sql.SynchronizerReceiver;
-import org.openecomp.appc.lockmanager.impl.sql.optimistic.LockRecord;
-import org.openecomp.appc.lockmanager.impl.sql.optimistic.MySqlLockManager;
+import org.onap.appc.lockmanager.impl.sql.Synchronizer;
+import org.onap.appc.lockmanager.impl.sql.SynchronizerReceiver;
+import org.onap.appc.lockmanager.impl.sql.optimistic.LockRecord;
+import org.onap.appc.lockmanager.impl.sql.optimistic.MySqlLockManager;
class MySqlLockManagerMock extends MySqlLockManager implements SynchronizerReceiver {
diff --git a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/test/java/org/openecomp/appc/lockmanager/impl/sql/optimistic/TestMySqlLockManager.java b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/test/java/org/openecomp/appc/lockmanager/impl/sql/optimistic/TestMySqlLockManager.java
index 696c187e7..d652c7523 100644
--- a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/test/java/org/openecomp/appc/lockmanager/impl/sql/optimistic/TestMySqlLockManager.java
+++ b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/test/java/org/openecomp/appc/lockmanager/impl/sql/optimistic/TestMySqlLockManager.java
@@ -22,14 +22,14 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.lockmanager.impl.sql.optimistic;
+package org.onap.appc.lockmanager.impl.sql.optimistic;
import org.junit.Assert;
import org.junit.Test;
-import org.openecomp.appc.lockmanager.api.LockException;
-import org.openecomp.appc.lockmanager.impl.sql.JdbcLockManager;
-import org.openecomp.appc.lockmanager.impl.sql.MySqlLockManagerBaseTests;
-import org.openecomp.appc.lockmanager.impl.sql.Synchronizer;
+import org.onap.appc.lockmanager.api.LockException;
+import org.onap.appc.lockmanager.impl.sql.JdbcLockManager;
+import org.onap.appc.lockmanager.impl.sql.MySqlLockManagerBaseTests;
+import org.onap.appc.lockmanager.impl.sql.Synchronizer;
import java.util.concurrent.*;
diff --git a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/test/java/org/openecomp/appc/lockmanager/impl/sql/pessimistic/MySqlLockManagerMock.java b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/test/java/org/openecomp/appc/lockmanager/impl/sql/pessimistic/MySqlLockManagerMock.java
index 64416f040..a4bbd3406 100644
--- a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/test/java/org/openecomp/appc/lockmanager/impl/sql/pessimistic/MySqlLockManagerMock.java
+++ b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/test/java/org/openecomp/appc/lockmanager/impl/sql/pessimistic/MySqlLockManagerMock.java
@@ -22,7 +22,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.lockmanager.impl.sql.pessimistic;
+package org.onap.appc.lockmanager.impl.sql.pessimistic;
import java.sql.Connection;
import java.sql.SQLException;
@@ -32,11 +32,11 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
-import org.openecomp.appc.lockmanager.api.LockRuntimeException;
-import org.openecomp.appc.lockmanager.impl.sql.Synchronizer;
-import org.openecomp.appc.lockmanager.impl.sql.SynchronizerReceiver;
-import org.openecomp.appc.lockmanager.impl.sql.pessimistic.LockRecord;
-import org.openecomp.appc.lockmanager.impl.sql.pessimistic.MySqlLockManager;
+import org.onap.appc.lockmanager.api.LockRuntimeException;
+import org.onap.appc.lockmanager.impl.sql.Synchronizer;
+import org.onap.appc.lockmanager.impl.sql.SynchronizerReceiver;
+import org.onap.appc.lockmanager.impl.sql.pessimistic.LockRecord;
+import org.onap.appc.lockmanager.impl.sql.pessimistic.MySqlLockManager;
class MySqlLockManagerMock extends MySqlLockManager implements SynchronizerReceiver {
diff --git a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/test/java/org/openecomp/appc/lockmanager/impl/sql/pessimistic/TestMySqlLockManager.java b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/test/java/org/openecomp/appc/lockmanager/impl/sql/pessimistic/TestMySqlLockManager.java
index f1039a451..c54cfc81a 100644
--- a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/test/java/org/openecomp/appc/lockmanager/impl/sql/pessimistic/TestMySqlLockManager.java
+++ b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/src/test/java/org/openecomp/appc/lockmanager/impl/sql/pessimistic/TestMySqlLockManager.java
@@ -22,16 +22,16 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.lockmanager.impl.sql.pessimistic;
+package org.onap.appc.lockmanager.impl.sql.pessimistic;
import org.junit.Assert;
import org.junit.Test;
-import org.openecomp.appc.lockmanager.api.LockException;
-import org.openecomp.appc.lockmanager.api.LockRuntimeException;
-import org.openecomp.appc.lockmanager.impl.sql.JdbcLockManager;
-import org.openecomp.appc.lockmanager.impl.sql.MySqlLockManagerBaseTests;
-import org.openecomp.appc.lockmanager.impl.sql.Synchronizer;
-import org.openecomp.appc.lockmanager.impl.sql.pessimistic.MySqlLockManager;
+import org.onap.appc.lockmanager.api.LockException;
+import org.onap.appc.lockmanager.api.LockRuntimeException;
+import org.onap.appc.lockmanager.impl.sql.JdbcLockManager;
+import org.onap.appc.lockmanager.impl.sql.MySqlLockManagerBaseTests;
+import org.onap.appc.lockmanager.impl.sql.Synchronizer;
+import org.onap.appc.lockmanager.impl.sql.pessimistic.MySqlLockManager;
import java.util.concurrent.*;