diff options
Diffstat (limited to 'appc-dispatcher/appc-dispatcher-common/execution-queue-management-lib')
12 files changed, 34 insertions, 34 deletions
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 { |