summaryrefslogtreecommitdiffstats
path: root/appc-client
diff options
context:
space:
mode:
authorPatrick Brady <pb071s@att.com>2017-12-13 11:09:30 -0800
committerPatrick Brady <pb071s@att.com>2017-12-13 11:09:41 -0800
commit0756759f39e125b02d63b4e93de83b3c6b13beea (patch)
tree274e9830e522007c590ace136a57efaa806e19d5 /appc-client
parentcb81f75d84c1df021730341cd61ed650adc7ba3a (diff)
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 <pb071s@att.com> Issue-ID: APPC-13
Diffstat (limited to 'appc-client')
-rw-r--r--appc-client/client-kit/pom.xml4
-rw-r--r--appc-client/client-kit/src/main/java/org/openecomp/appc/RPC.java2
-rw-r--r--appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/api/AppcClientServiceFactoryProvider.java4
-rw-r--r--appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/api/AppcLifeCycleManagerServiceFactory.java4
-rw-r--r--appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/api/ApplicationContext.java2
-rw-r--r--appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/api/LifeCycleManagerStateful.java108
-rw-r--r--appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/api/ResponseHandler.java4
-rw-r--r--appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/exceptions/AppcClientBusinessException.java2
-rw-r--r--appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/exceptions/AppcClientException.java2
-rw-r--r--appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/exceptions/AppcClientInternalException.java2
-rw-r--r--appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/impl/business/AppcLifeCycleManagerServiceFactoryImpl.java10
-rw-r--r--appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/impl/business/CoreAsyncResponseHandlerImpl.java10
-rw-r--r--appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/impl/business/CoreResponseHandler.java6
-rw-r--r--appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/impl/business/CoreSyncResponseHandlerImpl.java8
-rw-r--r--appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/impl/business/LCMRequestProcessor.java14
-rw-r--r--appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/impl/business/RPCInvocator.java12
-rw-r--r--appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/Action.java2
-rw-r--r--appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ActionIdentifiers.java2
-rw-r--r--appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/AuditInput.java2
-rw-r--r--appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/AuditOutput.java2
-rw-r--r--appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/CheckLockInput.java2
-rw-r--r--appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/CheckLockOutput.java2
-rw-r--r--appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/CommonHeader.java2
-rw-r--r--appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigBackupDeleteInput.java2
-rw-r--r--appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigBackupDeleteOutput.java2
-rw-r--r--appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigBackupInput.java2
-rw-r--r--appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigBackupOutput.java2
-rw-r--r--appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigExportInput.java2
-rw-r--r--appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigExportOutput.java2
-rw-r--r--appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigModifyInput.java2
-rw-r--r--appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigModifyOutput.java2
-rw-r--r--appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigRestoreInput.java2
-rw-r--r--appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigRestoreOutput.java2
-rw-r--r--appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigScaleoutInput.java2
-rw-r--r--appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigScaleoutOutput.java2
-rw-r--r--appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigureInput.java2
-rw-r--r--appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigureOutput.java2
-rw-r--r--appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/EvacuateInput.java2
-rw-r--r--appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/EvacuateOutput.java2
-rw-r--r--appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/Flags.java2
-rw-r--r--appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/HealthCheckInput.java2
-rw-r--r--appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/HealthCheckOutput.java2
-rw-r--r--appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/LiveUpgradeInput.java2
-rw-r--r--appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/LiveUpgradeOutput.java2
-rw-r--r--appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/LockInput.java2
-rw-r--r--appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/LockOutput.java2
-rw-r--r--appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/MigrateInput.java2
-rw-r--r--appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/MigrateOutput.java2
-rw-r--r--appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/Payload.java2
-rw-r--r--appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/RebuildInput.java2
-rw-r--r--appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/RebuildOutput.java2
-rw-r--r--appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/RestartInput.java2
-rw-r--r--appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/RestartOutput.java2
-rw-r--r--appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/RollbackInput.java2
-rw-r--r--appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/RollbackOutput.java2
-rw-r--r--appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/SnapshotInput.java2
-rw-r--r--appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/SnapshotOutput.java2
-rw-r--r--appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/SoftwareUploadInput.java2
-rw-r--r--appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/SoftwareUploadOutput.java2
-rw-r--r--appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/StartApplicationInput.java2
-rw-r--r--appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/StartApplicationOutput.java2
-rw-r--r--appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/StartInput.java2
-rw-r--r--appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/StartOutput.java2
-rw-r--r--appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/Status.java2
-rw-r--r--appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/StopApplicationInput.java2
-rw-r--r--appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/StopApplicationOutput.java2
-rw-r--r--appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/StopInput.java2
-rw-r--r--appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/StopOutput.java2
-rw-r--r--appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/SyncInput.java2
-rw-r--r--appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/SyncOutput.java2
-rw-r--r--appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/TerminateInput.java2
-rw-r--r--appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/TerminateOutput.java2
-rw-r--r--appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/TestInput.java2
-rw-r--r--appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/TestOutput.java2
-rw-r--r--appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/UnlockInput.java2
-rw-r--r--appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/UnlockOutput.java2
-rw-r--r--appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ZULU.java2
-rw-r--r--appc-client/client-kit/src/test/java/client/lcm/api/AppcClientServiceFactoryProviderTest.java4
-rw-r--r--appc-client/client-kit/src/test/java/client/lcm/api/ApplicationContextTest.java2
-rw-r--r--appc-client/client-kit/src/test/java/json2java/Json2JavaGeneratorTest.java6
-rw-r--r--appc-client/client-kit/src/test/java/org/openecomp/appc/client/lcm/impl/business/TestAppcLifeCycleManagerServiceFactoryImpl.java10
-rw-r--r--appc-client/client-kit/src/test/java/org/openecomp/appc/client/lcm/model/TestModelPOJO.java2
-rw-r--r--appc-client/client-kit/src/test/java/org/openecomp/appc/generator/JsonHelper.java2
-rw-r--r--appc-client/client-kit/src/test/java/org/openecomp/appc/generator/yang2json/Yang2JsonGeneratorTest.java4
-rw-r--r--appc-client/client-lib/pom.xml2
-rw-r--r--appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/AbstractRequestResponseHandler.java2
-rw-r--r--appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/AsyncRequestResponseHandler.java2
-rw-r--r--appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/CoreException.java2
-rw-r--r--appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/CoreManager.java4
-rw-r--r--appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/CoreRegistry.java2
-rw-r--r--appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/ICoreAsyncResponseHandler.java2
-rw-r--r--appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/ICoreResponseHandler.java2
-rw-r--r--appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/ICoreSyncResponseHandler.java2
-rw-r--r--appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/IInvocationManager.java2
-rw-r--r--appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/ITimeoutHandler.java2
-rw-r--r--appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/ITimerService.java2
-rw-r--r--appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/InvocationManager.java2
-rw-r--r--appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/InvocationManagerFactory.java2
-rw-r--r--appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/MessageContext.java2
-rw-r--r--appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/RequestResponseHandler.java2
-rw-r--r--appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/SyncRequestResponseHandler.java2
-rw-r--r--appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/TaskQueue.java2
-rw-r--r--appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/TaskQueueManager.java2
-rw-r--r--appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/TimerServiceImpl.java2
-rw-r--r--appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/APPCMessageReaderWriter.java4
-rw-r--r--appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/AsyncProtocol.java4
-rw-r--r--appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/AsyncProtocolImpl.java4
-rw-r--r--appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/Consumer.java2
-rw-r--r--appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/ConsumerImpl.java2
-rw-r--r--appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/MessageReader.java4
-rw-r--r--appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/MessageWriter.java4
-rw-r--r--appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/MessagingService.java2
-rw-r--r--appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/Producer.java2
-rw-r--r--appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/ProducerImpl.java2
-rw-r--r--appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/Protocol.java2
-rw-r--r--appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/ProtocolException.java2
-rw-r--r--appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/ProtocolFactory.java2
-rw-r--r--appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/ProtocolMessage.java2
-rw-r--r--appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/ProtocolType.java2
-rw-r--r--appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/RetrieveMessageCallback.java4
-rw-r--r--appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/UEBMessagingService.java2
-rw-r--r--appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/UEBPropertiesKeys.java2
-rw-r--r--appc-client/client-lib/src/test/java/org/openecomp/appc/client/impl/core/ResponseManagerTest.java20
-rw-r--r--appc-client/client-lib/src/test/java/org/openecomp/appc/client/impl/core/SyncFlowTest.java20
-rw-r--r--appc-client/client-lib/src/test/java/org/openecomp/appc/client/impl/protocol/APPCMessageReaderWriterTest.java8
-rw-r--r--appc-client/client-lib/src/test/java/org/openecomp/appc/client/impl/protocol/TestAsyncProtocolImpl.java16
-rw-r--r--appc-client/client-lib/src/test/java/org/openecomp/appc/client/impl/protocol/TestAsyncProtocolImplMissingProps.java10
-rw-r--r--appc-client/client-lib/src/test/java/org/openecomp/appc/client/impl/protocol/TestAsyncProtocolImplNullCallback.java8
-rw-r--r--appc-client/client-lib/src/test/java/org/openecomp/appc/client/impl/protocol/TestUEBMessagingService.java6
-rw-r--r--appc-client/client-simulator/pom.xml6
-rw-r--r--appc-client/client-simulator/src/main/java/org/openecomp/appc/simulator/client/RequestHandler.java2
-rw-r--r--appc-client/client-simulator/src/main/java/org/openecomp/appc/simulator/client/ResponseHandler.java2
-rw-r--r--appc-client/client-simulator/src/main/java/org/openecomp/appc/simulator/client/impl/JsonRequestHandler.java16
-rw-r--r--appc-client/client-simulator/src/main/java/org/openecomp/appc/simulator/client/impl/JsonResponseHandler.java6
-rw-r--r--appc-client/client-simulator/src/main/java/org/openecomp/appc/simulator/client/main/ClientRunner.java6
-rw-r--r--appc-client/client-simulator/src/main/resources/client-simulator.properties2
-rw-r--r--appc-client/client-simulator/src/test/java/org/openecomp/appc/simulator/client/impl/TestJsonRequestHandler.java6
-rw-r--r--appc-client/client-simulator/src/test/java/org/openecomp/appc/simulator/client/impl/TestJsonResponseHandler.java2
-rw-r--r--appc-client/client-simulator/src/test/java/org/openecomp/appc/simulator/client/main/TestClientRunner.java6
-rw-r--r--appc-client/client-simulator/src/test/java/run.java2
-rw-r--r--appc-client/code-generator/pom.xml2
-rw-r--r--appc-client/code-generator/src/main/java/org/openecomp/appc/tools/generator/api/CLI.java4
-rw-r--r--appc-client/code-generator/src/main/java/org/openecomp/appc/tools/generator/api/ContextBuilder.java2
-rw-r--r--appc-client/code-generator/src/main/java/org/openecomp/appc/tools/generator/api/MavenPlugin.java4
-rw-r--r--appc-client/code-generator/src/main/java/org/openecomp/appc/tools/generator/extensions/JsonContextBuilderImpl.java4
-rw-r--r--appc-client/code-generator/src/main/java/org/openecomp/appc/tools/generator/extensions/YangContextBuilderImpl.java4
-rw-r--r--appc-client/code-generator/src/main/java/org/openecomp/appc/tools/generator/impl/CodeGenWriter.java2
-rw-r--r--appc-client/code-generator/src/main/java/org/openecomp/appc/tools/generator/impl/ModelGenerator.java4
-rw-r--r--appc-client/code-generator/src/main/resources/configuration/client-kit.properties8
-rw-r--r--appc-client/code-generator/src/test/java/org/openecomp/appc/tools/generator/api/CLITest.java2
-rw-r--r--appc-client/code-generator/src/test/java/org/openecomp/appc/tools/generator/impl/CodeGenWriterTest.java2
-rw-r--r--appc-client/pom.xml4
152 files changed, 311 insertions, 311 deletions
diff --git a/appc-client/client-kit/pom.xml b/appc-client/client-kit/pom.xml
index 7462a2cbd..cc21d0401 100644
--- a/appc-client/client-kit/pom.xml
+++ b/appc-client/client-kit/pom.xml
@@ -27,7 +27,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>appc-java-client</artifactId>
- <groupId>org.openecomp.appc.client</groupId>
+ <groupId>org.onap.appc.client</groupId>
<version>1.3.0-SNAPSHOT</version>
</parent>
@@ -40,7 +40,7 @@
<dependencies>
<dependency>
- <groupId>org.openecomp.appc.client</groupId>
+ <groupId>org.onap.appc.client</groupId>
<artifactId>client-lib</artifactId>
<version>${project.parent.version}</version>
</dependency>
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/RPC.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/RPC.java
index 001a3035e..2b2c5220a 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/RPC.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/RPC.java
@@ -22,7 +22,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc;
+package org.onap.appc;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/api/AppcClientServiceFactoryProvider.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/api/AppcClientServiceFactoryProvider.java
index ba6284ecd..0ae23f19a 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/api/AppcClientServiceFactoryProvider.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/api/AppcClientServiceFactoryProvider.java
@@ -22,9 +22,9 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.client.lcm.api;
+package org.onap.appc.client.lcm.api;
-import org.openecomp.appc.client.lcm.impl.business.AppcLifeCycleManagerServiceFactoryImpl;
+import org.onap.appc.client.lcm.impl.business.AppcLifeCycleManagerServiceFactoryImpl;
public class AppcClientServiceFactoryProvider {
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/api/AppcLifeCycleManagerServiceFactory.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/api/AppcLifeCycleManagerServiceFactory.java
index 7bf97907e..c0d2daa01 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/api/AppcLifeCycleManagerServiceFactory.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/api/AppcLifeCycleManagerServiceFactory.java
@@ -22,9 +22,9 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.client.lcm.api;
+package org.onap.appc.client.lcm.api;
-import org.openecomp.appc.client.lcm.exceptions.AppcClientException;
+import org.onap.appc.client.lcm.exceptions.AppcClientException;
import java.util.Properties;
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/api/ApplicationContext.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/api/ApplicationContext.java
index 5829b0f92..b0877ef55 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/api/ApplicationContext.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/api/ApplicationContext.java
@@ -22,7 +22,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.client.lcm.api;
+package org.onap.appc.client.lcm.api;
/**
* Created by gital on 11/27/2016.
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/api/LifeCycleManagerStateful.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/api/LifeCycleManagerStateful.java
index 3a2aeb0dc..5600f137f 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/api/LifeCycleManagerStateful.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/api/LifeCycleManagerStateful.java
@@ -25,60 +25,60 @@
/*
* NOTE: This file is auto-generated and should not be changed manually.
*/
-package org.openecomp.appc.client.lcm.api;
-
-import org.openecomp.appc.client.lcm.model.AuditOutput;
-import org.openecomp.appc.client.lcm.model.AuditInput;
-import org.openecomp.appc.client.lcm.model.CheckLockOutput;
-import org.openecomp.appc.client.lcm.model.CheckLockInput;
-import org.openecomp.appc.client.lcm.model.ConfigBackupOutput;
-import org.openecomp.appc.client.lcm.model.ConfigBackupInput;
-import org.openecomp.appc.client.lcm.model.ConfigBackupDeleteOutput;
-import org.openecomp.appc.client.lcm.model.ConfigBackupDeleteInput;
-import org.openecomp.appc.client.lcm.model.ConfigExportOutput;
-import org.openecomp.appc.client.lcm.model.ConfigExportInput;
-import org.openecomp.appc.client.lcm.model.ConfigModifyOutput;
-import org.openecomp.appc.client.lcm.model.ConfigModifyInput;
-import org.openecomp.appc.client.lcm.model.ConfigRestoreOutput;
-import org.openecomp.appc.client.lcm.model.ConfigRestoreInput;
-import org.openecomp.appc.client.lcm.model.ConfigScaleoutOutput;
-import org.openecomp.appc.client.lcm.model.ConfigScaleoutInput;
-import org.openecomp.appc.client.lcm.model.ConfigureOutput;
-import org.openecomp.appc.client.lcm.model.ConfigureInput;
-import org.openecomp.appc.client.lcm.model.EvacuateOutput;
-import org.openecomp.appc.client.lcm.model.EvacuateInput;
-import org.openecomp.appc.client.lcm.model.HealthCheckOutput;
-import org.openecomp.appc.client.lcm.model.HealthCheckInput;
-import org.openecomp.appc.client.lcm.model.LiveUpgradeOutput;
-import org.openecomp.appc.client.lcm.model.LiveUpgradeInput;
-import org.openecomp.appc.client.lcm.model.LockOutput;
-import org.openecomp.appc.client.lcm.model.LockInput;
-import org.openecomp.appc.client.lcm.model.MigrateOutput;
-import org.openecomp.appc.client.lcm.model.MigrateInput;
-import org.openecomp.appc.client.lcm.model.RebuildOutput;
-import org.openecomp.appc.client.lcm.model.RebuildInput;
-import org.openecomp.appc.client.lcm.model.RestartOutput;
-import org.openecomp.appc.client.lcm.model.RestartInput;
-import org.openecomp.appc.client.lcm.model.RollbackOutput;
-import org.openecomp.appc.client.lcm.model.RollbackInput;
-import org.openecomp.appc.client.lcm.model.SnapshotOutput;
-import org.openecomp.appc.client.lcm.model.SnapshotInput;
-import org.openecomp.appc.client.lcm.model.SoftwareUploadOutput;
-import org.openecomp.appc.client.lcm.model.SoftwareUploadInput;
-import org.openecomp.appc.client.lcm.model.StartOutput;
-import org.openecomp.appc.client.lcm.model.StartInput;
-import org.openecomp.appc.client.lcm.model.StopOutput;
-import org.openecomp.appc.client.lcm.model.StopInput;
-import org.openecomp.appc.client.lcm.model.SyncOutput;
-import org.openecomp.appc.client.lcm.model.SyncInput;
-import org.openecomp.appc.client.lcm.model.TerminateOutput;
-import org.openecomp.appc.client.lcm.model.TerminateInput;
-import org.openecomp.appc.client.lcm.model.TestOutput;
-import org.openecomp.appc.client.lcm.model.TestInput;
-import org.openecomp.appc.client.lcm.model.UnlockOutput;
-import org.openecomp.appc.client.lcm.model.UnlockInput;
-import org.openecomp.appc.RPC;
-import org.openecomp.appc.client.lcm.exceptions.AppcClientException;
+package org.onap.appc.client.lcm.api;
+
+import org.onap.appc.client.lcm.model.AuditOutput;
+import org.onap.appc.client.lcm.model.AuditInput;
+import org.onap.appc.client.lcm.model.CheckLockOutput;
+import org.onap.appc.client.lcm.model.CheckLockInput;
+import org.onap.appc.client.lcm.model.ConfigBackupOutput;
+import org.onap.appc.client.lcm.model.ConfigBackupInput;
+import org.onap.appc.client.lcm.model.ConfigBackupDeleteOutput;
+import org.onap.appc.client.lcm.model.ConfigBackupDeleteInput;
+import org.onap.appc.client.lcm.model.ConfigExportOutput;
+import org.onap.appc.client.lcm.model.ConfigExportInput;
+import org.onap.appc.client.lcm.model.ConfigModifyOutput;
+import org.onap.appc.client.lcm.model.ConfigModifyInput;
+import org.onap.appc.client.lcm.model.ConfigRestoreOutput;
+import org.onap.appc.client.lcm.model.ConfigRestoreInput;
+import org.onap.appc.client.lcm.model.ConfigScaleoutOutput;
+import org.onap.appc.client.lcm.model.ConfigScaleoutInput;
+import org.onap.appc.client.lcm.model.ConfigureOutput;
+import org.onap.appc.client.lcm.model.ConfigureInput;
+import org.onap.appc.client.lcm.model.EvacuateOutput;
+import org.onap.appc.client.lcm.model.EvacuateInput;
+import org.onap.appc.client.lcm.model.HealthCheckOutput;
+import org.onap.appc.client.lcm.model.HealthCheckInput;
+import org.onap.appc.client.lcm.model.LiveUpgradeOutput;
+import org.onap.appc.client.lcm.model.LiveUpgradeInput;
+import org.onap.appc.client.lcm.model.LockOutput;
+import org.onap.appc.client.lcm.model.LockInput;
+import org.onap.appc.client.lcm.model.MigrateOutput;
+import org.onap.appc.client.lcm.model.MigrateInput;
+import org.onap.appc.client.lcm.model.RebuildOutput;
+import org.onap.appc.client.lcm.model.RebuildInput;
+import org.onap.appc.client.lcm.model.RestartOutput;
+import org.onap.appc.client.lcm.model.RestartInput;
+import org.onap.appc.client.lcm.model.RollbackOutput;
+import org.onap.appc.client.lcm.model.RollbackInput;
+import org.onap.appc.client.lcm.model.SnapshotOutput;
+import org.onap.appc.client.lcm.model.SnapshotInput;
+import org.onap.appc.client.lcm.model.SoftwareUploadOutput;
+import org.onap.appc.client.lcm.model.SoftwareUploadInput;
+import org.onap.appc.client.lcm.model.StartOutput;
+import org.onap.appc.client.lcm.model.StartInput;
+import org.onap.appc.client.lcm.model.StopOutput;
+import org.onap.appc.client.lcm.model.StopInput;
+import org.onap.appc.client.lcm.model.SyncOutput;
+import org.onap.appc.client.lcm.model.SyncInput;
+import org.onap.appc.client.lcm.model.TerminateOutput;
+import org.onap.appc.client.lcm.model.TerminateInput;
+import org.onap.appc.client.lcm.model.TestOutput;
+import org.onap.appc.client.lcm.model.TestInput;
+import org.onap.appc.client.lcm.model.UnlockOutput;
+import org.onap.appc.client.lcm.model.UnlockInput;
+import org.onap.appc.RPC;
+import org.onap.appc.client.lcm.exceptions.AppcClientException;
/**
* Defines the services and request/response requirements for the ECOMP APP-C
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/api/ResponseHandler.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/api/ResponseHandler.java
index f762dea2c..68459925f 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/api/ResponseHandler.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/api/ResponseHandler.java
@@ -22,9 +22,9 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.client.lcm.api;
+package org.onap.appc.client.lcm.api;
-import org.openecomp.appc.client.lcm.exceptions.AppcClientException;
+import org.onap.appc.client.lcm.exceptions.AppcClientException;
public interface ResponseHandler<T> {
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/exceptions/AppcClientBusinessException.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/exceptions/AppcClientBusinessException.java
index 054dcc1ec..7d91f39e5 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/exceptions/AppcClientBusinessException.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/exceptions/AppcClientBusinessException.java
@@ -22,7 +22,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.client.lcm.exceptions;
+package org.onap.appc.client.lcm.exceptions;
public class AppcClientBusinessException extends AppcClientException {
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/exceptions/AppcClientException.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/exceptions/AppcClientException.java
index aad22ee38..c72f6150e 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/exceptions/AppcClientException.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/exceptions/AppcClientException.java
@@ -22,7 +22,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.client.lcm.exceptions;
+package org.onap.appc.client.lcm.exceptions;
public class AppcClientException extends Exception {
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/exceptions/AppcClientInternalException.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/exceptions/AppcClientInternalException.java
index a92eb5562..9b6dfed7b 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/exceptions/AppcClientInternalException.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/exceptions/AppcClientInternalException.java
@@ -22,7 +22,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.client.lcm.exceptions;
+package org.onap.appc.client.lcm.exceptions;
public class AppcClientInternalException extends AppcClientException {
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/impl/business/AppcLifeCycleManagerServiceFactoryImpl.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/impl/business/AppcLifeCycleManagerServiceFactoryImpl.java
index 2cd671153..b8ab36bbe 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/impl/business/AppcLifeCycleManagerServiceFactoryImpl.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/impl/business/AppcLifeCycleManagerServiceFactoryImpl.java
@@ -22,12 +22,12 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.client.lcm.impl.business;
+package org.onap.appc.client.lcm.impl.business;
-import org.openecomp.appc.client.lcm.api.AppcLifeCycleManagerServiceFactory;
-import org.openecomp.appc.client.lcm.api.ApplicationContext;
-import org.openecomp.appc.client.lcm.api.LifeCycleManagerStateful;
-import org.openecomp.appc.client.lcm.exceptions.AppcClientException;
+import org.onap.appc.client.lcm.api.AppcLifeCycleManagerServiceFactory;
+import org.onap.appc.client.lcm.api.ApplicationContext;
+import org.onap.appc.client.lcm.api.LifeCycleManagerStateful;
+import org.onap.appc.client.lcm.exceptions.AppcClientException;
import java.lang.reflect.Proxy;
import java.util.Properties;
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/impl/business/CoreAsyncResponseHandlerImpl.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/impl/business/CoreAsyncResponseHandlerImpl.java
index c01199e58..96e21d8f8 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/impl/business/CoreAsyncResponseHandlerImpl.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/impl/business/CoreAsyncResponseHandlerImpl.java
@@ -22,12 +22,12 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.client.lcm.impl.business;
+package org.onap.appc.client.lcm.impl.business;
-import org.openecomp.appc.client.impl.core.CoreException;
-import org.openecomp.appc.client.impl.core.ICoreAsyncResponseHandler;
-import org.openecomp.appc.client.lcm.api.ResponseHandler;
-import org.openecomp.appc.client.lcm.exceptions.AppcClientException;
+import org.onap.appc.client.impl.core.CoreException;
+import org.onap.appc.client.impl.core.ICoreAsyncResponseHandler;
+import org.onap.appc.client.lcm.api.ResponseHandler;
+import org.onap.appc.client.lcm.exceptions.AppcClientException;
import com.fasterxml.jackson.databind.ObjectMapper;
class CoreAsyncResponseHandlerImpl<T> extends CoreResponseHandler implements ICoreAsyncResponseHandler {
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/impl/business/CoreResponseHandler.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/impl/business/CoreResponseHandler.java
index 7a04251c8..3d4786862 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/impl/business/CoreResponseHandler.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/impl/business/CoreResponseHandler.java
@@ -22,11 +22,11 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.client.lcm.impl.business;
+package org.onap.appc.client.lcm.impl.business;
-import org.openecomp.appc.client.lcm.exceptions.AppcClientInternalException;
+import org.onap.appc.client.lcm.exceptions.AppcClientInternalException;
-import org.openecomp.appc.client.lcm.model.Status;
+import org.onap.appc.client.lcm.model.Status;
import com.att.eelf.configuration.EELFLogger;
import com.att.eelf.configuration.EELFManager;
import com.fasterxml.jackson.databind.JsonNode;
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/impl/business/CoreSyncResponseHandlerImpl.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/impl/business/CoreSyncResponseHandlerImpl.java
index 34aae4723..66da8fbe2 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/impl/business/CoreSyncResponseHandlerImpl.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/impl/business/CoreSyncResponseHandlerImpl.java
@@ -22,11 +22,11 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.client.lcm.impl.business;
+package org.onap.appc.client.lcm.impl.business;
-import org.openecomp.appc.client.impl.core.CoreException;
-import org.openecomp.appc.client.impl.core.ICoreSyncResponseHandler;
-import org.openecomp.appc.client.lcm.exceptions.AppcClientInternalException;
+import org.onap.appc.client.impl.core.CoreException;
+import org.onap.appc.client.impl.core.ICoreSyncResponseHandler;
+import org.onap.appc.client.lcm.exceptions.AppcClientInternalException;
import com.fasterxml.jackson.databind.ObjectMapper;
class CoreSyncResponseHandlerImpl<T> extends CoreResponseHandler implements ICoreSyncResponseHandler {
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/impl/business/LCMRequestProcessor.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/impl/business/LCMRequestProcessor.java
index 941e74dce..b718c1ac9 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/impl/business/LCMRequestProcessor.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/impl/business/LCMRequestProcessor.java
@@ -22,14 +22,14 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.client.lcm.impl.business;
+package org.onap.appc.client.lcm.impl.business;
-import org.openecomp.appc.client.impl.core.*;
-import org.openecomp.appc.client.lcm.api.ApplicationContext;
-import org.openecomp.appc.client.lcm.api.ResponseHandler;
-import org.openecomp.appc.client.lcm.exceptions.AppcClientBusinessException;
-import org.openecomp.appc.client.lcm.exceptions.AppcClientInternalException;
-import org.openecomp.appc.client.lcm.model.CommonHeader;
+import org.onap.appc.client.impl.core.*;
+import org.onap.appc.client.lcm.api.ApplicationContext;
+import org.onap.appc.client.lcm.api.ResponseHandler;
+import org.onap.appc.client.lcm.exceptions.AppcClientBusinessException;
+import org.onap.appc.client.lcm.exceptions.AppcClientInternalException;
+import org.onap.appc.client.lcm.model.CommonHeader;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/impl/business/RPCInvocator.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/impl/business/RPCInvocator.java
index 97ff1c46f..525700d62 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/impl/business/RPCInvocator.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/impl/business/RPCInvocator.java
@@ -22,13 +22,13 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.client.lcm.impl.business;
+package org.onap.appc.client.lcm.impl.business;
-import org.openecomp.appc.RPC;
-import org.openecomp.appc.client.lcm.api.ResponseHandler;
-import org.openecomp.appc.client.lcm.exceptions.AppcClientBusinessException;
-import org.openecomp.appc.client.lcm.exceptions.AppcClientException;
-import org.openecomp.appc.client.lcm.exceptions.AppcClientInternalException;
+import org.onap.appc.RPC;
+import org.onap.appc.client.lcm.api.ResponseHandler;
+import org.onap.appc.client.lcm.exceptions.AppcClientBusinessException;
+import org.onap.appc.client.lcm.exceptions.AppcClientException;
+import org.onap.appc.client.lcm.exceptions.AppcClientInternalException;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Method;
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/Action.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/Action.java
index 3884428ff..d43a61c92 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/Action.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/Action.java
@@ -25,7 +25,7 @@
/**
* NOTE: This file is auto-generated and should not be changed manually.
*/
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
import com.fasterxml.jackson.annotation.JsonCreator;
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ActionIdentifiers.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ActionIdentifiers.java
index 54bd9a627..bff2c44cb 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ActionIdentifiers.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ActionIdentifiers.java
@@ -25,7 +25,7 @@
/**
* NOTE: This file is auto-generated and should not be changed manually.
*/
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/AuditInput.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/AuditInput.java
index b5f15e00f..2301913a9 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/AuditInput.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/AuditInput.java
@@ -25,7 +25,7 @@
/**
* NOTE: This file is auto-generated and should not be changed manually.
*/
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/AuditOutput.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/AuditOutput.java
index 975c01b8f..00f4244ba 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/AuditOutput.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/AuditOutput.java
@@ -25,7 +25,7 @@
/**
* NOTE: This file is auto-generated and should not be changed manually.
*/
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/CheckLockInput.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/CheckLockInput.java
index a0fdfee87..840aad615 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/CheckLockInput.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/CheckLockInput.java
@@ -25,7 +25,7 @@
/**
* NOTE: This file is auto-generated and should not be changed manually.
*/
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/CheckLockOutput.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/CheckLockOutput.java
index b72ac0491..2bfdea0fe 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/CheckLockOutput.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/CheckLockOutput.java
@@ -25,7 +25,7 @@
/**
* NOTE: This file is auto-generated and should not be changed manually.
*/
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/CommonHeader.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/CommonHeader.java
index e71ad1294..43320d333 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/CommonHeader.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/CommonHeader.java
@@ -25,7 +25,7 @@
/**
* NOTE: This file is auto-generated and should not be changed manually.
*/
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigBackupDeleteInput.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigBackupDeleteInput.java
index 96a87666d..c5f14b6ae 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigBackupDeleteInput.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigBackupDeleteInput.java
@@ -25,7 +25,7 @@
/**
* NOTE: This file is auto-generated and should not be changed manually.
*/
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigBackupDeleteOutput.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigBackupDeleteOutput.java
index 4edcfdb69..730240276 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigBackupDeleteOutput.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigBackupDeleteOutput.java
@@ -25,7 +25,7 @@
/**
* NOTE: This file is auto-generated and should not be changed manually.
*/
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigBackupInput.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigBackupInput.java
index 8f6f64f39..26f799cb4 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigBackupInput.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigBackupInput.java
@@ -25,7 +25,7 @@
/**
* NOTE: This file is auto-generated and should not be changed manually.
*/
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigBackupOutput.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigBackupOutput.java
index 14f872192..1768ea74d 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigBackupOutput.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigBackupOutput.java
@@ -25,7 +25,7 @@
/**
* NOTE: This file is auto-generated and should not be changed manually.
*/
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigExportInput.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigExportInput.java
index e42e2dfe2..5c2d98d19 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigExportInput.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigExportInput.java
@@ -25,7 +25,7 @@
/**
* NOTE: This file is auto-generated and should not be changed manually.
*/
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigExportOutput.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigExportOutput.java
index 25984aa1f..bbfe27af1 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigExportOutput.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigExportOutput.java
@@ -25,7 +25,7 @@
/**
* NOTE: This file is auto-generated and should not be changed manually.
*/
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigModifyInput.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigModifyInput.java
index c4c16d602..c1a9e6be6 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigModifyInput.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigModifyInput.java
@@ -25,7 +25,7 @@
/**
* NOTE: This file is auto-generated and should not be changed manually.
*/
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigModifyOutput.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigModifyOutput.java
index bc7e249da..356299d77 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigModifyOutput.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigModifyOutput.java
@@ -25,7 +25,7 @@
/**
* NOTE: This file is auto-generated and should not be changed manually.
*/
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigRestoreInput.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigRestoreInput.java
index bfda83030..ec26bae34 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigRestoreInput.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigRestoreInput.java
@@ -25,7 +25,7 @@
/**
* NOTE: This file is auto-generated and should not be changed manually.
*/
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigRestoreOutput.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigRestoreOutput.java
index 788c973a3..0646d670b 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigRestoreOutput.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigRestoreOutput.java
@@ -25,7 +25,7 @@
/**
* NOTE: This file is auto-generated and should not be changed manually.
*/
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigScaleoutInput.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigScaleoutInput.java
index a81904472..14c62689a 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigScaleoutInput.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigScaleoutInput.java
@@ -25,7 +25,7 @@
/**
* NOTE: This file is auto-generated and should not be changed manually.
*/
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigScaleoutOutput.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigScaleoutOutput.java
index 553d72644..fb3f1973a 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigScaleoutOutput.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigScaleoutOutput.java
@@ -25,7 +25,7 @@
/**
* NOTE: This file is auto-generated and should not be changed manually.
*/
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigureInput.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigureInput.java
index a1fe98964..b56d692b8 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigureInput.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigureInput.java
@@ -25,7 +25,7 @@
/**
* NOTE: This file is auto-generated and should not be changed manually.
*/
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigureOutput.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigureOutput.java
index 3de081468..fcf32bf2d 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigureOutput.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ConfigureOutput.java
@@ -25,7 +25,7 @@
/**
* NOTE: This file is auto-generated and should not be changed manually.
*/
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/EvacuateInput.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/EvacuateInput.java
index b7908cdbd..85c36e8a4 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/EvacuateInput.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/EvacuateInput.java
@@ -25,7 +25,7 @@
/**
* NOTE: This file is auto-generated and should not be changed manually.
*/
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/EvacuateOutput.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/EvacuateOutput.java
index dd1dc0e03..2c73a5b84 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/EvacuateOutput.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/EvacuateOutput.java
@@ -25,7 +25,7 @@
/**
* NOTE: This file is auto-generated and should not be changed manually.
*/
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/Flags.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/Flags.java
index f0fa8f093..01d2652dd 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/Flags.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/Flags.java
@@ -25,7 +25,7 @@
/**
* NOTE: This file is auto-generated and should not be changed manually.
*/
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/HealthCheckInput.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/HealthCheckInput.java
index 2124d3cfe..7bd3207cb 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/HealthCheckInput.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/HealthCheckInput.java
@@ -25,7 +25,7 @@
/**
* NOTE: This file is auto-generated and should not be changed manually.
*/
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/HealthCheckOutput.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/HealthCheckOutput.java
index 6c2f5cc08..41a907c71 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/HealthCheckOutput.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/HealthCheckOutput.java
@@ -25,7 +25,7 @@
/**
* NOTE: This file is auto-generated and should not be changed manually.
*/
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/LiveUpgradeInput.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/LiveUpgradeInput.java
index 980bcae3e..82a971bc7 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/LiveUpgradeInput.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/LiveUpgradeInput.java
@@ -25,7 +25,7 @@
/**
* NOTE: This file is auto-generated and should not be changed manually.
*/
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/LiveUpgradeOutput.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/LiveUpgradeOutput.java
index 3b40bde58..809adcd8f 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/LiveUpgradeOutput.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/LiveUpgradeOutput.java
@@ -25,7 +25,7 @@
/**
* NOTE: This file is auto-generated and should not be changed manually.
*/
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/LockInput.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/LockInput.java
index cb6bbe517..f6f68d2c6 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/LockInput.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/LockInput.java
@@ -25,7 +25,7 @@
/**
* NOTE: This file is auto-generated and should not be changed manually.
*/
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/LockOutput.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/LockOutput.java
index 8c08002af..0f77bced6 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/LockOutput.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/LockOutput.java
@@ -25,7 +25,7 @@
/**
* NOTE: This file is auto-generated and should not be changed manually.
*/
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/MigrateInput.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/MigrateInput.java
index 89504a950..5877aab07 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/MigrateInput.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/MigrateInput.java
@@ -25,7 +25,7 @@
/**
* NOTE: This file is auto-generated and should not be changed manually.
*/
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/MigrateOutput.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/MigrateOutput.java
index 38a439389..4d804db9a 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/MigrateOutput.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/MigrateOutput.java
@@ -25,7 +25,7 @@
/**
* NOTE: This file is auto-generated and should not be changed manually.
*/
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/Payload.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/Payload.java
index 23a15ce4b..56ce6c529 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/Payload.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/Payload.java
@@ -25,7 +25,7 @@
/**
* NOTE: This file is auto-generated and should not be changed manually.
*/
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/RebuildInput.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/RebuildInput.java
index 1041d515a..ecd199dee 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/RebuildInput.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/RebuildInput.java
@@ -25,7 +25,7 @@
/**
* NOTE: This file is auto-generated and should not be changed manually.
*/
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/RebuildOutput.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/RebuildOutput.java
index 48ade9328..0816c5b87 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/RebuildOutput.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/RebuildOutput.java
@@ -25,7 +25,7 @@
/**
* NOTE: This file is auto-generated and should not be changed manually.
*/
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/RestartInput.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/RestartInput.java
index 49a4a7ccb..4df2184c4 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/RestartInput.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/RestartInput.java
@@ -25,7 +25,7 @@
/**
* NOTE: This file is auto-generated and should not be changed manually.
*/
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/RestartOutput.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/RestartOutput.java
index 69fc9def3..8c44631dd 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/RestartOutput.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/RestartOutput.java
@@ -25,7 +25,7 @@
/**
* NOTE: This file is auto-generated and should not be changed manually.
*/
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/RollbackInput.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/RollbackInput.java
index 576954c99..db688c0ec 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/RollbackInput.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/RollbackInput.java
@@ -25,7 +25,7 @@
/**
* NOTE: This file is auto-generated and should not be changed manually.
*/
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/RollbackOutput.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/RollbackOutput.java
index ae8bbd068..21aa1f08f 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/RollbackOutput.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/RollbackOutput.java
@@ -25,7 +25,7 @@
/**
* NOTE: This file is auto-generated and should not be changed manually.
*/
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/SnapshotInput.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/SnapshotInput.java
index fe13e9842..b3492c2dd 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/SnapshotInput.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/SnapshotInput.java
@@ -25,7 +25,7 @@
/**
* NOTE: This file is auto-generated and should not be changed manually.
*/
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/SnapshotOutput.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/SnapshotOutput.java
index 931f09db3..9036b2607 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/SnapshotOutput.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/SnapshotOutput.java
@@ -25,7 +25,7 @@
/**
* NOTE: This file is auto-generated and should not be changed manually.
*/
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/SoftwareUploadInput.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/SoftwareUploadInput.java
index 286b351d2..270121a96 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/SoftwareUploadInput.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/SoftwareUploadInput.java
@@ -25,7 +25,7 @@
/**
* NOTE: This file is auto-generated and should not be changed manually.
*/
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/SoftwareUploadOutput.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/SoftwareUploadOutput.java
index 02bf80cdb..8e32dd3a2 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/SoftwareUploadOutput.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/SoftwareUploadOutput.java
@@ -25,7 +25,7 @@
/**
* NOTE: This file is auto-generated and should not be changed manually.
*/
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/StartApplicationInput.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/StartApplicationInput.java
index a37228759..dca0bc47b 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/StartApplicationInput.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/StartApplicationInput.java
@@ -25,7 +25,7 @@
/**
* NOTE: This file is auto-generated and should not be changed manually.
*/
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/StartApplicationOutput.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/StartApplicationOutput.java
index 7b3c193f4..061f2476e 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/StartApplicationOutput.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/StartApplicationOutput.java
@@ -25,7 +25,7 @@
/**
* NOTE: This file is auto-generated and should not be changed manually.
*/
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/StartInput.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/StartInput.java
index cfcf46384..3e0829b52 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/StartInput.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/StartInput.java
@@ -25,7 +25,7 @@
/**
* NOTE: This file is auto-generated and should not be changed manually.
*/
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/StartOutput.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/StartOutput.java
index c3e58644d..1efcae95d 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/StartOutput.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/StartOutput.java
@@ -25,7 +25,7 @@
/**
* NOTE: This file is auto-generated and should not be changed manually.
*/
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/Status.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/Status.java
index c70d8646c..85f64c790 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/Status.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/Status.java
@@ -25,7 +25,7 @@
/**
* NOTE: This file is auto-generated and should not be changed manually.
*/
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/StopApplicationInput.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/StopApplicationInput.java
index 56e828216..dc9bf4840 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/StopApplicationInput.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/StopApplicationInput.java
@@ -25,7 +25,7 @@
/**
* NOTE: This file is auto-generated and should not be changed manually.
*/
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/StopApplicationOutput.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/StopApplicationOutput.java
index 071276d36..d0193a16d 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/StopApplicationOutput.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/StopApplicationOutput.java
@@ -25,7 +25,7 @@
/**
* NOTE: This file is auto-generated and should not be changed manually.
*/
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/StopInput.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/StopInput.java
index 1cc7af4c3..f5477405e 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/StopInput.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/StopInput.java
@@ -25,7 +25,7 @@
/**
* NOTE: This file is auto-generated and should not be changed manually.
*/
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/StopOutput.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/StopOutput.java
index 2fb0b7110..9160a98f7 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/StopOutput.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/StopOutput.java
@@ -25,7 +25,7 @@
/**
* NOTE: This file is auto-generated and should not be changed manually.
*/
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/SyncInput.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/SyncInput.java
index c9b861355..2928c76a2 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/SyncInput.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/SyncInput.java
@@ -25,7 +25,7 @@
/**
* NOTE: This file is auto-generated and should not be changed manually.
*/
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/SyncOutput.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/SyncOutput.java
index 0fbe7e9f4..82347d295 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/SyncOutput.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/SyncOutput.java
@@ -25,7 +25,7 @@
/**
* NOTE: This file is auto-generated and should not be changed manually.
*/
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/TerminateInput.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/TerminateInput.java
index 44b0b8ef7..de45dddda 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/TerminateInput.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/TerminateInput.java
@@ -25,7 +25,7 @@
/**
* NOTE: This file is auto-generated and should not be changed manually.
*/
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/TerminateOutput.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/TerminateOutput.java
index f3740c4ea..1a78f0e3f 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/TerminateOutput.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/TerminateOutput.java
@@ -25,7 +25,7 @@
/**
* NOTE: This file is auto-generated and should not be changed manually.
*/
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/TestInput.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/TestInput.java
index 27507d9d1..33dab668e 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/TestInput.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/TestInput.java
@@ -25,7 +25,7 @@
/**
* NOTE: This file is auto-generated and should not be changed manually.
*/
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/TestOutput.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/TestOutput.java
index 5c2090183..283a92d7e 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/TestOutput.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/TestOutput.java
@@ -25,7 +25,7 @@
/**
* NOTE: This file is auto-generated and should not be changed manually.
*/
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/UnlockInput.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/UnlockInput.java
index e073c2dcf..b03c683b7 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/UnlockInput.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/UnlockInput.java
@@ -25,7 +25,7 @@
/**
* NOTE: This file is auto-generated and should not be changed manually.
*/
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/UnlockOutput.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/UnlockOutput.java
index fb7cfeecb..9830c8f87 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/UnlockOutput.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/UnlockOutput.java
@@ -25,7 +25,7 @@
/**
* NOTE: This file is auto-generated and should not be changed manually.
*/
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ZULU.java b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ZULU.java
index 0517a906e..416b56a20 100644
--- a/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ZULU.java
+++ b/appc-client/client-kit/src/main/java/org/openecomp/appc/client/lcm/model/ZULU.java
@@ -25,7 +25,7 @@
/**
* NOTE: This file is auto-generated and should not be changed manually.
*/
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/appc-client/client-kit/src/test/java/client/lcm/api/AppcClientServiceFactoryProviderTest.java b/appc-client/client-kit/src/test/java/client/lcm/api/AppcClientServiceFactoryProviderTest.java
index 74c7046c6..9c06f5aa3 100644
--- a/appc-client/client-kit/src/test/java/client/lcm/api/AppcClientServiceFactoryProviderTest.java
+++ b/appc-client/client-kit/src/test/java/client/lcm/api/AppcClientServiceFactoryProviderTest.java
@@ -26,8 +26,8 @@ package client.lcm.api;
import org.junit.Assert;
import org.junit.Test;
-import org.openecomp.appc.client.lcm.api.AppcClientServiceFactoryProvider;
-import org.openecomp.appc.client.lcm.api.AppcLifeCycleManagerServiceFactory;
+import org.onap.appc.client.lcm.api.AppcClientServiceFactoryProvider;
+import org.onap.appc.client.lcm.api.AppcLifeCycleManagerServiceFactory;
public class AppcClientServiceFactoryProviderTest {
diff --git a/appc-client/client-kit/src/test/java/client/lcm/api/ApplicationContextTest.java b/appc-client/client-kit/src/test/java/client/lcm/api/ApplicationContextTest.java
index c56172798..5bfad74dd 100644
--- a/appc-client/client-kit/src/test/java/client/lcm/api/ApplicationContextTest.java
+++ b/appc-client/client-kit/src/test/java/client/lcm/api/ApplicationContextTest.java
@@ -2,7 +2,7 @@ package client.lcm.api;
import org.junit.Assert;
import org.junit.Test;
-import org.openecomp.appc.client.lcm.api.ApplicationContext;
+import org.onap.appc.client.lcm.api.ApplicationContext;
public class ApplicationContextTest {
diff --git a/appc-client/client-kit/src/test/java/json2java/Json2JavaGeneratorTest.java b/appc-client/client-kit/src/test/java/json2java/Json2JavaGeneratorTest.java
index b5ded0283..e9ed8ec13 100644
--- a/appc-client/client-kit/src/test/java/json2java/Json2JavaGeneratorTest.java
+++ b/appc-client/client-kit/src/test/java/json2java/Json2JavaGeneratorTest.java
@@ -29,7 +29,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-import org.openecomp.appc.generator.JsonHelper;
+import org.onap.appc.generator.JsonHelper;
import java.io.File;
import java.io.IOException;
@@ -41,8 +41,8 @@ import java.util.regex.Pattern;
public class Json2JavaGeneratorTest {
private static JsonNode jsonNode = null;
- private static final String MODEL_PACKAGE = "org.openecomp.appc.client.lcm.model";
- private static final String GENERATED_LCM_API_CLASS = "org.openecomp.appc.client.lcm.api.LifeCycleManagerStateful";
+ private static final String MODEL_PACKAGE = "org.onap.appc.client.lcm.model";
+ private static final String GENERATED_LCM_API_CLASS = "org.onap.appc.client.lcm.api.LifeCycleManagerStateful";
//@Before
public void readIOfiles() throws IOException{
diff --git a/appc-client/client-kit/src/test/java/org/openecomp/appc/client/lcm/impl/business/TestAppcLifeCycleManagerServiceFactoryImpl.java b/appc-client/client-kit/src/test/java/org/openecomp/appc/client/lcm/impl/business/TestAppcLifeCycleManagerServiceFactoryImpl.java
index 865110180..6b24b0a83 100644
--- a/appc-client/client-kit/src/test/java/org/openecomp/appc/client/lcm/impl/business/TestAppcLifeCycleManagerServiceFactoryImpl.java
+++ b/appc-client/client-kit/src/test/java/org/openecomp/appc/client/lcm/impl/business/TestAppcLifeCycleManagerServiceFactoryImpl.java
@@ -1,13 +1,13 @@
-package org.openecomp.appc.client.lcm.impl.business;
+package org.onap.appc.client.lcm.impl.business;
import org.junit.Assert;
import org.junit.Ignore;
import org.junit.Test;
-import org.openecomp.appc.client.lcm.api.ApplicationContext;
-import org.openecomp.appc.client.lcm.api.LifeCycleManagerStateful;
-import org.openecomp.appc.client.lcm.exceptions.AppcClientException;
-import org.openecomp.appc.client.lcm.impl.business.LCMRequestProcessor;
+import org.onap.appc.client.lcm.api.ApplicationContext;
+import org.onap.appc.client.lcm.api.LifeCycleManagerStateful;
+import org.onap.appc.client.lcm.exceptions.AppcClientException;
+import org.onap.appc.client.lcm.impl.business.LCMRequestProcessor;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
diff --git a/appc-client/client-kit/src/test/java/org/openecomp/appc/client/lcm/model/TestModelPOJO.java b/appc-client/client-kit/src/test/java/org/openecomp/appc/client/lcm/model/TestModelPOJO.java
index 9aab1c334..9cb3b9f56 100644
--- a/appc-client/client-kit/src/test/java/org/openecomp/appc/client/lcm/model/TestModelPOJO.java
+++ b/appc-client/client-kit/src/test/java/org/openecomp/appc/client/lcm/model/TestModelPOJO.java
@@ -1,4 +1,4 @@
-package org.openecomp.appc.client.lcm.model;
+package org.onap.appc.client.lcm.model;
import org.junit.Assert;
import org.junit.Test;
diff --git a/appc-client/client-kit/src/test/java/org/openecomp/appc/generator/JsonHelper.java b/appc-client/client-kit/src/test/java/org/openecomp/appc/generator/JsonHelper.java
index 6d9bf628f..e75a44e65 100644
--- a/appc-client/client-kit/src/test/java/org/openecomp/appc/generator/JsonHelper.java
+++ b/appc-client/client-kit/src/test/java/org/openecomp/appc/generator/JsonHelper.java
@@ -22,7 +22,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.generator;
+package org.onap.appc.generator;
import com.fasterxml.jackson.databind.JsonNode;
diff --git a/appc-client/client-kit/src/test/java/org/openecomp/appc/generator/yang2json/Yang2JsonGeneratorTest.java b/appc-client/client-kit/src/test/java/org/openecomp/appc/generator/yang2json/Yang2JsonGeneratorTest.java
index 2e8ef9577..ff3a4ccb6 100644
--- a/appc-client/client-kit/src/test/java/org/openecomp/appc/generator/yang2json/Yang2JsonGeneratorTest.java
+++ b/appc-client/client-kit/src/test/java/org/openecomp/appc/generator/yang2json/Yang2JsonGeneratorTest.java
@@ -22,7 +22,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.generator.yang2json;
+package org.onap.appc.generator.yang2json;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -36,7 +36,7 @@ import org.opendaylight.yangtools.yang.model.api.SchemaContext;
import org.opendaylight.yangtools.yang.model.parser.api.YangSyntaxErrorException;
import org.opendaylight.yangtools.yang.model.repo.api.SchemaSourceException;
import org.opendaylight.yangtools.yang.parser.repo.YangTextSchemaContextResolver;
-import org.openecomp.appc.generator.JsonHelper;
+import org.onap.appc.generator.JsonHelper;
import java.io.File;
import java.io.IOException;
diff --git a/appc-client/client-lib/pom.xml b/appc-client/client-lib/pom.xml
index c153555a2..ad86c0b3a 100644
--- a/appc-client/client-lib/pom.xml
+++ b/appc-client/client-lib/pom.xml
@@ -26,7 +26,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>appc-java-client</artifactId>
- <groupId>org.openecomp.appc.client</groupId>
+ <groupId>org.onap.appc.client</groupId>
<version>1.3.0-SNAPSHOT</version>
</parent>
diff --git a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/AbstractRequestResponseHandler.java b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/AbstractRequestResponseHandler.java
index 82d631965..c5d6120f0 100644
--- a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/AbstractRequestResponseHandler.java
+++ b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/AbstractRequestResponseHandler.java
@@ -22,7 +22,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.client.impl.core;
+package org.onap.appc.client.impl.core;
import com.att.eelf.configuration.EELFLogger;
import com.att.eelf.configuration.EELFManager;
diff --git a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/AsyncRequestResponseHandler.java b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/AsyncRequestResponseHandler.java
index 86756e6b2..1bcf0af99 100644
--- a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/AsyncRequestResponseHandler.java
+++ b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/AsyncRequestResponseHandler.java
@@ -22,7 +22,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.client.impl.core;
+package org.onap.appc.client.impl.core;
import com.att.eelf.configuration.EELFLogger;
import com.att.eelf.configuration.EELFManager;
diff --git a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/CoreException.java b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/CoreException.java
index 009a1f42e..a2bf6e250 100644
--- a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/CoreException.java
+++ b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/CoreException.java
@@ -22,7 +22,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.client.impl.core;
+package org.onap.appc.client.impl.core;
public class CoreException extends Exception {
diff --git a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/CoreManager.java b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/CoreManager.java
index f299dc748..c1c23890e 100644
--- a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/CoreManager.java
+++ b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/CoreManager.java
@@ -22,9 +22,9 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.client.impl.core;
+package org.onap.appc.client.impl.core;
-import org.openecomp.appc.client.impl.protocol.*;
+import org.onap.appc.client.impl.protocol.*;
import com.att.eelf.configuration.EELFLogger;
import com.att.eelf.configuration.EELFManager;
diff --git a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/CoreRegistry.java b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/CoreRegistry.java
index 8d5d0b729..e0a0c5b34 100644
--- a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/CoreRegistry.java
+++ b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/CoreRegistry.java
@@ -22,7 +22,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.client.impl.core;
+package org.onap.appc.client.impl.core;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
diff --git a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/ICoreAsyncResponseHandler.java b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/ICoreAsyncResponseHandler.java
index 23fce28dc..862d56dc3 100644
--- a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/ICoreAsyncResponseHandler.java
+++ b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/ICoreAsyncResponseHandler.java
@@ -22,7 +22,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.client.impl.core;
+package org.onap.appc.client.impl.core;
public interface ICoreAsyncResponseHandler extends ICoreResponseHandler{
diff --git a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/ICoreResponseHandler.java b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/ICoreResponseHandler.java
index 4f0cb8a8c..555640dfd 100644
--- a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/ICoreResponseHandler.java
+++ b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/ICoreResponseHandler.java
@@ -22,7 +22,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.client.impl.core;
+package org.onap.appc.client.impl.core;
public interface ICoreResponseHandler {
}
diff --git a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/ICoreSyncResponseHandler.java b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/ICoreSyncResponseHandler.java
index 332986733..996d3d8d2 100644
--- a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/ICoreSyncResponseHandler.java
+++ b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/ICoreSyncResponseHandler.java
@@ -22,7 +22,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.client.impl.core;
+package org.onap.appc.client.impl.core;
public interface ICoreSyncResponseHandler extends ICoreResponseHandler{
diff --git a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/IInvocationManager.java b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/IInvocationManager.java
index 831263aad..93cf20b3f 100644
--- a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/IInvocationManager.java
+++ b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/IInvocationManager.java
@@ -22,7 +22,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.client.impl.core;
+package org.onap.appc.client.impl.core;
import java.util.Properties;
import java.util.concurrent.TimeoutException;
diff --git a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/ITimeoutHandler.java b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/ITimeoutHandler.java
index e2ec1d6cc..0f3b81a6f 100644
--- a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/ITimeoutHandler.java
+++ b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/ITimeoutHandler.java
@@ -22,7 +22,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.client.impl.core;
+package org.onap.appc.client.impl.core;
interface ITimeoutHandler {
diff --git a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/ITimerService.java b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/ITimerService.java
index c5a4145f9..96b06033f 100644
--- a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/ITimerService.java
+++ b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/ITimerService.java
@@ -22,7 +22,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.client.impl.core;
+package org.onap.appc.client.impl.core;
interface ITimerService {
diff --git a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/InvocationManager.java b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/InvocationManager.java
index 0582244ff..8179da107 100644
--- a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/InvocationManager.java
+++ b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/InvocationManager.java
@@ -22,7 +22,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.client.impl.core;
+package org.onap.appc.client.impl.core;
import java.util.Properties;
import java.util.concurrent.TimeoutException;
diff --git a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/InvocationManagerFactory.java b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/InvocationManagerFactory.java
index 32b3ff22f..c9face762 100644
--- a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/InvocationManagerFactory.java
+++ b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/InvocationManagerFactory.java
@@ -22,7 +22,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.client.impl.core;
+package org.onap.appc.client.impl.core;
public abstract class InvocationManagerFactory {
private static IInvocationManager invocationManager = null;
diff --git a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/MessageContext.java b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/MessageContext.java
index abd644cea..6fab66bb3 100644
--- a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/MessageContext.java
+++ b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/MessageContext.java
@@ -22,7 +22,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.client.impl.core;
+package org.onap.appc.client.impl.core;
/** Helper class for wrapping request/response information.
*/
diff --git a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/RequestResponseHandler.java b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/RequestResponseHandler.java
index 7264e35f8..8e05a2974 100644
--- a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/RequestResponseHandler.java
+++ b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/RequestResponseHandler.java
@@ -22,7 +22,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.client.impl.core;
+package org.onap.appc.client.impl.core;
interface RequestResponseHandler {
diff --git a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/SyncRequestResponseHandler.java b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/SyncRequestResponseHandler.java
index e7a65766e..90b0a9926 100644
--- a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/SyncRequestResponseHandler.java
+++ b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/SyncRequestResponseHandler.java
@@ -22,7 +22,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.client.impl.core;
+package org.onap.appc.client.impl.core;
import com.att.eelf.configuration.EELFLogger;
import com.att.eelf.configuration.EELFManager;
diff --git a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/TaskQueue.java b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/TaskQueue.java
index e75d33f91..4ceeb3f08 100644
--- a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/TaskQueue.java
+++ b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/TaskQueue.java
@@ -22,7 +22,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.client.impl.core;
+package org.onap.appc.client.impl.core;
import com.att.eelf.configuration.EELFLogger;
import com.att.eelf.configuration.EELFManager;
diff --git a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/TaskQueueManager.java b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/TaskQueueManager.java
index 1d1fc1533..b87349411 100644
--- a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/TaskQueueManager.java
+++ b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/TaskQueueManager.java
@@ -22,7 +22,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.client.impl.core;
+package org.onap.appc.client.impl.core;
import com.att.eelf.configuration.EELFLogger;
import com.att.eelf.configuration.EELFManager;
diff --git a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/TimerServiceImpl.java b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/TimerServiceImpl.java
index 10f664c65..fa2d0804d 100644
--- a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/TimerServiceImpl.java
+++ b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/core/TimerServiceImpl.java
@@ -22,7 +22,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.client.impl.core;
+package org.onap.appc.client.impl.core;
import com.att.eelf.configuration.EELFLogger;
import com.att.eelf.configuration.EELFManager;
diff --git a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/APPCMessageReaderWriter.java b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/APPCMessageReaderWriter.java
index 1415514ac..a76f0a90b 100644
--- a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/APPCMessageReaderWriter.java
+++ b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/APPCMessageReaderWriter.java
@@ -22,9 +22,9 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.client.impl.protocol;
+package org.onap.appc.client.impl.protocol;
-import org.openecomp.appc.client.impl.core.MessageContext;
+import org.onap.appc.client.impl.core.MessageContext;
import com.att.eelf.configuration.EELFLogger;
import com.att.eelf.configuration.EELFManager;
import com.fasterxml.jackson.databind.JsonNode;
diff --git a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/AsyncProtocol.java b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/AsyncProtocol.java
index 6d42d7cf4..94d2d6b85 100644
--- a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/AsyncProtocol.java
+++ b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/AsyncProtocol.java
@@ -22,9 +22,9 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.client.impl.protocol;
+package org.onap.appc.client.impl.protocol;
-import org.openecomp.appc.client.impl.core.MessageContext;
+import org.onap.appc.client.impl.core.MessageContext;
public interface AsyncProtocol extends Protocol {
diff --git a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/AsyncProtocolImpl.java b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/AsyncProtocolImpl.java
index a20c2a0cb..82626d802 100644
--- a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/AsyncProtocolImpl.java
+++ b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/AsyncProtocolImpl.java
@@ -22,9 +22,9 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.client.impl.protocol;
+package org.onap.appc.client.impl.protocol;
-import org.openecomp.appc.client.impl.core.MessageContext;
+import org.onap.appc.client.impl.core.MessageContext;
import com.att.eelf.configuration.EELFLogger;
import com.att.eelf.configuration.EELFManager;
diff --git a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/Consumer.java b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/Consumer.java
index ec9606c19..4765a58ef 100644
--- a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/Consumer.java
+++ b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/Consumer.java
@@ -22,7 +22,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.client.impl.protocol;
+package org.onap.appc.client.impl.protocol;
import java.io.IOException;
import java.util.List;
diff --git a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/ConsumerImpl.java b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/ConsumerImpl.java
index 99d884e98..913f80f44 100644
--- a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/ConsumerImpl.java
+++ b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/ConsumerImpl.java
@@ -22,7 +22,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.client.impl.protocol;
+package org.onap.appc.client.impl.protocol;
import com.att.nsa.cambria.client.CambriaClientBuilders.ConsumerBuilder;
import com.att.nsa.cambria.client.CambriaConsumer;
diff --git a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/MessageReader.java b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/MessageReader.java
index 682220a2d..19688d696 100644
--- a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/MessageReader.java
+++ b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/MessageReader.java
@@ -22,9 +22,9 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.client.impl.protocol;
+package org.onap.appc.client.impl.protocol;
-import org.openecomp.appc.client.impl.core.MessageContext;
+import org.onap.appc.client.impl.core.MessageContext;
public interface MessageReader {
diff --git a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/MessageWriter.java b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/MessageWriter.java
index a19fd3fb4..0849bc4a4 100644
--- a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/MessageWriter.java
+++ b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/MessageWriter.java
@@ -22,9 +22,9 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.client.impl.protocol;
+package org.onap.appc.client.impl.protocol;
-import org.openecomp.appc.client.impl.core.MessageContext;
+import org.onap.appc.client.impl.core.MessageContext;
import com.fasterxml.jackson.databind.JsonNode;
public interface MessageWriter {
diff --git a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/MessagingService.java b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/MessagingService.java
index 791e1224b..029378931 100644
--- a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/MessagingService.java
+++ b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/MessagingService.java
@@ -22,7 +22,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.client.impl.protocol;
+package org.onap.appc.client.impl.protocol;
import java.io.IOException;
import java.security.GeneralSecurityException;
diff --git a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/Producer.java b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/Producer.java
index 2f2490a54..f290e8a89 100644
--- a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/Producer.java
+++ b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/Producer.java
@@ -22,7 +22,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.client.impl.protocol;
+package org.onap.appc.client.impl.protocol;
import java.io.IOException;
diff --git a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/ProducerImpl.java b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/ProducerImpl.java
index 1455fd922..7729db98d 100644
--- a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/ProducerImpl.java
+++ b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/ProducerImpl.java
@@ -22,7 +22,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.client.impl.protocol;
+package org.onap.appc.client.impl.protocol;
import com.att.nsa.cambria.client.CambriaBatchingPublisher;
import com.att.nsa.cambria.client.CambriaClientBuilders.PublisherBuilder;
diff --git a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/Protocol.java b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/Protocol.java
index 19e7d6024..eaa21d857 100644
--- a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/Protocol.java
+++ b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/Protocol.java
@@ -22,7 +22,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.client.impl.protocol;
+package org.onap.appc.client.impl.protocol;
import java.util.Properties;
diff --git a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/ProtocolException.java b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/ProtocolException.java
index 87e1318ee..eb0537b80 100644
--- a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/ProtocolException.java
+++ b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/ProtocolException.java
@@ -22,7 +22,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.client.impl.protocol;
+package org.onap.appc.client.impl.protocol;
public class ProtocolException extends Exception {
diff --git a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/ProtocolFactory.java b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/ProtocolFactory.java
index f9364e192..98e7d669b 100644
--- a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/ProtocolFactory.java
+++ b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/ProtocolFactory.java
@@ -22,7 +22,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.client.impl.protocol;
+package org.onap.appc.client.impl.protocol;
import java.util.HashMap;
import java.util.Map;
diff --git a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/ProtocolMessage.java b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/ProtocolMessage.java
index 161a590a0..c02ea5607 100644
--- a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/ProtocolMessage.java
+++ b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/ProtocolMessage.java
@@ -22,7 +22,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.client.impl.protocol;
+package org.onap.appc.client.impl.protocol;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.JsonNode;
diff --git a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/ProtocolType.java b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/ProtocolType.java
index 133fbf8ad..cc2eca447 100644
--- a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/ProtocolType.java
+++ b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/ProtocolType.java
@@ -22,7 +22,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.client.impl.protocol;
+package org.onap.appc.client.impl.protocol;
public enum ProtocolType {
diff --git a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/RetrieveMessageCallback.java b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/RetrieveMessageCallback.java
index 46105553a..8fc486bb8 100644
--- a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/RetrieveMessageCallback.java
+++ b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/RetrieveMessageCallback.java
@@ -22,10 +22,10 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.client.impl.protocol;
+package org.onap.appc.client.impl.protocol;
-import org.openecomp.appc.client.impl.core.MessageContext;
+import org.onap.appc.client.impl.core.MessageContext;
public interface RetrieveMessageCallback {
diff --git a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/UEBMessagingService.java b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/UEBMessagingService.java
index 22563f68a..df51861b8 100644
--- a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/UEBMessagingService.java
+++ b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/UEBMessagingService.java
@@ -22,7 +22,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.client.impl.protocol;
+package org.onap.appc.client.impl.protocol;
import com.att.eelf.configuration.EELFLogger;
import com.att.eelf.configuration.EELFManager;
diff --git a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/UEBPropertiesKeys.java b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/UEBPropertiesKeys.java
index 8bbcaf404..5c1916f2b 100644
--- a/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/UEBPropertiesKeys.java
+++ b/appc-client/client-lib/src/main/java/org/openecomp/appc/client/impl/protocol/UEBPropertiesKeys.java
@@ -22,7 +22,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.client.impl.protocol;
+package org.onap.appc.client.impl.protocol;
class UEBPropertiesKeys {
diff --git a/appc-client/client-lib/src/test/java/org/openecomp/appc/client/impl/core/ResponseManagerTest.java b/appc-client/client-lib/src/test/java/org/openecomp/appc/client/impl/core/ResponseManagerTest.java
index d1720f03b..cc157e5c4 100644
--- a/appc-client/client-lib/src/test/java/org/openecomp/appc/client/impl/core/ResponseManagerTest.java
+++ b/appc-client/client-lib/src/test/java/org/openecomp/appc/client/impl/core/ResponseManagerTest.java
@@ -22,16 +22,16 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.client.impl.core;
-
-import org.openecomp.appc.client.impl.core.AsyncRequestResponseHandler;
-import org.openecomp.appc.client.impl.core.CoreException;
-import org.openecomp.appc.client.impl.core.CoreManager;
-import org.openecomp.appc.client.impl.core.ICoreAsyncResponseHandler;
-import org.openecomp.appc.client.impl.core.MessageContext;
-import org.openecomp.appc.client.impl.protocol.AsyncProtocol;
-import org.openecomp.appc.client.impl.protocol.ProtocolException;
-import org.openecomp.appc.client.impl.protocol.RetrieveMessageCallback;
+package org.onap.appc.client.impl.core;
+
+import org.onap.appc.client.impl.core.AsyncRequestResponseHandler;
+import org.onap.appc.client.impl.core.CoreException;
+import org.onap.appc.client.impl.core.CoreManager;
+import org.onap.appc.client.impl.core.ICoreAsyncResponseHandler;
+import org.onap.appc.client.impl.core.MessageContext;
+import org.onap.appc.client.impl.protocol.AsyncProtocol;
+import org.onap.appc.client.impl.protocol.ProtocolException;
+import org.onap.appc.client.impl.protocol.RetrieveMessageCallback;
import org.junit.Before;
import java.util.Properties;
diff --git a/appc-client/client-lib/src/test/java/org/openecomp/appc/client/impl/core/SyncFlowTest.java b/appc-client/client-lib/src/test/java/org/openecomp/appc/client/impl/core/SyncFlowTest.java
index 4b4bce578..2e69369b9 100644
--- a/appc-client/client-lib/src/test/java/org/openecomp/appc/client/impl/core/SyncFlowTest.java
+++ b/appc-client/client-lib/src/test/java/org/openecomp/appc/client/impl/core/SyncFlowTest.java
@@ -22,16 +22,16 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.client.impl.core;
-
-import org.openecomp.appc.client.impl.core.CoreException;
-import org.openecomp.appc.client.impl.core.CoreManager;
-import org.openecomp.appc.client.impl.core.ICoreSyncResponseHandler;
-import org.openecomp.appc.client.impl.core.MessageContext;
-import org.openecomp.appc.client.impl.core.SyncRequestResponseHandler;
-import org.openecomp.appc.client.impl.protocol.AsyncProtocol;
-import org.openecomp.appc.client.impl.protocol.ProtocolException;
-import org.openecomp.appc.client.impl.protocol.RetrieveMessageCallback;
+package org.onap.appc.client.impl.core;
+
+import org.onap.appc.client.impl.core.CoreException;
+import org.onap.appc.client.impl.core.CoreManager;
+import org.onap.appc.client.impl.core.ICoreSyncResponseHandler;
+import org.onap.appc.client.impl.core.MessageContext;
+import org.onap.appc.client.impl.core.SyncRequestResponseHandler;
+import org.onap.appc.client.impl.protocol.AsyncProtocol;
+import org.onap.appc.client.impl.protocol.ProtocolException;
+import org.onap.appc.client.impl.protocol.RetrieveMessageCallback;
import org.junit.Assert;
import org.junit.Before;
diff --git a/appc-client/client-lib/src/test/java/org/openecomp/appc/client/impl/protocol/APPCMessageReaderWriterTest.java b/appc-client/client-lib/src/test/java/org/openecomp/appc/client/impl/protocol/APPCMessageReaderWriterTest.java
index 91f615720..1d41a52f8 100644
--- a/appc-client/client-lib/src/test/java/org/openecomp/appc/client/impl/protocol/APPCMessageReaderWriterTest.java
+++ b/appc-client/client-lib/src/test/java/org/openecomp/appc/client/impl/protocol/APPCMessageReaderWriterTest.java
@@ -22,11 +22,11 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.client.impl.protocol;
+package org.onap.appc.client.impl.protocol;
-import org.openecomp.appc.client.impl.core.MessageContext;
-import org.openecomp.appc.client.impl.protocol.APPCMessageReaderWriter;
-import org.openecomp.appc.client.impl.protocol.ProtocolException;
+import org.onap.appc.client.impl.core.MessageContext;
+import org.onap.appc.client.impl.protocol.APPCMessageReaderWriter;
+import org.onap.appc.client.impl.protocol.ProtocolException;
import com.fasterxml.jackson.core.JsonFactory;
import com.fasterxml.jackson.core.JsonGenerator;
diff --git a/appc-client/client-lib/src/test/java/org/openecomp/appc/client/impl/protocol/TestAsyncProtocolImpl.java b/appc-client/client-lib/src/test/java/org/openecomp/appc/client/impl/protocol/TestAsyncProtocolImpl.java
index 046f5a814..ceba10b58 100644
--- a/appc-client/client-lib/src/test/java/org/openecomp/appc/client/impl/protocol/TestAsyncProtocolImpl.java
+++ b/appc-client/client-lib/src/test/java/org/openecomp/appc/client/impl/protocol/TestAsyncProtocolImpl.java
@@ -22,14 +22,14 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.client.impl.protocol;
-
-import org.openecomp.appc.client.impl.core.MessageContext;
-import org.openecomp.appc.client.impl.protocol.AsyncProtocol;
-import org.openecomp.appc.client.impl.protocol.AsyncProtocolImpl;
-import org.openecomp.appc.client.impl.protocol.ProtocolException;
-import org.openecomp.appc.client.impl.protocol.RetrieveMessageCallback;
-import org.openecomp.appc.client.impl.protocol.UEBPropertiesKeys;
+package org.onap.appc.client.impl.protocol;
+
+import org.onap.appc.client.impl.core.MessageContext;
+import org.onap.appc.client.impl.protocol.AsyncProtocol;
+import org.onap.appc.client.impl.protocol.AsyncProtocolImpl;
+import org.onap.appc.client.impl.protocol.ProtocolException;
+import org.onap.appc.client.impl.protocol.RetrieveMessageCallback;
+import org.onap.appc.client.impl.protocol.UEBPropertiesKeys;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
diff --git a/appc-client/client-lib/src/test/java/org/openecomp/appc/client/impl/protocol/TestAsyncProtocolImplMissingProps.java b/appc-client/client-lib/src/test/java/org/openecomp/appc/client/impl/protocol/TestAsyncProtocolImplMissingProps.java
index 9611a7900..267282abd 100644
--- a/appc-client/client-lib/src/test/java/org/openecomp/appc/client/impl/protocol/TestAsyncProtocolImplMissingProps.java
+++ b/appc-client/client-lib/src/test/java/org/openecomp/appc/client/impl/protocol/TestAsyncProtocolImplMissingProps.java
@@ -22,12 +22,12 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.client.impl.protocol;
+package org.onap.appc.client.impl.protocol;
-import org.openecomp.appc.client.impl.core.MessageContext;
-import org.openecomp.appc.client.impl.protocol.AsyncProtocol;
-import org.openecomp.appc.client.impl.protocol.AsyncProtocolImpl;
-import org.openecomp.appc.client.impl.protocol.RetrieveMessageCallback;
+import org.onap.appc.client.impl.core.MessageContext;
+import org.onap.appc.client.impl.protocol.AsyncProtocol;
+import org.onap.appc.client.impl.protocol.AsyncProtocolImpl;
+import org.onap.appc.client.impl.protocol.RetrieveMessageCallback;
import org.junit.Assert;
import org.junit.Test;
diff --git a/appc-client/client-lib/src/test/java/org/openecomp/appc/client/impl/protocol/TestAsyncProtocolImplNullCallback.java b/appc-client/client-lib/src/test/java/org/openecomp/appc/client/impl/protocol/TestAsyncProtocolImplNullCallback.java
index e537037f7..22954cd75 100644
--- a/appc-client/client-lib/src/test/java/org/openecomp/appc/client/impl/protocol/TestAsyncProtocolImplNullCallback.java
+++ b/appc-client/client-lib/src/test/java/org/openecomp/appc/client/impl/protocol/TestAsyncProtocolImplNullCallback.java
@@ -22,13 +22,13 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.client.impl.protocol;
+package org.onap.appc.client.impl.protocol;
import org.junit.Assert;
import org.junit.Test;
-import org.openecomp.appc.client.impl.protocol.AsyncProtocol;
-import org.openecomp.appc.client.impl.protocol.AsyncProtocolImpl;
-import org.openecomp.appc.client.impl.protocol.ProtocolException;
+import org.onap.appc.client.impl.protocol.AsyncProtocol;
+import org.onap.appc.client.impl.protocol.AsyncProtocolImpl;
+import org.onap.appc.client.impl.protocol.ProtocolException;
import java.io.IOException;
import java.io.InputStream;
diff --git a/appc-client/client-lib/src/test/java/org/openecomp/appc/client/impl/protocol/TestUEBMessagingService.java b/appc-client/client-lib/src/test/java/org/openecomp/appc/client/impl/protocol/TestUEBMessagingService.java
index 109065ab4..de192ab12 100644
--- a/appc-client/client-lib/src/test/java/org/openecomp/appc/client/impl/protocol/TestUEBMessagingService.java
+++ b/appc-client/client-lib/src/test/java/org/openecomp/appc/client/impl/protocol/TestUEBMessagingService.java
@@ -22,12 +22,12 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.client.impl.protocol;
+package org.onap.appc.client.impl.protocol;
import org.junit.*;
import org.junit.runners.MethodSorters;
-import org.openecomp.appc.client.impl.protocol.MessagingService;
-import org.openecomp.appc.client.impl.protocol.UEBMessagingService;
+import org.onap.appc.client.impl.protocol.MessagingService;
+import org.onap.appc.client.impl.protocol.UEBMessagingService;
import java.io.IOException;
import java.io.InputStream;
diff --git a/appc-client/client-simulator/pom.xml b/appc-client/client-simulator/pom.xml
index c6383a3ef..cb6b2b051 100644
--- a/appc-client/client-simulator/pom.xml
+++ b/appc-client/client-simulator/pom.xml
@@ -27,7 +27,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>appc-java-client</artifactId>
- <groupId>org.openecomp.appc.client</groupId>
+ <groupId>org.onap.appc.client</groupId>
<version>1.3.0-SNAPSHOT</version>
</parent>
<artifactId>client-simulator</artifactId>
@@ -51,7 +51,7 @@
<configuration>
<archive>
<manifest>
- <mainClass>org.openecomp.appc.simulator.client.main.ClientRunner</mainClass>
+ <mainClass>org.onap.appc.simulator.client.main.ClientRunner</mainClass>
</manifest>
</archive>
<descriptors>
@@ -96,7 +96,7 @@
<version>${jackson.version}</version>
</dependency>
<dependency>
- <groupId>org.openecomp.appc.client</groupId>
+ <groupId>org.onap.appc.client</groupId>
<artifactId>client-kit</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/appc-client/client-simulator/src/main/java/org/openecomp/appc/simulator/client/RequestHandler.java b/appc-client/client-simulator/src/main/java/org/openecomp/appc/simulator/client/RequestHandler.java
index 225f6bba9..293b72f89 100644
--- a/appc-client/client-simulator/src/main/java/org/openecomp/appc/simulator/client/RequestHandler.java
+++ b/appc-client/client-simulator/src/main/java/org/openecomp/appc/simulator/client/RequestHandler.java
@@ -22,7 +22,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.simulator.client;
+package org.onap.appc.simulator.client;
import java.io.File;
import java.io.IOException;
diff --git a/appc-client/client-simulator/src/main/java/org/openecomp/appc/simulator/client/ResponseHandler.java b/appc-client/client-simulator/src/main/java/org/openecomp/appc/simulator/client/ResponseHandler.java
index 459804aaa..5a24028e8 100644
--- a/appc-client/client-simulator/src/main/java/org/openecomp/appc/simulator/client/ResponseHandler.java
+++ b/appc-client/client-simulator/src/main/java/org/openecomp/appc/simulator/client/ResponseHandler.java
@@ -22,7 +22,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.simulator.client;
+package org.onap.appc.simulator.client;
import java.io.File;
diff --git a/appc-client/client-simulator/src/main/java/org/openecomp/appc/simulator/client/impl/JsonRequestHandler.java b/appc-client/client-simulator/src/main/java/org/openecomp/appc/simulator/client/impl/JsonRequestHandler.java
index e3a86e01a..243136d0e 100644
--- a/appc-client/client-simulator/src/main/java/org/openecomp/appc/simulator/client/impl/JsonRequestHandler.java
+++ b/appc-client/client-simulator/src/main/java/org/openecomp/appc/simulator/client/impl/JsonRequestHandler.java
@@ -22,16 +22,16 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.simulator.client.impl;
+package org.onap.appc.simulator.client.impl;
-import org.openecomp.appc.client.lcm.api.AppcClientServiceFactoryProvider;
-import org.openecomp.appc.client.lcm.api.AppcLifeCycleManagerServiceFactory;
-import org.openecomp.appc.client.lcm.api.ApplicationContext;
-import org.openecomp.appc.client.lcm.api.LifeCycleManagerStateful;
-import org.openecomp.appc.client.lcm.api.ResponseHandler;
+import org.onap.appc.client.lcm.api.AppcClientServiceFactoryProvider;
+import org.onap.appc.client.lcm.api.AppcLifeCycleManagerServiceFactory;
+import org.onap.appc.client.lcm.api.ApplicationContext;
+import org.onap.appc.client.lcm.api.LifeCycleManagerStateful;
+import org.onap.appc.client.lcm.api.ResponseHandler;
-import org.openecomp.appc.client.lcm.exceptions.AppcClientException;
-import org.openecomp.appc.simulator.client.RequestHandler;
+import org.onap.appc.client.lcm.exceptions.AppcClientException;
+import org.onap.appc.simulator.client.RequestHandler;
import com.att.eelf.configuration.EELFLogger;
import com.att.eelf.configuration.EELFManager;
diff --git a/appc-client/client-simulator/src/main/java/org/openecomp/appc/simulator/client/impl/JsonResponseHandler.java b/appc-client/client-simulator/src/main/java/org/openecomp/appc/simulator/client/impl/JsonResponseHandler.java
index 5f14bb849..c19abb2fb 100644
--- a/appc-client/client-simulator/src/main/java/org/openecomp/appc/simulator/client/impl/JsonResponseHandler.java
+++ b/appc-client/client-simulator/src/main/java/org/openecomp/appc/simulator/client/impl/JsonResponseHandler.java
@@ -22,10 +22,10 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.simulator.client.impl;
+package org.onap.appc.simulator.client.impl;
-import org.openecomp.appc.client.lcm.api.ResponseHandler;
-import org.openecomp.appc.client.lcm.exceptions.AppcClientException;
+import org.onap.appc.client.lcm.api.ResponseHandler;
+import org.onap.appc.client.lcm.exceptions.AppcClientException;
import com.att.eelf.configuration.EELFLogger;
import com.att.eelf.configuration.EELFManager;
import com.fasterxml.jackson.core.JsonProcessingException;
diff --git a/appc-client/client-simulator/src/main/java/org/openecomp/appc/simulator/client/main/ClientRunner.java b/appc-client/client-simulator/src/main/java/org/openecomp/appc/simulator/client/main/ClientRunner.java
index 704fbee80..c8da17e79 100644
--- a/appc-client/client-simulator/src/main/java/org/openecomp/appc/simulator/client/main/ClientRunner.java
+++ b/appc-client/client-simulator/src/main/java/org/openecomp/appc/simulator/client/main/ClientRunner.java
@@ -22,11 +22,11 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.simulator.client.main;
+package org.onap.appc.simulator.client.main;
import org.apache.commons.io.filefilter.WildcardFileFilter;
-import org.openecomp.appc.simulator.client.RequestHandler;
-import org.openecomp.appc.simulator.client.impl.JsonRequestHandler;
+import org.onap.appc.simulator.client.RequestHandler;
+import org.onap.appc.simulator.client.impl.JsonRequestHandler;
import java.io.*;
import java.nio.file.Path;
diff --git a/appc-client/client-simulator/src/main/resources/client-simulator.properties b/appc-client/client-simulator/src/main/resources/client-simulator.properties
index 242b34f93..fec61a2f2 100644
--- a/appc-client/client-simulator/src/main/resources/client-simulator.properties
+++ b/appc-client/client-simulator/src/main/resources/client-simulator.properties
@@ -26,7 +26,7 @@
# Default Properties - Configured for client simulator
#
#--------------------------------------------------------------------------------------------
-ctx.model.package=org.openecomp.appc.client.lcm.model
+ctx.model.package=org.onap.appc.client.lcm.model
client.pool.size=10
client.rpc.exceptions.map.file=C:\\test\\test1\\exceptions.txt
diff --git a/appc-client/client-simulator/src/test/java/org/openecomp/appc/simulator/client/impl/TestJsonRequestHandler.java b/appc-client/client-simulator/src/test/java/org/openecomp/appc/simulator/client/impl/TestJsonRequestHandler.java
index 417b98d64..ba3696f26 100644
--- a/appc-client/client-simulator/src/test/java/org/openecomp/appc/simulator/client/impl/TestJsonRequestHandler.java
+++ b/appc-client/client-simulator/src/test/java/org/openecomp/appc/simulator/client/impl/TestJsonRequestHandler.java
@@ -1,4 +1,4 @@
-package org.openecomp.appc.simulator.client.impl;
+package org.onap.appc.simulator.client.impl;
import org.apache.commons.io.filefilter.WildcardFileFilter;
import org.junit.Assert;
@@ -7,8 +7,8 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Matchers;
import org.mockito.Mockito;
-import org.openecomp.appc.client.lcm.api.LifeCycleManagerStateful;
-import org.openecomp.appc.client.lcm.exceptions.AppcClientException;
+import org.onap.appc.client.lcm.api.LifeCycleManagerStateful;
+import org.onap.appc.client.lcm.exceptions.AppcClientException;
import org.powermock.core.classloader.annotations.PrepareForTest;
import org.powermock.modules.junit4.PowerMockRunner;
diff --git a/appc-client/client-simulator/src/test/java/org/openecomp/appc/simulator/client/impl/TestJsonResponseHandler.java b/appc-client/client-simulator/src/test/java/org/openecomp/appc/simulator/client/impl/TestJsonResponseHandler.java
index b477b8a61..59ffe1b31 100644
--- a/appc-client/client-simulator/src/test/java/org/openecomp/appc/simulator/client/impl/TestJsonResponseHandler.java
+++ b/appc-client/client-simulator/src/test/java/org/openecomp/appc/simulator/client/impl/TestJsonResponseHandler.java
@@ -1,4 +1,4 @@
-package org.openecomp.appc.simulator.client.impl;
+package org.onap.appc.simulator.client.impl;
import org.apache.commons.io.filefilter.WildcardFileFilter;
import org.junit.Assert;
diff --git a/appc-client/client-simulator/src/test/java/org/openecomp/appc/simulator/client/main/TestClientRunner.java b/appc-client/client-simulator/src/test/java/org/openecomp/appc/simulator/client/main/TestClientRunner.java
index d0de0cd49..db648f957 100644
--- a/appc-client/client-simulator/src/test/java/org/openecomp/appc/simulator/client/main/TestClientRunner.java
+++ b/appc-client/client-simulator/src/test/java/org/openecomp/appc/simulator/client/main/TestClientRunner.java
@@ -1,4 +1,4 @@
-package org.openecomp.appc.simulator.client.main;
+package org.onap.appc.simulator.client.main;
import org.apache.commons.io.filefilter.WildcardFileFilter;
import org.junit.After;
@@ -8,8 +8,8 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Matchers;
import org.mockito.Mockito;
-import org.openecomp.appc.client.lcm.exceptions.AppcClientException;
-import org.openecomp.appc.simulator.client.impl.JsonRequestHandler;
+import org.onap.appc.client.lcm.exceptions.AppcClientException;
+import org.onap.appc.simulator.client.impl.JsonRequestHandler;
import org.powermock.api.mockito.PowerMockito;
import org.powermock.core.classloader.annotations.PrepareForTest;
import org.powermock.modules.junit4.PowerMockRunner;
diff --git a/appc-client/client-simulator/src/test/java/run.java b/appc-client/client-simulator/src/test/java/run.java
index 62f12acbb..1ef241848 100644
--- a/appc-client/client-simulator/src/test/java/run.java
+++ b/appc-client/client-simulator/src/test/java/run.java
@@ -25,7 +25,7 @@
import java.io.FileNotFoundException;
import java.io.IOException;
-import org.openecomp.appc.simulator.client.main.ClientRunner;
+import org.onap.appc.simulator.client.main.ClientRunner;
public class run {
public static void main(String ... args) throws Exception, IOException, RuntimeException, FileNotFoundException {
diff --git a/appc-client/code-generator/pom.xml b/appc-client/code-generator/pom.xml
index 4b762cb55..bdce0af71 100644
--- a/appc-client/code-generator/pom.xml
+++ b/appc-client/code-generator/pom.xml
@@ -26,7 +26,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>appc-java-client</artifactId>
- <groupId>org.openecomp.appc.client</groupId>
+ <groupId>org.onap.appc.client</groupId>
<version>1.3.0-SNAPSHOT</version>
</parent>
diff --git a/appc-client/code-generator/src/main/java/org/openecomp/appc/tools/generator/api/CLI.java b/appc-client/code-generator/src/main/java/org/openecomp/appc/tools/generator/api/CLI.java
index c748b7cca..e28b3706a 100644
--- a/appc-client/code-generator/src/main/java/org/openecomp/appc/tools/generator/api/CLI.java
+++ b/appc-client/code-generator/src/main/java/org/openecomp/appc/tools/generator/api/CLI.java
@@ -22,9 +22,9 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.tools.generator.api;
+package org.onap.appc.tools.generator.api;
-import org.openecomp.appc.tools.generator.impl.ModelGenerator;
+import org.onap.appc.tools.generator.impl.ModelGenerator;
public class CLI {
public static void main(String... args) throws Exception {
diff --git a/appc-client/code-generator/src/main/java/org/openecomp/appc/tools/generator/api/ContextBuilder.java b/appc-client/code-generator/src/main/java/org/openecomp/appc/tools/generator/api/ContextBuilder.java
index 7e0bbe15a..a1826f270 100644
--- a/appc-client/code-generator/src/main/java/org/openecomp/appc/tools/generator/api/ContextBuilder.java
+++ b/appc-client/code-generator/src/main/java/org/openecomp/appc/tools/generator/api/ContextBuilder.java
@@ -22,7 +22,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.tools.generator.api;
+package org.onap.appc.tools.generator.api;
import java.io.FileNotFoundException;
import java.io.IOException;
diff --git a/appc-client/code-generator/src/main/java/org/openecomp/appc/tools/generator/api/MavenPlugin.java b/appc-client/code-generator/src/main/java/org/openecomp/appc/tools/generator/api/MavenPlugin.java
index f031dd666..9e160eed2 100644
--- a/appc-client/code-generator/src/main/java/org/openecomp/appc/tools/generator/api/MavenPlugin.java
+++ b/appc-client/code-generator/src/main/java/org/openecomp/appc/tools/generator/api/MavenPlugin.java
@@ -22,9 +22,9 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.tools.generator.api;
+package org.onap.appc.tools.generator.api;
-import org.openecomp.appc.tools.generator.impl.ModelGenerator;
+import org.onap.appc.tools.generator.impl.ModelGenerator;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
diff --git a/appc-client/code-generator/src/main/java/org/openecomp/appc/tools/generator/extensions/JsonContextBuilderImpl.java b/appc-client/code-generator/src/main/java/org/openecomp/appc/tools/generator/extensions/JsonContextBuilderImpl.java
index 6a3d13bf5..6c408dd1d 100644
--- a/appc-client/code-generator/src/main/java/org/openecomp/appc/tools/generator/extensions/JsonContextBuilderImpl.java
+++ b/appc-client/code-generator/src/main/java/org/openecomp/appc/tools/generator/extensions/JsonContextBuilderImpl.java
@@ -22,9 +22,9 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.tools.generator.extensions;
+package org.onap.appc.tools.generator.extensions;
-import org.openecomp.appc.tools.generator.api.ContextBuilder;
+import org.onap.appc.tools.generator.api.ContextBuilder;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
diff --git a/appc-client/code-generator/src/main/java/org/openecomp/appc/tools/generator/extensions/YangContextBuilderImpl.java b/appc-client/code-generator/src/main/java/org/openecomp/appc/tools/generator/extensions/YangContextBuilderImpl.java
index 8325ecb6d..67055c757 100644
--- a/appc-client/code-generator/src/main/java/org/openecomp/appc/tools/generator/extensions/YangContextBuilderImpl.java
+++ b/appc-client/code-generator/src/main/java/org/openecomp/appc/tools/generator/extensions/YangContextBuilderImpl.java
@@ -22,9 +22,9 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.tools.generator.extensions;
+package org.onap.appc.tools.generator.extensions;
-import org.openecomp.appc.tools.generator.api.ContextBuilder;
+import org.onap.appc.tools.generator.api.ContextBuilder;
import com.google.common.base.Optional;
import org.opendaylight.yangtools.yang.model.api.Module;
diff --git a/appc-client/code-generator/src/main/java/org/openecomp/appc/tools/generator/impl/CodeGenWriter.java b/appc-client/code-generator/src/main/java/org/openecomp/appc/tools/generator/impl/CodeGenWriter.java
index 15498c83d..347c24c06 100644
--- a/appc-client/code-generator/src/main/java/org/openecomp/appc/tools/generator/impl/CodeGenWriter.java
+++ b/appc-client/code-generator/src/main/java/org/openecomp/appc/tools/generator/impl/CodeGenWriter.java
@@ -22,7 +22,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.tools.generator.impl;
+package org.onap.appc.tools.generator.impl;
import java.io.*;
import java.nio.file.Files;
diff --git a/appc-client/code-generator/src/main/java/org/openecomp/appc/tools/generator/impl/ModelGenerator.java b/appc-client/code-generator/src/main/java/org/openecomp/appc/tools/generator/impl/ModelGenerator.java
index bdaa3a29d..2275fdac7 100644
--- a/appc-client/code-generator/src/main/java/org/openecomp/appc/tools/generator/impl/ModelGenerator.java
+++ b/appc-client/code-generator/src/main/java/org/openecomp/appc/tools/generator/impl/ModelGenerator.java
@@ -22,9 +22,9 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.tools.generator.impl;
+package org.onap.appc.tools.generator.impl;
-import org.openecomp.appc.tools.generator.api.ContextBuilder;
+import org.onap.appc.tools.generator.api.ContextBuilder;
import freemarker.template.Configuration;
import freemarker.template.Template;
import freemarker.template.TemplateException;
diff --git a/appc-client/code-generator/src/main/resources/configuration/client-kit.properties b/appc-client/code-generator/src/main/resources/configuration/client-kit.properties
index 047915e44..a0097c9fa 100644
--- a/appc-client/code-generator/src/main/resources/configuration/client-kit.properties
+++ b/appc-client/code-generator/src/main/resources/configuration/client-kit.properties
@@ -26,9 +26,9 @@
# Default Properties - Configured for code generator
#
#--------------------------------------------------------------------------------------------
-ctx.model.package=org.openecomp.appc.client.lcm.model
-ctx.api.package=org.openecomp.appc.client.lcm.api
-ctx.utils.package=org.openecomp.appc.client.lcm.utils
-ctx.exceptions.package=org.openecomp.appc.client.lcm.exceptions
+ctx.model.package=org.onap.appc.client.lcm.model
+ctx.api.package=org.onap.appc.client.lcm.api
+ctx.utils.package=org.onap.appc.client.lcm.utils
+ctx.exceptions.package=org.onap.appc.client.lcm.exceptions
ctx.interface.classname=LifeCycleManagerStateful
diff --git a/appc-client/code-generator/src/test/java/org/openecomp/appc/tools/generator/api/CLITest.java b/appc-client/code-generator/src/test/java/org/openecomp/appc/tools/generator/api/CLITest.java
index 3d6eb1bf3..4cd6bb5f5 100644
--- a/appc-client/code-generator/src/test/java/org/openecomp/appc/tools/generator/api/CLITest.java
+++ b/appc-client/code-generator/src/test/java/org/openecomp/appc/tools/generator/api/CLITest.java
@@ -1,4 +1,4 @@
-package org.openecomp.appc.tools.generator.api;
+package org.onap.appc.tools.generator.api;
import org.junit.Assert;
import org.junit.Test;
diff --git a/appc-client/code-generator/src/test/java/org/openecomp/appc/tools/generator/impl/CodeGenWriterTest.java b/appc-client/code-generator/src/test/java/org/openecomp/appc/tools/generator/impl/CodeGenWriterTest.java
index 84cca9337..e0669b836 100644
--- a/appc-client/code-generator/src/test/java/org/openecomp/appc/tools/generator/impl/CodeGenWriterTest.java
+++ b/appc-client/code-generator/src/test/java/org/openecomp/appc/tools/generator/impl/CodeGenWriterTest.java
@@ -1,4 +1,4 @@
-package org.openecomp.appc.tools.generator.impl;
+package org.onap.appc.tools.generator.impl;
import org.junit.Assert;
import org.junit.Test;
diff --git a/appc-client/pom.xml b/appc-client/pom.xml
index 8f7a93dbe..abd27216e 100644
--- a/appc-client/pom.xml
+++ b/appc-client/pom.xml
@@ -27,13 +27,13 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.openecomp.appc</groupId>
+ <groupId>org.onap.appc</groupId>
<artifactId>appc</artifactId>
<version>1.3.0-SNAPSHOT</version>
</parent>
<artifactId>appc-java-client</artifactId>
- <groupId>org.openecomp.appc.client</groupId>
+ <groupId>org.onap.appc.client</groupId>
<version>1.3.0-SNAPSHOT</version>
<name>appc-java-client</name>