Re-add source from correct branch

Change-Id: I515f8378ea1d2baf0aa2434ec46272f1b5bdb229
Signed-off-by: Lisa Revel <lr0306@att.com>

34 files changed, 57 insertions, 57 deletions

diff --git a/dcae-analytics-common/pom.xml b/dcae-analytics-common/pom.xml
index 1c58693..7da767f 100644
--- a/dcae-analytics-common/pom.xml
+++ b/dcae-analytics-common/pom.xml
@@ -27,7 +27,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.openecomp.dcae.analytics</groupId>
+        <groupId>org.openecomp.dcae.apod.analytics</groupId>
         <artifactId>dcae-analytics</artifactId>
         <version>1.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
@@ -49,7 +49,7 @@
 
         <!-- DCAE PROJECT DEPENDENCIES -->
         <dependency>
-            <groupId>org.openecomp.dcae.analytics</groupId>
+            <groupId>org.openecomp.dcae.apod.analytics</groupId>
             <artifactId>dcae-analytics-model</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
@@ -108,7 +108,7 @@
 
         <!-- TEST DEPENDENCIES -->
         <dependency>
-            <groupId>org.openecomp.dcae.analytics</groupId>
+            <groupId>org.openecomp.dcae.apod.analytics</groupId>
             <artifactId>dcae-analytics-test</artifactId>
             <version>1.0-SNAPSHOT</version>
             <scope>test</scope>
