diff options
Diffstat (limited to 'appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main')
9 files changed, 68 insertions, 68 deletions
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<M> implements MessageExpirationListener<M>{ 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 @@ <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0 http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd"> - <bean id="commandExecutorBean" class="org.openecomp.appc.executor.impl.CommandExecutorImpl" + <bean id="commandExecutorBean" class="org.onap.appc.executor.impl.CommandExecutorImpl" scope="singleton" init-method="initialize"> <property name="executionQueueService" ref="ExecutionQueueServiceRef"/> <property name="executionTaskFactory" ref="CommandExecutionTaskFactory"/> <property name="expiredMessageHandler" ref="expiredMessageHandlerBean"/> </bean> - <bean id="CommandExecutionTaskFactory" class="org.openecomp.appc.executor.impl.CommandTaskFactory" + <bean id="CommandExecutionTaskFactory" class="org.onap.appc.executor.impl.CommandTaskFactory" scope="singleton"> <property name="vnfRequestHandler" ref="vnfRequestHandlerService"/> <property name="vmRequestHandler" ref="vmRequestHandlerService"/> @@ -44,23 +44,23 @@ <property name="lifecyclemanager" ref="LifecyclemanagerRef"/> </bean> - <bean id="expiredMessageHandlerBean" class="org.openecomp.appc.executor.impl.ExpiredMessageHandler" + <bean id="expiredMessageHandlerBean" class="org.onap.appc.executor.impl.ExpiredMessageHandler" scope="singleton"> <property name="vnfRequestHandler" ref="vnfRequestHandlerService"/> <property name="vmRequestHandler" ref="vmRequestHandlerService"/> </bean> <reference id="WorkFlowManagerRef" availability="mandatory" activation="eager" - interface="org.openecomp.appc.workflow.WorkFlowManager"/> + interface="org.onap.appc.workflow.WorkFlowManager"/> <reference id="vnfRequestHandlerService" availability="optional" activation="eager" - interface="org.openecomp.appc.requesthandler.RequestHandler" filter="(level=VNF)"/> + interface="org.onap.appc.requesthandler.RequestHandler" filter="(level=VNF)"/> <reference id="vmRequestHandlerService" availability="optional" activation="eager" - interface="org.openecomp.appc.requesthandler.RequestHandler" filter="(level=VM)"/> + interface="org.onap.appc.requesthandler.RequestHandler" filter="(level=VM)"/> <reference id="LifecyclemanagerRef" availability="mandatory" activation="eager" - interface="org.openecomp.appc.lifecyclemanager.LifecycleManager"/> + interface="org.onap.appc.lifecyclemanager.LifecycleManager"/> <reference id="ExecutionQueueServiceRef" availability="mandatory" activation="eager" - interface="org.openecomp.appc.executionqueue.ExecutionQueueService"/> + interface="org.onap.appc.executionqueue.ExecutionQueueService"/> - <service id="commandExecutorService" interface="org.openecomp.appc.executor.CommandExecutor" + <service id="commandExecutorService" interface="org.onap.appc.executor.CommandExecutor" ref="commandExecutorBean"/> </blueprint> 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 |