From 0756759f39e125b02d63b4e93de83b3c6b13beea Mon Sep 17 00:00:00 2001 From: Patrick Brady Date: Wed, 13 Dec 2017 11:09:30 -0800 Subject: First part of onap rename This is the first commit of the rename. This commit changes refereces to org.openecomp.appc > org.onap.appc that occur within files. The package folder structure is not changed in this commit. Change-Id: Ic95d749eb99d8a6f4f2b9ee9b06eb41c5cfa7e1c Signed-off-by: Patrick Brady Issue-ID: APPC-13 --- .../appc-command-executor-api/pom.xml | 10 +-- .../openecomp/appc/executor/CommandExecutor.java | 6 +- .../appc/executor/UnstableVNFException.java | 2 +- .../openecomp/appc/executor/conv/Converter.java | 4 +- .../appc/executor/objects/CommandResponse.java | 4 +- .../appc/executor/objects/LCMCommandStatus.java | 6 +- .../openecomp/appc/executor/objects/Params.java | 2 +- .../executor/objects/UniqueRequestIdentifier.java | 2 +- .../appc-command-executor-core/pom.xml | 30 ++++---- .../appc/executor/impl/CommandExecutorImpl.java | 10 +-- .../openecomp/appc/executor/impl/CommandTask.java | 22 +++--- .../appc/executor/impl/CommandTaskFactory.java | 14 ++-- .../appc/executor/impl/CommonMethods.java | 2 +- .../appc/executor/impl/ExpiredMessageHandler.java | 10 +-- .../appc/executor/impl/LCMCommandTask.java | 36 ++++----- .../appc/executor/impl/LCMReadonlyCommandTask.java | 20 ++--- .../resources/OSGI-INF/blueprint/blueprint.xml | 18 ++--- .../org/openecomp/appc/default.properties | 4 +- .../appc/executor/CommandExecutionTaskTest.java | 38 ++++----- .../appc/executor/TestCommandExecutor.java | 28 +++---- .../org/openecomp/appc/default.properties | 16 ++-- .../appc-command-executor-features/pom.xml | 6 +- .../src/main/resources/features.xml | 6 +- .../appc-command-executor-installer/pom.xml | 10 +-- appc-dispatcher/appc-command-executor/pom.xml | 2 +- .../appc-data-access-lib/pom.xml | 8 +- .../appc/dao/util/AppcJdbcConnectionFactory.java | 2 +- .../java/org/openecomp/appc/dao/util/DBUtils.java | 12 +-- .../dao/util/DefaultJdbcConnectionFactory.java | 2 +- .../appc/dao/util/JdbcConnectionFactory.java | 2 +- .../appc/dao/util/JdbcRuntimeException.java | 2 +- .../java/org/openecomp/appc/dao/util/Messages.java | 2 +- .../domain-model-lib/pom.xml | 4 +- .../appc/domainmodel/lcm/ActionIdentifiers.java | 2 +- .../appc/domainmodel/lcm/ActionLevel.java | 2 +- .../appc/domainmodel/lcm/CommonHeader.java | 2 +- .../org/openecomp/appc/domainmodel/lcm/Flags.java | 2 +- .../appc/domainmodel/lcm/OperationType.java | 2 +- .../appc/domainmodel/lcm/RequestContext.java | 2 +- .../appc/domainmodel/lcm/ResponseContext.java | 2 +- .../appc/domainmodel/lcm/RuntimeContext.java | 2 +- .../org/openecomp/appc/domainmodel/lcm/Status.java | 2 +- .../openecomp/appc/domainmodel/lcm/VNFContext.java | 2 +- .../appc/domainmodel/lcm/VNFOperation.java | 2 +- .../execution-queue-management-lib/pom.xml | 6 +- .../appc/executionqueue/ExecutionQueueService.java | 4 +- .../executionqueue/MessageExpirationListener.java | 2 +- .../openecomp/appc/executionqueue/helper/Util.java | 8 +- .../impl/ExecutionQueueServiceFactory.java | 4 +- .../impl/ExecutionQueueServiceImpl.java | 10 +-- .../appc/executionqueue/impl/QueueManager.java | 8 +- .../executionqueue/impl/object/QueueMessage.java | 2 +- .../resources/OSGI-INF/blueprint/blueprint.xml | 8 +- .../executionqueue/ExecutionQueueServiceTest.java | 10 +-- .../openecomp/appc/executionqueue/Listener.java | 4 +- .../org/openecomp/appc/executionqueue/Message.java | 2 +- .../lock-manager-lib/lock-manager-api/pom.xml | 4 +- .../appc/lockmanager/api/LockException.java | 2 +- .../appc/lockmanager/api/LockManager.java | 2 +- .../appc/lockmanager/api/LockRuntimeException.java | 2 +- .../lock-manager-lib/lock-manager-features/pom.xml | 6 +- .../src/main/resources/features.xml | 8 +- .../lock-manager-lib/lock-manager-impl/pom.xml | 14 ++-- .../impl/inmemory/LockManagerInMemoryImpl.java | 6 +- .../appc/lockmanager/impl/inmemory/LockValue.java | 2 +- .../appc/lockmanager/impl/sql/JdbcLockManager.java | 6 +- .../appc/lockmanager/impl/sql/Messages.java | 2 +- .../impl/sql/MySqlConnectionFactory.java | 4 +- .../impl/sql/optimistic/LockRecord.java | 2 +- .../impl/sql/optimistic/MySqlLockManager.java | 2 +- .../impl/sql/optimistic/SqlLockManager.java | 10 +-- .../impl/sql/pessimistic/LockRecord.java | 2 +- .../impl/sql/pessimistic/MySqlLockManager.java | 4 +- .../impl/sql/pessimistic/SqlLockManager.java | 10 +-- .../resources/OSGI-INF/blueprint/blueprint.xml | 10 +-- .../appc/lockmanager/api/LockManagerBaseTests.java | 6 +- .../impl/inmemory/LockManagerInMemoryImplTest.java | 8 +- .../impl/sql/MySqlLockManagerBaseTests.java | 12 +-- .../appc/lockmanager/impl/sql/Synchronizer.java | 2 +- .../lockmanager/impl/sql/SynchronizerReceiver.java | 2 +- .../impl/sql/optimistic/MySqlLockManagerMock.java | 10 +-- .../impl/sql/optimistic/TestMySqlLockManager.java | 10 +-- .../impl/sql/pessimistic/MySqlLockManagerMock.java | 12 +-- .../impl/sql/pessimistic/TestMySqlLockManager.java | 14 ++-- .../lock-manager-lib/pom.xml | 2 +- appc-dispatcher/appc-dispatcher-common/pom.xml | 2 +- .../ranking-framework-lib/pom.xml | 6 +- .../AbstractRankedAttributesResolverFactory.java | 4 +- .../appc/rankingframework/ConfigurationEntry.java | 2 +- .../appc/rankingframework/ConfigurationSet.java | 2 +- .../rankingframework/RankedAttributesContext.java | 2 +- .../rankingframework/RankedAttributesResolver.java | 2 +- .../RankedAttributesResolverFactory.java | 2 +- .../rankingframework/impl/BacktraceStrategy.java | 4 +- .../appc/rankingframework/impl/CompositeNode.java | 2 +- .../appc/rankingframework/impl/Constants.java | 2 +- .../impl/DefaultRankedAttributesTreeFactory.java | 8 +- .../appc/rankingframework/impl/LeafNode.java | 2 +- .../openecomp/appc/rankingframework/impl/Node.java | 2 +- .../appc/rankingframework/impl/NodeBase.java | 2 +- .../impl/RankedAttributesTree.java | 6 +- .../impl/RankedAttributesTreeBuilder.java | 6 +- .../appc/rankingframework/impl/Strategy.java | 4 +- .../appc/rankingframework/impl/Utils.java | 2 +- .../rankingframework/TestRankingFramework.java | 12 +-- .../src/test/resources/logback.xml | 2 +- .../transaction-recorder/pom.xml | 10 +-- .../transactionrecorder/TransactionRecorder.java | 4 +- .../impl/TransactionRecorderImpl.java | 8 +- .../objects/TransactionRecord.java | 2 +- .../resources/OSGI-INF/blueprint/blueprint.xml | 4 +- appc-dispatcher/appc-dispatcher-features/pom.xml | 2 +- appc-dispatcher/appc-dispatcher-installer/pom.xml | 32 ++++---- .../appc-license-manager-api/pom.xml | 4 +- .../java/org/openecomp/appc/licmgr/Constants.java | 14 ++-- .../appc/licmgr/LicenseDataAccessService.java | 4 +- .../org/openecomp/appc/licmgr/LicenseManager.java | 6 +- .../appc/licmgr/exception/DataAccessException.java | 2 +- .../appc/licmgr/objects/LicenseModel.java | 2 +- .../appc-license-manager-core/pom.xml | 10 +-- .../licmgr/impl/LicenseDataAccessServiceImpl.java | 10 +-- .../appc/licmgr/impl/LicenseManagerImpl.java | 12 +-- .../resources/OSGI-INF/blueprint/blueprint.xml | 6 +- .../org/openecomp/appc/default.properties | 4 +- .../appc/licmgr/LicenseManagerImplTest.java | 2 +- .../openecomp/appc/licmgr/LicenseManagerMock.java | 6 +- .../appc/licmgr/LicenseManagerPluginImplTest.java | 2 +- .../openecomp/appc/licmgr/LicenseServiceMock.java | 4 +- .../appc/licmgr/TestVfLicenseModelConvert.java | 4 +- .../appc-license-manager-features/pom.xml | 6 +- .../src/main/resources/features.xml | 4 +- appc-dispatcher/appc-license-manager/pom.xml | 2 +- .../appc-request-handler-api/pom.xml | 12 +-- .../appc/message/RequestHandlerMessages.java | 2 +- .../appc/requesthandler/LCMStateManager.java | 2 +- .../appc/requesthandler/RequestHandler.java | 10 +-- .../objects/RequestHandlerInput.java | 4 +- .../objects/RequestHandlerOutput.java | 4 +- .../appc-request-handler-core/pom.xml | 44 +++++------ .../appc/messageadapter/MessageAdapter.java | 6 +- .../messageadapter/impl/MessageAdapterImpl.java | 22 +++--- .../appc/requesthandler/constant/Constants.java | 2 +- .../appc/requesthandler/conv/Converter.java | 36 ++++----- .../exceptions/DGWorkflowNotFoundException.java | 2 +- .../exceptions/DuplicateRequestException.java | 2 +- .../exceptions/InvalidInputException.java | 2 +- .../exceptions/LCMOperationsDisabledException.java | 2 +- .../exceptions/MissingVNFDataInAAIException.java | 2 +- .../exceptions/RequestExpiredException.java | 2 +- .../exceptions/VNFNotFoundException.java | 2 +- .../exceptions/WorkflowNotFoundException.java | 2 +- .../requesthandler/helper/RequestRegistry.java | 4 +- .../requesthandler/helper/RequestValidator.java | 26 +++---- .../impl/AbstractRequestHandlerImpl.java | 74 +++++++++--------- .../impl/AbstractRequestValidatorImpl.java | 48 ++++++------ .../requesthandler/impl/DmaapOutgoingMessage.java | 4 +- .../requesthandler/impl/LCMStateManagerImpl.java | 4 +- .../requesthandler/impl/RequestHandlerImpl.java | 32 ++++---- .../requesthandler/impl/RequestValidatorImpl.java | 28 +++---- .../requesthandler/impl/VMRequestHandlerImpl.java | 6 +- .../impl/VMRequestValidatorImpl.java | 16 ++-- .../workingstatemanager/WorkingStateManager.java | 6 +- .../impl/JdbcWorkingStateManager.java | 6 +- .../impl/RequestHandlerMessages.java | 2 +- .../impl/WorkingStateManagerImpl.java | 16 ++-- .../objects/VNFWorkingState.java | 2 +- .../objects/VnfWorkingStateDto.java | 2 +- .../resources/OSGI-INF/blueprint/blueprint.xml | 30 ++++---- .../org/openecomp/appc/default.properties | 12 +-- .../requesthandler/LCMStateManagerImplTest.java | 4 +- .../appc/requesthandler/RequestValidatorTest.java | 42 +++++----- .../appc/requesthandler/TestConverter.java | 8 +- .../appc/requesthandler/TestRequestHandler.java | 90 +++++++++++----------- .../TestWorkingStateManager.java | 12 +-- .../org/openecomp/appc/default.properties | 24 +++--- .../appc-request-handler-features/pom.xml | 6 +- .../src/main/resources/features.xml | 12 +-- appc-dispatcher/appc-request-handler/pom.xml | 2 +- .../appc-workflow-management-api/pom.xml | 8 +- .../openecomp/appc/workflow/WorkFlowManager.java | 8 +- .../workflow/objects/WorkflowExistsOutput.java | 2 +- .../appc/workflow/objects/WorkflowRequest.java | 8 +- .../appc/workflow/objects/WorkflowResponse.java | 4 +- .../appc-workflow-management-core/pom.xml | 16 ++-- .../openecomp/appc/common/constant/Constants.java | 20 ++--- .../appc/workflow/impl/WorkFlowManagerImpl.java | 44 +++++------ .../openecomp/appc/workflow/impl/WorkflowKey.java | 2 +- .../appc/workflow/impl/WorkflowResolver.java | 6 +- .../workflow/impl/WorkflowResolverDataReader.java | 12 +-- .../resources/OSGI-INF/blueprint/blueprint.xml | 4 +- .../org/openecomp/appc/default.properties | 6 +- .../appc/workflow/TestWorkFlowManager.java | 8 +- .../org/openecomp/appc/default.properties | 16 ++-- .../appc-workflow-management-features/pom.xml | 6 +- .../src/main/resources/features.xml | 8 +- appc-dispatcher/appc-workflow-management/pom.xml | 2 +- appc-dispatcher/pom.xml | 2 +- 197 files changed, 855 insertions(+), 855 deletions(-) (limited to 'appc-dispatcher') diff --git a/appc-dispatcher/appc-command-executor/appc-command-executor-api/pom.xml b/appc-dispatcher/appc-command-executor/appc-command-executor-api/pom.xml index d63a10a4d..d58c7bd6c 100644 --- a/appc-dispatcher/appc-command-executor/appc-command-executor-api/pom.xml +++ b/appc-dispatcher/appc-command-executor/appc-command-executor-api/pom.xml @@ -1,7 +1,7 @@ 4.0.0 - org.openecomp.appc + org.onap.appc appc-command-executor 1.3.0-SNAPSHOT @@ -17,17 +17,17 @@ - org.openecomp.appc + org.onap.appc execution-queue-management-lib ${project.version} - org.openecomp.appc + org.onap.appc domain-model-lib ${project.version} - org.openecomp.appc + org.onap.appc appc-common ${project.version} compile @@ -48,7 +48,7 @@ ${project.artifactId} ${project.version} - org.openecomp.appc.executor,org.openecomp.appc.executor.objects,org.openecomp.appc.executor.conv,org.openecomp.appc.executor.helper + org.onap.appc.executor,org.onap.appc.executor.objects,org.onap.appc.executor.conv,org.onap.appc.executor.helper javax.json;scope=compile|runtime;inline=false diff --git a/appc-dispatcher/appc-command-executor/appc-command-executor-api/src/main/java/org/openecomp/appc/executor/CommandExecutor.java b/appc-dispatcher/appc-command-executor/appc-command-executor-api/src/main/java/org/openecomp/appc/executor/CommandExecutor.java index b348ffde8..d6935b83a 100644 --- a/appc-dispatcher/appc-command-executor/appc-command-executor-api/src/main/java/org/openecomp/appc/executor/CommandExecutor.java +++ b/appc-dispatcher/appc-command-executor/appc-command-executor-api/src/main/java/org/openecomp/appc/executor/CommandExecutor.java @@ -25,11 +25,11 @@ /** * */ -package org.openecomp.appc.executor; +package org.onap.appc.executor; -import org.openecomp.appc.domainmodel.lcm.RuntimeContext; -import org.openecomp.appc.exceptions.APPCException; +import org.onap.appc.domainmodel.lcm.RuntimeContext; +import org.onap.appc.exceptions.APPCException; diff --git a/appc-dispatcher/appc-command-executor/appc-command-executor-api/src/main/java/org/openecomp/appc/executor/UnstableVNFException.java b/appc-dispatcher/appc-command-executor/appc-command-executor-api/src/main/java/org/openecomp/appc/executor/UnstableVNFException.java index 7c6f65f75..634bd0f68 100644 --- a/appc-dispatcher/appc-command-executor/appc-command-executor-api/src/main/java/org/openecomp/appc/executor/UnstableVNFException.java +++ b/appc-dispatcher/appc-command-executor/appc-command-executor-api/src/main/java/org/openecomp/appc/executor/UnstableVNFException.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.executor; +package org.onap.appc.executor; public class UnstableVNFException extends Exception{ diff --git a/appc-dispatcher/appc-command-executor/appc-command-executor-api/src/main/java/org/openecomp/appc/executor/conv/Converter.java b/appc-dispatcher/appc-command-executor/appc-command-executor-api/src/main/java/org/openecomp/appc/executor/conv/Converter.java index 0373cff48..3cfc7ece7 100644 --- a/appc-dispatcher/appc-command-executor/appc-command-executor-api/src/main/java/org/openecomp/appc/executor/conv/Converter.java +++ b/appc-dispatcher/appc-command-executor/appc-command-executor-api/src/main/java/org/openecomp/appc/executor/conv/Converter.java @@ -22,11 +22,11 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.executor.conv; +package org.onap.appc.executor.conv; import java.io.IOException; -import org.openecomp.appc.executor.objects.Params; +import org.onap.appc.executor.objects.Params; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/appc-dispatcher/appc-command-executor/appc-command-executor-api/src/main/java/org/openecomp/appc/executor/objects/CommandResponse.java b/appc-dispatcher/appc-command-executor/appc-command-executor-api/src/main/java/org/openecomp/appc/executor/objects/CommandResponse.java index 8c7cff8f5..4e7b9b17f 100644 --- a/appc-dispatcher/appc-command-executor/appc-command-executor-api/src/main/java/org/openecomp/appc/executor/objects/CommandResponse.java +++ b/appc-dispatcher/appc-command-executor/appc-command-executor-api/src/main/java/org/openecomp/appc/executor/objects/CommandResponse.java @@ -22,9 +22,9 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.executor.objects; +package org.onap.appc.executor.objects; -import org.openecomp.appc.domainmodel.lcm.RuntimeContext; +import org.onap.appc.domainmodel.lcm.RuntimeContext; public class CommandResponse { diff --git a/appc-dispatcher/appc-command-executor/appc-command-executor-api/src/main/java/org/openecomp/appc/executor/objects/LCMCommandStatus.java b/appc-dispatcher/appc-command-executor/appc-command-executor-api/src/main/java/org/openecomp/appc/executor/objects/LCMCommandStatus.java index 44588d0df..be13fd0ff 100644 --- a/appc-dispatcher/appc-command-executor/appc-command-executor-api/src/main/java/org/openecomp/appc/executor/objects/LCMCommandStatus.java +++ b/appc-dispatcher/appc-command-executor/appc-command-executor-api/src/main/java/org/openecomp/appc/executor/objects/LCMCommandStatus.java @@ -22,12 +22,12 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.executor.objects; +package org.onap.appc.executor.objects; import org.apache.commons.lang3.StringUtils; -import org.openecomp.appc.domainmodel.lcm.Status; -import org.openecomp.appc.util.MessageFormatter; +import org.onap.appc.domainmodel.lcm.Status; +import org.onap.appc.util.MessageFormatter; import java.util.Map; diff --git a/appc-dispatcher/appc-command-executor/appc-command-executor-api/src/main/java/org/openecomp/appc/executor/objects/Params.java b/appc-dispatcher/appc-command-executor/appc-command-executor-api/src/main/java/org/openecomp/appc/executor/objects/Params.java index 337f28085..c3cae7bcd 100644 --- a/appc-dispatcher/appc-command-executor/appc-command-executor-api/src/main/java/org/openecomp/appc/executor/objects/Params.java +++ b/appc-dispatcher/appc-command-executor/appc-command-executor-api/src/main/java/org/openecomp/appc/executor/objects/Params.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.executor.objects; +package org.onap.appc.executor.objects; import java.lang.Object; import java.util.HashMap; diff --git a/appc-dispatcher/appc-command-executor/appc-command-executor-api/src/main/java/org/openecomp/appc/executor/objects/UniqueRequestIdentifier.java b/appc-dispatcher/appc-command-executor/appc-command-executor-api/src/main/java/org/openecomp/appc/executor/objects/UniqueRequestIdentifier.java index 01c8d063a..b2f2a1d89 100644 --- a/appc-dispatcher/appc-command-executor/appc-command-executor-api/src/main/java/org/openecomp/appc/executor/objects/UniqueRequestIdentifier.java +++ b/appc-dispatcher/appc-command-executor/appc-command-executor-api/src/main/java/org/openecomp/appc/executor/objects/UniqueRequestIdentifier.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.executor.objects; +package org.onap.appc.executor.objects; import org.apache.commons.lang3.StringUtils; diff --git a/appc-dispatcher/appc-command-executor/appc-command-executor-core/pom.xml b/appc-dispatcher/appc-command-executor/appc-command-executor-core/pom.xml index 2d71339c2..a0ebe9dc0 100644 --- a/appc-dispatcher/appc-command-executor/appc-command-executor-core/pom.xml +++ b/appc-dispatcher/appc-command-executor/appc-command-executor-core/pom.xml @@ -21,7 +21,7 @@ 4.0.0 - org.openecomp.appc + org.onap.appc appc-command-executor 1.3.0-SNAPSHOT @@ -33,41 +33,41 @@ - org.openecomp.appc + org.onap.appc appc-common ${project.version} - org.openecomp.appc + org.onap.appc appc-command-executor-api - org.openecomp.appc + org.onap.appc appc-workflow-management-api ${project.version} - org.openecomp.appc + org.onap.appc appc-request-handler-api ${project.version} - org.openecomp.appc + org.onap.appc execution-queue-management-lib ${project.version} - org.openecomp.appc + org.onap.appc appc-data-access-lib ${project.version} - org.openecomp.appc + org.onap.appc appc-dmaap-adapter-bundle ${project.version} - org.openecomp.appc + org.onap.appc appc-lifecycle-management-api ${project.version} @@ -76,7 +76,7 @@ aai-service-provider - org.openecomp.appc + org.onap.appc domain-model-lib ${project.version} @@ -93,11 +93,11 @@ ${project.version} eelf-core,logback-core,logback-classic;scope=compile|runtime;inline=false true - org.openecomp.appc.executor.CommandExecutor + org.onap.appc.executor.CommandExecutor - org.openecomp.appc.executionqueue.*, - org.openecomp.appc.executor, - org.openecomp.appc.executor.objects, + org.onap.appc.executionqueue.*, + org.onap.appc.executor, + org.onap.appc.executor.objects, *;resolution:=optional @@ -109,7 +109,7 @@ - org.openecomp.appc + org.onap.appc appc-command-executor-api ${project.version} diff --git a/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/java/org/openecomp/appc/executor/impl/CommandExecutorImpl.java b/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/java/org/openecomp/appc/executor/impl/CommandExecutorImpl.java index f7ffdadce..d23a3fdd6 100644 --- a/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/java/org/openecomp/appc/executor/impl/CommandExecutorImpl.java +++ b/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/java/org/openecomp/appc/executor/impl/CommandExecutorImpl.java @@ -25,16 +25,16 @@ /** * */ -package org.openecomp.appc.executor.impl; +package org.onap.appc.executor.impl; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; import org.apache.commons.lang.ObjectUtils; -import org.openecomp.appc.domainmodel.lcm.RuntimeContext; -import org.openecomp.appc.exceptions.APPCException; -import org.openecomp.appc.executionqueue.ExecutionQueueService; -import org.openecomp.appc.executor.CommandExecutor; +import org.onap.appc.domainmodel.lcm.RuntimeContext; +import org.onap.appc.exceptions.APPCException; +import org.onap.appc.executionqueue.ExecutionQueueService; +import org.onap.appc.executor.CommandExecutor; import java.time.Instant; import java.time.temporal.ChronoUnit; diff --git a/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/java/org/openecomp/appc/executor/impl/CommandTask.java b/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/java/org/openecomp/appc/executor/impl/CommandTask.java index 3af436552..1df756efa 100644 --- a/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/java/org/openecomp/appc/executor/impl/CommandTask.java +++ b/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/java/org/openecomp/appc/executor/impl/CommandTask.java @@ -22,17 +22,17 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.executor.impl; - -import org.openecomp.appc.domainmodel.lcm.Status; -import org.openecomp.appc.executor.objects.CommandResponse; -import org.openecomp.appc.executor.objects.LCMCommandStatus; -import org.openecomp.appc.executor.objects.Params; -import org.openecomp.appc.requesthandler.RequestHandler; -import org.openecomp.appc.domainmodel.lcm.RuntimeContext; -import org.openecomp.appc.workflow.WorkFlowManager; -import org.openecomp.appc.workflow.objects.WorkflowRequest; -import org.openecomp.appc.workflow.objects.WorkflowResponse; +package org.onap.appc.executor.impl; + +import org.onap.appc.domainmodel.lcm.Status; +import org.onap.appc.executor.objects.CommandResponse; +import org.onap.appc.executor.objects.LCMCommandStatus; +import org.onap.appc.executor.objects.Params; +import org.onap.appc.requesthandler.RequestHandler; +import org.onap.appc.domainmodel.lcm.RuntimeContext; +import org.onap.appc.workflow.WorkFlowManager; +import org.onap.appc.workflow.objects.WorkflowRequest; +import org.onap.appc.workflow.objects.WorkflowResponse; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; diff --git a/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/java/org/openecomp/appc/executor/impl/CommandTaskFactory.java b/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/java/org/openecomp/appc/executor/impl/CommandTaskFactory.java index 5a7550cc4..bd7247854 100644 --- a/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/java/org/openecomp/appc/executor/impl/CommandTaskFactory.java +++ b/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/java/org/openecomp/appc/executor/impl/CommandTaskFactory.java @@ -22,15 +22,15 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.executor.impl; +package org.onap.appc.executor.impl; -import org.openecomp.appc.domainmodel.lcm.ActionLevel; -import org.openecomp.appc.domainmodel.lcm.RuntimeContext; -import org.openecomp.appc.domainmodel.lcm.VNFOperation; -import org.openecomp.appc.lifecyclemanager.LifecycleManager; -import org.openecomp.appc.requesthandler.RequestHandler; -import org.openecomp.appc.workflow.WorkFlowManager; +import org.onap.appc.domainmodel.lcm.ActionLevel; +import org.onap.appc.domainmodel.lcm.RuntimeContext; +import org.onap.appc.domainmodel.lcm.VNFOperation; +import org.onap.appc.lifecyclemanager.LifecycleManager; +import org.onap.appc.requesthandler.RequestHandler; +import org.onap.appc.workflow.WorkFlowManager; diff --git a/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/java/org/openecomp/appc/executor/impl/CommonMethods.java b/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/java/org/openecomp/appc/executor/impl/CommonMethods.java index 65d4b432f..a032f3737 100644 --- a/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/java/org/openecomp/appc/executor/impl/CommonMethods.java +++ b/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/java/org/openecomp/appc/executor/impl/CommonMethods.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.executor.impl; +package org.onap.appc.executor.impl; import java.io.IOException; import java.io.StringWriter; diff --git a/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/java/org/openecomp/appc/executor/impl/ExpiredMessageHandler.java b/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/java/org/openecomp/appc/executor/impl/ExpiredMessageHandler.java index 7aa4cd167..bd5773216 100644 --- a/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/java/org/openecomp/appc/executor/impl/ExpiredMessageHandler.java +++ b/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/java/org/openecomp/appc/executor/impl/ExpiredMessageHandler.java @@ -22,12 +22,12 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.executor.impl; +package org.onap.appc.executor.impl; -import org.openecomp.appc.domainmodel.lcm.RuntimeContext; -import org.openecomp.appc.domainmodel.lcm.ActionLevel; -import org.openecomp.appc.executionqueue.MessageExpirationListener; -import org.openecomp.appc.requesthandler.RequestHandler; +import org.onap.appc.domainmodel.lcm.RuntimeContext; +import org.onap.appc.domainmodel.lcm.ActionLevel; +import org.onap.appc.executionqueue.MessageExpirationListener; +import org.onap.appc.requesthandler.RequestHandler; public class ExpiredMessageHandler implements MessageExpirationListener{ diff --git a/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/java/org/openecomp/appc/executor/impl/LCMCommandTask.java b/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/java/org/openecomp/appc/executor/impl/LCMCommandTask.java index 77126086f..999957fc8 100644 --- a/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/java/org/openecomp/appc/executor/impl/LCMCommandTask.java +++ b/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/java/org/openecomp/appc/executor/impl/LCMCommandTask.java @@ -22,30 +22,30 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.executor.impl; +package org.onap.appc.executor.impl; import java.util.HashMap; import java.util.Map; import org.apache.commons.lang3.StringUtils; -import org.openecomp.appc.domainmodel.lcm.CommonHeader; -import org.openecomp.appc.domainmodel.lcm.RuntimeContext; -import org.openecomp.appc.domainmodel.lcm.Status; -import org.openecomp.appc.domainmodel.lcm.VNFOperation; -import org.openecomp.appc.executor.UnstableVNFException; -import org.openecomp.appc.executor.objects.CommandResponse; -import org.openecomp.appc.executor.objects.LCMCommandStatus; -import org.openecomp.appc.executor.objects.Params; -import org.openecomp.appc.executor.objects.UniqueRequestIdentifier; -import org.openecomp.appc.lifecyclemanager.LifecycleManager; -import org.openecomp.appc.lifecyclemanager.objects.LifecycleException; -import org.openecomp.appc.lifecyclemanager.objects.NoTransitionDefinedException; -import org.openecomp.appc.lifecyclemanager.objects.VNFOperationOutcome; -import org.openecomp.appc.logging.LoggingConstants; -import org.openecomp.appc.requesthandler.RequestHandler; -import org.openecomp.appc.workflow.WorkFlowManager; -import org.openecomp.appc.workflow.objects.WorkflowResponse; +import org.onap.appc.domainmodel.lcm.CommonHeader; +import org.onap.appc.domainmodel.lcm.RuntimeContext; +import org.onap.appc.domainmodel.lcm.Status; +import org.onap.appc.domainmodel.lcm.VNFOperation; +import org.onap.appc.executor.UnstableVNFException; +import org.onap.appc.executor.objects.CommandResponse; +import org.onap.appc.executor.objects.LCMCommandStatus; +import org.onap.appc.executor.objects.Params; +import org.onap.appc.executor.objects.UniqueRequestIdentifier; +import org.onap.appc.lifecyclemanager.LifecycleManager; +import org.onap.appc.lifecyclemanager.objects.LifecycleException; +import org.onap.appc.lifecyclemanager.objects.NoTransitionDefinedException; +import org.onap.appc.lifecyclemanager.objects.VNFOperationOutcome; +import org.onap.appc.logging.LoggingConstants; +import org.onap.appc.requesthandler.RequestHandler; +import org.onap.appc.workflow.WorkFlowManager; +import org.onap.appc.workflow.objects.WorkflowResponse; import org.onap.ccsdk.sli.core.sli.SvcLogicContext; import org.onap.ccsdk.sli.core.sli.SvcLogicException; import org.onap.ccsdk.sli.core.sli.SvcLogicResource; diff --git a/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/java/org/openecomp/appc/executor/impl/LCMReadonlyCommandTask.java b/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/java/org/openecomp/appc/executor/impl/LCMReadonlyCommandTask.java index 83e0638ae..0eeefe540 100644 --- a/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/java/org/openecomp/appc/executor/impl/LCMReadonlyCommandTask.java +++ b/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/java/org/openecomp/appc/executor/impl/LCMReadonlyCommandTask.java @@ -22,19 +22,19 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.executor.impl; +package org.onap.appc.executor.impl; import org.apache.commons.lang3.StringUtils; -import org.openecomp.appc.domainmodel.lcm.CommonHeader; -import org.openecomp.appc.domainmodel.lcm.RuntimeContext; -import org.openecomp.appc.executor.UnstableVNFException; -import org.openecomp.appc.executor.objects.CommandResponse; -import org.openecomp.appc.executor.objects.LCMCommandStatus; -import org.openecomp.appc.executor.objects.Params; -import org.openecomp.appc.executor.objects.UniqueRequestIdentifier; -import org.openecomp.appc.requesthandler.RequestHandler; -import org.openecomp.appc.workflow.WorkFlowManager; +import org.onap.appc.domainmodel.lcm.CommonHeader; +import org.onap.appc.domainmodel.lcm.RuntimeContext; +import org.onap.appc.executor.UnstableVNFException; +import org.onap.appc.executor.objects.CommandResponse; +import org.onap.appc.executor.objects.LCMCommandStatus; +import org.onap.appc.executor.objects.Params; +import org.onap.appc.executor.objects.UniqueRequestIdentifier; +import org.onap.appc.requesthandler.RequestHandler; +import org.onap.appc.workflow.WorkFlowManager; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; diff --git a/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml index 5474dcc6f..d0ee8cd05 100644 --- a/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml +++ b/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml @@ -29,14 +29,14 @@ - - @@ -44,23 +44,23 @@ - + interface="org.onap.appc.workflow.WorkFlowManager"/> + interface="org.onap.appc.requesthandler.RequestHandler" filter="(level=VNF)"/> + interface="org.onap.appc.requesthandler.RequestHandler" filter="(level=VM)"/> + interface="org.onap.appc.lifecyclemanager.LifecycleManager"/> + interface="org.onap.appc.executionqueue.ExecutionQueueService"/> - diff --git a/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/resources/org/openecomp/appc/default.properties b/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/resources/org/openecomp/appc/default.properties index a6e3a6aea..1a4f859db 100644 --- a/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/resources/org/openecomp/appc/default.properties +++ b/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/resources/org/openecomp/appc/default.properties @@ -24,8 +24,8 @@ # Define the name and path of any user-provided configuration (bootstrap) file that can be loaded # to supply configuration options -org.openecomp.appc.bootstrap.file=appc.properties -org.openecomp.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},. +org.onap.appc.bootstrap.file=appc.properties +org.onap.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},. #Property below provided by appc.properties appc.LCM.provider.url=https://localhost:8443/restconf/operations/appc-provider-lcm diff --git a/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/test/java/org/openecomp/appc/executor/CommandExecutionTaskTest.java b/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/test/java/org/openecomp/appc/executor/CommandExecutionTaskTest.java index daf302c3b..af62a06f6 100644 --- a/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/test/java/org/openecomp/appc/executor/CommandExecutionTaskTest.java +++ b/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/test/java/org/openecomp/appc/executor/CommandExecutionTaskTest.java @@ -22,30 +22,30 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.executor; +package org.onap.appc.executor; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mockito; -import org.openecomp.appc.domainmodel.lcm.ActionIdentifiers; -import org.openecomp.appc.domainmodel.lcm.CommonHeader; -import org.openecomp.appc.domainmodel.lcm.Flags; -import org.openecomp.appc.domainmodel.lcm.RequestContext; -import org.openecomp.appc.domainmodel.lcm.ResponseContext; -import org.openecomp.appc.domainmodel.lcm.RuntimeContext; -import org.openecomp.appc.domainmodel.lcm.Status; -import org.openecomp.appc.domainmodel.lcm.VNFContext; -import org.openecomp.appc.domainmodel.lcm.VNFOperation; -import org.openecomp.appc.executor.impl.CommandTask; -import org.openecomp.appc.executor.impl.CommandTaskFactory; -import org.openecomp.appc.executor.impl.LCMCommandTask; -import org.openecomp.appc.executor.impl.LCMReadonlyCommandTask; -import org.openecomp.appc.executor.objects.CommandResponse; -import org.openecomp.appc.lifecyclemanager.LifecycleManager; -import org.openecomp.appc.requesthandler.RequestHandler; -import org.openecomp.appc.workflow.WorkFlowManager; -import org.openecomp.appc.workflow.objects.WorkflowResponse; +import org.onap.appc.domainmodel.lcm.ActionIdentifiers; +import org.onap.appc.domainmodel.lcm.CommonHeader; +import org.onap.appc.domainmodel.lcm.Flags; +import org.onap.appc.domainmodel.lcm.RequestContext; +import org.onap.appc.domainmodel.lcm.ResponseContext; +import org.onap.appc.domainmodel.lcm.RuntimeContext; +import org.onap.appc.domainmodel.lcm.Status; +import org.onap.appc.domainmodel.lcm.VNFContext; +import org.onap.appc.domainmodel.lcm.VNFOperation; +import org.onap.appc.executor.impl.CommandTask; +import org.onap.appc.executor.impl.CommandTaskFactory; +import org.onap.appc.executor.impl.LCMCommandTask; +import org.onap.appc.executor.impl.LCMReadonlyCommandTask; +import org.onap.appc.executor.objects.CommandResponse; +import org.onap.appc.lifecyclemanager.LifecycleManager; +import org.onap.appc.requesthandler.RequestHandler; +import org.onap.appc.workflow.WorkFlowManager; +import org.onap.appc.workflow.objects.WorkflowResponse; import org.onap.ccsdk.sli.core.sli.SvcLogicContext; import org.onap.ccsdk.sli.core.sli.SvcLogicException; import org.onap.ccsdk.sli.core.sli.SvcLogicResource; diff --git a/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/test/java/org/openecomp/appc/executor/TestCommandExecutor.java b/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/test/java/org/openecomp/appc/executor/TestCommandExecutor.java index fa9257faa..cd02c260d 100644 --- a/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/test/java/org/openecomp/appc/executor/TestCommandExecutor.java +++ b/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/test/java/org/openecomp/appc/executor/TestCommandExecutor.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.executor; +package org.onap.appc.executor; /** * */ @@ -34,19 +34,19 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.mockito.Mockito; -import org.openecomp.appc.domainmodel.lcm.ActionIdentifiers; -import org.openecomp.appc.domainmodel.lcm.CommonHeader; -import org.openecomp.appc.domainmodel.lcm.Flags; -import org.openecomp.appc.domainmodel.lcm.RequestContext; -import org.openecomp.appc.domainmodel.lcm.RuntimeContext; -import org.openecomp.appc.domainmodel.lcm.VNFContext; -import org.openecomp.appc.domainmodel.lcm.VNFOperation; -import org.openecomp.appc.exceptions.APPCException; -import org.openecomp.appc.executionqueue.ExecutionQueueService; -import org.openecomp.appc.executor.impl.*; -import org.openecomp.appc.lifecyclemanager.LifecycleManager; -import org.openecomp.appc.requesthandler.RequestHandler; -import org.openecomp.appc.workflow.WorkFlowManager; +import org.onap.appc.domainmodel.lcm.ActionIdentifiers; +import org.onap.appc.domainmodel.lcm.CommonHeader; +import org.onap.appc.domainmodel.lcm.Flags; +import org.onap.appc.domainmodel.lcm.RequestContext; +import org.onap.appc.domainmodel.lcm.RuntimeContext; +import org.onap.appc.domainmodel.lcm.VNFContext; +import org.onap.appc.domainmodel.lcm.VNFOperation; +import org.onap.appc.exceptions.APPCException; +import org.onap.appc.executionqueue.ExecutionQueueService; +import org.onap.appc.executor.impl.*; +import org.onap.appc.lifecyclemanager.LifecycleManager; +import org.onap.appc.requesthandler.RequestHandler; +import org.onap.appc.workflow.WorkFlowManager; import org.powermock.api.mockito.PowerMockito; import java.util.Date; diff --git a/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/test/resources/org/openecomp/appc/default.properties b/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/test/resources/org/openecomp/appc/default.properties index f7089f1e4..c5130b3ab 100644 --- a/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/test/resources/org/openecomp/appc/default.properties +++ b/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/test/resources/org/openecomp/appc/default.properties @@ -23,9 +23,9 @@ ### # Define the name and path of any user-provided configuration (bootstrap) file that can be loaded to supply configuration options -#org.openecomp.appc.bootstrap.file=executor-test.properties -org.openecomp.appc.bootstrap.file=appc.properties -org.openecomp.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},. +#org.onap.appc.bootstrap.file=executor-test.properties +org.onap.appc.bootstrap.file=appc.properties +org.onap.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},. # @@ -72,12 +72,12 @@ org.openecomp.sdnc.sli.aai.param.vnf_type=vnf-type org.openecomp.sdnc.sli.aai.param.physical.location.id=physical-location-id org.openecomp.sdnc.sli.aai.param.service.type=service-type -org.openecomp.appc.logging.path=${user.home},etc,../etc,. -org.openecomp.appc.logging.file=logback.xml +org.onap.appc.logging.path=${user.home},etc,../etc,. +org.onap.appc.logging.file=logback.xml -org.openecomp.appc.db.url.%s", schema), ""); -org.openecomp.appc.db.user.%s", schema), ""); -org.openecomp.appc.db.pass.%s", schema), ""); +org.onap.appc.db.url.%s", schema), ""); +org.onap.appc.db.user.%s", schema), ""); +org.onap.appc.db.pass.%s", schema), ""); #Property below provided by appc.properties appc.LCM.provider.url=https://localhost:8443/restconf/operations/appc-provider-lcm diff --git a/appc-dispatcher/appc-command-executor/appc-command-executor-features/pom.xml b/appc-dispatcher/appc-command-executor/appc-command-executor-features/pom.xml index e5b895d4d..bed8584dc 100644 --- a/appc-dispatcher/appc-command-executor/appc-command-executor-features/pom.xml +++ b/appc-dispatcher/appc-command-executor/appc-command-executor-features/pom.xml @@ -3,7 +3,7 @@ 4.0.0 appc-command-executor - org.openecomp.appc + org.onap.appc 1.3.0-SNAPSHOT appc-command-executor-features @@ -13,12 +13,12 @@ - org.openecomp.appc + org.onap.appc appc-command-executor-api ${project.version} - org.openecomp.appc + org.onap.appc appc-command-executor-core ${project.version} diff --git a/appc-dispatcher/appc-command-executor/appc-command-executor-features/src/main/resources/features.xml b/appc-dispatcher/appc-command-executor/appc-command-executor-features/src/main/resources/features.xml index fefff52ec..fc1ec092e 100644 --- a/appc-dispatcher/appc-command-executor/appc-command-executor-features/src/main/resources/features.xml +++ b/appc-dispatcher/appc-command-executor/appc-command-executor-features/src/main/resources/features.xml @@ -29,9 +29,9 @@ xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0"> - mvn:org.openecomp.appc/execution-queue-management-lib/${project.version} - mvn:org.openecomp.appc/appc-command-executor-api/${project.version} - mvn:org.openecomp.appc/appc-command-executor-core/${project.version} + mvn:org.onap.appc/execution-queue-management-lib/${project.version} + mvn:org.onap.appc/appc-command-executor-api/${project.version} + mvn:org.onap.appc/appc-command-executor-core/${project.version} diff --git a/appc-dispatcher/appc-command-executor/appc-command-executor-installer/pom.xml b/appc-dispatcher/appc-command-executor/appc-command-executor-installer/pom.xml index fb7597b5f..407af7ef9 100644 --- a/appc-dispatcher/appc-command-executor/appc-command-executor-installer/pom.xml +++ b/appc-dispatcher/appc-command-executor/appc-command-executor-installer/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - org.openecomp.appc + org.onap.appc appc-command-executor 1.3.0-SNAPSHOT @@ -15,14 +15,14 @@ appc-command-executor appc-command-executor - mvn:org.openecomp.appc/appc-command-executor-features/${project.version}/xml/features + mvn:org.onap.appc/appc-command-executor-features/${project.version}/xml/features false - org.openecomp.appc + org.onap.appc appc-command-executor-features ${project.version} features @@ -35,12 +35,12 @@ - org.openecomp.appc + org.onap.appc appc-command-executor-api ${project.version} - org.openecomp.appc + org.onap.appc appc-command-executor-core ${project.version} diff --git a/appc-dispatcher/appc-command-executor/pom.xml b/appc-dispatcher/appc-command-executor/pom.xml index 9fcf1fc9a..69cf83900 100644 --- a/appc-dispatcher/appc-command-executor/pom.xml +++ b/appc-dispatcher/appc-command-executor/pom.xml @@ -1,7 +1,7 @@ 4.0.0 - org.openecomp.appc + org.onap.appc appc-dispatcher 1.3.0-SNAPSHOT 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 @@ 4.0.0 - org.openecomp.appc + org.onap.appc appc-dispatcher-common 1.3.0-SNAPSHOT @@ -32,7 +32,7 @@ compile - org.openecomp.appc + org.onap.appc appc-common ${project.version} @@ -50,8 +50,8 @@ ${project.artifactId} - org.openecomp.appc.dao.util - org.openecomp.appc.configuration,*;resolution:=optional + org.onap.appc.dao.util + org.onap.appc.configuration,*;resolution:=optional mariadb-java-client true 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 @@ 4.0.0 - org.openecomp.appc + org.onap.appc appc-dispatcher-common 1.3.0-SNAPSHOT @@ -24,7 +24,7 @@ ${project.artifactId} ${project.version} - org.openecomp.appc.domainmodel.lcm + org.onap.appc.domainmodel.lcm true 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 @@ 4.0.0 - org.openecomp.appc + org.onap.appc appc-dispatcher-common 1.3.0-SNAPSHOT @@ -17,7 +17,7 @@ - org.openecomp.appc + org.onap.appc appc-common ${project.version} @@ -37,7 +37,7 @@ ${project.artifactId} ${project.version} true - org.openecomp.appc.executionqueue,org.openecomp.appc.executionqueue.impl + org.onap.appc.executionqueue,org.onap.appc.executionqueue.impl *;resolution:=optional 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 { 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 { 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"> - - - - 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 @@ 4.0.0 lock-manager-lib - org.openecomp.appc + org.onap.appc 1.3.0-SNAPSHOT @@ -18,7 +18,7 @@ true - org.openecomp.appc.lockmanager.api + org.onap.appc.lockmanager.api 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 @@ 4.0.0 lock-manager-lib - org.openecomp.appc + org.onap.appc 1.3.0-SNAPSHOT lock-manager-features @@ -13,12 +13,12 @@ - org.openecomp.appc + org.onap.appc lock-manager-api ${project.version} - org.openecomp.appc + org.onap.appc lock-manager-impl ${project.version} 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 @@ - mvn:org.openecomp.appc/appc-common/${project.version} - mvn:org.openecomp.appc/appc-data-access-lib/${project.version} + mvn:org.onap.appc/appc-common/${project.version} + mvn:org.onap.appc/appc-data-access-lib/${project.version} - mvn:org.openecomp.appc/lock-manager-api/${project.version} - mvn:org.openecomp.appc/lock-manager-impl/${project.version} + mvn:org.onap.appc/lock-manager-api/${project.version} + mvn:org.onap.appc/lock-manager-impl/${project.version} 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 @@ 4.0.0 lock-manager-lib - org.openecomp.appc + org.onap.appc 1.3.0-SNAPSHOT @@ -12,7 +12,7 @@ - org.openecomp.appc + org.onap.appc lock-manager-api ${project.version} provided @@ -22,7 +22,7 @@ mariadb-java-client - org.openecomp.appc + org.onap.appc appc-data-access-lib ${project.version} @@ -43,12 +43,12 @@ maven-bundle-plugin - org.openecomp.appc.lockmanager.api.LockManager + org.onap.appc.lockmanager.api.LockManager - 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 - org.openecomp.appc.lockmanager.impl.* + org.onap.appc.lockmanager.impl.* ${project.artifactId} ${project.version} 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"> - - + + - - + + - + 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 @@ 4.0.0 appc-dispatcher-common - org.openecomp.appc + org.onap.appc 1.3.0-SNAPSHOT lock-manager-lib 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 @@ 4.0.0 - org.openecomp.appc + org.onap.appc appc-dispatcher 1.3.0-SNAPSHOT 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 @@ 4.0.0 - org.openecomp.appc + org.onap.appc appc-dispatcher-common 1.3.0-SNAPSHOT @@ -24,8 +24,8 @@ ${project.artifactId} ${project.version} - org.openecomp.appc.rankingframework - org.openecomp.appc.rankingframework.impl + org.onap.appc.rankingframework + org.onap.appc.rankingframework.impl eelf-core,logback-core,logback-classic;scope=compile|runtime;inline=false true !groovy.lang,!javax.jms,!org.codehaus.commons.compiler,!org.codehaus.groovy.*,!org.codehaus.janino,!com.ibm.icu.*,!com.sun.faces.*,!org.apache.log,* 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 { 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 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 { RankedAttributesResolver create(ConfigurationSet 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 extends NodeBase { 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 { 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 implements RankedAttributesResolver { 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 resolve(CompositeNode root, List 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 @@ - + 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 @@ appc-dispatcher-common - org.openecomp.appc + org.onap.appc 1.3.0-SNAPSHOT 4.0.0 @@ -13,12 +13,12 @@ transaction-recorder - org.openecomp.appc + org.onap.appc appc-common ${project.version} - org.openecomp.appc + org.onap.appc appc-data-access-lib ${project.version} @@ -39,9 +39,9 @@ ${project.version} appc-common,eelf-core,logback-core,logback-classic,appc-data-access-lib;scope=compile|runtime;inline=false true - org.openecomp.appc.transactionrecorder.TransactionRecorder + org.onap.appc.transactionrecorder.TransactionRecorder !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 - org.openecomp.appc.transactionrecorder,org.openecomp.appc.transactionrecorder.objects + org.onap.appc.transactionrecorder,org.onap.appc.transactionrecorder.objects 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 @@ - - + + diff --git a/appc-dispatcher/appc-dispatcher-features/pom.xml b/appc-dispatcher/appc-dispatcher-features/pom.xml index a0532af33..1882a6a32 100644 --- a/appc-dispatcher/appc-dispatcher-features/pom.xml +++ b/appc-dispatcher/appc-dispatcher-features/pom.xml @@ -3,7 +3,7 @@ 4.0.0 appc-dispatcher - org.openecomp.appc + org.onap.appc 1.3.0-SNAPSHOT appc-dispatcher-features diff --git a/appc-dispatcher/appc-dispatcher-installer/pom.xml b/appc-dispatcher/appc-dispatcher-installer/pom.xml index b02674d57..e648e0009 100644 --- a/appc-dispatcher/appc-dispatcher-installer/pom.xml +++ b/appc-dispatcher/appc-dispatcher-installer/pom.xml @@ -3,7 +3,7 @@ 4.0.0 appc-dispatcher - org.openecomp.appc + org.onap.appc 1.3.0-SNAPSHOT @@ -15,16 +15,16 @@ appc-dispatcher appc-dispatcher appc-license-manager - + - mvn:org.openecomp.appc/appc-dispatcher-features/${project.version}/xml/features - mvn:org.openecomp.appc/appc-request-handler-features/${project.version}/xml/features - mvn:org.openecomp.appc/appc-command-executor-features/${project.version}/xml/features - mvn:org.openecomp.appc/appc-lifecycle-management-features/${project.version}/xml/features - mvn:org.openecomp.appc/appc-license-manager-features/${project.version}/xml/features - mvn:org.openecomp.appc/appc-workflow-management-features/${project.version}/xml/features - mvn:org.openecomp.appc/lock-manager-features/${project.version}/xml/features + mvn:org.onap.appc/appc-dispatcher-features/${project.version}/xml/features + mvn:org.onap.appc/appc-request-handler-features/${project.version}/xml/features + mvn:org.onap.appc/appc-command-executor-features/${project.version}/xml/features + mvn:org.onap.appc/appc-lifecycle-management-features/${project.version}/xml/features + mvn:org.onap.appc/appc-license-manager-features/${project.version}/xml/features + mvn:org.onap.appc/appc-workflow-management-features/${project.version}/xml/features + mvn:org.onap.appc/lock-manager-features/${project.version}/xml/features false @@ -32,7 +32,7 @@ - org.openecomp.appc + org.onap.appc appc-dispatcher-features ${project.version} features @@ -46,7 +46,7 @@ - org.openecomp.appc + org.onap.appc appc-request-handler-features ${project.version} features @@ -60,7 +60,7 @@ - org.openecomp.appc + org.onap.appc appc-command-executor-features ${project.version} features @@ -74,7 +74,7 @@ - org.openecomp.appc + org.onap.appc appc-lifecycle-management-features ${project.version} features @@ -88,7 +88,7 @@ - org.openecomp.appc + org.onap.appc appc-workflow-management-features ${project.version} features @@ -102,7 +102,7 @@ - org.openecomp.appc + org.onap.appc appc-license-manager-features ${project.version} features @@ -116,7 +116,7 @@ - org.openecomp.appc + org.onap.appc lock-manager-features ${project.version} features diff --git a/appc-dispatcher/appc-license-manager/appc-license-manager-api/pom.xml b/appc-dispatcher/appc-license-manager/appc-license-manager-api/pom.xml index 5eb1afb1a..03abbc54b 100644 --- a/appc-dispatcher/appc-license-manager/appc-license-manager-api/pom.xml +++ b/appc-dispatcher/appc-license-manager/appc-license-manager-api/pom.xml @@ -1,7 +1,7 @@ 4.0.0 - org.openecomp.appc + org.onap.appc appc-license-manager 1.3.0-SNAPSHOT @@ -30,7 +30,7 @@ ${project.artifactId} ${project.version} - org.openecomp.appc.licmgr,org.openecomp.appc.licmgr.exception,org.openecomp.appc.licmgr.objects + org.onap.appc.licmgr,org.onap.appc.licmgr.exception,org.onap.appc.licmgr.objects diff --git a/appc-dispatcher/appc-license-manager/appc-license-manager-api/src/main/java/org/openecomp/appc/licmgr/Constants.java b/appc-dispatcher/appc-license-manager/appc-license-manager-api/src/main/java/org/openecomp/appc/licmgr/Constants.java index ba39134bf..64e54be97 100644 --- a/appc-dispatcher/appc-license-manager/appc-license-manager-api/src/main/java/org/openecomp/appc/licmgr/Constants.java +++ b/appc-dispatcher/appc-license-manager/appc-license-manager-api/src/main/java/org/openecomp/appc/licmgr/Constants.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.licmgr; +package org.onap.appc.licmgr; public class Constants { @@ -61,19 +61,19 @@ public class Constants { public static final String PAYLOAD = "payload"; // constants fo DG - public static final String VNF_TYPE_FIELD_NAME = "org.openecomp.appc.vftype"; - public static final String VNF_VERSION_FIELD_NAME = "org.openecomp.appc.vfversion"; - public static final String VNF_RESOURCE_VERSION_FIELD_NAME = "org.openecomp.appc.resource-version"; + public static final String VNF_TYPE_FIELD_NAME = "org.onap.appc.vftype"; + public static final String VNF_VERSION_FIELD_NAME = "org.onap.appc.vfversion"; + public static final String VNF_RESOURCE_VERSION_FIELD_NAME = "org.onap.appc.resource-version"; public static final String TARGET_VNF_TYPE = "target-vnf-type"; public static final String FILE_CONTENT_FIELD_NAME = "file-content"; public static final String CONNECTION_DETAILS_FIELD_NAME = "connection-details"; public static final String CONFIGURATION_FILE_FIELD_NAME = "configuration-file-name"; public static final String VNF_HOST_IP_ADDRESS_FIELD_NAME = "vnf-host-ip-address"; public static final String UPGRADE_VERSION = "upgrade-version"; - public static final String DG_ERROR_FIELD_NAME = "org.openecomp.appc.dg.error"; + public static final String DG_ERROR_FIELD_NAME = "org.onap.appc.dg.error"; public static final String RESOURCEKEY = "resourceKey"; - public static final String REQ_ID_FIELD_NAME = "org.openecomp.appc.reqid"; - public static final String API_VERSION_FIELD_NAME = "org.openecomp.appc.apiversion"; + public static final String REQ_ID_FIELD_NAME = "org.onap.appc.reqid"; + public static final String API_VERSION_FIELD_NAME = "org.onap.appc.apiversion"; public static final String MODEL_ENTITLMENT_POOL_UUID_NAME = "model.entitlement.pool.uuid"; public static final String MODEL_LICENSE_KEY_UUID_NAME = "model.license.key.uuid"; public static final String ENTITLMENT_POOL_UUID_NAME = "entitlement.pool.uuid"; diff --git a/appc-dispatcher/appc-license-manager/appc-license-manager-api/src/main/java/org/openecomp/appc/licmgr/LicenseDataAccessService.java b/appc-dispatcher/appc-license-manager/appc-license-manager-api/src/main/java/org/openecomp/appc/licmgr/LicenseDataAccessService.java index 0f14b2ee6..f826828c4 100644 --- a/appc-dispatcher/appc-license-manager/appc-license-manager-api/src/main/java/org/openecomp/appc/licmgr/LicenseDataAccessService.java +++ b/appc-dispatcher/appc-license-manager/appc-license-manager-api/src/main/java/org/openecomp/appc/licmgr/LicenseDataAccessService.java @@ -22,9 +22,9 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.licmgr; +package org.onap.appc.licmgr; -import org.openecomp.appc.licmgr.exception.DataAccessException; +import org.onap.appc.licmgr.exception.DataAccessException; import java.util.Map; diff --git a/appc-dispatcher/appc-license-manager/appc-license-manager-api/src/main/java/org/openecomp/appc/licmgr/LicenseManager.java b/appc-dispatcher/appc-license-manager/appc-license-manager-api/src/main/java/org/openecomp/appc/licmgr/LicenseManager.java index 144cfb633..f396beba1 100644 --- a/appc-dispatcher/appc-license-manager/appc-license-manager-api/src/main/java/org/openecomp/appc/licmgr/LicenseManager.java +++ b/appc-dispatcher/appc-license-manager/appc-license-manager-api/src/main/java/org/openecomp/appc/licmgr/LicenseManager.java @@ -22,10 +22,10 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.licmgr; +package org.onap.appc.licmgr; -import org.openecomp.appc.licmgr.exception.DataAccessException; -import org.openecomp.appc.licmgr.objects.LicenseModel; +import org.onap.appc.licmgr.exception.DataAccessException; +import org.onap.appc.licmgr.objects.LicenseModel; @SuppressWarnings("JavaDoc") diff --git a/appc-dispatcher/appc-license-manager/appc-license-manager-api/src/main/java/org/openecomp/appc/licmgr/exception/DataAccessException.java b/appc-dispatcher/appc-license-manager/appc-license-manager-api/src/main/java/org/openecomp/appc/licmgr/exception/DataAccessException.java index d2037772e..ba3def389 100644 --- a/appc-dispatcher/appc-license-manager/appc-license-manager-api/src/main/java/org/openecomp/appc/licmgr/exception/DataAccessException.java +++ b/appc-dispatcher/appc-license-manager/appc-license-manager-api/src/main/java/org/openecomp/appc/licmgr/exception/DataAccessException.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.licmgr.exception; +package org.onap.appc.licmgr.exception; diff --git a/appc-dispatcher/appc-license-manager/appc-license-manager-api/src/main/java/org/openecomp/appc/licmgr/objects/LicenseModel.java b/appc-dispatcher/appc-license-manager/appc-license-manager-api/src/main/java/org/openecomp/appc/licmgr/objects/LicenseModel.java index ba84562af..a2ea85ba2 100644 --- a/appc-dispatcher/appc-license-manager/appc-license-manager-api/src/main/java/org/openecomp/appc/licmgr/objects/LicenseModel.java +++ b/appc-dispatcher/appc-license-manager/appc-license-manager-api/src/main/java/org/openecomp/appc/licmgr/objects/LicenseModel.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.licmgr.objects; +package org.onap.appc.licmgr.objects; public class LicenseModel { diff --git a/appc-dispatcher/appc-license-manager/appc-license-manager-core/pom.xml b/appc-dispatcher/appc-license-manager/appc-license-manager-core/pom.xml index b88fdb99a..7d6f4abee 100644 --- a/appc-dispatcher/appc-license-manager/appc-license-manager-core/pom.xml +++ b/appc-dispatcher/appc-license-manager/appc-license-manager-core/pom.xml @@ -3,7 +3,7 @@ 4.0.0 - org.openecomp.appc + org.onap.appc appc-license-manager 1.3.0-SNAPSHOT @@ -15,12 +15,12 @@ - org.openecomp.appc + org.onap.appc appc-common ${project.version} - org.openecomp.appc + org.onap.appc appc-license-manager-api ${project.version} @@ -53,14 +53,14 @@ ${project.artifactId} ${project.version} - org.openecomp.appc.licmgr.LicenseManager + org.onap.appc.licmgr.LicenseManager artifactId=!dblib-provider|slf4j-api|jcl-over-slf4j;scope=compile|runtime;inline=false - org.openecomp.appc.licmgr,org.openecomp.appc.licmgr.exception,org.openecomp.appc.licmgr.objects, + org.onap.appc.licmgr,org.onap.appc.licmgr.exception,org.onap.appc.licmgr.objects, *;resolution:=optional diff --git a/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/main/java/org/openecomp/appc/licmgr/impl/LicenseDataAccessServiceImpl.java b/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/main/java/org/openecomp/appc/licmgr/impl/LicenseDataAccessServiceImpl.java index 3b3bc3564..8976d1332 100644 --- a/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/main/java/org/openecomp/appc/licmgr/impl/LicenseDataAccessServiceImpl.java +++ b/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/main/java/org/openecomp/appc/licmgr/impl/LicenseDataAccessServiceImpl.java @@ -22,18 +22,18 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.licmgr.impl; +package org.onap.appc.licmgr.impl; import javax.sql.rowset.CachedRowSet; -import org.openecomp.appc.licmgr.Constants; -import org.openecomp.appc.licmgr.LicenseDataAccessService; -import org.openecomp.appc.licmgr.exception.DataAccessException; +import org.onap.appc.licmgr.Constants; +import org.onap.appc.licmgr.LicenseDataAccessService; +import org.onap.appc.licmgr.exception.DataAccessException; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; import org.onap.ccsdk.sli.core.dblib.DbLibService; -import static org.openecomp.appc.licmgr.Constants.SDC_ARTIFACTS_FIELDS; +import static org.onap.appc.licmgr.Constants.SDC_ARTIFACTS_FIELDS; import java.sql.SQLException; import java.util.ArrayList; diff --git a/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/main/java/org/openecomp/appc/licmgr/impl/LicenseManagerImpl.java b/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/main/java/org/openecomp/appc/licmgr/impl/LicenseManagerImpl.java index 4fc6a9345..422db7f2d 100644 --- a/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/main/java/org/openecomp/appc/licmgr/impl/LicenseManagerImpl.java +++ b/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/main/java/org/openecomp/appc/licmgr/impl/LicenseManagerImpl.java @@ -22,16 +22,16 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.licmgr.impl; +package org.onap.appc.licmgr.impl; -import static org.openecomp.appc.licmgr.Constants.SDC_ARTIFACTS_FIELDS.ARTIFACT_CONTENT; +import static org.onap.appc.licmgr.Constants.SDC_ARTIFACTS_FIELDS.ARTIFACT_CONTENT; import java.util.Map; -import org.openecomp.appc.licmgr.LicenseDataAccessService; -import org.openecomp.appc.licmgr.LicenseManager; -import org.openecomp.appc.licmgr.exception.DataAccessException; -import org.openecomp.appc.licmgr.objects.LicenseModel; +import org.onap.appc.licmgr.LicenseDataAccessService; +import org.onap.appc.licmgr.LicenseManager; +import org.onap.appc.licmgr.exception.DataAccessException; +import org.onap.appc.licmgr.objects.LicenseModel; @SuppressWarnings("all") diff --git a/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml index acdbb1150..a5c0c23fb 100644 --- a/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml +++ b/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml @@ -32,13 +32,13 @@ - + - + - + diff --git a/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/main/resources/org/openecomp/appc/default.properties b/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/main/resources/org/openecomp/appc/default.properties index 47a88601a..f775abb39 100644 --- a/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/main/resources/org/openecomp/appc/default.properties +++ b/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/main/resources/org/openecomp/appc/default.properties @@ -24,8 +24,8 @@ # Define the name and path of any user-provided configuration (bootstrap) file that can be loaded # to supply configuration options -org.openecomp.appc.bootstrap.file=appc.properties -org.openecomp.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},. +org.onap.appc.bootstrap.file=appc.properties +org.onap.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},. #Property below provided by appc.properties appc.LCM.provider.url=https://localhost:8443/restconf/operations/appc-provider-lcm appc.LCM.poolMembers=:3904 diff --git a/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/test/java/org/openecomp/appc/licmgr/LicenseManagerImplTest.java b/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/test/java/org/openecomp/appc/licmgr/LicenseManagerImplTest.java index 44e478d6a..35c8650d1 100644 --- a/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/test/java/org/openecomp/appc/licmgr/LicenseManagerImplTest.java +++ b/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/test/java/org/openecomp/appc/licmgr/LicenseManagerImplTest.java @@ -22,4 +22,4 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.licmgr; +package org.onap.appc.licmgr; diff --git a/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/test/java/org/openecomp/appc/licmgr/LicenseManagerMock.java b/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/test/java/org/openecomp/appc/licmgr/LicenseManagerMock.java index 92adefe55..21323fbef 100644 --- a/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/test/java/org/openecomp/appc/licmgr/LicenseManagerMock.java +++ b/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/test/java/org/openecomp/appc/licmgr/LicenseManagerMock.java @@ -22,10 +22,10 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.licmgr; +package org.onap.appc.licmgr; -import org.openecomp.appc.licmgr.exception.DataAccessException; -import org.openecomp.appc.licmgr.objects.LicenseModel; +import org.onap.appc.licmgr.exception.DataAccessException; +import org.onap.appc.licmgr.objects.LicenseModel; public class LicenseManagerMock implements LicenseManager { diff --git a/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/test/java/org/openecomp/appc/licmgr/LicenseManagerPluginImplTest.java b/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/test/java/org/openecomp/appc/licmgr/LicenseManagerPluginImplTest.java index 44e478d6a..35c8650d1 100644 --- a/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/test/java/org/openecomp/appc/licmgr/LicenseManagerPluginImplTest.java +++ b/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/test/java/org/openecomp/appc/licmgr/LicenseManagerPluginImplTest.java @@ -22,4 +22,4 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.licmgr; +package org.onap.appc.licmgr; diff --git a/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/test/java/org/openecomp/appc/licmgr/LicenseServiceMock.java b/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/test/java/org/openecomp/appc/licmgr/LicenseServiceMock.java index ec44e7cdf..a52c463fc 100644 --- a/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/test/java/org/openecomp/appc/licmgr/LicenseServiceMock.java +++ b/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/test/java/org/openecomp/appc/licmgr/LicenseServiceMock.java @@ -22,9 +22,9 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.licmgr; +package org.onap.appc.licmgr; -import org.openecomp.appc.licmgr.exception.DataAccessException; +import org.onap.appc.licmgr.exception.DataAccessException; import java.util.HashMap; import java.util.Map; diff --git a/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/test/java/org/openecomp/appc/licmgr/TestVfLicenseModelConvert.java b/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/test/java/org/openecomp/appc/licmgr/TestVfLicenseModelConvert.java index 675b0f715..7bb185b33 100644 --- a/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/test/java/org/openecomp/appc/licmgr/TestVfLicenseModelConvert.java +++ b/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/test/java/org/openecomp/appc/licmgr/TestVfLicenseModelConvert.java @@ -22,10 +22,10 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.licmgr; +package org.onap.appc.licmgr; /* -import org.openecomp.appc.licmgr.objects.VfLicenseModel; +import org.onap.appc.licmgr.objects.VfLicenseModel; import javax.xml.bind.JAXBContext; import javax.xml.bind.Unmarshaller; diff --git a/appc-dispatcher/appc-license-manager/appc-license-manager-features/pom.xml b/appc-dispatcher/appc-license-manager/appc-license-manager-features/pom.xml index efb0ad642..5d962c637 100644 --- a/appc-dispatcher/appc-license-manager/appc-license-manager-features/pom.xml +++ b/appc-dispatcher/appc-license-manager/appc-license-manager-features/pom.xml @@ -3,7 +3,7 @@ 4.0.0 appc-license-manager - org.openecomp.appc + org.onap.appc 1.3.0-SNAPSHOT appc-license-manager-features @@ -13,12 +13,12 @@ - org.openecomp.appc + org.onap.appc appc-license-manager-api ${project.version} - org.openecomp.appc + org.onap.appc appc-license-manager-core ${project.version} diff --git a/appc-dispatcher/appc-license-manager/appc-license-manager-features/src/main/resources/features.xml b/appc-dispatcher/appc-license-manager/appc-license-manager-features/src/main/resources/features.xml index baadce985..4bab1a93e 100644 --- a/appc-dispatcher/appc-license-manager/appc-license-manager-features/src/main/resources/features.xml +++ b/appc-dispatcher/appc-license-manager/appc-license-manager-features/src/main/resources/features.xml @@ -30,8 +30,8 @@ mvn:com.sun.mail/javax.mail/1.5.0 - mvn:org.openecomp.appc/appc-license-manager-api/${project.version} - mvn:org.openecomp.appc/appc-license-manager-core/${project.version} + mvn:org.onap.appc/appc-license-manager-api/${project.version} + mvn:org.onap.appc/appc-license-manager-core/${project.version} diff --git a/appc-dispatcher/appc-license-manager/pom.xml b/appc-dispatcher/appc-license-manager/pom.xml index db24ccfb7..77ac63508 100644 --- a/appc-dispatcher/appc-license-manager/pom.xml +++ b/appc-dispatcher/appc-license-manager/pom.xml @@ -1,7 +1,7 @@ 4.0.0 - org.openecomp.appc + org.onap.appc appc-dispatcher 1.3.0-SNAPSHOT diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-api/pom.xml b/appc-dispatcher/appc-request-handler/appc-request-handler-api/pom.xml index 32c6585c8..87cabf6ee 100644 --- a/appc-dispatcher/appc-request-handler/appc-request-handler-api/pom.xml +++ b/appc-dispatcher/appc-request-handler/appc-request-handler-api/pom.xml @@ -1,7 +1,7 @@ 4.0.0 - org.openecomp.appc + org.onap.appc appc-request-handler 1.3.0-SNAPSHOT @@ -22,17 +22,17 @@ - org.openecomp.appc + org.onap.appc appc-data-access-lib ${project.version} - org.openecomp.appc + org.onap.appc appc-command-executor-api ${project.version} - org.openecomp.appc + org.onap.appc appc-common ${project.version} @@ -46,13 +46,13 @@ ${project.artifactId} ${project.version} - org.openecomp.appc.requesthandler,org.openecomp.appc.requesthandler.objects,org.openecomp.appc.transactionrecorder,org.openecomp.appc.message + org.onap.appc.requesthandler,org.onap.appc.requesthandler.objects,org.onap.appc.transactionrecorder,org.onap.appc.message javax.json;scope=compile|runtime;inline=false true - org.openecomp.appc.domainmodel.lcm, + org.onap.appc.domainmodel.lcm, *;resolution:=optional diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-api/src/main/java/org/openecomp/appc/message/RequestHandlerMessages.java b/appc-dispatcher/appc-request-handler/appc-request-handler-api/src/main/java/org/openecomp/appc/message/RequestHandlerMessages.java index 944a09cae..36937a023 100644 --- a/appc-dispatcher/appc-request-handler/appc-request-handler-api/src/main/java/org/openecomp/appc/message/RequestHandlerMessages.java +++ b/appc-dispatcher/appc-request-handler/appc-request-handler-api/src/main/java/org/openecomp/appc/message/RequestHandlerMessages.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.message; +package org.onap.appc.message; public class RequestHandlerMessages { diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-api/src/main/java/org/openecomp/appc/requesthandler/LCMStateManager.java b/appc-dispatcher/appc-request-handler/appc-request-handler-api/src/main/java/org/openecomp/appc/requesthandler/LCMStateManager.java index 72054a443..3890b1e24 100644 --- a/appc-dispatcher/appc-request-handler/appc-request-handler-api/src/main/java/org/openecomp/appc/requesthandler/LCMStateManager.java +++ b/appc-dispatcher/appc-request-handler/appc-request-handler-api/src/main/java/org/openecomp/appc/requesthandler/LCMStateManager.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.requesthandler; +package org.onap.appc.requesthandler; /** */ diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-api/src/main/java/org/openecomp/appc/requesthandler/RequestHandler.java b/appc-dispatcher/appc-request-handler/appc-request-handler-api/src/main/java/org/openecomp/appc/requesthandler/RequestHandler.java index 231e97dd9..d8aba25b2 100644 --- a/appc-dispatcher/appc-request-handler/appc-request-handler-api/src/main/java/org/openecomp/appc/requesthandler/RequestHandler.java +++ b/appc-dispatcher/appc-request-handler/appc-request-handler-api/src/main/java/org/openecomp/appc/requesthandler/RequestHandler.java @@ -22,12 +22,12 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.requesthandler; +package org.onap.appc.requesthandler; -import org.openecomp.appc.domainmodel.lcm.RuntimeContext; -import org.openecomp.appc.executor.UnstableVNFException; -import org.openecomp.appc.requesthandler.objects.RequestHandlerInput; -import org.openecomp.appc.requesthandler.objects.RequestHandlerOutput; +import org.onap.appc.domainmodel.lcm.RuntimeContext; +import org.onap.appc.executor.UnstableVNFException; +import org.onap.appc.requesthandler.objects.RequestHandlerInput; +import org.onap.appc.requesthandler.objects.RequestHandlerOutput; /** * This class provides application logic for the Request/Response Handler Component. diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-api/src/main/java/org/openecomp/appc/requesthandler/objects/RequestHandlerInput.java b/appc-dispatcher/appc-request-handler/appc-request-handler-api/src/main/java/org/openecomp/appc/requesthandler/objects/RequestHandlerInput.java index 98ac5da7a..94d35028b 100644 --- a/appc-dispatcher/appc-request-handler/appc-request-handler-api/src/main/java/org/openecomp/appc/requesthandler/objects/RequestHandlerInput.java +++ b/appc-dispatcher/appc-request-handler/appc-request-handler-api/src/main/java/org/openecomp/appc/requesthandler/objects/RequestHandlerInput.java @@ -22,9 +22,9 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.requesthandler.objects; +package org.onap.appc.requesthandler.objects; -import org.openecomp.appc.domainmodel.lcm.RequestContext; +import org.onap.appc.domainmodel.lcm.RequestContext; public class RequestHandlerInput { diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-api/src/main/java/org/openecomp/appc/requesthandler/objects/RequestHandlerOutput.java b/appc-dispatcher/appc-request-handler/appc-request-handler-api/src/main/java/org/openecomp/appc/requesthandler/objects/RequestHandlerOutput.java index 0a8eb687f..16b36b048 100644 --- a/appc-dispatcher/appc-request-handler/appc-request-handler-api/src/main/java/org/openecomp/appc/requesthandler/objects/RequestHandlerOutput.java +++ b/appc-dispatcher/appc-request-handler/appc-request-handler-api/src/main/java/org/openecomp/appc/requesthandler/objects/RequestHandlerOutput.java @@ -22,9 +22,9 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.requesthandler.objects; +package org.onap.appc.requesthandler.objects; -import org.openecomp.appc.domainmodel.lcm.ResponseContext; +import org.onap.appc.domainmodel.lcm.ResponseContext; public class RequestHandlerOutput { diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-core/pom.xml b/appc-dispatcher/appc-request-handler/appc-request-handler-core/pom.xml index ea1fd54c5..7f76d2ec8 100644 --- a/appc-dispatcher/appc-request-handler/appc-request-handler-core/pom.xml +++ b/appc-dispatcher/appc-request-handler/appc-request-handler-core/pom.xml @@ -14,7 +14,7 @@ 4.0.0 - org.openecomp.appc + org.onap.appc appc-request-handler 1.3.0-SNAPSHOT @@ -26,66 +26,66 @@ - org.openecomp.appc + org.onap.appc appc-common ${project.version} - org.openecomp.appc + org.onap.appc appc-metric-bundle ${project.version} - org.openecomp.appc + org.onap.appc appc-dmaap-adapter-bundle ${project.version} provided - org.openecomp.appc + org.onap.appc appc-message-adapter-api ${project.version} provided - org.openecomp.appc + org.onap.appc appc-message-adapter-factory ${project.version} provided - org.openecomp.appc + org.onap.appc appc-command-executor-api ${project.version} - org.openecomp.appc + org.onap.appc appc-workflow-management-api ${project.version} - org.openecomp.appc + org.onap.appc appc-request-handler-api ${project.version} - org.openecomp.appc + org.onap.appc execution-queue-management-lib ${project.version} - org.openecomp.appc + org.onap.appc appc-lifecycle-management-api ${project.version} - org.openecomp.appc + org.onap.appc appc-data-access-lib ${project.version} - org.openecomp.appc + org.onap.appc lock-manager-api ${project.version} @@ -95,17 +95,17 @@ aai-service-provider - org.openecomp.appc + org.onap.appc domain-model-lib ${project.version} - org.openecomp.appc + org.onap.appc appc-provider-model ${project.version} - org.openecomp.appc + org.onap.appc transaction-recorder ${project.version} @@ -125,13 +125,13 @@ ${project.artifactId} ${project.version} - org.openecomp.appc.requesthandler.RequestHandler + org.onap.appc.requesthandler.RequestHandler - org.openecomp.appc.adapter.messaging.*, - org.openecomp.appc.adapter.message.*, - org.openecomp.appc.adapter.factory.*, - org.openecomp.appc.lockmanager.api.*,org.openecomp.appc.requesthandler,org.openecomp.appc.requesthandler.objects,org.openecomp.appc.transactionrecorder, - org.openecomp.appc.transactionrecorder.objects, org.openecomp.appc.dao.util, + org.onap.appc.adapter.messaging.*, + org.onap.appc.adapter.message.*, + org.onap.appc.adapter.factory.*, + org.onap.appc.lockmanager.api.*,org.onap.appc.requesthandler,org.onap.appc.requesthandler.objects,org.onap.appc.transactionrecorder, + org.onap.appc.transactionrecorder.objects, org.onap.appc.dao.util, *;resolution:=optional diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/messageadapter/MessageAdapter.java b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/messageadapter/MessageAdapter.java index a30c621e0..15e8d2436 100644 --- a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/messageadapter/MessageAdapter.java +++ b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/messageadapter/MessageAdapter.java @@ -22,10 +22,10 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.messageadapter; +package org.onap.appc.messageadapter; -import org.openecomp.appc.domainmodel.lcm.ResponseContext; -import org.openecomp.appc.domainmodel.lcm.VNFOperation; +import org.onap.appc.domainmodel.lcm.ResponseContext; +import org.onap.appc.domainmodel.lcm.VNFOperation; public interface MessageAdapter { /** diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/messageadapter/impl/MessageAdapterImpl.java b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/messageadapter/impl/MessageAdapterImpl.java index 207ab8556..63a3c00a4 100644 --- a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/messageadapter/impl/MessageAdapterImpl.java +++ b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/messageadapter/impl/MessageAdapterImpl.java @@ -22,24 +22,24 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.messageadapter.impl; +package org.onap.appc.messageadapter.impl; -import org.openecomp.appc.adapter.factory.DmaapMessageAdapterFactoryImpl; -import org.openecomp.appc.adapter.factory.MessageService; -import org.openecomp.appc.adapter.message.MessageAdapterFactory; -import org.openecomp.appc.adapter.message.Producer; -import org.openecomp.appc.configuration.Configuration; -import org.openecomp.appc.configuration.ConfigurationFactory; +import org.onap.appc.adapter.factory.DmaapMessageAdapterFactoryImpl; +import org.onap.appc.adapter.factory.MessageService; +import org.onap.appc.adapter.message.MessageAdapterFactory; +import org.onap.appc.adapter.message.Producer; +import org.onap.appc.configuration.Configuration; +import org.onap.appc.configuration.ConfigurationFactory; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; import com.fasterxml.jackson.core.JsonProcessingException; import org.apache.commons.lang.ObjectUtils; -import org.openecomp.appc.domainmodel.lcm.ResponseContext; -import org.openecomp.appc.domainmodel.lcm.VNFOperation; -import org.openecomp.appc.messageadapter.MessageAdapter; -import org.openecomp.appc.requesthandler.conv.Converter; +import org.onap.appc.domainmodel.lcm.ResponseContext; +import org.onap.appc.domainmodel.lcm.VNFOperation; +import org.onap.appc.messageadapter.MessageAdapter; +import org.onap.appc.requesthandler.conv.Converter; import org.osgi.framework.BundleContext; import org.osgi.framework.FrameworkUtil; import org.osgi.framework.ServiceReference; diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/constant/Constants.java b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/constant/Constants.java index 650262cff..4015181a1 100644 --- a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/constant/Constants.java +++ b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/constant/Constants.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.requesthandler.constant; +package org.onap.appc.requesthandler.constant; import java.util.concurrent.TimeUnit; diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/conv/Converter.java b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/conv/Converter.java index aaa9933ed..5a791711e 100644 --- a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/conv/Converter.java +++ b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/conv/Converter.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.requesthandler.conv; +package org.onap.appc.requesthandler.conv; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; @@ -36,18 +36,18 @@ import com.fasterxml.jackson.databind.MapperFeature; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectWriter; import com.fasterxml.jackson.databind.SerializationFeature; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.*; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.common.header.CommonHeader; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.common.header.CommonHeaderBuilder; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.common.header.common.header.Flags; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.common.header.common.header.FlagsBuilder; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.status.Status; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.status.StatusBuilder; +import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.*; +import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.common.header.CommonHeader; +import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.common.header.CommonHeaderBuilder; +import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.common.header.common.header.Flags; +import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.common.header.common.header.FlagsBuilder; +import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.status.Status; +import org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.status.StatusBuilder; import org.opendaylight.yangtools.concepts.Builder; import org.opendaylight.yangtools.yang.binding.DataContainer; -import org.openecomp.appc.domainmodel.lcm.ResponseContext; -import org.openecomp.appc.domainmodel.lcm.VNFOperation; -import org.openecomp.appc.requesthandler.impl.DmaapOutgoingMessage; +import org.onap.appc.domainmodel.lcm.ResponseContext; +import org.onap.appc.domainmodel.lcm.VNFOperation; +import org.onap.appc.requesthandler.impl.DmaapOutgoingMessage; import java.text.ParseException; import java.text.SimpleDateFormat; @@ -270,7 +270,7 @@ public class Converter { } CommonHeaderBuilder commonHeaderBuilder = new CommonHeaderBuilder(); - org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.common.header.common.header.Flags commonHeaderFlags = null; + org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.common.header.common.header.Flags commonHeaderFlags = null; if(inObj.getCommonHeader().getFlags() != null){ commonHeaderFlags = Converter.convFlagsMapTorev160108Flags(inObj.getCommonHeader().getFlags()); commonHeaderBuilder.setFlags(commonHeaderFlags); @@ -301,8 +301,8 @@ public class Converter { return isoFormatter.format(timeStamp); } - public static org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.common.header.common.header.Flags - convFlagsMapTorev160108Flags(org.openecomp.appc.domainmodel.lcm.Flags flags) { + public static org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.common.header.common.header.Flags + convFlagsMapTorev160108Flags(org.onap.appc.domainmodel.lcm.Flags flags) { Flags rev160108flags = null; boolean anyFlag = false; FlagsBuilder flagsBuilder = new FlagsBuilder(); @@ -311,14 +311,14 @@ public class Converter { */ /* if(flags.containsKey(FORCE_FLAG)){ - org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.common.header.common.header.Flags.Force force = - org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.common.header.common.header.Flags.Force.valueOf(flags.get(FORCE_FLAG).toString()); + org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.common.header.common.header.Flags.Force force = + org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.common.header.common.header.Flags.Force.valueOf(flags.get(FORCE_FLAG).toString()); flagsBuilder.setForce(force); anyFlag = true; } if(flags.containsKey(MODE_FLAG)){ - org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.common.header.common.header.Flags.Mode mode = - org.opendaylight.yang.gen.v1.org.openecomp.appc.lcm.rev160108.common.header.common.header.Flags.Mode.valueOf(flags.get(MODE_FLAG).toString()); + org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.common.header.common.header.Flags.Mode mode = + org.opendaylight.yang.gen.v1.org.onap.appc.lcm.rev160108.common.header.common.header.Flags.Mode.valueOf(flags.get(MODE_FLAG).toString()); flagsBuilder.setMode(mode); anyFlag = true; } diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/exceptions/DGWorkflowNotFoundException.java b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/exceptions/DGWorkflowNotFoundException.java index 1e7c3f5e9..5626cfe6f 100644 --- a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/exceptions/DGWorkflowNotFoundException.java +++ b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/exceptions/DGWorkflowNotFoundException.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.requesthandler.exceptions; +package org.onap.appc.requesthandler.exceptions; public class DGWorkflowNotFoundException extends Exception { diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/exceptions/DuplicateRequestException.java b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/exceptions/DuplicateRequestException.java index 63e270084..b06788a99 100644 --- a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/exceptions/DuplicateRequestException.java +++ b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/exceptions/DuplicateRequestException.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.requesthandler.exceptions; +package org.onap.appc.requesthandler.exceptions; public class DuplicateRequestException extends Exception { diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/exceptions/InvalidInputException.java b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/exceptions/InvalidInputException.java index e654db70f..6e2435559 100644 --- a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/exceptions/InvalidInputException.java +++ b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/exceptions/InvalidInputException.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.requesthandler.exceptions; +package org.onap.appc.requesthandler.exceptions; public class InvalidInputException extends Exception { diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/exceptions/LCMOperationsDisabledException.java b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/exceptions/LCMOperationsDisabledException.java index 696e965fd..ca5f72682 100644 --- a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/exceptions/LCMOperationsDisabledException.java +++ b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/exceptions/LCMOperationsDisabledException.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.requesthandler.exceptions; +package org.onap.appc.requesthandler.exceptions; /** */ diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/exceptions/MissingVNFDataInAAIException.java b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/exceptions/MissingVNFDataInAAIException.java index e5c6528ea..219265084 100644 --- a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/exceptions/MissingVNFDataInAAIException.java +++ b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/exceptions/MissingVNFDataInAAIException.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.requesthandler.exceptions; +package org.onap.appc.requesthandler.exceptions; public class MissingVNFDataInAAIException extends Exception { String missingAttributeName; diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/exceptions/RequestExpiredException.java b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/exceptions/RequestExpiredException.java index 25be97b1b..02a130c8b 100644 --- a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/exceptions/RequestExpiredException.java +++ b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/exceptions/RequestExpiredException.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.requesthandler.exceptions; +package org.onap.appc.requesthandler.exceptions; public class RequestExpiredException extends Exception { diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/exceptions/VNFNotFoundException.java b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/exceptions/VNFNotFoundException.java index 214cefede..d1b2759d6 100644 --- a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/exceptions/VNFNotFoundException.java +++ b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/exceptions/VNFNotFoundException.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.requesthandler.exceptions; +package org.onap.appc.requesthandler.exceptions; public class VNFNotFoundException extends Exception { diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/exceptions/WorkflowNotFoundException.java b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/exceptions/WorkflowNotFoundException.java index 531835bc6..85157e32f 100644 --- a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/exceptions/WorkflowNotFoundException.java +++ b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/exceptions/WorkflowNotFoundException.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.requesthandler.exceptions; +package org.onap.appc.requesthandler.exceptions; public class WorkflowNotFoundException extends Exception { diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/helper/RequestRegistry.java b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/helper/RequestRegistry.java index ad2ff6ed5..fd1292ff9 100644 --- a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/helper/RequestRegistry.java +++ b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/helper/RequestRegistry.java @@ -22,10 +22,10 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.requesthandler.helper; +package org.onap.appc.requesthandler.helper; import org.apache.commons.lang.ObjectUtils; -import org.openecomp.appc.executor.objects.UniqueRequestIdentifier; +import org.onap.appc.executor.objects.UniqueRequestIdentifier; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/helper/RequestValidator.java b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/helper/RequestValidator.java index fd38f5a84..e45341d3d 100644 --- a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/helper/RequestValidator.java +++ b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/helper/RequestValidator.java @@ -22,20 +22,20 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.requesthandler.helper; +package org.onap.appc.requesthandler.helper; -import org.openecomp.appc.domainmodel.lcm.RuntimeContext; -import org.openecomp.appc.executor.UnstableVNFException; -import org.openecomp.appc.lifecyclemanager.objects.LifecycleException; -import org.openecomp.appc.lifecyclemanager.objects.NoTransitionDefinedException; -import org.openecomp.appc.requesthandler.exceptions.DGWorkflowNotFoundException; -import org.openecomp.appc.requesthandler.exceptions.DuplicateRequestException; -import org.openecomp.appc.requesthandler.exceptions.InvalidInputException; -import org.openecomp.appc.requesthandler.exceptions.LCMOperationsDisabledException; -import org.openecomp.appc.requesthandler.exceptions.MissingVNFDataInAAIException; -import org.openecomp.appc.requesthandler.exceptions.RequestExpiredException; -import org.openecomp.appc.requesthandler.exceptions.VNFNotFoundException; -import org.openecomp.appc.requesthandler.exceptions.WorkflowNotFoundException; +import org.onap.appc.domainmodel.lcm.RuntimeContext; +import org.onap.appc.executor.UnstableVNFException; +import org.onap.appc.lifecyclemanager.objects.LifecycleException; +import org.onap.appc.lifecyclemanager.objects.NoTransitionDefinedException; +import org.onap.appc.requesthandler.exceptions.DGWorkflowNotFoundException; +import org.onap.appc.requesthandler.exceptions.DuplicateRequestException; +import org.onap.appc.requesthandler.exceptions.InvalidInputException; +import org.onap.appc.requesthandler.exceptions.LCMOperationsDisabledException; +import org.onap.appc.requesthandler.exceptions.MissingVNFDataInAAIException; +import org.onap.appc.requesthandler.exceptions.RequestExpiredException; +import org.onap.appc.requesthandler.exceptions.VNFNotFoundException; +import org.onap.appc.requesthandler.exceptions.WorkflowNotFoundException; public interface RequestValidator { public void validateRequest(RuntimeContext runtimeContext) throws VNFNotFoundException, RequestExpiredException, UnstableVNFException, InvalidInputException, DuplicateRequestException, NoTransitionDefinedException, LifecycleException, WorkflowNotFoundException, DGWorkflowNotFoundException, MissingVNFDataInAAIException, LCMOperationsDisabledException; diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/impl/AbstractRequestHandlerImpl.java b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/impl/AbstractRequestHandlerImpl.java index c14b2c1e7..8b56dda41 100644 --- a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/impl/AbstractRequestHandlerImpl.java +++ b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/impl/AbstractRequestHandlerImpl.java @@ -22,44 +22,44 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.requesthandler.impl; +package org.onap.appc.requesthandler.impl; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; import com.att.eelf.i18n.EELFResourceManager; import org.apache.commons.lang.ObjectUtils; -import org.openecomp.appc.requesthandler.constant.Constants; -import org.openecomp.appc.configuration.Configuration; -import org.openecomp.appc.configuration.ConfigurationFactory; -import org.openecomp.appc.domainmodel.lcm.*; -import org.openecomp.appc.exceptions.APPCException; -import org.openecomp.appc.executor.CommandExecutor; -import org.openecomp.appc.executor.UnstableVNFException; -import org.openecomp.appc.executor.objects.LCMCommandStatus; -import org.openecomp.appc.executor.objects.Params; -import org.openecomp.appc.executor.objects.UniqueRequestIdentifier; -import org.openecomp.appc.i18n.Msg; -import org.openecomp.appc.lifecyclemanager.objects.LifecycleException; -import org.openecomp.appc.lifecyclemanager.objects.NoTransitionDefinedException; -import org.openecomp.appc.logging.LoggingConstants; -import org.openecomp.appc.logging.LoggingUtils; -import org.openecomp.appc.messageadapter.MessageAdapter; -import org.openecomp.appc.messageadapter.impl.MessageAdapterImpl; -import org.openecomp.appc.metricservice.MetricRegistry; -import org.openecomp.appc.metricservice.MetricService; -import org.openecomp.appc.metricservice.metric.DispatchingFuntionMetric; -import org.openecomp.appc.metricservice.metric.Metric; -import org.openecomp.appc.metricservice.metric.MetricType; -import org.openecomp.appc.metricservice.policy.PublishingPolicy; -import org.openecomp.appc.metricservice.publisher.LogPublisher; -import org.openecomp.appc.requesthandler.RequestHandler; -import org.openecomp.appc.requesthandler.exceptions.*; -import org.openecomp.appc.requesthandler.helper.RequestRegistry; -import org.openecomp.appc.requesthandler.helper.RequestValidator; -import org.openecomp.appc.requesthandler.objects.RequestHandlerInput; -import org.openecomp.appc.requesthandler.objects.RequestHandlerOutput; -import org.openecomp.appc.transactionrecorder.TransactionRecorder; -import org.openecomp.appc.transactionrecorder.objects.TransactionRecord; +import org.onap.appc.requesthandler.constant.Constants; +import org.onap.appc.configuration.Configuration; +import org.onap.appc.configuration.ConfigurationFactory; +import org.onap.appc.domainmodel.lcm.*; +import org.onap.appc.exceptions.APPCException; +import org.onap.appc.executor.CommandExecutor; +import org.onap.appc.executor.UnstableVNFException; +import org.onap.appc.executor.objects.LCMCommandStatus; +import org.onap.appc.executor.objects.Params; +import org.onap.appc.executor.objects.UniqueRequestIdentifier; +import org.onap.appc.i18n.Msg; +import org.onap.appc.lifecyclemanager.objects.LifecycleException; +import org.onap.appc.lifecyclemanager.objects.NoTransitionDefinedException; +import org.onap.appc.logging.LoggingConstants; +import org.onap.appc.logging.LoggingUtils; +import org.onap.appc.messageadapter.MessageAdapter; +import org.onap.appc.messageadapter.impl.MessageAdapterImpl; +import org.onap.appc.metricservice.MetricRegistry; +import org.onap.appc.metricservice.MetricService; +import org.onap.appc.metricservice.metric.DispatchingFuntionMetric; +import org.onap.appc.metricservice.metric.Metric; +import org.onap.appc.metricservice.metric.MetricType; +import org.onap.appc.metricservice.policy.PublishingPolicy; +import org.onap.appc.metricservice.publisher.LogPublisher; +import org.onap.appc.requesthandler.RequestHandler; +import org.onap.appc.requesthandler.exceptions.*; +import org.onap.appc.requesthandler.helper.RequestRegistry; +import org.onap.appc.requesthandler.helper.RequestValidator; +import org.onap.appc.requesthandler.objects.RequestHandlerInput; +import org.onap.appc.requesthandler.objects.RequestHandlerOutput; +import org.onap.appc.transactionrecorder.TransactionRecorder; +import org.onap.appc.transactionrecorder.objects.TransactionRecord; import org.osgi.framework.BundleContext; import org.osgi.framework.FrameworkUtil; import org.osgi.framework.ServiceReference; @@ -428,7 +428,7 @@ public abstract class AbstractRequestHandlerImpl implements RequestHandler { if (logger.isTraceEnabled()) logger.trace("Entering in getInputTTL with RequestHeader = " + ObjectUtils.toString(header)); if (!isValidTTL(String.valueOf(header.getFlags().getTtl()))) { - String defaultTTLStr = configuration.getProperty("org.openecomp.appc.workflow.default.ttl", String.valueOf(Constants.DEFAULT_TTL)); + String defaultTTLStr = configuration.getProperty("org.onap.appc.workflow.default.ttl", String.valueOf(Constants.DEFAULT_TTL)); Integer defaultTTL = Integer.parseInt(defaultTTLStr); if (logger.isTraceEnabled()) logger.trace("Exiting from getInputTTL with (defaultTTL = " + ObjectUtils.toString(defaultTTL) + ")"); @@ -457,14 +457,14 @@ public abstract class AbstractRequestHandlerImpl implements RequestHandler { } private Boolean isLoggingEnabled() { - String defaultFlagStr = configuration.getProperty("org.openecomp.appc.localTransactionRecorder.enable", String.valueOf(Constants.DEFAULT_LOGGING_FLAG)); + String defaultFlagStr = configuration.getProperty("org.onap.appc.localTransactionRecorder.enable", String.valueOf(Constants.DEFAULT_LOGGING_FLAG)); return Boolean.parseBoolean(defaultFlagStr); } private static RequestHandlerOutput buildRequestHandlerOutput(LCMCommandStatus response, Params params) { RequestHandlerOutput output = new RequestHandlerOutput(); ResponseContext responseContext = new ResponseContext(); - org.openecomp.appc.domainmodel.lcm.Status status = new org.openecomp.appc.domainmodel.lcm.Status(response.getResponseCode(),response.getFormattedMessage(params)); + org.onap.appc.domainmodel.lcm.Status status = new org.onap.appc.domainmodel.lcm.Status(response.getResponseCode(),response.getFormattedMessage(params)); responseContext.setStatus(status); output.setResponseContext(responseContext); return output; @@ -607,7 +607,7 @@ public abstract class AbstractRequestHandlerImpl implements RequestHandler { return (MetricService) bctx.getService(sref); } else { logger.info("Metric Service error from bundlecontext"); - logger.warn("Cannot find service reference for org.openecomp.appc.metricservice.MetricService"); + logger.warn("Cannot find service reference for org.onap.appc.metricservice.MetricService"); return null; } } diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/impl/AbstractRequestValidatorImpl.java b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/impl/AbstractRequestValidatorImpl.java index e60095d95..4f4942b8a 100644 --- a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/impl/AbstractRequestValidatorImpl.java +++ b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/impl/AbstractRequestValidatorImpl.java @@ -22,35 +22,35 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.requesthandler.impl; +package org.onap.appc.requesthandler.impl; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; import com.att.eelf.i18n.EELFResourceManager; import org.apache.commons.lang.ObjectUtils; import org.apache.commons.lang.StringUtils; -import org.openecomp.appc.requesthandler.constant.Constants; -import org.openecomp.appc.configuration.Configuration; -import org.openecomp.appc.configuration.ConfigurationFactory; -import org.openecomp.appc.domainmodel.lcm.CommonHeader; -import org.openecomp.appc.domainmodel.lcm.RequestContext; -import org.openecomp.appc.domainmodel.lcm.RuntimeContext; -import org.openecomp.appc.domainmodel.lcm.VNFContext; -import org.openecomp.appc.executor.UnstableVNFException; -import org.openecomp.appc.executor.objects.UniqueRequestIdentifier; -import org.openecomp.appc.i18n.Msg; -import org.openecomp.appc.lifecyclemanager.LifecycleManager; -import org.openecomp.appc.lifecyclemanager.objects.LifecycleException; -import org.openecomp.appc.lifecyclemanager.objects.NoTransitionDefinedException; -import org.openecomp.appc.logging.LoggingConstants; -import org.openecomp.appc.logging.LoggingUtils; -import org.openecomp.appc.requesthandler.LCMStateManager; -import org.openecomp.appc.requesthandler.exceptions.*; -import org.openecomp.appc.requesthandler.helper.RequestRegistry; -import org.openecomp.appc.requesthandler.helper.RequestValidator; -import org.openecomp.appc.workflow.WorkFlowManager; -import org.openecomp.appc.workflow.objects.WorkflowExistsOutput; -import org.openecomp.appc.workflow.objects.WorkflowRequest; +import org.onap.appc.requesthandler.constant.Constants; +import org.onap.appc.configuration.Configuration; +import org.onap.appc.configuration.ConfigurationFactory; +import org.onap.appc.domainmodel.lcm.CommonHeader; +import org.onap.appc.domainmodel.lcm.RequestContext; +import org.onap.appc.domainmodel.lcm.RuntimeContext; +import org.onap.appc.domainmodel.lcm.VNFContext; +import org.onap.appc.executor.UnstableVNFException; +import org.onap.appc.executor.objects.UniqueRequestIdentifier; +import org.onap.appc.i18n.Msg; +import org.onap.appc.lifecyclemanager.LifecycleManager; +import org.onap.appc.lifecyclemanager.objects.LifecycleException; +import org.onap.appc.lifecyclemanager.objects.NoTransitionDefinedException; +import org.onap.appc.logging.LoggingConstants; +import org.onap.appc.logging.LoggingUtils; +import org.onap.appc.requesthandler.LCMStateManager; +import org.onap.appc.requesthandler.exceptions.*; +import org.onap.appc.requesthandler.helper.RequestRegistry; +import org.onap.appc.requesthandler.helper.RequestValidator; +import org.onap.appc.workflow.WorkFlowManager; +import org.onap.appc.workflow.objects.WorkflowExistsOutput; +import org.onap.appc.workflow.objects.WorkflowRequest; import org.onap.ccsdk.sli.core.sli.SvcLogicContext; import org.onap.ccsdk.sli.core.sli.SvcLogicException; import org.onap.ccsdk.sli.core.sli.SvcLogicResource; @@ -225,7 +225,7 @@ public abstract class AbstractRequestValidatorImpl implements RequestValidator { logger.trace("Entering to readTTL with RequestHandlerInput = "+ ObjectUtils.toString(header)); } if (header.getFlags()== null || !isValidTTL(String.valueOf(header.getFlags().getTtl()))) { - String defaultTTLStr = configuration.getProperty("org.openecomp.appc.workflow.default.ttl", String.valueOf(Constants.DEFAULT_TTL)); + String defaultTTLStr = configuration.getProperty("org.onap.appc.workflow.default.ttl", String.valueOf(Constants.DEFAULT_TTL)); return Integer.parseInt(defaultTTLStr); } if (logger.isTraceEnabled()) { diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/impl/DmaapOutgoingMessage.java b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/impl/DmaapOutgoingMessage.java index 9a673a0c3..0df57a754 100644 --- a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/impl/DmaapOutgoingMessage.java +++ b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/impl/DmaapOutgoingMessage.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.requesthandler.impl; +package org.onap.appc.requesthandler.impl; @@ -32,7 +32,7 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize; /** * This class represents a message being sent out to DMaaP by APPC as async response. - * note the structure of this class must be adapted to the sync message sent to DMaaP represened in org.openecomp.appc.listener.LCM.domainmodel.DmaapOutgoingMessage + * note the structure of this class must be adapted to the sync message sent to DMaaP represened in org.onap.appc.listener.LCM.domainmodel.DmaapOutgoingMessage * */ @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/impl/LCMStateManagerImpl.java b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/impl/LCMStateManagerImpl.java index 4d61bf599..276eaddab 100644 --- a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/impl/LCMStateManagerImpl.java +++ b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/impl/LCMStateManagerImpl.java @@ -22,14 +22,14 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.requesthandler.impl; +package org.onap.appc.requesthandler.impl; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; import java.util.concurrent.atomic.AtomicBoolean; -import org.openecomp.appc.requesthandler.LCMStateManager; +import org.onap.appc.requesthandler.LCMStateManager; public class LCMStateManagerImpl implements LCMStateManager { private static final EELFLogger logger = EELFManager.getInstance().getLogger(LCMStateManagerImpl.class); diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/impl/RequestHandlerImpl.java b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/impl/RequestHandlerImpl.java index 845351246..1f07b277c 100644 --- a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/impl/RequestHandlerImpl.java +++ b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/impl/RequestHandlerImpl.java @@ -22,25 +22,25 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.requesthandler.impl; +package org.onap.appc.requesthandler.impl; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; import com.att.eelf.i18n.EELFResourceManager; -import org.openecomp.appc.requesthandler.constant.Constants; -import org.openecomp.appc.domainmodel.lcm.RuntimeContext; -import org.openecomp.appc.domainmodel.lcm.Status; -import org.openecomp.appc.domainmodel.lcm.VNFOperation; -import org.openecomp.appc.executor.UnstableVNFException; -import org.openecomp.appc.executor.objects.LCMCommandStatus; -import org.openecomp.appc.executor.objects.Params; -import org.openecomp.appc.executor.objects.UniqueRequestIdentifier; -import org.openecomp.appc.i18n.Msg; -import org.openecomp.appc.lockmanager.api.LockException; -import org.openecomp.appc.lockmanager.api.LockManager; -import org.openecomp.appc.logging.LoggingConstants; -import org.openecomp.appc.workingstatemanager.WorkingStateManager; -import org.openecomp.appc.workingstatemanager.objects.VNFWorkingState; +import org.onap.appc.requesthandler.constant.Constants; +import org.onap.appc.domainmodel.lcm.RuntimeContext; +import org.onap.appc.domainmodel.lcm.Status; +import org.onap.appc.domainmodel.lcm.VNFOperation; +import org.onap.appc.executor.UnstableVNFException; +import org.onap.appc.executor.objects.LCMCommandStatus; +import org.onap.appc.executor.objects.Params; +import org.onap.appc.executor.objects.UniqueRequestIdentifier; +import org.onap.appc.i18n.Msg; +import org.onap.appc.lockmanager.api.LockException; +import org.onap.appc.lockmanager.api.LockManager; +import org.onap.appc.logging.LoggingConstants; +import org.onap.appc.workingstatemanager.WorkingStateManager; +import org.onap.appc.workingstatemanager.objects.VNFWorkingState; /** * This class provides application logic for the Request/Response Handler Component. @@ -51,7 +51,7 @@ public class RequestHandlerImpl extends AbstractRequestHandlerImpl { /** * APP-C VNF lock idle timeout in milliseconds. Applied only when locking VNF using northbound API "lock" */ - private static final String PROP_IDLE_TIMEOUT = "org.openecomp.appc.lock.idleTimeout"; + private static final String PROP_IDLE_TIMEOUT = "org.onap.appc.lock.idleTimeout"; private LockManager lockManager; diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/impl/RequestValidatorImpl.java b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/impl/RequestValidatorImpl.java index 8e0947e66..8724adc59 100644 --- a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/impl/RequestValidatorImpl.java +++ b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/impl/RequestValidatorImpl.java @@ -22,23 +22,23 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.requesthandler.impl; +package org.onap.appc.requesthandler.impl; import com.att.eelf.i18n.EELFResourceManager; import org.apache.commons.lang.ObjectUtils; -import org.openecomp.appc.domainmodel.lcm.RuntimeContext; -import org.openecomp.appc.domainmodel.lcm.VNFContext; -import org.openecomp.appc.domainmodel.lcm.VNFOperation; -import org.openecomp.appc.executor.UnstableVNFException; -import org.openecomp.appc.i18n.Msg; -import org.openecomp.appc.lifecyclemanager.LifecycleManager; -import org.openecomp.appc.lifecyclemanager.objects.LifecycleException; -import org.openecomp.appc.lifecyclemanager.objects.NoTransitionDefinedException; -import org.openecomp.appc.logging.LoggingConstants; -import org.openecomp.appc.logging.LoggingUtils; -import org.openecomp.appc.requesthandler.LCMStateManager; -import org.openecomp.appc.requesthandler.exceptions.*; -import org.openecomp.appc.workingstatemanager.WorkingStateManager; +import org.onap.appc.domainmodel.lcm.RuntimeContext; +import org.onap.appc.domainmodel.lcm.VNFContext; +import org.onap.appc.domainmodel.lcm.VNFOperation; +import org.onap.appc.executor.UnstableVNFException; +import org.onap.appc.i18n.Msg; +import org.onap.appc.lifecyclemanager.LifecycleManager; +import org.onap.appc.lifecyclemanager.objects.LifecycleException; +import org.onap.appc.lifecyclemanager.objects.NoTransitionDefinedException; +import org.onap.appc.logging.LoggingConstants; +import org.onap.appc.logging.LoggingUtils; +import org.onap.appc.requesthandler.LCMStateManager; +import org.onap.appc.requesthandler.exceptions.*; +import org.onap.appc.workingstatemanager.WorkingStateManager; public class RequestValidatorImpl extends AbstractRequestValidatorImpl { diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/impl/VMRequestHandlerImpl.java b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/impl/VMRequestHandlerImpl.java index e5dad8617..7e3917313 100644 --- a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/impl/VMRequestHandlerImpl.java +++ b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/impl/VMRequestHandlerImpl.java @@ -22,10 +22,10 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.requesthandler.impl; +package org.onap.appc.requesthandler.impl; -import org.openecomp.appc.domainmodel.lcm.RuntimeContext; -import org.openecomp.appc.executor.UnstableVNFException; +import org.onap.appc.domainmodel.lcm.RuntimeContext; +import org.onap.appc.executor.UnstableVNFException; public class VMRequestHandlerImpl extends AbstractRequestHandlerImpl{ diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/impl/VMRequestValidatorImpl.java b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/impl/VMRequestValidatorImpl.java index 4bfac802f..79f83fbc6 100644 --- a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/impl/VMRequestValidatorImpl.java +++ b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/impl/VMRequestValidatorImpl.java @@ -22,16 +22,16 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.requesthandler.impl; +package org.onap.appc.requesthandler.impl; import com.att.eelf.i18n.EELFResourceManager; -import org.openecomp.appc.domainmodel.lcm.RuntimeContext; -import org.openecomp.appc.domainmodel.lcm.VNFContext; -import org.openecomp.appc.domainmodel.lcm.VNFOperation; -import org.openecomp.appc.i18n.Msg; -import org.openecomp.appc.logging.LoggingConstants; -import org.openecomp.appc.logging.LoggingUtils; -import org.openecomp.appc.requesthandler.exceptions.*; +import org.onap.appc.domainmodel.lcm.RuntimeContext; +import org.onap.appc.domainmodel.lcm.VNFContext; +import org.onap.appc.domainmodel.lcm.VNFOperation; +import org.onap.appc.i18n.Msg; +import org.onap.appc.logging.LoggingConstants; +import org.onap.appc.logging.LoggingUtils; +import org.onap.appc.requesthandler.exceptions.*; import java.util.HashSet; import java.util.LinkedList; diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/workingstatemanager/WorkingStateManager.java b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/workingstatemanager/WorkingStateManager.java index 11687f25a..e9b3d0f3a 100644 --- a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/workingstatemanager/WorkingStateManager.java +++ b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/workingstatemanager/WorkingStateManager.java @@ -22,10 +22,10 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.workingstatemanager; +package org.onap.appc.workingstatemanager; -import org.openecomp.appc.requesthandler.exceptions.VNFNotFoundException; -import org.openecomp.appc.workingstatemanager.objects.VNFWorkingState; +import org.onap.appc.requesthandler.exceptions.VNFNotFoundException; +import org.onap.appc.workingstatemanager.objects.VNFWorkingState; public interface WorkingStateManager { diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/workingstatemanager/impl/JdbcWorkingStateManager.java b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/workingstatemanager/impl/JdbcWorkingStateManager.java index 85e1baab9..041cf7e84 100644 --- a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/workingstatemanager/impl/JdbcWorkingStateManager.java +++ b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/workingstatemanager/impl/JdbcWorkingStateManager.java @@ -22,12 +22,12 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.workingstatemanager.impl; +package org.onap.appc.workingstatemanager.impl; import java.sql.Connection; -import org.openecomp.appc.dao.util.JdbcConnectionFactory; -import org.openecomp.appc.workingstatemanager.WorkingStateManager; +import org.onap.appc.dao.util.JdbcConnectionFactory; +import org.onap.appc.workingstatemanager.WorkingStateManager; public abstract class JdbcWorkingStateManager implements WorkingStateManager { diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/workingstatemanager/impl/RequestHandlerMessages.java b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/workingstatemanager/impl/RequestHandlerMessages.java index b41e9b41e..206d57229 100644 --- a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/workingstatemanager/impl/RequestHandlerMessages.java +++ b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/workingstatemanager/impl/RequestHandlerMessages.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.workingstatemanager.impl; +package org.onap.appc.workingstatemanager.impl; public class RequestHandlerMessages { diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/workingstatemanager/impl/WorkingStateManagerImpl.java b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/workingstatemanager/impl/WorkingStateManagerImpl.java index 3431d2774..e2fb3f298 100644 --- a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/workingstatemanager/impl/WorkingStateManagerImpl.java +++ b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/workingstatemanager/impl/WorkingStateManagerImpl.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.workingstatemanager.impl; +package org.onap.appc.workingstatemanager.impl; import java.sql.Connection; import java.sql.PreparedStatement; @@ -33,12 +33,12 @@ import java.util.concurrent.ConcurrentHashMap; import org.apache.commons.lang.ObjectUtils; import org.apache.commons.lang3.StringUtils; -import org.openecomp.appc.configuration.ConfigurationFactory; -import org.openecomp.appc.executor.objects.Params; -import org.openecomp.appc.message.RequestHandlerMessages; -import org.openecomp.appc.util.MessageFormatter; -import org.openecomp.appc.workingstatemanager.objects.VNFWorkingState; -import org.openecomp.appc.workingstatemanager.objects.VnfWorkingStateDto; +import org.onap.appc.configuration.ConfigurationFactory; +import org.onap.appc.executor.objects.Params; +import org.onap.appc.message.RequestHandlerMessages; +import org.onap.appc.util.MessageFormatter; +import org.onap.appc.workingstatemanager.objects.VNFWorkingState; +import org.onap.appc.workingstatemanager.objects.VnfWorkingStateDto; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; import org.apache.commons.lang3.StringUtils; @@ -50,7 +50,7 @@ public class WorkingStateManagerImpl extends JdbcWorkingStateManager { private static final String SQL_INSERT_VNF_STATE_MANAGEMENT = "INSERT IGNORE INTO VNF_STATE_MANAGEMENT (VNF_ID,STATE,OWNER_ID,UPDATED,VER) VALUES (?, ?, ?, ?, ?)"; private static final String SQL_UPDATE_VNF_STATE_MANAGEMENT = "UPDATE VNF_STATE_MANAGEMENT SET OWNER_ID=?, UPDATED=?, STATE=?, VER=? WHERE VNF_ID=? AND VER=?"; private static final String SQL_CURRENT_TIMESTAMP = "SELECT CURRENT_TIMESTAMP()"; - private static int maxAttempts = ConfigurationFactory.getConfiguration().getIntegerProperty("org.openecomp.appc.workingstatemanager.maxAttempts",20); + private static int maxAttempts = ConfigurationFactory.getConfiguration().getIntegerProperty("org.onap.appc.workingstatemanager.maxAttempts",20); private static Map workingStateMap = new ConcurrentHashMap<>(); private static final EELFLogger logger = EELFManager.getInstance().getLogger(WorkingStateManagerImpl.class); diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/workingstatemanager/objects/VNFWorkingState.java b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/workingstatemanager/objects/VNFWorkingState.java index 60ff8b582..9c638de20 100644 --- a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/workingstatemanager/objects/VNFWorkingState.java +++ b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/workingstatemanager/objects/VNFWorkingState.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.workingstatemanager.objects; +package org.onap.appc.workingstatemanager.objects; public enum VNFWorkingState { diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/workingstatemanager/objects/VnfWorkingStateDto.java b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/workingstatemanager/objects/VnfWorkingStateDto.java index 30603a6a6..948d4ca59 100644 --- a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/workingstatemanager/objects/VnfWorkingStateDto.java +++ b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/workingstatemanager/objects/VnfWorkingStateDto.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.workingstatemanager.objects; +package org.onap.appc.workingstatemanager.objects; public class VnfWorkingStateDto { diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml index cf2aa4804..447c2ce21 100644 --- a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml +++ b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml @@ -29,7 +29,7 @@ - + @@ -37,51 +37,51 @@ - + - + - + - + - + VM - + VNF - - - - - - + + + + + + - + - + diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/resources/org/openecomp/appc/default.properties b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/resources/org/openecomp/appc/default.properties index f04b048d7..9bf3b6c1a 100644 --- a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/resources/org/openecomp/appc/default.properties +++ b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/resources/org/openecomp/appc/default.properties @@ -24,8 +24,8 @@ # Define the name and path of any user-provided configuration (bootstrap) file that can be loaded # to supply configuration options -org.openecomp.appc.bootstrap.file=appc.properties -org.openecomp.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},. +org.onap.appc.bootstrap.file=appc.properties +org.onap.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},. #Property below provided by appc.properties appc.LCM.provider.url=https://localhost:8443/restconf/operations/appc-provider-lcm @@ -37,13 +37,13 @@ appc.LCM.provider.user=test appc.LCM.provider.pass=test -org.openecomp.appc.db.url.sdnctl=jdbc:mysql://127.0.0.1:3306/test -org.openecomp.appc.db.user.sdnctl=test -org.openecomp.appc.db.pass.sdnctl=123456 +org.onap.appc.db.url.sdnctl=jdbc:mysql://127.0.0.1:3306/test +org.onap.appc.db.user.sdnctl=test +org.onap.appc.db.pass.sdnctl=123456 # # This needs to be changed so that the action can be appended to the end of the URL path # #provider.urls.topology=https://admin:password@:8443/restconf/operations/appc-provider:topology-service #provider.urls.topology=https://admin:password@:8443/restconf/operations/appc-provider: -org.openecomp.appc.workingstatemanager.maxAttempts=20 +org.onap.appc.workingstatemanager.maxAttempts=20 diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/test/java/org/openecomp/appc/requesthandler/LCMStateManagerImplTest.java b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/test/java/org/openecomp/appc/requesthandler/LCMStateManagerImplTest.java index 113c6c65b..95146fbfa 100644 --- a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/test/java/org/openecomp/appc/requesthandler/LCMStateManagerImplTest.java +++ b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/test/java/org/openecomp/appc/requesthandler/LCMStateManagerImplTest.java @@ -22,12 +22,12 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.requesthandler; +package org.onap.appc.requesthandler; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import org.openecomp.appc.requesthandler.impl.LCMStateManagerImpl; +import org.onap.appc.requesthandler.impl.LCMStateManagerImpl; public class LCMStateManagerImplTest { diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/test/java/org/openecomp/appc/requesthandler/RequestValidatorTest.java b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/test/java/org/openecomp/appc/requesthandler/RequestValidatorTest.java index 9e2dd6f66..9339931e8 100644 --- a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/test/java/org/openecomp/appc/requesthandler/RequestValidatorTest.java +++ b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/test/java/org/openecomp/appc/requesthandler/RequestValidatorTest.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.requesthandler; +package org.onap.appc.requesthandler; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; @@ -30,26 +30,26 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mockito; -import org.openecomp.appc.domainmodel.lcm.ActionIdentifiers; -import org.openecomp.appc.domainmodel.lcm.CommonHeader; -import org.openecomp.appc.domainmodel.lcm.Flags; -import org.openecomp.appc.domainmodel.lcm.RequestContext; -import org.openecomp.appc.domainmodel.lcm.ResponseContext; -import org.openecomp.appc.domainmodel.lcm.RuntimeContext; -import org.openecomp.appc.domainmodel.lcm.Status; -import org.openecomp.appc.domainmodel.lcm.VNFContext; -import org.openecomp.appc.domainmodel.lcm.VNFOperation; -import org.openecomp.appc.lifecyclemanager.LifecycleManager; -import org.openecomp.appc.lifecyclemanager.objects.NoTransitionDefinedException; -import org.openecomp.appc.requesthandler.exceptions.InvalidInputException; -import org.openecomp.appc.requesthandler.exceptions.LCMOperationsDisabledException; -import org.openecomp.appc.requesthandler.impl.RequestHandlerImpl; -import org.openecomp.appc.requesthandler.impl.RequestValidatorImpl; -import org.openecomp.appc.requesthandler.objects.RequestHandlerInput; -import org.openecomp.appc.transactionrecorder.TransactionRecorder; -import org.openecomp.appc.workflow.WorkFlowManager; -import org.openecomp.appc.workflow.objects.WorkflowExistsOutput; -import org.openecomp.appc.workingstatemanager.WorkingStateManager; +import org.onap.appc.domainmodel.lcm.ActionIdentifiers; +import org.onap.appc.domainmodel.lcm.CommonHeader; +import org.onap.appc.domainmodel.lcm.Flags; +import org.onap.appc.domainmodel.lcm.RequestContext; +import org.onap.appc.domainmodel.lcm.ResponseContext; +import org.onap.appc.domainmodel.lcm.RuntimeContext; +import org.onap.appc.domainmodel.lcm.Status; +import org.onap.appc.domainmodel.lcm.VNFContext; +import org.onap.appc.domainmodel.lcm.VNFOperation; +import org.onap.appc.lifecyclemanager.LifecycleManager; +import org.onap.appc.lifecyclemanager.objects.NoTransitionDefinedException; +import org.onap.appc.requesthandler.exceptions.InvalidInputException; +import org.onap.appc.requesthandler.exceptions.LCMOperationsDisabledException; +import org.onap.appc.requesthandler.impl.RequestHandlerImpl; +import org.onap.appc.requesthandler.impl.RequestValidatorImpl; +import org.onap.appc.requesthandler.objects.RequestHandlerInput; +import org.onap.appc.transactionrecorder.TransactionRecorder; +import org.onap.appc.workflow.WorkFlowManager; +import org.onap.appc.workflow.objects.WorkflowExistsOutput; +import org.onap.appc.workingstatemanager.WorkingStateManager; import org.onap.ccsdk.sli.core.sli.SvcLogicContext; import org.onap.ccsdk.sli.core.sli.SvcLogicResource; import org.onap.ccsdk.sli.adaptors.aai.AAIService; diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/test/java/org/openecomp/appc/requesthandler/TestConverter.java b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/test/java/org/openecomp/appc/requesthandler/TestConverter.java index dd308976a..a65af669b 100644 --- a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/test/java/org/openecomp/appc/requesthandler/TestConverter.java +++ b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/test/java/org/openecomp/appc/requesthandler/TestConverter.java @@ -22,14 +22,14 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.requesthandler; +package org.onap.appc.requesthandler; import com.fasterxml.jackson.core.JsonProcessingException; import org.junit.Assert; import org.junit.Test; -import org.openecomp.appc.domainmodel.lcm.*; -import org.openecomp.appc.executor.objects.LCMCommandStatus; -import org.openecomp.appc.requesthandler.conv.Converter; +import org.onap.appc.domainmodel.lcm.*; +import org.onap.appc.executor.objects.LCMCommandStatus; +import org.onap.appc.requesthandler.conv.Converter; import java.text.ParseException; import java.time.Instant; diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/test/java/org/openecomp/appc/requesthandler/TestRequestHandler.java b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/test/java/org/openecomp/appc/requesthandler/TestRequestHandler.java index ef6d96e1e..dfb45389d 100644 --- a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/test/java/org/openecomp/appc/requesthandler/TestRequestHandler.java +++ b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/test/java/org/openecomp/appc/requesthandler/TestRequestHandler.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.requesthandler; +package org.onap.appc.requesthandler; import static org.mockito.Matchers.anyBoolean; import static org.mockito.Matchers.anyObject; @@ -42,50 +42,50 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Matchers; import org.mockito.Mockito; -import org.openecomp.appc.adapter.factory.DmaapMessageAdapterFactoryImpl; -import org.openecomp.appc.adapter.message.MessageAdapterFactory; -import org.openecomp.appc.adapter.messaging.dmaap.impl.DmaapProducerImpl; -import org.openecomp.appc.configuration.Configuration; -import org.openecomp.appc.configuration.ConfigurationFactory; -import org.openecomp.appc.domainmodel.lcm.*; -import org.openecomp.appc.domainmodel.lcm.Flags.Mode; -import org.openecomp.appc.domainmodel.lcm.ActionIdentifiers; -import org.openecomp.appc.domainmodel.lcm.CommonHeader; -import org.openecomp.appc.domainmodel.lcm.Flags; -import org.openecomp.appc.domainmodel.lcm.RequestContext; -import org.openecomp.appc.domainmodel.lcm.ResponseContext; -import org.openecomp.appc.domainmodel.lcm.RuntimeContext; -import org.openecomp.appc.domainmodel.lcm.Status; -import org.openecomp.appc.domainmodel.lcm.VNFContext; -import org.openecomp.appc.domainmodel.lcm.VNFOperation; -import org.openecomp.appc.executor.CommandExecutor; -import org.openecomp.appc.executor.UnstableVNFException; -import org.openecomp.appc.executor.objects.LCMCommandStatus; -import org.openecomp.appc.lifecyclemanager.LifecycleManager; -import org.openecomp.appc.lifecyclemanager.objects.LifecycleException; -import org.openecomp.appc.lifecyclemanager.objects.NoTransitionDefinedException; -import org.openecomp.appc.lockmanager.api.LockException; -import org.openecomp.appc.lockmanager.api.LockManager; -import org.openecomp.appc.messageadapter.MessageAdapter; -import org.openecomp.appc.messageadapter.impl.MessageAdapterImpl; -import org.openecomp.appc.requesthandler.exceptions.*; -import org.openecomp.appc.requesthandler.exceptions.DGWorkflowNotFoundException; -import org.openecomp.appc.requesthandler.exceptions.DuplicateRequestException; -import org.openecomp.appc.requesthandler.exceptions.InvalidInputException; -import org.openecomp.appc.requesthandler.exceptions.RequestExpiredException; -import org.openecomp.appc.requesthandler.exceptions.VNFNotFoundException; -import org.openecomp.appc.requesthandler.exceptions.WorkflowNotFoundException; -import org.openecomp.appc.requesthandler.impl.RequestHandlerImpl; -import org.openecomp.appc.requesthandler.impl.RequestValidatorImpl; -import org.openecomp.appc.requesthandler.objects.RequestHandlerInput; -import org.openecomp.appc.requesthandler.objects.RequestHandlerOutput; -import org.openecomp.appc.transactionrecorder.TransactionRecorder; -import org.openecomp.appc.transactionrecorder.objects.TransactionRecord; -import org.openecomp.appc.workflow.WorkFlowManager; -import org.openecomp.appc.workflow.objects.WorkflowExistsOutput; -import org.openecomp.appc.workflow.objects.WorkflowRequest; -import org.openecomp.appc.workingstatemanager.WorkingStateManager; -import org.openecomp.appc.workingstatemanager.objects.VNFWorkingState; +import org.onap.appc.adapter.factory.DmaapMessageAdapterFactoryImpl; +import org.onap.appc.adapter.message.MessageAdapterFactory; +import org.onap.appc.adapter.messaging.dmaap.impl.DmaapProducerImpl; +import org.onap.appc.configuration.Configuration; +import org.onap.appc.configuration.ConfigurationFactory; +import org.onap.appc.domainmodel.lcm.*; +import org.onap.appc.domainmodel.lcm.Flags.Mode; +import org.onap.appc.domainmodel.lcm.ActionIdentifiers; +import org.onap.appc.domainmodel.lcm.CommonHeader; +import org.onap.appc.domainmodel.lcm.Flags; +import org.onap.appc.domainmodel.lcm.RequestContext; +import org.onap.appc.domainmodel.lcm.ResponseContext; +import org.onap.appc.domainmodel.lcm.RuntimeContext; +import org.onap.appc.domainmodel.lcm.Status; +import org.onap.appc.domainmodel.lcm.VNFContext; +import org.onap.appc.domainmodel.lcm.VNFOperation; +import org.onap.appc.executor.CommandExecutor; +import org.onap.appc.executor.UnstableVNFException; +import org.onap.appc.executor.objects.LCMCommandStatus; +import org.onap.appc.lifecyclemanager.LifecycleManager; +import org.onap.appc.lifecyclemanager.objects.LifecycleException; +import org.onap.appc.lifecyclemanager.objects.NoTransitionDefinedException; +import org.onap.appc.lockmanager.api.LockException; +import org.onap.appc.lockmanager.api.LockManager; +import org.onap.appc.messageadapter.MessageAdapter; +import org.onap.appc.messageadapter.impl.MessageAdapterImpl; +import org.onap.appc.requesthandler.exceptions.*; +import org.onap.appc.requesthandler.exceptions.DGWorkflowNotFoundException; +import org.onap.appc.requesthandler.exceptions.DuplicateRequestException; +import org.onap.appc.requesthandler.exceptions.InvalidInputException; +import org.onap.appc.requesthandler.exceptions.RequestExpiredException; +import org.onap.appc.requesthandler.exceptions.VNFNotFoundException; +import org.onap.appc.requesthandler.exceptions.WorkflowNotFoundException; +import org.onap.appc.requesthandler.impl.RequestHandlerImpl; +import org.onap.appc.requesthandler.impl.RequestValidatorImpl; +import org.onap.appc.requesthandler.objects.RequestHandlerInput; +import org.onap.appc.requesthandler.objects.RequestHandlerOutput; +import org.onap.appc.transactionrecorder.TransactionRecorder; +import org.onap.appc.transactionrecorder.objects.TransactionRecord; +import org.onap.appc.workflow.WorkFlowManager; +import org.onap.appc.workflow.objects.WorkflowExistsOutput; +import org.onap.appc.workflow.objects.WorkflowRequest; +import org.onap.appc.workingstatemanager.WorkingStateManager; +import org.onap.appc.workingstatemanager.objects.VNFWorkingState; import org.onap.ccsdk.sli.adaptors.aai.AAIService; import com.att.eelf.configuration.EELFLogger; diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/test/java/org/openecomp/appc/workingstatemanager/TestWorkingStateManager.java b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/test/java/org/openecomp/appc/workingstatemanager/TestWorkingStateManager.java index 12ef95c6f..fc14f2ac9 100644 --- a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/test/java/org/openecomp/appc/workingstatemanager/TestWorkingStateManager.java +++ b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/test/java/org/openecomp/appc/workingstatemanager/TestWorkingStateManager.java @@ -22,16 +22,16 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.workingstatemanager; +package org.onap.appc.workingstatemanager; import org.junit.Assert; import org.junit.Before; import org.junit.Ignore; import org.junit.Test; -import org.openecomp.appc.configuration.ConfigurationFactory; -import org.openecomp.appc.dao.util.AppcJdbcConnectionFactory; -import org.openecomp.appc.workingstatemanager.impl.WorkingStateManagerImpl; -import org.openecomp.appc.workingstatemanager.objects.VNFWorkingState; +import org.onap.appc.configuration.ConfigurationFactory; +import org.onap.appc.dao.util.AppcJdbcConnectionFactory; +import org.onap.appc.workingstatemanager.impl.WorkingStateManagerImpl; +import org.onap.appc.workingstatemanager.objects.VNFWorkingState; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; @@ -50,7 +50,7 @@ public class TestWorkingStateManager { String schema = "sdnctl"; appcJdbcConnectionFactory.setSchema(schema); workingStateManager.setConnectionFactory(appcJdbcConnectionFactory); - String property = ConfigurationFactory.getConfiguration().getProperty(String.format("org.openecomp.appc.db.url.%s", schema)); + String property = ConfigurationFactory.getConfiguration().getProperty(String.format("org.onap.appc.db.url.%s", schema)); logger.info(property+" will be used as connection URL to mySQL."); logger.warn("you can set connection URL to other IP by adding -DmysqlIp= in VM Option"); // System.getProperties().getProperty("mys") diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/test/resources/org/openecomp/appc/default.properties b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/test/resources/org/openecomp/appc/default.properties index 11a9b74fb..80e77b261 100644 --- a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/test/resources/org/openecomp/appc/default.properties +++ b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/test/resources/org/openecomp/appc/default.properties @@ -23,9 +23,9 @@ ### # Define the name and path of any user-provided configuration (bootstrap) file that can be loaded to supply configuration options -#org.openecomp.appc.bootstrap.file=executor-test.properties -org.openecomp.appc.bootstrap.file=appc.properties -org.openecomp.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},. +#org.onap.appc.bootstrap.file=executor-test.properties +org.onap.appc.bootstrap.file=appc.properties +org.onap.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},. # # Certificate keystore and truststore @@ -71,12 +71,12 @@ org.openecomp.sdnc.sli.aai.param.physical.location.id=physical-location-id org.openecomp.sdnc.sli.aai.param.service.type=service-type -org.openecomp.appc.logging.path=${user.home},etc,../etc,. -org.openecomp.appc.logging.file=logback.xml +org.onap.appc.logging.path=${user.home},etc,../etc,. +org.onap.appc.logging.file=logback.xml -org.openecomp.appc.db.url.%s", schema), ""); -org.openecomp.appc.db.user.%s", schema), ""); -org.openecomp.appc.db.pass.%s", schema), ""); +org.onap.appc.db.url.%s", schema), ""); +org.onap.appc.db.user.%s", schema), ""); +org.onap.appc.db.pass.%s", schema), ""); #Property below provided by appc.properties @@ -91,8 +91,8 @@ appc.LCM.provider.pass=test mysqlIp=127.0.0.1 -org.openecomp.appc.db.url.sdnctl=jdbc:mysql://${mysqlIp}:3306/test -org.openecomp.appc.db.user.sdnctl=test -org.openecomp.appc.db.pass.sdnctl=123456 +org.onap.appc.db.url.sdnctl=jdbc:mysql://${mysqlIp}:3306/test +org.onap.appc.db.user.sdnctl=test +org.onap.appc.db.pass.sdnctl=123456 -org.openecomp.appc.workingstatemanager.maxAttempts=2 +org.onap.appc.workingstatemanager.maxAttempts=2 diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-features/pom.xml b/appc-dispatcher/appc-request-handler/appc-request-handler-features/pom.xml index 2279e5bb0..1562a6e01 100644 --- a/appc-dispatcher/appc-request-handler/appc-request-handler-features/pom.xml +++ b/appc-dispatcher/appc-request-handler/appc-request-handler-features/pom.xml @@ -3,7 +3,7 @@ 4.0.0 appc-request-handler - org.openecomp.appc + org.onap.appc 1.3.0-SNAPSHOT appc-request-handler-features @@ -13,12 +13,12 @@ - org.openecomp.appc + org.onap.appc appc-request-handler-api ${project.version} - org.openecomp.appc + org.onap.appc appc-request-handler-core ${project.version} diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-features/src/main/resources/features.xml b/appc-dispatcher/appc-request-handler/appc-request-handler-features/src/main/resources/features.xml index 4df1ea054..75b21a656 100644 --- a/appc-dispatcher/appc-request-handler/appc-request-handler-features/src/main/resources/features.xml +++ b/appc-dispatcher/appc-request-handler/appc-request-handler-features/src/main/resources/features.xml @@ -29,15 +29,15 @@ xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0"> - mvn:org.openecomp.appc/transaction-recorder/${project.version} + mvn:org.onap.appc/transaction-recorder/${project.version} - mvn:org.openecomp.appc/appc-data-access-lib/${project.version} + mvn:org.onap.appc/appc-data-access-lib/${project.version} - mvn:org.openecomp.appc/domain-model-lib/${project.version} - mvn:org.openecomp.appc/appc-command-executor-api/${project.version} - mvn:org.openecomp.appc/appc-request-handler-api/${project.version} - mvn:org.openecomp.appc/appc-request-handler-core/${project.version} + mvn:org.onap.appc/domain-model-lib/${project.version} + mvn:org.onap.appc/appc-command-executor-api/${project.version} + mvn:org.onap.appc/appc-request-handler-api/${project.version} + mvn:org.onap.appc/appc-request-handler-core/${project.version} diff --git a/appc-dispatcher/appc-request-handler/pom.xml b/appc-dispatcher/appc-request-handler/pom.xml index 28d223947..7c480a13b 100644 --- a/appc-dispatcher/appc-request-handler/pom.xml +++ b/appc-dispatcher/appc-request-handler/pom.xml @@ -1,7 +1,7 @@ 4.0.0 - org.openecomp.appc + org.onap.appc appc-dispatcher 1.3.0-SNAPSHOT diff --git a/appc-dispatcher/appc-workflow-management/appc-workflow-management-api/pom.xml b/appc-dispatcher/appc-workflow-management/appc-workflow-management-api/pom.xml index 92aa37bbe..14c9e2df9 100644 --- a/appc-dispatcher/appc-workflow-management/appc-workflow-management-api/pom.xml +++ b/appc-dispatcher/appc-workflow-management/appc-workflow-management-api/pom.xml @@ -1,7 +1,7 @@ 4.0.0 - org.openecomp.appc + org.onap.appc appc-workflow-management 1.3.0-SNAPSHOT @@ -17,12 +17,12 @@ - org.openecomp.appc + org.onap.appc appc-data-access-lib ${project.version} - org.openecomp.appc + org.onap.appc domain-model-lib ${project.version} @@ -36,7 +36,7 @@ ${project.artifactId} ${project.version} - org.openecomp.appc.dao.objects,org.openecomp.appc.workflow,org.openecomp.appc.workflow.helper,org.openecomp.appc.workflow.objects + org.onap.appc.dao.objects,org.onap.appc.workflow,org.onap.appc.workflow.helper,org.onap.appc.workflow.objects diff --git a/appc-dispatcher/appc-workflow-management/appc-workflow-management-api/src/main/java/org/openecomp/appc/workflow/WorkFlowManager.java b/appc-dispatcher/appc-workflow-management/appc-workflow-management-api/src/main/java/org/openecomp/appc/workflow/WorkFlowManager.java index 0342d6777..c0cb8f48e 100644 --- a/appc-dispatcher/appc-workflow-management/appc-workflow-management-api/src/main/java/org/openecomp/appc/workflow/WorkFlowManager.java +++ b/appc-dispatcher/appc-workflow-management/appc-workflow-management-api/src/main/java/org/openecomp/appc/workflow/WorkFlowManager.java @@ -22,11 +22,11 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.workflow; +package org.onap.appc.workflow; -import org.openecomp.appc.workflow.objects.WorkflowExistsOutput; -import org.openecomp.appc.workflow.objects.WorkflowRequest; -import org.openecomp.appc.workflow.objects.WorkflowResponse; +import org.onap.appc.workflow.objects.WorkflowExistsOutput; +import org.onap.appc.workflow.objects.WorkflowRequest; +import org.onap.appc.workflow.objects.WorkflowResponse; public interface WorkFlowManager { /** diff --git a/appc-dispatcher/appc-workflow-management/appc-workflow-management-api/src/main/java/org/openecomp/appc/workflow/objects/WorkflowExistsOutput.java b/appc-dispatcher/appc-workflow-management/appc-workflow-management-api/src/main/java/org/openecomp/appc/workflow/objects/WorkflowExistsOutput.java index c38ba97d4..37d33d286 100644 --- a/appc-dispatcher/appc-workflow-management/appc-workflow-management-api/src/main/java/org/openecomp/appc/workflow/objects/WorkflowExistsOutput.java +++ b/appc-dispatcher/appc-workflow-management/appc-workflow-management-api/src/main/java/org/openecomp/appc/workflow/objects/WorkflowExistsOutput.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.workflow.objects; +package org.onap.appc.workflow.objects; public class WorkflowExistsOutput { diff --git a/appc-dispatcher/appc-workflow-management/appc-workflow-management-api/src/main/java/org/openecomp/appc/workflow/objects/WorkflowRequest.java b/appc-dispatcher/appc-workflow-management/appc-workflow-management-api/src/main/java/org/openecomp/appc/workflow/objects/WorkflowRequest.java index 6e2b3b0ba..6cdbc7146 100644 --- a/appc-dispatcher/appc-workflow-management/appc-workflow-management-api/src/main/java/org/openecomp/appc/workflow/objects/WorkflowRequest.java +++ b/appc-dispatcher/appc-workflow-management/appc-workflow-management-api/src/main/java/org/openecomp/appc/workflow/objects/WorkflowRequest.java @@ -22,11 +22,11 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.workflow.objects; +package org.onap.appc.workflow.objects; -import org.openecomp.appc.domainmodel.lcm.RequestContext; -import org.openecomp.appc.domainmodel.lcm.ResponseContext; -import org.openecomp.appc.domainmodel.lcm.VNFContext; +import org.onap.appc.domainmodel.lcm.RequestContext; +import org.onap.appc.domainmodel.lcm.ResponseContext; +import org.onap.appc.domainmodel.lcm.VNFContext; public class WorkflowRequest { diff --git a/appc-dispatcher/appc-workflow-management/appc-workflow-management-api/src/main/java/org/openecomp/appc/workflow/objects/WorkflowResponse.java b/appc-dispatcher/appc-workflow-management/appc-workflow-management-api/src/main/java/org/openecomp/appc/workflow/objects/WorkflowResponse.java index a1d58f6ca..f8d2997c5 100644 --- a/appc-dispatcher/appc-workflow-management/appc-workflow-management-api/src/main/java/org/openecomp/appc/workflow/objects/WorkflowResponse.java +++ b/appc-dispatcher/appc-workflow-management/appc-workflow-management-api/src/main/java/org/openecomp/appc/workflow/objects/WorkflowResponse.java @@ -22,11 +22,11 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.workflow.objects; +package org.onap.appc.workflow.objects; import java.util.Properties; -import org.openecomp.appc.domainmodel.lcm.ResponseContext; +import org.onap.appc.domainmodel.lcm.ResponseContext; public class WorkflowResponse { diff --git a/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/pom.xml b/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/pom.xml index 1b4787667..51ab9f95c 100644 --- a/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/pom.xml +++ b/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/pom.xml @@ -21,7 +21,7 @@ 4.0.0 - org.openecomp.appc + org.onap.appc appc-workflow-management 1.3.0-SNAPSHOT @@ -33,22 +33,22 @@ - org.openecomp.appc + org.onap.appc appc-common ${project.version} - org.openecomp.appc + org.onap.appc appc-data-access-lib ${project.version} - org.openecomp.appc + org.onap.appc appc-workflow-management-api ${project.version} - org.openecomp.appc + org.onap.appc appc-ranking-framework-lib ${project.version} @@ -70,10 +70,10 @@ ${project.version} javax.json;scope=compile|runtime;inline=false true - org.openecomp.appc.workflow.WorkFlowManager + org.onap.appc.workflow.WorkFlowManager - org.openecomp.appc.workflow,org.openecomp.appc.workflow.objects, org.openecomp.appc.configuration, - org.openecomp.appc.util,com.att.eelf.configuration, org.openecomp.appc.dao.util, + org.onap.appc.workflow,org.onap.appc.workflow.objects, org.onap.appc.configuration, + org.onap.appc.util,com.att.eelf.configuration, org.onap.appc.dao.util, *;resolution:=optional diff --git a/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/main/java/org/openecomp/appc/common/constant/Constants.java b/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/main/java/org/openecomp/appc/common/constant/Constants.java index d0c5990eb..ebac2d001 100644 --- a/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/main/java/org/openecomp/appc/common/constant/Constants.java +++ b/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/main/java/org/openecomp/appc/common/constant/Constants.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.common.constant; +package org.onap.appc.common.constant; public class Constants { @@ -36,34 +36,34 @@ public class Constants { /** * The name of the property that contains the VM id value in the graph's context */ - public static final String VF_ID = "org.openecomp.appc.vfid"; + public static final String VF_ID = "org.onap.appc.vfid"; /** * The name of the property that contains the VF Type value in the graph's context */ - public static final String VF_TYPE = "org.openecomp.appc.vftype"; + public static final String VF_TYPE = "org.onap.appc.vftype"; /** * The name of the property that contains the service request id value in the graph's context */ - public static final String REQUEST_ID = "org.openecomp.appc.reqid"; + public static final String REQUEST_ID = "org.onap.appc.reqid"; /** * The name of the property that indicates which method of the IaaS adapter to call */ - public static final String ACTION = "org.openecomp.appc.action"; + public static final String ACTION = "org.onap.appc.action"; public static final String PAYLOAD = "payload"; - public static final String CONF_ID = "org.openecomp.appc.confid"; + public static final String CONF_ID = "org.onap.appc.confid"; - public static final String API_VERSION = "org.openecomp.appc.apiversion"; + public static final String API_VERSION = "org.onap.appc.apiversion"; - public static final String ORIGINATOR_ID = "org.openecomp.appc.originatorid"; + public static final String ORIGINATOR_ID = "org.onap.appc.originatorid"; - public static final String OBJECT_ID ="org.openecomp.appc.objectid"; + public static final String OBJECT_ID ="org.onap.appc.objectid"; - public static final String SUB_REQUEST_ID = "org.openecomp.appc.subrequestid"; + public static final String SUB_REQUEST_ID = "org.onap.appc.subrequestid"; public static final String ERROR_MESSAGE = "error-message"; diff --git a/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/main/java/org/openecomp/appc/workflow/impl/WorkFlowManagerImpl.java b/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/main/java/org/openecomp/appc/workflow/impl/WorkFlowManagerImpl.java index cbf7f975a..ceae5677c 100644 --- a/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/main/java/org/openecomp/appc/workflow/impl/WorkFlowManagerImpl.java +++ b/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/main/java/org/openecomp/appc/workflow/impl/WorkFlowManagerImpl.java @@ -22,21 +22,21 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.workflow.impl; +package org.onap.appc.workflow.impl; import org.apache.commons.lang.ObjectUtils; import org.apache.commons.lang3.StringUtils; -import org.openecomp.appc.common.constant.Constants; -import org.openecomp.appc.configuration.Configuration; -import org.openecomp.appc.configuration.ConfigurationFactory; -import org.openecomp.appc.domainmodel.lcm.RequestContext; -import org.openecomp.appc.domainmodel.lcm.ResponseContext; -import org.openecomp.appc.domainmodel.lcm.Status; -import org.openecomp.appc.util.ObjectMapper; -import org.openecomp.appc.workflow.WorkFlowManager; -import org.openecomp.appc.workflow.objects.WorkflowExistsOutput; -import org.openecomp.appc.workflow.objects.WorkflowRequest; -import org.openecomp.appc.workflow.objects.WorkflowResponse; +import org.onap.appc.common.constant.Constants; +import org.onap.appc.configuration.Configuration; +import org.onap.appc.configuration.ConfigurationFactory; +import org.onap.appc.domainmodel.lcm.RequestContext; +import org.onap.appc.domainmodel.lcm.ResponseContext; +import org.onap.appc.domainmodel.lcm.Status; +import org.onap.appc.util.ObjectMapper; +import org.onap.appc.workflow.WorkFlowManager; +import org.onap.appc.workflow.objects.WorkflowExistsOutput; +import org.onap.appc.workflow.objects.WorkflowRequest; +import org.onap.appc.workflow.objects.WorkflowResponse; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; import org.onap.ccsdk.sli.core.sli.SvcLogicException; @@ -55,7 +55,7 @@ public class WorkFlowManagerImpl implements WorkFlowManager{ private static final Configuration configuration = ConfigurationFactory.getConfiguration(); private final WorkflowResolver workflowResolver = new WorkflowResolver( - configuration.getIntegerProperty("org.openecomp.appc.workflow.resolver.refresh_interval", 300) + configuration.getIntegerProperty("org.onap.appc.workflow.resolver.refresh_interval", 300) ); public void setSvcLogicServiceRef(SvcLogicService svcLogic) { @@ -94,20 +94,20 @@ public class WorkFlowManagerImpl implements WorkFlowManager{ /* The following method call (populateDGContext) populates DG context with the request parameters to maintain backward compatibility with old DGs, - we are not altering the old way of passing (org.openecomp.appc.vnfId and so on..) + we are not altering the old way of passing (org.onap.appc.vnfId and so on..) This is still a temporary solution, the end solution should be agreed with all stakeholders and implemented. */ populateDGContext(workflowParams,workflowRequest); } else { - actionProperty = configuration.getProperty("org.openecomp.appc.workflow.action", String.valueOf(Constants.ACTION)); - requestIdProperty = configuration.getProperty("org.openecomp.appc.workflow.request.id", String.valueOf(Constants.REQUEST_ID)); - vfIdProperty = configuration.getProperty("org.openecomp.appc.workflow.vfid", String.valueOf(Constants.VF_ID)); - String payloadProperty = configuration.getProperty("org.openecomp.appc.workflow.payload", String.valueOf(Constants.PAYLOAD)); - String vfTypeProperty = configuration.getProperty("org.openecomp.appc.workflow.vftype", String.valueOf(Constants.VF_TYPE)); - String apiVerProperty = configuration.getProperty("org.openecomp.appc.workflow.apiVersion", String.valueOf(Constants.API_VERSION)); - String originatorIdProperty = configuration.getProperty("org.openecomp.appc.workflow.originatorId",Constants.ORIGINATOR_ID); - String subRequestId = configuration.getProperty("org.openecomp.appc.workflow.subRequestId",Constants.SUB_REQUEST_ID); + actionProperty = configuration.getProperty("org.onap.appc.workflow.action", String.valueOf(Constants.ACTION)); + requestIdProperty = configuration.getProperty("org.onap.appc.workflow.request.id", String.valueOf(Constants.REQUEST_ID)); + vfIdProperty = configuration.getProperty("org.onap.appc.workflow.vfid", String.valueOf(Constants.VF_ID)); + String payloadProperty = configuration.getProperty("org.onap.appc.workflow.payload", String.valueOf(Constants.PAYLOAD)); + String vfTypeProperty = configuration.getProperty("org.onap.appc.workflow.vftype", String.valueOf(Constants.VF_TYPE)); + String apiVerProperty = configuration.getProperty("org.onap.appc.workflow.apiVersion", String.valueOf(Constants.API_VERSION)); + String originatorIdProperty = configuration.getProperty("org.onap.appc.workflow.originatorId",Constants.ORIGINATOR_ID); + String subRequestId = configuration.getProperty("org.onap.appc.workflow.subRequestId",Constants.SUB_REQUEST_ID); workflowParams.put(actionProperty,workflowRequest.getRequestContext().getAction().name()); workflowParams.put(requestIdProperty, workflowRequest.getRequestContext().getCommonHeader().getRequestId()); diff --git a/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/main/java/org/openecomp/appc/workflow/impl/WorkflowKey.java b/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/main/java/org/openecomp/appc/workflow/impl/WorkflowKey.java index 79ac2ee66..d61628fc9 100644 --- a/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/main/java/org/openecomp/appc/workflow/impl/WorkflowKey.java +++ b/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/main/java/org/openecomp/appc/workflow/impl/WorkflowKey.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.workflow.impl; +package org.onap.appc.workflow.impl; class WorkflowKey { private final String name; diff --git a/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/main/java/org/openecomp/appc/workflow/impl/WorkflowResolver.java b/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/main/java/org/openecomp/appc/workflow/impl/WorkflowResolver.java index 51fd09b8b..1f4a5b406 100644 --- a/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/main/java/org/openecomp/appc/workflow/impl/WorkflowResolver.java +++ b/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/main/java/org/openecomp/appc/workflow/impl/WorkflowResolver.java @@ -22,12 +22,12 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.workflow.impl; +package org.onap.appc.workflow.impl; import java.util.concurrent.locks.ReentrantLock; -import org.openecomp.appc.rankingframework.RankedAttributesContext; -import org.openecomp.appc.rankingframework.RankedAttributesResolver; +import org.onap.appc.rankingframework.RankedAttributesContext; +import org.onap.appc.rankingframework.RankedAttributesResolver; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; diff --git a/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/main/java/org/openecomp/appc/workflow/impl/WorkflowResolverDataReader.java b/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/main/java/org/openecomp/appc/workflow/impl/WorkflowResolverDataReader.java index 161240d93..9cb04c42a 100644 --- a/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/main/java/org/openecomp/appc/workflow/impl/WorkflowResolverDataReader.java +++ b/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/main/java/org/openecomp/appc/workflow/impl/WorkflowResolverDataReader.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.workflow.impl; +package org.onap.appc.workflow.impl; import java.sql.Connection; import java.sql.PreparedStatement; @@ -32,11 +32,11 @@ import java.util.Arrays; import java.util.Collection; import java.util.Iterator; -import org.openecomp.appc.dao.util.DBUtils; -import org.openecomp.appc.rankingframework.AbstractRankedAttributesResolverFactory; -import org.openecomp.appc.rankingframework.ConfigurationEntry; -import org.openecomp.appc.rankingframework.ConfigurationSet; -import org.openecomp.appc.rankingframework.RankedAttributesResolver; +import org.onap.appc.dao.util.DBUtils; +import org.onap.appc.rankingframework.AbstractRankedAttributesResolverFactory; +import org.onap.appc.rankingframework.ConfigurationEntry; +import org.onap.appc.rankingframework.ConfigurationSet; +import org.onap.appc.rankingframework.RankedAttributesResolver; class WorkflowResolverDataReader { diff --git a/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml index 2bfd64f72..6da63d813 100644 --- a/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml +++ b/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml @@ -29,10 +29,10 @@ - + - + diff --git a/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/main/resources/org/openecomp/appc/default.properties b/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/main/resources/org/openecomp/appc/default.properties index 8ef6c917a..55249d0f9 100644 --- a/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/main/resources/org/openecomp/appc/default.properties +++ b/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/main/resources/org/openecomp/appc/default.properties @@ -24,8 +24,8 @@ # Define the name and path of any user-provided configuration (bootstrap) file that can be loaded # to supply configuration options -org.openecomp.appc.bootstrap.file=appc.properties -org.openecomp.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},. +org.onap.appc.bootstrap.file=appc.properties +org.onap.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},. #Property below provided by appc.properties appc.LCM.provider.url=https://localhost:8443/restconf/operations/appc-provider-lcm @@ -39,5 +39,5 @@ appc.LCM.provider.pass=test # Tolerance interval (in seconds) between invalidation of DG resolver configuration -org.openecomp.appc.workflow.resolver.refresh_interval=300 +org.onap.appc.workflow.resolver.refresh_interval=300 diff --git a/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/test/java/org/openecomp/appc/workflow/TestWorkFlowManager.java b/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/test/java/org/openecomp/appc/workflow/TestWorkFlowManager.java index 41f19ce10..74828a5d2 100644 --- a/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/test/java/org/openecomp/appc/workflow/TestWorkFlowManager.java +++ b/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/test/java/org/openecomp/appc/workflow/TestWorkFlowManager.java @@ -22,14 +22,14 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.workflow; +package org.onap.appc.workflow; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mockito; -import org.openecomp.appc.workflow.impl.WorkFlowManagerImpl; -import org.openecomp.appc.workflow.objects.WorkflowRequest; +import org.onap.appc.workflow.impl.WorkFlowManagerImpl; +import org.onap.appc.workflow.objects.WorkflowRequest; import org.onap.ccsdk.sli.core.sli.SvcLogicException; import org.onap.ccsdk.sli.core.sli.SvcLogicGraph; import org.onap.ccsdk.sli.core.sli.SvcLogicNode; @@ -177,7 +177,7 @@ public class TestWorkFlowManager { try { svcLogicConfigureNode.setAttribute("status", "success"); svcLogicOtherNode.setAttribute("status", "failure"); - svcLogicRootNode.setAttribute("test", "$org.openecomp.appc.action"); + svcLogicRootNode.setAttribute("test", "$org.onap.appc.action"); svcLogicRootNode.addOutcome("Configure", svcLogicConfigureNode); svcLogicRootNode.addOutcome("Other", svcLogicOtherNode); } catch (SvcLogicException e) { diff --git a/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/test/resources/org/openecomp/appc/default.properties b/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/test/resources/org/openecomp/appc/default.properties index 3c3789968..227a83753 100644 --- a/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/test/resources/org/openecomp/appc/default.properties +++ b/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/test/resources/org/openecomp/appc/default.properties @@ -23,9 +23,9 @@ ### # Define the name and path of any user-provided configuration (bootstrap) file that can be loaded to supply configuration options -#org.openecomp.appc.bootstrap.file=executor-test.properties -org.openecomp.appc.bootstrap.file=appc.properties -org.openecomp.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},. +#org.onap.appc.bootstrap.file=executor-test.properties +org.onap.appc.bootstrap.file=appc.properties +org.onap.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},. # @@ -72,12 +72,12 @@ org.openecomp.sdnc.sli.aai.param.physical.location.id=physical-location-id org.openecomp.sdnc.sli.aai.param.service.type=service-type -org.openecomp.appc.logging.path=${user.home},etc,../etc,. -org.openecomp.appc.logging.file=logback.xml +org.onap.appc.logging.path=${user.home},etc,../etc,. +org.onap.appc.logging.file=logback.xml -org.openecomp.appc.db.url.%s", schema), ""); -org.openecomp.appc.db.user.%s", schema), ""); -org.openecomp.appc.db.pass.%s", schema), ""); +org.onap.appc.db.url.%s", schema), ""); +org.onap.appc.db.user.%s", schema), ""); +org.onap.appc.db.pass.%s", schema), ""); #Property below provided by appc.properties appc.LCM.provider.url=https://localhost:8443/restconf/operations/appc-provider-lcm diff --git a/appc-dispatcher/appc-workflow-management/appc-workflow-management-features/pom.xml b/appc-dispatcher/appc-workflow-management/appc-workflow-management-features/pom.xml index b68268f36..5e27242ea 100644 --- a/appc-dispatcher/appc-workflow-management/appc-workflow-management-features/pom.xml +++ b/appc-dispatcher/appc-workflow-management/appc-workflow-management-features/pom.xml @@ -3,7 +3,7 @@ 4.0.0 appc-workflow-management - org.openecomp.appc + org.onap.appc 1.3.0-SNAPSHOT appc-workflow-management-features @@ -13,12 +13,12 @@ - org.openecomp.appc + org.onap.appc appc-workflow-management-api ${project.version} - org.openecomp.appc + org.onap.appc appc-workflow-management-core ${project.version} diff --git a/appc-dispatcher/appc-workflow-management/appc-workflow-management-features/src/main/resources/features.xml b/appc-dispatcher/appc-workflow-management/appc-workflow-management-features/src/main/resources/features.xml index a29e0b11d..227867acb 100644 --- a/appc-dispatcher/appc-workflow-management/appc-workflow-management-features/src/main/resources/features.xml +++ b/appc-dispatcher/appc-workflow-management/appc-workflow-management-features/src/main/resources/features.xml @@ -29,11 +29,11 @@ xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0"> - mvn:org.openecomp.appc/appc-data-access-lib/${project.version} + mvn:org.onap.appc/appc-data-access-lib/${project.version} - mvn:org.openecomp.appc/appc-workflow-management-api/${project.version} - mvn:org.openecomp.appc/appc-workflow-management-core/${project.version} - mvn:org.openecomp.appc/appc-ranking-framework-lib/${project.version} + mvn:org.onap.appc/appc-workflow-management-api/${project.version} + mvn:org.onap.appc/appc-workflow-management-core/${project.version} + mvn:org.onap.appc/appc-ranking-framework-lib/${project.version} diff --git a/appc-dispatcher/appc-workflow-management/pom.xml b/appc-dispatcher/appc-workflow-management/pom.xml index b843246c0..3b0f7564b 100644 --- a/appc-dispatcher/appc-workflow-management/pom.xml +++ b/appc-dispatcher/appc-workflow-management/pom.xml @@ -1,7 +1,7 @@ 4.0.0 - org.openecomp.appc + org.onap.appc appc-dispatcher 1.3.0-SNAPSHOT diff --git a/appc-dispatcher/pom.xml b/appc-dispatcher/pom.xml index beb970fe4..4c9018210 100644 --- a/appc-dispatcher/pom.xml +++ b/appc-dispatcher/pom.xml @@ -1,7 +1,7 @@ 4.0.0 - org.openecomp.appc + org.onap.appc appc 1.3.0-SNAPSHOT -- cgit 1.2.3-korg