diff options
Diffstat (limited to 'appc-dispatcher/appc-dispatcher-common')
86 files changed, 202 insertions, 202 deletions
diff --git a/appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/pom.xml b/appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/pom.xml index 9788241eb..749764bc7 100644 --- a/appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/pom.xml +++ b/appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/pom.xml @@ -1,7 +1,7 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.openecomp.appc</groupId> + <groupId>org.onap.appc</groupId> <artifactId>appc-dispatcher-common</artifactId> <version>1.3.0-SNAPSHOT</version> </parent> @@ -32,7 +32,7 @@ <scope>compile</scope> </dependency> <dependency> - <groupId>org.openecomp.appc</groupId> + <groupId>org.onap.appc</groupId> <artifactId>appc-common</artifactId> <version>${project.version}</version> </dependency> @@ -50,8 +50,8 @@ <configuration> <instructions> <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName> - <Export-Package>org.openecomp.appc.dao.util</Export-Package> - <Import-Package>org.openecomp.appc.configuration,*;resolution:=optional</Import-Package> + <Export-Package>org.onap.appc.dao.util</Export-Package> + <Import-Package>org.onap.appc.configuration,*;resolution:=optional</Import-Package> <Embed-Dependency>mariadb-java-client</Embed-Dependency> <Embed-Transitive>true</Embed-Transitive> </instructions> diff --git a/appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/src/main/java/org/openecomp/appc/dao/util/AppcJdbcConnectionFactory.java b/appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/src/main/java/org/openecomp/appc/dao/util/AppcJdbcConnectionFactory.java index a33b0fe44..e62f03da3 100644 --- a/appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/src/main/java/org/openecomp/appc/dao/util/AppcJdbcConnectionFactory.java +++ b/appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/src/main/java/org/openecomp/appc/dao/util/AppcJdbcConnectionFactory.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.dao.util; +package org.onap.appc.dao.util; import java.sql.Connection; import java.sql.SQLException; diff --git a/appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/src/main/java/org/openecomp/appc/dao/util/DBUtils.java b/appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/src/main/java/org/openecomp/appc/dao/util/DBUtils.java index c4b788057..447dce8fc 100644 --- a/appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/src/main/java/org/openecomp/appc/dao/util/DBUtils.java +++ b/appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/src/main/java/org/openecomp/appc/dao/util/DBUtils.java @@ -22,12 +22,12 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.dao.util; +package org.onap.appc.dao.util; import java.sql.*; -import org.openecomp.appc.configuration.Configuration; -import org.openecomp.appc.configuration.ConfigurationFactory; +import org.onap.appc.configuration.Configuration; +import org.onap.appc.configuration.ConfigurationFactory; @Deprecated public class DBUtils { @@ -44,9 +44,9 @@ public class DBUtils { public static Connection getConnection(String schema) throws SQLException { DriverManager.registerDriver(new org.mariadb.jdbc.Driver()); - String dbURL = configuration.getProperty(String.format("org.openecomp.appc.db.url.%s", schema), ""); - String userName = configuration.getProperty(String.format("org.openecomp.appc.db.user.%s", schema), ""); - String password = configuration.getProperty(String.format("org.openecomp.appc.db.pass.%s", schema), ""); + String dbURL = configuration.getProperty(String.format("org.onap.appc.db.url.%s", schema), ""); + String userName = configuration.getProperty(String.format("org.onap.appc.db.user.%s", schema), ""); + String password = configuration.getProperty(String.format("org.onap.appc.db.pass.%s", schema), ""); return DriverManager.getConnection(dbURL, userName, password); } diff --git a/appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/src/main/java/org/openecomp/appc/dao/util/DefaultJdbcConnectionFactory.java b/appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/src/main/java/org/openecomp/appc/dao/util/DefaultJdbcConnectionFactory.java index 0704014df..88599ac72 100644 --- a/appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/src/main/java/org/openecomp/appc/dao/util/DefaultJdbcConnectionFactory.java +++ b/appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/src/main/java/org/openecomp/appc/dao/util/DefaultJdbcConnectionFactory.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.dao.util; +package org.onap.appc.dao.util; import java.sql.Connection; import java.sql.DriverManager; diff --git a/appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/src/main/java/org/openecomp/appc/dao/util/JdbcConnectionFactory.java b/appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/src/main/java/org/openecomp/appc/dao/util/JdbcConnectionFactory.java index 0bb526515..1a47db3f7 100644 --- a/appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/src/main/java/org/openecomp/appc/dao/util/JdbcConnectionFactory.java +++ b/appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/src/main/java/org/openecomp/appc/dao/util/JdbcConnectionFactory.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.dao.util; +package org.onap.appc.dao.util; import java.sql.Connection; diff --git a/appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/src/main/java/org/openecomp/appc/dao/util/JdbcRuntimeException.java b/appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/src/main/java/org/openecomp/appc/dao/util/JdbcRuntimeException.java index 70bc3c6dd..8e606fe94 100644 --- a/appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/src/main/java/org/openecomp/appc/dao/util/JdbcRuntimeException.java +++ b/appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/src/main/java/org/openecomp/appc/dao/util/JdbcRuntimeException.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.dao.util; +package org.onap.appc.dao.util; public class JdbcRuntimeException extends RuntimeException { diff --git a/appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/src/main/java/org/openecomp/appc/dao/util/Messages.java b/appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/src/main/java/org/openecomp/appc/dao/util/Messages.java index e375d4fa3..6330793b7 100644 --- a/appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/src/main/java/org/openecomp/appc/dao/util/Messages.java +++ b/appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/src/main/java/org/openecomp/appc/dao/util/Messages.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.dao.util; +package org.onap.appc.dao.util; public enum Messages { EXP_JDBC_CONNECT("Error connecting to JDBC URL [%s]."), diff --git a/appc-dispatcher/appc-dispatcher-common/domain-model-lib/pom.xml b/appc-dispatcher/appc-dispatcher-common/domain-model-lib/pom.xml index 1ab18e08f..204e9f2e4 100644 --- a/appc-dispatcher/appc-dispatcher-common/domain-model-lib/pom.xml +++ b/appc-dispatcher/appc-dispatcher-common/domain-model-lib/pom.xml @@ -1,7 +1,7 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.openecomp.appc</groupId> + <groupId>org.onap.appc</groupId> <artifactId>appc-dispatcher-common</artifactId> <version>1.3.0-SNAPSHOT</version> </parent> @@ -24,7 +24,7 @@ <instructions> <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName> <Bundle-Version>${project.version}</Bundle-Version> - <Export-Package>org.openecomp.appc.domainmodel.lcm</Export-Package> + <Export-Package>org.onap.appc.domainmodel.lcm</Export-Package> <Embed-Transitive>true</Embed-Transitive> </instructions> diff --git a/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/ActionIdentifiers.java b/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/ActionIdentifiers.java index 6aa9ef507..bb5b4cdab 100644 --- a/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/ActionIdentifiers.java +++ b/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/ActionIdentifiers.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.domainmodel.lcm; +package org.onap.appc.domainmodel.lcm; public class ActionIdentifiers { diff --git a/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/ActionLevel.java b/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/ActionLevel.java index 67d0fab5c..230812cef 100644 --- a/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/ActionLevel.java +++ b/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/ActionLevel.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.domainmodel.lcm; +package org.onap.appc.domainmodel.lcm; public enum ActionLevel { VNF,VM,VNFC diff --git a/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/CommonHeader.java b/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/CommonHeader.java index faa61a8d0..7c44efecb 100644 --- a/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/CommonHeader.java +++ b/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/CommonHeader.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.domainmodel.lcm; +package org.onap.appc.domainmodel.lcm; import java.time.Instant; diff --git a/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/Flags.java b/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/Flags.java index f500890fc..4102955f0 100644 --- a/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/Flags.java +++ b/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/Flags.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.domainmodel.lcm; +package org.onap.appc.domainmodel.lcm; public class Flags { diff --git a/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/OperationType.java b/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/OperationType.java index becca04b6..b5b017e40 100644 --- a/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/OperationType.java +++ b/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/OperationType.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.domainmodel.lcm; +package org.onap.appc.domainmodel.lcm; public enum OperationType { ReadOnly,BuiltIn,OrchestrationStatusUpdate,OperationStatusUpdate diff --git a/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/RequestContext.java b/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/RequestContext.java index 9a3dab1e3..12ad5ae95 100644 --- a/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/RequestContext.java +++ b/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/RequestContext.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.domainmodel.lcm; +package org.onap.appc.domainmodel.lcm; import java.util.HashMap; import java.util.Map; diff --git a/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/ResponseContext.java b/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/ResponseContext.java index 945b5183b..da3a6be69 100644 --- a/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/ResponseContext.java +++ b/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/ResponseContext.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.domainmodel.lcm; +package org.onap.appc.domainmodel.lcm; import java.util.HashMap; import java.util.Map; diff --git a/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/RuntimeContext.java b/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/RuntimeContext.java index 7b85f808b..2580f1830 100644 --- a/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/RuntimeContext.java +++ b/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/RuntimeContext.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.domainmodel.lcm; +package org.onap.appc.domainmodel.lcm; import java.time.Instant; import java.util.Date; diff --git a/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/Status.java b/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/Status.java index 8da7b41d1..2f8fd1950 100644 --- a/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/Status.java +++ b/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/Status.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.domainmodel.lcm; +package org.onap.appc.domainmodel.lcm; public class Status { diff --git a/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/VNFContext.java b/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/VNFContext.java index fcd332cea..bcc31fcec 100644 --- a/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/VNFContext.java +++ b/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/VNFContext.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.domainmodel.lcm; +package org.onap.appc.domainmodel.lcm; public class VNFContext { diff --git a/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/VNFOperation.java b/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/VNFOperation.java index 316b5acb7..228005d34 100644 --- a/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/VNFOperation.java +++ b/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/VNFOperation.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.domainmodel.lcm; +package org.onap.appc.domainmodel.lcm; public enum VNFOperation { Configure, Test, HealthCheck, Start, Terminate, Restart, Rebuild, Stop, ConfigModify, diff --git a/appc-dispatcher/appc-dispatcher-common/execution-queue-management-lib/pom.xml b/appc-dispatcher/appc-dispatcher-common/execution-queue-management-lib/pom.xml index e15aada06..cc89f3c3f 100644 --- a/appc-dispatcher/appc-dispatcher-common/execution-queue-management-lib/pom.xml +++ b/appc-dispatcher/appc-dispatcher-common/execution-queue-management-lib/pom.xml @@ -1,7 +1,7 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.openecomp.appc</groupId> + <groupId>org.onap.appc</groupId> <artifactId>appc-dispatcher-common</artifactId> <version>1.3.0-SNAPSHOT</version> </parent> @@ -17,7 +17,7 @@ <dependencies> <dependency> - <groupId>org.openecomp.appc</groupId> + <groupId>org.onap.appc</groupId> <artifactId>appc-common</artifactId> <version>${project.version}</version> </dependency> @@ -37,7 +37,7 @@ <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName> <Bundle-Version>${project.version}</Bundle-Version> <Embed-Transitive>true</Embed-Transitive> - <Export-Package>org.openecomp.appc.executionqueue,org.openecomp.appc.executionqueue.impl</Export-Package> + <Export-Package>org.onap.appc.executionqueue,org.onap.appc.executionqueue.impl</Export-Package> <Import-Package> *;resolution:=optional </Import-Package> diff --git a/appc-dispatcher/appc-dispatcher-common/execution-queue-management-lib/src/main/java/org/openecomp/appc/executionqueue/ExecutionQueueService.java b/appc-dispatcher/appc-dispatcher-common/execution-queue-management-lib/src/main/java/org/openecomp/appc/executionqueue/ExecutionQueueService.java index 6bda39dbf..1423962ef 100644 --- a/appc-dispatcher/appc-dispatcher-common/execution-queue-management-lib/src/main/java/org/openecomp/appc/executionqueue/ExecutionQueueService.java +++ b/appc-dispatcher/appc-dispatcher-common/execution-queue-management-lib/src/main/java/org/openecomp/appc/executionqueue/ExecutionQueueService.java @@ -22,11 +22,11 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.executionqueue; +package org.onap.appc.executionqueue; import java.util.concurrent.TimeUnit; -import org.openecomp.appc.exceptions.APPCException; +import org.onap.appc.exceptions.APPCException; public interface ExecutionQueueService<M extends Runnable> { void putMessage(M message) throws APPCException; diff --git a/appc-dispatcher/appc-dispatcher-common/execution-queue-management-lib/src/main/java/org/openecomp/appc/executionqueue/MessageExpirationListener.java b/appc-dispatcher/appc-dispatcher-common/execution-queue-management-lib/src/main/java/org/openecomp/appc/executionqueue/MessageExpirationListener.java index 62fac766f..c1f3592c6 100644 --- a/appc-dispatcher/appc-dispatcher-common/execution-queue-management-lib/src/main/java/org/openecomp/appc/executionqueue/MessageExpirationListener.java +++ b/appc-dispatcher/appc-dispatcher-common/execution-queue-management-lib/src/main/java/org/openecomp/appc/executionqueue/MessageExpirationListener.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.executionqueue; +package org.onap.appc.executionqueue; public interface MessageExpirationListener<M> { void onMessageExpiration(M message); diff --git a/appc-dispatcher/appc-dispatcher-common/execution-queue-management-lib/src/main/java/org/openecomp/appc/executionqueue/helper/Util.java b/appc-dispatcher/appc-dispatcher-common/execution-queue-management-lib/src/main/java/org/openecomp/appc/executionqueue/helper/Util.java index 8670adabd..58279e8a7 100644 --- a/appc-dispatcher/appc-dispatcher-common/execution-queue-management-lib/src/main/java/org/openecomp/appc/executionqueue/helper/Util.java +++ b/appc-dispatcher/appc-dispatcher-common/execution-queue-management-lib/src/main/java/org/openecomp/appc/executionqueue/helper/Util.java @@ -22,13 +22,13 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.executionqueue.helper; +package org.onap.appc.executionqueue.helper; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; -import org.openecomp.appc.configuration.Configuration; -import org.openecomp.appc.configuration.ConfigurationFactory; -import org.openecomp.appc.executionqueue.impl.QueueManager; +import org.onap.appc.configuration.Configuration; +import org.onap.appc.configuration.ConfigurationFactory; +import org.onap.appc.executionqueue.impl.QueueManager; import java.util.concurrent.Executors; import java.util.concurrent.ThreadFactory; diff --git a/appc-dispatcher/appc-dispatcher-common/execution-queue-management-lib/src/main/java/org/openecomp/appc/executionqueue/impl/ExecutionQueueServiceFactory.java b/appc-dispatcher/appc-dispatcher-common/execution-queue-management-lib/src/main/java/org/openecomp/appc/executionqueue/impl/ExecutionQueueServiceFactory.java index 9a0867f3f..f071be6f0 100644 --- a/appc-dispatcher/appc-dispatcher-common/execution-queue-management-lib/src/main/java/org/openecomp/appc/executionqueue/impl/ExecutionQueueServiceFactory.java +++ b/appc-dispatcher/appc-dispatcher-common/execution-queue-management-lib/src/main/java/org/openecomp/appc/executionqueue/impl/ExecutionQueueServiceFactory.java @@ -22,9 +22,9 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.executionqueue.impl; +package org.onap.appc.executionqueue.impl; -import org.openecomp.appc.executionqueue.ExecutionQueueService; +import org.onap.appc.executionqueue.ExecutionQueueService; public class ExecutionQueueServiceFactory { diff --git a/appc-dispatcher/appc-dispatcher-common/execution-queue-management-lib/src/main/java/org/openecomp/appc/executionqueue/impl/ExecutionQueueServiceImpl.java b/appc-dispatcher/appc-dispatcher-common/execution-queue-management-lib/src/main/java/org/openecomp/appc/executionqueue/impl/ExecutionQueueServiceImpl.java index c29078c27..0634a0eb2 100644 --- a/appc-dispatcher/appc-dispatcher-common/execution-queue-management-lib/src/main/java/org/openecomp/appc/executionqueue/impl/ExecutionQueueServiceImpl.java +++ b/appc-dispatcher/appc-dispatcher-common/execution-queue-management-lib/src/main/java/org/openecomp/appc/executionqueue/impl/ExecutionQueueServiceImpl.java @@ -22,14 +22,14 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.executionqueue.impl; +package org.onap.appc.executionqueue.impl; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; -import org.openecomp.appc.exceptions.APPCException; -import org.openecomp.appc.executionqueue.ExecutionQueueService; -import org.openecomp.appc.executionqueue.MessageExpirationListener; -import org.openecomp.appc.executionqueue.impl.object.QueueMessage; +import org.onap.appc.exceptions.APPCException; +import org.onap.appc.executionqueue.ExecutionQueueService; +import org.onap.appc.executionqueue.MessageExpirationListener; +import org.onap.appc.executionqueue.impl.object.QueueMessage; import java.time.Instant; import java.util.concurrent.TimeUnit; diff --git a/appc-dispatcher/appc-dispatcher-common/execution-queue-management-lib/src/main/java/org/openecomp/appc/executionqueue/impl/QueueManager.java b/appc-dispatcher/appc-dispatcher-common/execution-queue-management-lib/src/main/java/org/openecomp/appc/executionqueue/impl/QueueManager.java index 9e1efb644..db0e3d4c5 100644 --- a/appc-dispatcher/appc-dispatcher-common/execution-queue-management-lib/src/main/java/org/openecomp/appc/executionqueue/impl/QueueManager.java +++ b/appc-dispatcher/appc-dispatcher-common/execution-queue-management-lib/src/main/java/org/openecomp/appc/executionqueue/impl/QueueManager.java @@ -22,13 +22,13 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.executionqueue.impl; +package org.onap.appc.executionqueue.impl; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; -import org.openecomp.appc.executionqueue.MessageExpirationListener; -import org.openecomp.appc.executionqueue.helper.Util; -import org.openecomp.appc.executionqueue.impl.object.QueueMessage; +import org.onap.appc.executionqueue.MessageExpirationListener; +import org.onap.appc.executionqueue.helper.Util; +import org.onap.appc.executionqueue.impl.object.QueueMessage; import java.util.List; import java.util.concurrent.ExecutorService; diff --git a/appc-dispatcher/appc-dispatcher-common/execution-queue-management-lib/src/main/java/org/openecomp/appc/executionqueue/impl/object/QueueMessage.java b/appc-dispatcher/appc-dispatcher-common/execution-queue-management-lib/src/main/java/org/openecomp/appc/executionqueue/impl/object/QueueMessage.java index 62d4874d9..bb48da7e5 100644 --- a/appc-dispatcher/appc-dispatcher-common/execution-queue-management-lib/src/main/java/org/openecomp/appc/executionqueue/impl/object/QueueMessage.java +++ b/appc-dispatcher/appc-dispatcher-common/execution-queue-management-lib/src/main/java/org/openecomp/appc/executionqueue/impl/object/QueueMessage.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.executionqueue.impl.object; +package org.onap.appc.executionqueue.impl.object; import java.time.Instant; import java.util.Objects; diff --git a/appc-dispatcher/appc-dispatcher-common/execution-queue-management-lib/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/appc-dispatcher/appc-dispatcher-common/execution-queue-management-lib/src/main/resources/OSGI-INF/blueprint/blueprint.xml index 9f8628458..4f1530ba5 100644 --- a/appc-dispatcher/appc-dispatcher-common/execution-queue-management-lib/src/main/resources/OSGI-INF/blueprint/blueprint.xml +++ b/appc-dispatcher/appc-dispatcher-common/execution-queue-management-lib/src/main/resources/OSGI-INF/blueprint/blueprint.xml @@ -28,20 +28,20 @@ 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="ExecutionQueueUtilBean" class="org.openecomp.appc.executionqueue.helper.Util" scope="singleton" + <bean id="ExecutionQueueUtilBean" class="org.onap.appc.executionqueue.helper.Util" scope="singleton" init-method="init"> </bean> - <bean id="QueueManagerBean" class="org.openecomp.appc.executionqueue.impl.QueueManager" scope="singleton" + <bean id="QueueManagerBean" class="org.onap.appc.executionqueue.impl.QueueManager" scope="singleton" init-method="init" destroy-method="stop"> <property name="executionQueueUtil" ref="ExecutionQueueUtilBean"/> </bean> - <bean id="ExecutionQueueServiceBean" class="org.openecomp.appc.executionqueue.impl.ExecutionQueueServiceImpl" + <bean id="ExecutionQueueServiceBean" class="org.onap.appc.executionqueue.impl.ExecutionQueueServiceImpl" scope="singleton"> <property name="queueManager" ref="QueueManagerBean"/> </bean> - <service id="ExecutionQueueService" interface="org.openecomp.appc.executionqueue.ExecutionQueueService" + <service id="ExecutionQueueService" interface="org.onap.appc.executionqueue.ExecutionQueueService" ref="ExecutionQueueServiceBean"/> </blueprint> diff --git a/appc-dispatcher/appc-dispatcher-common/execution-queue-management-lib/src/test/java/org/openecomp/appc/executionqueue/ExecutionQueueServiceTest.java b/appc-dispatcher/appc-dispatcher-common/execution-queue-management-lib/src/test/java/org/openecomp/appc/executionqueue/ExecutionQueueServiceTest.java index 067b6c3e7..67f480d47 100644 --- a/appc-dispatcher/appc-dispatcher-common/execution-queue-management-lib/src/test/java/org/openecomp/appc/executionqueue/ExecutionQueueServiceTest.java +++ b/appc-dispatcher/appc-dispatcher-common/execution-queue-management-lib/src/test/java/org/openecomp/appc/executionqueue/ExecutionQueueServiceTest.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.executionqueue; +package org.onap.appc.executionqueue; import org.junit.Assert; import org.junit.Before; @@ -31,10 +31,10 @@ import org.junit.runner.RunWith; import org.mockito.InjectMocks; import org.mockito.Mockito; import org.mockito.Spy; -import org.openecomp.appc.exceptions.APPCException; -import org.openecomp.appc.executionqueue.helper.Util; -import org.openecomp.appc.executionqueue.impl.ExecutionQueueServiceImpl; -import org.openecomp.appc.executionqueue.impl.QueueManager; +import org.onap.appc.exceptions.APPCException; +import org.onap.appc.executionqueue.helper.Util; +import org.onap.appc.executionqueue.impl.ExecutionQueueServiceImpl; +import org.onap.appc.executionqueue.impl.QueueManager; import org.powermock.modules.junit4.PowerMockRunner; import static org.mockito.Matchers.any; diff --git a/appc-dispatcher/appc-dispatcher-common/execution-queue-management-lib/src/test/java/org/openecomp/appc/executionqueue/Listener.java b/appc-dispatcher/appc-dispatcher-common/execution-queue-management-lib/src/test/java/org/openecomp/appc/executionqueue/Listener.java index 61c447630..ce26fd92a 100644 --- a/appc-dispatcher/appc-dispatcher-common/execution-queue-management-lib/src/test/java/org/openecomp/appc/executionqueue/Listener.java +++ b/appc-dispatcher/appc-dispatcher-common/execution-queue-management-lib/src/test/java/org/openecomp/appc/executionqueue/Listener.java @@ -22,9 +22,9 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.executionqueue; +package org.onap.appc.executionqueue; -import org.openecomp.appc.executionqueue.MessageExpirationListener; +import org.onap.appc.executionqueue.MessageExpirationListener; public class Listener implements MessageExpirationListener { diff --git a/appc-dispatcher/appc-dispatcher-common/execution-queue-management-lib/src/test/java/org/openecomp/appc/executionqueue/Message.java b/appc-dispatcher/appc-dispatcher-common/execution-queue-management-lib/src/test/java/org/openecomp/appc/executionqueue/Message.java index f7a61b6a8..43bd7077c 100644 --- a/appc-dispatcher/appc-dispatcher-common/execution-queue-management-lib/src/test/java/org/openecomp/appc/executionqueue/Message.java +++ b/appc-dispatcher/appc-dispatcher-common/execution-queue-management-lib/src/test/java/org/openecomp/appc/executionqueue/Message.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.executionqueue; +package org.onap.appc.executionqueue; public class Message implements Runnable { diff --git a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-api/pom.xml b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-api/pom.xml index 934e24f69..d340bc19b 100644 --- a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-api/pom.xml +++ b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-api/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> @@ -18,7 +18,7 @@ <extensions>true</extensions> <configuration> <instructions> - <Export-Package>org.openecomp.appc.lockmanager.api</Export-Package> + <Export-Package>org.onap.appc.lockmanager.api</Export-Package> </instructions> </configuration> </plugin> diff --git a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-api/src/main/java/org/openecomp/appc/lockmanager/api/LockException.java b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-api/src/main/java/org/openecomp/appc/lockmanager/api/LockException.java index 8e39370c6..ab5356325 100644 --- a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-api/src/main/java/org/openecomp/appc/lockmanager/api/LockException.java +++ b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-api/src/main/java/org/openecomp/appc/lockmanager/api/LockException.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.lockmanager.api; +package org.onap.appc.lockmanager.api; public class LockException extends Exception { diff --git a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-api/src/main/java/org/openecomp/appc/lockmanager/api/LockManager.java b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-api/src/main/java/org/openecomp/appc/lockmanager/api/LockManager.java index 8290a8dda..e6a0fb778 100644 --- a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-api/src/main/java/org/openecomp/appc/lockmanager/api/LockManager.java +++ b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-api/src/main/java/org/openecomp/appc/lockmanager/api/LockManager.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.lockmanager.api; +package org.onap.appc.lockmanager.api; /** * Enables locking and unlocking of a resource by id. diff --git a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-api/src/main/java/org/openecomp/appc/lockmanager/api/LockRuntimeException.java b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-api/src/main/java/org/openecomp/appc/lockmanager/api/LockRuntimeException.java index 894ec14c1..99df74628 100644 --- a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-api/src/main/java/org/openecomp/appc/lockmanager/api/LockRuntimeException.java +++ b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-api/src/main/java/org/openecomp/appc/lockmanager/api/LockRuntimeException.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.lockmanager.api; +package org.onap.appc.lockmanager.api; public class LockRuntimeException extends RuntimeException { diff --git a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-features/pom.xml b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-features/pom.xml index 1c52e0685..4f34bbaa9 100644 --- a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-features/pom.xml +++ b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-features/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> <name>lock-manager-features</name> @@ -13,12 +13,12 @@ <dependencies> <dependency> - <groupId>org.openecomp.appc</groupId> + <groupId>org.onap.appc</groupId> <artifactId>lock-manager-api</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.openecomp.appc</groupId> + <groupId>org.onap.appc</groupId> <artifactId>lock-manager-impl</artifactId> <version>${project.version}</version> </dependency> diff --git a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-features/src/main/resources/features.xml b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-features/src/main/resources/features.xml index c9fd3a04a..4408b6954 100644 --- a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-features/src/main/resources/features.xml +++ b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-features/src/main/resources/features.xml @@ -30,11 +30,11 @@ <feature name='lock-manager' description="lock-manager" version='${project.version}'> <!-- appc-common and appc-data-access-lib bundles are flagged as being a dependency --> - <bundle dependency="true">mvn:org.openecomp.appc/appc-common/${project.version}</bundle> - <bundle dependency="true">mvn:org.openecomp.appc/appc-data-access-lib/${project.version}</bundle> + <bundle dependency="true">mvn:org.onap.appc/appc-common/${project.version}</bundle> + <bundle dependency="true">mvn:org.onap.appc/appc-data-access-lib/${project.version}</bundle> - <bundle start-level="80" start="true">mvn:org.openecomp.appc/lock-manager-api/${project.version}</bundle> - <bundle start-level="85" start="true">mvn:org.openecomp.appc/lock-manager-impl/${project.version}</bundle> + <bundle start-level="80" start="true">mvn:org.onap.appc/lock-manager-api/${project.version}</bundle> + <bundle start-level="85" start="true">mvn:org.onap.appc/lock-manager-impl/${project.version}</bundle> </feature> </features> 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.*; diff --git a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/pom.xml b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/pom.xml index 13b0375b9..7c6ae9970 100644 --- a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/pom.xml +++ b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/pom.xml @@ -3,7 +3,7 @@ <modelVersion>4.0.0</modelVersion> <parent> <artifactId>appc-dispatcher-common</artifactId> - <groupId>org.openecomp.appc</groupId> + <groupId>org.onap.appc</groupId> <version>1.3.0-SNAPSHOT</version> </parent> <artifactId>lock-manager-lib</artifactId> diff --git a/appc-dispatcher/appc-dispatcher-common/pom.xml b/appc-dispatcher/appc-dispatcher-common/pom.xml index 69e483bd6..8afae5e4a 100644 --- a/appc-dispatcher/appc-dispatcher-common/pom.xml +++ b/appc-dispatcher/appc-dispatcher-common/pom.xml @@ -2,7 +2,7 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.openecomp.appc</groupId> + <groupId>org.onap.appc</groupId> <artifactId>appc-dispatcher</artifactId> <version>1.3.0-SNAPSHOT</version> </parent> diff --git a/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/pom.xml b/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/pom.xml index a17ffdedc..8f17c3ff2 100644 --- a/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/pom.xml +++ b/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/pom.xml @@ -1,7 +1,7 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.openecomp.appc</groupId> + <groupId>org.onap.appc</groupId> <artifactId>appc-dispatcher-common</artifactId> <version>1.3.0-SNAPSHOT</version> </parent> @@ -24,8 +24,8 @@ <instructions> <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName> <Bundle-Version>${project.version}</Bundle-Version> - <Export-Package>org.openecomp.appc.rankingframework</Export-Package> - <Private-Package>org.openecomp.appc.rankingframework.impl</Private-Package> + <Export-Package>org.onap.appc.rankingframework</Export-Package> + <Private-Package>org.onap.appc.rankingframework.impl</Private-Package> <Embed-Dependency>eelf-core,logback-core,logback-classic;scope=compile|runtime;inline=false</Embed-Dependency> <Embed-Transitive>true</Embed-Transitive> <Import-Package>!groovy.lang,!javax.jms,!org.codehaus.commons.compiler,!org.codehaus.groovy.*,!org.codehaus.janino,!com.ibm.icu.*,!com.sun.faces.*,!org.apache.log,*</Import-Package> diff --git a/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/AbstractRankedAttributesResolverFactory.java b/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/AbstractRankedAttributesResolverFactory.java index bd8413464..99ac8a74e 100644 --- a/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/AbstractRankedAttributesResolverFactory.java +++ b/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/AbstractRankedAttributesResolverFactory.java @@ -22,9 +22,9 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.rankingframework; +package org.onap.appc.rankingframework; -import org.openecomp.appc.rankingframework.impl.DefaultRankedAttributesTreeFactory; +import org.onap.appc.rankingframework.impl.DefaultRankedAttributesTreeFactory; public abstract class AbstractRankedAttributesResolverFactory implements RankedAttributesResolverFactory { diff --git a/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/ConfigurationEntry.java b/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/ConfigurationEntry.java index 163c355b4..66c4ce7da 100644 --- a/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/ConfigurationEntry.java +++ b/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/ConfigurationEntry.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.rankingframework; +package org.onap.appc.rankingframework; public interface ConfigurationEntry<R> { Object getAttributeValue(String name); diff --git a/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/ConfigurationSet.java b/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/ConfigurationSet.java index af7698cf6..461d197e7 100644 --- a/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/ConfigurationSet.java +++ b/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/ConfigurationSet.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.rankingframework; +package org.onap.appc.rankingframework; import java.util.Collection; diff --git a/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/RankedAttributesContext.java b/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/RankedAttributesContext.java index ee2efa887..09e749852 100644 --- a/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/RankedAttributesContext.java +++ b/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/RankedAttributesContext.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.rankingframework; +package org.onap.appc.rankingframework; public interface RankedAttributesContext { Object getAttributeValue(String name); diff --git a/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/RankedAttributesResolver.java b/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/RankedAttributesResolver.java index 077208cf1..bd9da0911 100644 --- a/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/RankedAttributesResolver.java +++ b/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/RankedAttributesResolver.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.rankingframework; +package org.onap.appc.rankingframework; public interface RankedAttributesResolver<R> { R resolve(RankedAttributesContext context); diff --git a/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/RankedAttributesResolverFactory.java b/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/RankedAttributesResolverFactory.java index 9461ded08..4f5a85299 100644 --- a/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/RankedAttributesResolverFactory.java +++ b/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/RankedAttributesResolverFactory.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.rankingframework; +package org.onap.appc.rankingframework; public interface RankedAttributesResolverFactory { <R> RankedAttributesResolver<R> create(ConfigurationSet<R> config); diff --git a/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/impl/BacktraceStrategy.java b/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/impl/BacktraceStrategy.java index e6d35ac7f..6523fef65 100644 --- a/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/impl/BacktraceStrategy.java +++ b/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/impl/BacktraceStrategy.java @@ -22,13 +22,13 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.rankingframework.impl; +package org.onap.appc.rankingframework.impl; import java.util.HashSet; import java.util.List; import java.util.Set; -import org.openecomp.appc.rankingframework.RankedAttributesContext; +import org.onap.appc.rankingframework.RankedAttributesContext; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; diff --git a/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/impl/CompositeNode.java b/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/impl/CompositeNode.java index 53781cc67..8d15c5632 100644 --- a/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/impl/CompositeNode.java +++ b/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/impl/CompositeNode.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.rankingframework.impl; +package org.onap.appc.rankingframework.impl; import java.util.Map; diff --git a/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/impl/Constants.java b/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/impl/Constants.java index ac7be0106..2e4ffd8e1 100644 --- a/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/impl/Constants.java +++ b/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/impl/Constants.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.rankingframework.impl; +package org.onap.appc.rankingframework.impl; class Constants { diff --git a/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/impl/DefaultRankedAttributesTreeFactory.java b/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/impl/DefaultRankedAttributesTreeFactory.java index fa33d6e63..4d59735b5 100644 --- a/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/impl/DefaultRankedAttributesTreeFactory.java +++ b/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/impl/DefaultRankedAttributesTreeFactory.java @@ -22,16 +22,16 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.rankingframework.impl; +package org.onap.appc.rankingframework.impl; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.List; -import org.openecomp.appc.rankingframework.ConfigurationSet; -import org.openecomp.appc.rankingframework.RankedAttributesResolver; -import org.openecomp.appc.rankingframework.RankedAttributesResolverFactory; +import org.onap.appc.rankingframework.ConfigurationSet; +import org.onap.appc.rankingframework.RankedAttributesResolver; +import org.onap.appc.rankingframework.RankedAttributesResolverFactory; public final class DefaultRankedAttributesTreeFactory implements RankedAttributesResolverFactory { diff --git a/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/impl/LeafNode.java b/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/impl/LeafNode.java index 61bc61d5a..c6bb97378 100644 --- a/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/impl/LeafNode.java +++ b/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/impl/LeafNode.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.rankingframework.impl; +package org.onap.appc.rankingframework.impl; class LeafNode<R> extends NodeBase<R> { diff --git a/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/impl/Node.java b/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/impl/Node.java index 9c9b76b5b..940e50972 100644 --- a/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/impl/Node.java +++ b/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/impl/Node.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.rankingframework.impl; +package org.onap.appc.rankingframework.impl; interface Node<R> { enum Type { diff --git a/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/impl/NodeBase.java b/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/impl/NodeBase.java index 996c29e5e..1075cca50 100644 --- a/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/impl/NodeBase.java +++ b/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/impl/NodeBase.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.rankingframework.impl; +package org.onap.appc.rankingframework.impl; import java.util.UUID; diff --git a/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/impl/RankedAttributesTree.java b/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/impl/RankedAttributesTree.java index b90ace3ca..f3e3191ec 100644 --- a/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/impl/RankedAttributesTree.java +++ b/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/impl/RankedAttributesTree.java @@ -22,12 +22,12 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.rankingframework.impl; +package org.onap.appc.rankingframework.impl; import java.util.List; -import org.openecomp.appc.rankingframework.RankedAttributesContext; -import org.openecomp.appc.rankingframework.RankedAttributesResolver; +import org.onap.appc.rankingframework.RankedAttributesContext; +import org.onap.appc.rankingframework.RankedAttributesResolver; class RankedAttributesTree<R> implements RankedAttributesResolver<R> { diff --git a/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/impl/RankedAttributesTreeBuilder.java b/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/impl/RankedAttributesTreeBuilder.java index 0c9d3bd03..2a7cfbfe0 100644 --- a/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/impl/RankedAttributesTreeBuilder.java +++ b/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/impl/RankedAttributesTreeBuilder.java @@ -22,12 +22,12 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.rankingframework.impl; +package org.onap.appc.rankingframework.impl; import java.util.HashMap; -import org.openecomp.appc.rankingframework.ConfigurationEntry; -import org.openecomp.appc.rankingframework.ConfigurationSet; +import org.onap.appc.rankingframework.ConfigurationEntry; +import org.onap.appc.rankingframework.ConfigurationSet; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; diff --git a/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/impl/Strategy.java b/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/impl/Strategy.java index d2fc1b964..36f898163 100644 --- a/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/impl/Strategy.java +++ b/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/impl/Strategy.java @@ -22,11 +22,11 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.rankingframework.impl; +package org.onap.appc.rankingframework.impl; import java.util.List; -import org.openecomp.appc.rankingframework.RankedAttributesContext; +import org.onap.appc.rankingframework.RankedAttributesContext; interface Strategy { <R> R resolve(CompositeNode<R> root, List<String> rankedNames, RankedAttributesContext context); diff --git a/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/impl/Utils.java b/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/impl/Utils.java index 22da46add..fb18377f9 100644 --- a/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/impl/Utils.java +++ b/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/main/java/org/openecomp/appc/rankingframework/impl/Utils.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.rankingframework.impl; +package org.onap.appc.rankingframework.impl; class Utils { diff --git a/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/test/java/org/openecomp/appc/rankingframework/TestRankingFramework.java b/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/test/java/org/openecomp/appc/rankingframework/TestRankingFramework.java index 48a7753f9..99376923f 100644 --- a/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/test/java/org/openecomp/appc/rankingframework/TestRankingFramework.java +++ b/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/test/java/org/openecomp/appc/rankingframework/TestRankingFramework.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.rankingframework; +package org.onap.appc.rankingframework; import java.util.Arrays; import java.util.Collection; @@ -32,11 +32,11 @@ import java.util.Map; import org.junit.Assert; import org.junit.Test; -import org.openecomp.appc.rankingframework.AbstractRankedAttributesResolverFactory; -import org.openecomp.appc.rankingframework.ConfigurationEntry; -import org.openecomp.appc.rankingframework.ConfigurationSet; -import org.openecomp.appc.rankingframework.RankedAttributesContext; -import org.openecomp.appc.rankingframework.RankedAttributesResolver; +import org.onap.appc.rankingframework.AbstractRankedAttributesResolverFactory; +import org.onap.appc.rankingframework.ConfigurationEntry; +import org.onap.appc.rankingframework.ConfigurationSet; +import org.onap.appc.rankingframework.RankedAttributesContext; +import org.onap.appc.rankingframework.RankedAttributesResolver; public class TestRankingFramework { diff --git a/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/test/resources/logback.xml b/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/test/resources/logback.xml index 36b985cec..5733ce02c 100644 --- a/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/test/resources/logback.xml +++ b/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/src/test/resources/logback.xml @@ -39,7 +39,7 @@ </encoder> </appender> - <logger name="org.openecomp.appc" level="DEBUG" additivity="false"> + <logger name="org.onap.appc" level="DEBUG" additivity="false"> <appender-ref ref="FILE" /> </logger> diff --git a/appc-dispatcher/appc-dispatcher-common/transaction-recorder/pom.xml b/appc-dispatcher/appc-dispatcher-common/transaction-recorder/pom.xml index 857a9f1a2..3e9a24bfa 100644 --- a/appc-dispatcher/appc-dispatcher-common/transaction-recorder/pom.xml +++ b/appc-dispatcher/appc-dispatcher-common/transaction-recorder/pom.xml @@ -2,7 +2,7 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <parent> <artifactId>appc-dispatcher-common</artifactId> - <groupId>org.openecomp.appc</groupId> + <groupId>org.onap.appc</groupId> <version>1.3.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -13,12 +13,12 @@ <name>transaction-recorder</name> <dependencies> <dependency> - <groupId>org.openecomp.appc</groupId> + <groupId>org.onap.appc</groupId> <artifactId>appc-common</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.openecomp.appc</groupId> + <groupId>org.onap.appc</groupId> <artifactId>appc-data-access-lib</artifactId> <version>${project.version}</version> </dependency> @@ -39,9 +39,9 @@ <Bundle-Version>${project.version}</Bundle-Version> <Embed-Dependency>appc-common,eelf-core,logback-core,logback-classic,appc-data-access-lib;scope=compile|runtime;inline=false</Embed-Dependency> <Embed-Transitive>true</Embed-Transitive> - <Export-Service>org.openecomp.appc.transactionrecorder.TransactionRecorder</Export-Service> + <Export-Service>org.onap.appc.transactionrecorder.TransactionRecorder</Export-Service> <Import-Package>!javax.*,!groovy.lang,!org.apache.log,!org.apache.log4j.*,!org.codehaus.jackson.*,!org.codehaus.jackson.map.*,!org.codehaus.commons.compiler,!org.codehaus.groovy.*,!org.apache.commons.lang3,!org.codehaus.janino,!org.jasypt.*,!com.ibm.icu.*,!com.sun.faces.*,*;resolution:=optional</Import-Package> - <Export-Package>org.openecomp.appc.transactionrecorder,org.openecomp.appc.transactionrecorder.objects</Export-Package> + <Export-Package>org.onap.appc.transactionrecorder,org.onap.appc.transactionrecorder.objects</Export-Package> </instructions> </configuration> </plugin> diff --git a/appc-dispatcher/appc-dispatcher-common/transaction-recorder/src/main/java/org/openecomp/appc/transactionrecorder/TransactionRecorder.java b/appc-dispatcher/appc-dispatcher-common/transaction-recorder/src/main/java/org/openecomp/appc/transactionrecorder/TransactionRecorder.java index d50cce8db..8f3c51129 100644 --- a/appc-dispatcher/appc-dispatcher-common/transaction-recorder/src/main/java/org/openecomp/appc/transactionrecorder/TransactionRecorder.java +++ b/appc-dispatcher/appc-dispatcher-common/transaction-recorder/src/main/java/org/openecomp/appc/transactionrecorder/TransactionRecorder.java @@ -22,10 +22,10 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.transactionrecorder; +package org.onap.appc.transactionrecorder; -import org.openecomp.appc.transactionrecorder.objects.TransactionRecord; +import org.onap.appc.transactionrecorder.objects.TransactionRecord; public interface TransactionRecorder { diff --git a/appc-dispatcher/appc-dispatcher-common/transaction-recorder/src/main/java/org/openecomp/appc/transactionrecorder/impl/TransactionRecorderImpl.java b/appc-dispatcher/appc-dispatcher-common/transaction-recorder/src/main/java/org/openecomp/appc/transactionrecorder/impl/TransactionRecorderImpl.java index 1601177c9..89e0d9281 100644 --- a/appc-dispatcher/appc-dispatcher-common/transaction-recorder/src/main/java/org/openecomp/appc/transactionrecorder/impl/TransactionRecorderImpl.java +++ b/appc-dispatcher/appc-dispatcher-common/transaction-recorder/src/main/java/org/openecomp/appc/transactionrecorder/impl/TransactionRecorderImpl.java @@ -22,11 +22,11 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.transactionrecorder.impl; +package org.onap.appc.transactionrecorder.impl; -import org.openecomp.appc.dao.util.DBUtils; -import org.openecomp.appc.transactionrecorder.TransactionRecorder; -import org.openecomp.appc.transactionrecorder.objects.TransactionRecord; +import org.onap.appc.dao.util.DBUtils; +import org.onap.appc.transactionrecorder.TransactionRecorder; +import org.onap.appc.transactionrecorder.objects.TransactionRecord; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/appc-dispatcher/appc-dispatcher-common/transaction-recorder/src/main/java/org/openecomp/appc/transactionrecorder/objects/TransactionRecord.java b/appc-dispatcher/appc-dispatcher-common/transaction-recorder/src/main/java/org/openecomp/appc/transactionrecorder/objects/TransactionRecord.java index 8e45d82f8..ba3af9985 100644 --- a/appc-dispatcher/appc-dispatcher-common/transaction-recorder/src/main/java/org/openecomp/appc/transactionrecorder/objects/TransactionRecord.java +++ b/appc-dispatcher/appc-dispatcher-common/transaction-recorder/src/main/java/org/openecomp/appc/transactionrecorder/objects/TransactionRecord.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.transactionrecorder.objects; +package org.onap.appc.transactionrecorder.objects; import java.time.Instant; diff --git a/appc-dispatcher/appc-dispatcher-common/transaction-recorder/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/appc-dispatcher/appc-dispatcher-common/transaction-recorder/src/main/resources/OSGI-INF/blueprint/blueprint.xml index d157ffa57..ba8d9f8a0 100644 --- a/appc-dispatcher/appc-dispatcher-common/transaction-recorder/src/main/resources/OSGI-INF/blueprint/blueprint.xml +++ b/appc-dispatcher/appc-dispatcher-common/transaction-recorder/src/main/resources/OSGI-INF/blueprint/blueprint.xml @@ -29,6 +29,6 @@ <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0" 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="transactionRecorderBean" class="org.openecomp.appc.transactionrecorder.impl.TransactionRecorderImpl" scope="singleton" ></bean> - <service id="transactionRecorderService" interface="org.openecomp.appc.transactionrecorder.TransactionRecorder" ref="transactionRecorderBean"/> + <bean id="transactionRecorderBean" class="org.onap.appc.transactionrecorder.impl.TransactionRecorderImpl" scope="singleton" ></bean> + <service id="transactionRecorderService" interface="org.onap.appc.transactionrecorder.TransactionRecorder" ref="transactionRecorderBean"/> </blueprint> |