12 files changed, 19 insertions, 20 deletions
diff --git a/pom.xml b/pom.xml
index 57a0873..90092c1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -54,7 +54,7 @@
       </dependency>
       <!-- ECOMP REST Client Library. -->
       <dependency>
-         <groupId>org.openecomp.aai</groupId>
+         <groupId>org.onap.aai</groupId>
          <artifactId>rest-client</artifactId>
          <version>1.1.0-SNAPSHOT</version>
       </dependency>
@@ -95,7 +95,7 @@
             <extensions>true</extensions>
             <configuration>
                <instructions>
-                  <Bundle-SymbolicName>org.openecomp.router-core</Bundle-SymbolicName>
+                  <Bundle-SymbolicName>org.onap.aai.router-core</Bundle-SymbolicName>
                   <Export-Service>org.apache.camel.spi.ComponentResolver;component=event-bus</Export-Service>
                </instructions>
             </configuration>
diff --git a/src/main/java/org/openecomp/event/EventBusComponent.java b/src/main/java/org/onap/aai/event/EventBusComponent.java
index 9a02a77..f6e373a 100644
--- a/src/main/java/org/openecomp/event/EventBusComponent.java
+++ b/src/main/java/org/onap/aai/event/EventBusComponent.java
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.event;
+package org.onap.aai.event;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.Endpoint;
diff --git a/src/main/java/org/openecomp/event/EventBusConsumer.java b/src/main/java/org/onap/aai/event/EventBusConsumer.java
index 982b402..472d0ff 100644
--- a/src/main/java/org/openecomp/event/EventBusConsumer.java
+++ b/src/main/java/org/onap/aai/event/EventBusConsumer.java
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.event;
+package org.onap.aai.event;
 
 import com.att.nsa.cambria.client.CambriaClientBuilders;
 import com.att.nsa.cambria.client.CambriaClientBuilders.ConsumerBuilder;
@@ -30,10 +30,10 @@ import org.apache.camel.Exchange;
 import org.apache.camel.Message;
 import org.apache.camel.Processor;
 import org.apache.camel.impl.ScheduledPollConsumer;
+import org.onap.aai.logging.RouterCoreMsgs;
 import org.openecomp.cl.api.Logger;
 import org.openecomp.cl.eelf.LoggerFactory;
 import org.openecomp.cl.mdc.MdcContext;
-import org.openecomp.logging.RouterCoreMsgs;
 
 import java.net.MalformedURLException;
 import java.security.GeneralSecurityException;
diff --git a/src/main/java/org/openecomp/event/EventBusEndpoint.java b/src/main/java/org/onap/aai/event/EventBusEndpoint.java
index 986c897..965dc72 100644
--- a/src/main/java/org/openecomp/event/EventBusEndpoint.java
+++ b/src/main/java/org/onap/aai/event/EventBusEndpoint.java
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.event;
+package org.onap.aai.event;
 
 
 import org.apache.camel.Consumer;
diff --git a/src/main/java/org/openecomp/event/EventBusProducer.java b/src/main/java/org/onap/aai/event/EventBusProducer.java
index d8902d2..a0578fc 100644
--- a/src/main/java/org/openecomp/event/EventBusProducer.java
+++ b/src/main/java/org/onap/aai/event/EventBusProducer.java
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.event;
+package org.onap.aai.event;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.impl.DefaultProducer;
diff --git a/src/main/java/org/openecomp/logging/RouterCoreMsgs.java b/src/main/java/org/onap/aai/logging/RouterCoreMsgs.java
index b23c35a..6b2fcae 100644
--- a/src/main/java/org/openecomp/logging/RouterCoreMsgs.java
+++ b/src/main/java/org/onap/aai/logging/RouterCoreMsgs.java
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.logging;
+package org.onap.aai.logging;
 
 import com.att.eelf.i18n.EELFResourceManager;
 import org.openecomp.cl.eelf.LogMessageEnum;
diff --git a/src/main/java/org/openecomp/rest/RestClientComponent.java b/src/main/java/org/onap/aai/rest/RestClientComponent.java
index 60d5724..877e25f 100644
--- a/src/main/java/org/openecomp/rest/RestClientComponent.java
+++ b/src/main/java/org/onap/aai/rest/RestClientComponent.java
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.rest;
+package org.onap.aai.rest;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.Endpoint;
diff --git a/src/main/java/org/openecomp/rest/RestClientConsumer.java b/src/main/java/org/onap/aai/rest/RestClientConsumer.java
index e082b9e..be17159 100644
--- a/src/main/java/org/openecomp/rest/RestClientConsumer.java
+++ b/src/main/java/org/onap/aai/rest/RestClientConsumer.java
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.rest;
+package org.onap.aai.rest;
 
 import org.apache.camel.Processor;
 import org.apache.camel.impl.DefaultConsumer;
diff --git a/src/main/java/org/openecomp/rest/RestClientEndpoint.java b/src/main/java/org/onap/aai/rest/RestClientEndpoint.java
index 63c4e0d..41d8db5 100644
--- a/src/main/java/org/openecomp/rest/RestClientEndpoint.java
+++ b/src/main/java/org/onap/aai/rest/RestClientEndpoint.java
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.rest;
+package org.onap.aai.rest;
 
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
diff --git a/src/main/java/org/openecomp/rest/RestClientProducer.java b/src/main/java/org/onap/aai/rest/RestClientProducer.java
index 6e36067..542cf1d 100644
--- a/src/main/java/org/openecomp/rest/RestClientProducer.java
+++ b/src/main/java/org/onap/aai/rest/RestClientProducer.java
@@ -20,19 +20,18 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.rest;
+package org.onap.aai.rest;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.impl.DefaultProducer;
 import org.eclipse.jetty.util.security.Password;
+import org.onap.aai.event.EventBusConsumer;
+import org.onap.aai.restclient.client.Headers;
+import org.onap.aai.restclient.client.OperationResult;
+import org.onap.aai.restclient.client.RestClient;
+import org.onap.aai.restclient.rest.HttpUtil;
 import org.openecomp.cl.api.Logger;
 import org.openecomp.cl.eelf.LoggerFactory;
-import org.openecomp.event.EventBusConsumer;
-
-import org.openecomp.restclient.client.Headers;
-import org.openecomp.restclient.client.OperationResult;
-import org.openecomp.restclient.client.RestClient;
-import org.openecomp.restclient.rest.HttpUtil;
 
 import java.util.Arrays;
 import java.util.HashMap;
diff --git a/src/main/resources/META-INF/services/org/apache/camel/component/event-bus b/src/main/resources/META-INF/services/org/apache/camel/component/event-bus
index 8256ed6..f795067 100644
--- a/src/main/resources/META-INF/services/org/apache/camel/component/event-bus
+++ b/src/main/resources/META-INF/services/org/apache/camel/component/event-bus
@@ -1 +1 @@
-class=org.openecomp.event.EventBusComponent
+class=org.onap.aai.event.EventBusComponent
diff --git a/src/main/resources/META-INF/services/org/apache/camel/component/rest-client b/src/main/resources/META-INF/services/org/apache/camel/component/rest-client
index 493eb1f..375dcd7 100644
--- a/src/main/resources/META-INF/services/org/apache/camel/component/rest-client
+++ b/src/main/resources/META-INF/services/org/apache/camel/component/rest-client
@@ -1 +1 @@
-class=org.openecomp.rest.RestClientComponent
+class=org.onap.aai.rest.RestClientComponent