diff --git a/dcae-analytics-common/src/main/java/org/openecomp/dcae/analytics/common/AnalyticsConstants.java b/dcae-analytics-common/src/main/java/org/openecomp/dcae/apod/analytics/common/AnalyticsConstants.java
index 6c51069..4294d6a 100644
--- a/dcae-analytics-common/src/main/java/org/openecomp/dcae/analytics/common/AnalyticsConstants.java
+++ b/dcae-analytics-common/src/main/java/org/openecomp/dcae/apod/analytics/common/AnalyticsConstants.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.analytics.common;
+package org.openecomp.dcae.apod.analytics.common;
 
 /**
  * Contains static variable for all DCAE Components.
diff --git a/dcae-analytics-common/src/main/java/org/openecomp/dcae/analytics/common/CDAPComponentsConstants.java b/dcae-analytics-common/src/main/java/org/openecomp/dcae/apod/analytics/common/CDAPComponentsConstants.java
index 50aad3c..ab39ee9 100644
--- a/dcae-analytics-common/src/main/java/org/openecomp/dcae/analytics/common/CDAPComponentsConstants.java
+++ b/dcae-analytics-common/src/main/java/org/openecomp/dcae/apod/analytics/common/CDAPComponentsConstants.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.analytics.common;
+package org.openecomp.dcae.apod.analytics.common;
 
 /**
  *  Contains static constant variable names and values of all DCAE CDAP Components for
diff --git a/dcae-analytics-common/src/main/java/org/openecomp/dcae/analytics/common/CDAPMetricsConstants.java b/dcae-analytics-common/src/main/java/org/openecomp/dcae/apod/analytics/common/CDAPMetricsConstants.java
index 12df643..63ac7e0 100644
--- a/dcae-analytics-common/src/main/java/org/openecomp/dcae/analytics/common/CDAPMetricsConstants.java
+++ b/dcae-analytics-common/src/main/java/org/openecomp/dcae/apod/analytics/common/CDAPMetricsConstants.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.analytics.common;
+package org.openecomp.dcae.apod.analytics.common;
 
 /**
  * Contains all metrics names used for DCAE CDAP modules
diff --git a/dcae-analytics-common/src/main/java/org/openecomp/dcae/analytics/common/DCAEAnalyticsPreferences.java b/dcae-analytics-common/src/main/java/org/openecomp/dcae/apod/analytics/common/DCAEAnalyticsPreferences.java
index dc345f4..c912179 100644
--- a/dcae-analytics-common/src/main/java/org/openecomp/dcae/analytics/common/DCAEAnalyticsPreferences.java
+++ b/dcae-analytics-common/src/main/java/org/openecomp/dcae/apod/analytics/common/DCAEAnalyticsPreferences.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.analytics.common;
+package org.openecomp.dcae.apod.analytics.common;
 
 /**
  * A Marker Interface for all DCAE Analytics Preferences
diff --git a/dcae-analytics-common/src/main/java/org/openecomp/dcae/analytics/common/cdap/settings/CDAPAppConfig.java b/dcae-analytics-common/src/main/java/org/openecomp/dcae/apod/analytics/common/cdap/settings/CDAPAppConfig.java
index 3fc6f22..a47170f 100644
--- a/dcae-analytics-common/src/main/java/org/openecomp/dcae/analytics/common/cdap/settings/CDAPAppConfig.java
+++ b/dcae-analytics-common/src/main/java/org/openecomp/dcae/apod/analytics/common/cdap/settings/CDAPAppConfig.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.analytics.common.cdap.settings;
+package org.openecomp.dcae.apod.analytics.common.cdap.settings;
 
 /**
  *<p>
diff --git a/dcae-analytics-common/src/main/java/org/openecomp/dcae/analytics/common/cdap/settings/CDAPAppPreferences.java b/dcae-analytics-common/src/main/java/org/openecomp/dcae/apod/analytics/common/cdap/settings/CDAPAppPreferences.java
index 52ec1af..67fbfc1 100644
--- a/dcae-analytics-common/src/main/java/org/openecomp/dcae/analytics/common/cdap/settings/CDAPAppPreferences.java
+++ b/dcae-analytics-common/src/main/java/org/openecomp/dcae/apod/analytics/common/cdap/settings/CDAPAppPreferences.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.analytics.common.cdap.settings;
+package org.openecomp.dcae.apod.analytics.common.cdap.settings;
 
 /**
  * <p>
diff --git a/dcae-analytics-common/src/main/java/org/openecomp/dcae/analytics/common/cdap/settings/CDAPAppSettings.java b/dcae-analytics-common/src/main/java/org/openecomp/dcae/apod/analytics/common/cdap/settings/CDAPAppSettings.java
index d59e6f4..9e96cfe 100644
--- a/dcae-analytics-common/src/main/java/org/openecomp/dcae/analytics/common/cdap/settings/CDAPAppSettings.java
+++ b/dcae-analytics-common/src/main/java/org/openecomp/dcae/apod/analytics/common/cdap/settings/CDAPAppSettings.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.analytics.common.cdap.settings;
+package org.openecomp.dcae.apod.analytics.common.cdap.settings;
 
 import java.io.Serializable;
 
diff --git a/dcae-analytics-common/src/main/java/org/openecomp/dcae/analytics/common/cdap/settings/CDAPBaseAppConfig.java b/dcae-analytics-common/src/main/java/org/openecomp/dcae/apod/analytics/common/cdap/settings/CDAPBaseAppConfig.java
index 1360b20..38c882f 100644
--- a/dcae-analytics-common/src/main/java/org/openecomp/dcae/analytics/common/cdap/settings/CDAPBaseAppConfig.java
+++ b/dcae-analytics-common/src/main/java/org/openecomp/dcae/apod/analytics/common/cdap/settings/CDAPBaseAppConfig.java
@@ -18,10 +18,10 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.analytics.common.cdap.settings;
+package org.openecomp.dcae.apod.analytics.common.cdap.settings;
 
 import co.cask.cdap.api.Config;
-import org.openecomp.dcae.analytics.common.CDAPComponentsConstants;
+import org.openecomp.dcae.apod.analytics.common.CDAPComponentsConstants;
 
 /**
  * Base class for all DACE Analytics Application Configurations
diff --git a/dcae-analytics-common/src/main/java/org/openecomp/dcae/analytics/common/cdap/validation/CDAPAppSettingsValidator.java b/dcae-analytics-common/src/main/java/org/openecomp/dcae/apod/analytics/common/cdap/validation/CDAPAppSettingsValidator.java
index df00eff..7ebe8e3 100644
--- a/dcae-analytics-common/src/main/java/org/openecomp/dcae/analytics/common/cdap/validation/CDAPAppSettingsValidator.java
+++ b/dcae-analytics-common/src/main/java/org/openecomp/dcae/apod/analytics/common/cdap/validation/CDAPAppSettingsValidator.java
@@ -18,11 +18,11 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.analytics.common.cdap.validation;
+package org.openecomp.dcae.apod.analytics.common.cdap.validation;
 
-import org.openecomp.dcae.analytics.common.cdap.settings.CDAPAppSettings;
-import org.openecomp.dcae.analytics.common.validation.DCAEValidator;
-import org.openecomp.dcae.analytics.common.validation.ValidationResponse;
+import org.openecomp.dcae.apod.analytics.common.cdap.settings.CDAPAppSettings;
+import org.openecomp.dcae.apod.analytics.common.validation.DCAEValidator;
+import org.openecomp.dcae.apod.analytics.common.validation.ValidationResponse;
 
 /**
  * <p>
diff --git a/dcae-analytics-common/src/main/java/org/openecomp/dcae/analytics/common/exception/CDAPSettingsException.java b/dcae-analytics-common/src/main/java/org/openecomp/dcae/apod/analytics/common/exception/CDAPSettingsException.java
index f6859e2..f5a8037 100644
--- a/dcae-analytics-common/src/main/java/org/openecomp/dcae/analytics/common/exception/CDAPSettingsException.java
+++ b/dcae-analytics-common/src/main/java/org/openecomp/dcae/apod/analytics/common/exception/CDAPSettingsException.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.analytics.common.exception;
+package org.openecomp.dcae.apod.analytics.common.exception;
 
 import org.slf4j.Logger;
 
diff --git a/dcae-analytics-common/src/main/java/org/openecomp/dcae/analytics/common/exception/DCAEAnalyticsRuntimeException.java b/dcae-analytics-common/src/main/java/org/openecomp/dcae/apod/analytics/common/exception/DCAEAnalyticsRuntimeException.java
index cc00e33..559e6ae 100644
--- a/dcae-analytics-common/src/main/java/org/openecomp/dcae/analytics/common/exception/DCAEAnalyticsRuntimeException.java
+++ b/dcae-analytics-common/src/main/java/org/openecomp/dcae/apod/analytics/common/exception/DCAEAnalyticsRuntimeException.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.analytics.common.exception;
+package org.openecomp.dcae.apod.analytics.common.exception;
 
 import org.slf4j.Logger;
 
diff --git a/dcae-analytics-common/src/main/java/org/openecomp/dcae/analytics/common/exception/MessageProcessingException.java b/dcae-analytics-common/src/main/java/org/openecomp/dcae/apod/analytics/common/exception/MessageProcessingException.java
index b40f604..44ef147 100644
--- a/dcae-analytics-common/src/main/java/org/openecomp/dcae/analytics/common/exception/MessageProcessingException.java
+++ b/dcae-analytics-common/src/main/java/org/openecomp/dcae/apod/analytics/common/exception/MessageProcessingException.java
@@ -18,9 +18,9 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.analytics.common.exception;
+package org.openecomp.dcae.apod.analytics.common.exception;
 
-import org.openecomp.dcae.analytics.common.service.processor.MessageProcessor;
+import org.openecomp.dcae.apod.analytics.common.service.processor.MessageProcessor;
 import org.slf4j.Logger;
 
 /**
diff --git a/dcae-analytics-common/src/main/java/org/openecomp/dcae/analytics/common/service/processor/AbstractMessageProcessor.java b/dcae-analytics-common/src/main/java/org/openecomp/dcae/apod/analytics/common/service/processor/AbstractMessageProcessor.java
index e5b9afc..c90858a 100644
--- a/dcae-analytics-common/src/main/java/org/openecomp/dcae/analytics/common/service/processor/AbstractMessageProcessor.java
+++ b/dcae-analytics-common/src/main/java/org/openecomp/dcae/apod/analytics/common/service/processor/AbstractMessageProcessor.java
@@ -18,10 +18,10 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.analytics.common.service.processor;
+package org.openecomp.dcae.apod.analytics.common.service.processor;
 
 import com.google.common.base.Optional;
-import org.openecomp.dcae.analytics.common.exception.MessageProcessingException;
+import org.openecomp.dcae.apod.analytics.common.exception.MessageProcessingException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/dcae-analytics-common/src/main/java/org/openecomp/dcae/analytics/common/service/processor/AbstractProcessorContext.java b/dcae-analytics-common/src/main/java/org/openecomp/dcae/apod/analytics/common/service/processor/AbstractProcessorContext.java
index 15145b5..2274f0e 100644
--- a/dcae-analytics-common/src/main/java/org/openecomp/dcae/analytics/common/service/processor/AbstractProcessorContext.java
+++ b/dcae-analytics-common/src/main/java/org/openecomp/dcae/apod/analytics/common/service/processor/AbstractProcessorContext.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.analytics.common.service.processor;
+package org.openecomp.dcae.apod.analytics.common.service.processor;
 
 import com.google.common.base.Objects;
 
diff --git a/dcae-analytics-common/src/main/java/org/openecomp/dcae/analytics/common/service/processor/GenericMessageChainProcessor.java b/dcae-analytics-common/src/main/java/org/openecomp/dcae/apod/analytics/common/service/processor/GenericMessageChainProcessor.java
index b86d3ad..b289a32 100644
--- a/dcae-analytics-common/src/main/java/org/openecomp/dcae/analytics/common/service/processor/GenericMessageChainProcessor.java
+++ b/dcae-analytics-common/src/main/java/org/openecomp/dcae/apod/analytics/common/service/processor/GenericMessageChainProcessor.java
@@ -18,9 +18,9 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.analytics.common.service.processor;
+package org.openecomp.dcae.apod.analytics.common.service.processor;
 
-import org.openecomp.dcae.analytics.common.utils.MessageProcessorUtils;
+import org.openecomp.dcae.apod.analytics.common.utils.MessageProcessorUtils;
 
 import java.util.List;
 
diff --git a/dcae-analytics-common/src/main/java/org/openecomp/dcae/analytics/common/service/processor/GenericProcessorInfo.java b/dcae-analytics-common/src/main/java/org/openecomp/dcae/apod/analytics/common/service/processor/GenericProcessorInfo.java
index 665f787..681bb4d 100644
--- a/dcae-analytics-common/src/main/java/org/openecomp/dcae/analytics/common/service/processor/GenericProcessorInfo.java
+++ b/dcae-analytics-common/src/main/java/org/openecomp/dcae/apod/analytics/common/service/processor/GenericProcessorInfo.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.analytics.common.service.processor;
+package org.openecomp.dcae.apod.analytics.common.service.processor;
 
 import javax.annotation.Nonnull;
 
diff --git a/dcae-analytics-common/src/main/java/org/openecomp/dcae/analytics/common/service/processor/MessageProcessor.java b/dcae-analytics-common/src/main/java/org/openecomp/dcae/apod/analytics/common/service/processor/MessageProcessor.java
index 3c09da9..73414db 100644
--- a/dcae-analytics-common/src/main/java/org/openecomp/dcae/analytics/common/service/processor/MessageProcessor.java
+++ b/dcae-analytics-common/src/main/java/org/openecomp/dcae/apod/analytics/common/service/processor/MessageProcessor.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.analytics.common.service.processor;
+package org.openecomp.dcae.apod.analytics.common.service.processor;
 
 import com.google.common.base.Function;
 import com.google.common.base.Optional;
diff --git a/dcae-analytics-common/src/main/java/org/openecomp/dcae/analytics/common/service/processor/ProcessingState.java b/dcae-analytics-common/src/main/java/org/openecomp/dcae/apod/analytics/common/service/processor/ProcessingState.java
index c5090f7..8f97d63 100644
--- a/dcae-analytics-common/src/main/java/org/openecomp/dcae/analytics/common/service/processor/ProcessingState.java
+++ b/dcae-analytics-common/src/main/java/org/openecomp/dcae/apod/analytics/common/service/processor/ProcessingState.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.analytics.common.service.processor;
+package org.openecomp.dcae.apod.analytics.common.service.processor;
 
 /**
  * <p>
diff --git a/dcae-analytics-common/src/main/java/org/openecomp/dcae/analytics/common/service/processor/ProcessorContext.java b/dcae-analytics-common/src/main/java/org/openecomp/dcae/apod/analytics/common/service/processor/ProcessorContext.java
index 74eabd7..3c70919 100644
--- a/dcae-analytics-common/src/main/java/org/openecomp/dcae/analytics/common/service/processor/ProcessorContext.java
+++ b/dcae-analytics-common/src/main/java/org/openecomp/dcae/apod/analytics/common/service/processor/ProcessorContext.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.analytics.common.service.processor;
+package org.openecomp.dcae.apod.analytics.common.service.processor;
 
 import java.io.Serializable;
 import java.util.List;
diff --git a/dcae-analytics-common/src/main/java/org/openecomp/dcae/analytics/common/service/processor/ProcessorInfo.java b/dcae-analytics-common/src/main/java/org/openecomp/dcae/apod/analytics/common/service/processor/ProcessorInfo.java
index e657ed7..6bb74b0 100644
--- a/dcae-analytics-common/src/main/java/org/openecomp/dcae/analytics/common/service/processor/ProcessorInfo.java
+++ b/dcae-analytics-common/src/main/java/org/openecomp/dcae/apod/analytics/common/service/processor/ProcessorInfo.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.analytics.common.service.processor;
+package org.openecomp.dcae.apod.analytics.common.service.processor;
 
 import java.io.Serializable;
 
diff --git a/dcae-analytics-common/src/main/java/org/openecomp/dcae/analytics/common/utils/HTTPUtils.java b/dcae-analytics-common/src/main/java/org/openecomp/dcae/apod/analytics/common/utils/HTTPUtils.java
index 4c36cb3..c10935f 100644
--- a/dcae-analytics-common/src/main/java/org/openecomp/dcae/analytics/common/utils/HTTPUtils.java
+++ b/dcae-analytics-common/src/main/java/org/openecomp/dcae/apod/analytics/common/utils/HTTPUtils.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.analytics.common.utils;
+package org.openecomp.dcae.apod.analytics.common.utils;
 
 /**
  * Contains common utils to check HTTP Related Utils
diff --git a/dcae-analytics-common/src/main/java/org/openecomp/dcae/analytics/common/utils/MessageProcessorUtils.java b/dcae-analytics-common/src/main/java/org/openecomp/dcae/apod/analytics/common/utils/MessageProcessorUtils.java
index 10c8d7c..20deb72 100644
--- a/dcae-analytics-common/src/main/java/org/openecomp/dcae/analytics/common/utils/MessageProcessorUtils.java
+++ b/dcae-analytics-common/src/main/java/org/openecomp/dcae/apod/analytics/common/utils/MessageProcessorUtils.java
@@ -18,11 +18,11 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.analytics.common.utils;
+package org.openecomp.dcae.apod.analytics.common.utils;
 
-import org.openecomp.dcae.analytics.common.exception.MessageProcessingException;
-import org.openecomp.dcae.analytics.common.service.processor.MessageProcessor;
-import org.openecomp.dcae.analytics.common.service.processor.ProcessorContext;
+import org.openecomp.dcae.apod.analytics.common.exception.MessageProcessingException;
+import org.openecomp.dcae.apod.analytics.common.service.processor.MessageProcessor;
+import org.openecomp.dcae.apod.analytics.common.service.processor.ProcessorContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/dcae-analytics-common/src/main/java/org/openecomp/dcae/analytics/common/utils/PersistenceUtils.java b/dcae-analytics-common/src/main/java/org/openecomp/dcae/apod/analytics/common/utils/PersistenceUtils.java
index e408171..a10280f 100644
--- a/dcae-analytics-common/src/main/java/org/openecomp/dcae/analytics/common/utils/PersistenceUtils.java
+++ b/dcae-analytics-common/src/main/java/org/openecomp/dcae/apod/analytics/common/utils/PersistenceUtils.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.analytics.common.utils;
+package org.openecomp.dcae.apod.analytics.common.utils;
 
 import java.util.Date;
 
diff --git a/dcae-analytics-common/src/main/java/org/openecomp/dcae/analytics/common/utils/ValidationUtils.java b/dcae-analytics-common/src/main/java/org/openecomp/dcae/apod/analytics/common/utils/ValidationUtils.java
index 694529f..f4f50a7 100644
--- a/dcae-analytics-common/src/main/java/org/openecomp/dcae/analytics/common/utils/ValidationUtils.java
+++ b/dcae-analytics-common/src/main/java/org/openecomp/dcae/apod/analytics/common/utils/ValidationUtils.java
@@ -18,12 +18,12 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.analytics.common.utils;
+package org.openecomp.dcae.apod.analytics.common.utils;
 
-import org.openecomp.dcae.analytics.common.cdap.settings.CDAPAppSettings;
-import org.openecomp.dcae.analytics.common.cdap.validation.CDAPAppSettingsValidator;
-import org.openecomp.dcae.analytics.common.exception.CDAPSettingsException;
-import org.openecomp.dcae.analytics.common.validation.ValidationResponse;
+import org.openecomp.dcae.apod.analytics.common.cdap.settings.CDAPAppSettings;
+import org.openecomp.dcae.apod.analytics.common.cdap.validation.CDAPAppSettingsValidator;
+import org.openecomp.dcae.apod.analytics.common.exception.CDAPSettingsException;
+import org.openecomp.dcae.apod.analytics.common.validation.ValidationResponse;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/dcae-analytics-common/src/main/java/org/openecomp/dcae/analytics/common/validation/DCAEValidator.java b/dcae-analytics-common/src/main/java/org/openecomp/dcae/apod/analytics/common/validation/DCAEValidator.java
index 065411f..a42b53a 100644
--- a/dcae-analytics-common/src/main/java/org/openecomp/dcae/analytics/common/validation/DCAEValidator.java
+++ b/dcae-analytics-common/src/main/java/org/openecomp/dcae/apod/analytics/common/validation/DCAEValidator.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.analytics.common.validation;
+package org.openecomp.dcae.apod.analytics.common.validation;
 
 /**
  * Marker interface for all DCAE Validators
diff --git a/dcae-analytics-common/src/main/java/org/openecomp/dcae/analytics/common/validation/GenericValidationResponse.java b/dcae-analytics-common/src/main/java/org/openecomp/dcae/apod/analytics/common/validation/GenericValidationResponse.java
index 7015ffe..3acb0c8 100644
--- a/dcae-analytics-common/src/main/java/org/openecomp/dcae/analytics/common/validation/GenericValidationResponse.java
+++ b/dcae-analytics-common/src/main/java/org/openecomp/dcae/apod/analytics/common/validation/GenericValidationResponse.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.analytics.common.validation;
+package org.openecomp.dcae.apod.analytics.common.validation;
 
 import com.google.common.base.Joiner;
 import com.google.common.base.Objects;
diff --git a/dcae-analytics-common/src/main/java/org/openecomp/dcae/analytics/common/validation/ValidationResponse.java b/dcae-analytics-common/src/main/java/org/openecomp/dcae/apod/analytics/common/validation/ValidationResponse.java
index b1b7a16..11591a3 100644
--- a/dcae-analytics-common/src/main/java/org/openecomp/dcae/analytics/common/validation/ValidationResponse.java
+++ b/dcae-analytics-common/src/main/java/org/openecomp/dcae/apod/analytics/common/validation/ValidationResponse.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.analytics.common.validation;
+package org.openecomp.dcae.apod.analytics.common.validation;
 
 import java.util.Collection;
 import java.util.Map;
diff --git a/dcae-analytics-common/src/test/java/org/openecomp/dcae/analytics/common/BaseAnalyticsCommonUnitTest.java b/dcae-analytics-common/src/test/java/org/openecomp/dcae/apod/analytics/common/BaseAnalyticsCommonUnitTest.java
index 06b7e63..bd38168 100644
--- a/dcae-analytics-common/src/test/java/org/openecomp/dcae/analytics/common/BaseAnalyticsCommonUnitTest.java
+++ b/dcae-analytics-common/src/test/java/org/openecomp/dcae/apod/analytics/common/BaseAnalyticsCommonUnitTest.java
@@ -18,13 +18,13 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.analytics.common;
+package org.openecomp.dcae.apod.analytics.common;
 
-import org.openecomp.dcae.analytics.common.service.processor.TestEarlyTerminatingProcessor;
-import org.openecomp.dcae.analytics.common.service.processor.TestMessageProcessor1;
-import org.openecomp.dcae.analytics.common.service.processor.TestMessageProcessor2;
-import org.openecomp.dcae.analytics.common.service.processor.TestProcessorContext;
-import org.openecomp.dcae.analytics.test.BaseDCAEAnalyticsUnitTest;
+import org.openecomp.dcae.apod.analytics.common.service.processor.TestEarlyTerminatingProcessor;
+import org.openecomp.dcae.apod.analytics.common.service.processor.TestMessageProcessor1;
+import org.openecomp.dcae.apod.analytics.common.service.processor.TestMessageProcessor2;
+import org.openecomp.dcae.apod.analytics.common.service.processor.TestProcessorContext;
+import org.openecomp.dcae.apod.analytics.test.BaseDCAEAnalyticsUnitTest;
 
 /**
  * Base class from all DCEA Analytics Common Module Unit Tests
diff --git a/dcae-analytics-common/src/test/java/org/openecomp/dcae/analytics/common/service/processor/GenericMessageChainProcessorTest.java b/dcae-analytics-common/src/test/java/org/openecomp/dcae/apod/analytics/common/service/processor/GenericMessageChainProcessorTest.java
index 2ab9d40..2ed82b6 100644
--- a/dcae-analytics-common/src/test/java/org/openecomp/dcae/analytics/common/service/processor/GenericMessageChainProcessorTest.java
+++ b/dcae-analytics-common/src/test/java/org/openecomp/dcae/apod/analytics/common/service/processor/GenericMessageChainProcessorTest.java
@@ -18,12 +18,12 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.analytics.common.service.processor;
+package org.openecomp.dcae.apod.analytics.common.service.processor;
 
 import com.google.common.collect.ImmutableList;
 import org.junit.Test;
-import org.openecomp.dcae.analytics.common.BaseAnalyticsCommonUnitTest;
-import org.openecomp.dcae.analytics.common.exception.MessageProcessingException;
+import org.openecomp.dcae.apod.analytics.common.BaseAnalyticsCommonUnitTest;
+import org.openecomp.dcae.apod.analytics.common.exception.MessageProcessingException;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertNull;
diff --git a/dcae-analytics-common/src/test/java/org/openecomp/dcae/analytics/common/service/processor/TestEarlyTerminatingProcessor.java b/dcae-analytics-common/src/test/java/org/openecomp/dcae/apod/analytics/common/service/processor/TestEarlyTerminatingProcessor.java
index c5852de..a015677 100644
--- a/dcae-analytics-common/src/test/java/org/openecomp/dcae/analytics/common/service/processor/TestEarlyTerminatingProcessor.java
+++ b/dcae-analytics-common/src/test/java/org/openecomp/dcae/apod/analytics/common/service/processor/TestEarlyTerminatingProcessor.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.analytics.common.service.processor;
+package org.openecomp.dcae.apod.analytics.common.service.processor;
 
 /**
  *
diff --git a/dcae-analytics-common/src/test/java/org/openecomp/dcae/analytics/common/service/processor/TestMessageProcessor1.java b/dcae-analytics-common/src/test/java/org/openecomp/dcae/apod/analytics/common/service/processor/TestMessageProcessor1.java
index 6c56cb8..ac29080 100644
--- a/dcae-analytics-common/src/test/java/org/openecomp/dcae/analytics/common/service/processor/TestMessageProcessor1.java
+++ b/dcae-analytics-common/src/test/java/org/openecomp/dcae/apod/analytics/common/service/processor/TestMessageProcessor1.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.analytics.common.service.processor;
+package org.openecomp.dcae.apod.analytics.common.service.processor;
 
 /**
  *
diff --git a/dcae-analytics-common/src/test/java/org/openecomp/dcae/analytics/common/service/processor/TestMessageProcessor2.java b/dcae-analytics-common/src/test/java/org/openecomp/dcae/apod/analytics/common/service/processor/TestMessageProcessor2.java
index 0ecbedf..a0704db 100644
--- a/dcae-analytics-common/src/test/java/org/openecomp/dcae/analytics/common/service/processor/TestMessageProcessor2.java
+++ b/dcae-analytics-common/src/test/java/org/openecomp/dcae/apod/analytics/common/service/processor/TestMessageProcessor2.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.analytics.common.service.processor;
+package org.openecomp.dcae.apod.analytics.common.service.processor;
 
 /**
  *
diff --git a/dcae-analytics-common/src/test/java/org/openecomp/dcae/analytics/common/service/processor/TestProcessorContext.java b/dcae-analytics-common/src/test/java/org/openecomp/dcae/apod/analytics/common/service/processor/TestProcessorContext.java
index 9d9342f..85e8c74 100644
--- a/dcae-analytics-common/src/test/java/org/openecomp/dcae/analytics/common/service/processor/TestProcessorContext.java
+++ b/dcae-analytics-common/src/test/java/org/openecomp/dcae/apod/analytics/common/service/processor/TestProcessorContext.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.analytics.common.service.processor;
+package org.openecomp.dcae.apod.analytics.common.service.processor;
 
 import java.util.LinkedList;
 import java.util.List;