From 6a91fa496b5464a9f96b43851968eee4c837d80c Mon Sep 17 00:00:00 2001
From: "Smokowski, Kevin (ks6305)" <kevin.smokowski@att.com>
Date: Thu, 28 Mar 2019 14:45:52 +0000
Subject: message router publisher changes

resolve message router publisher namespace issues

Resolve issues loading message-router in odlsli container

Change-Id: Ib36bced43129c735c61d5ff7bb0cf29362bb7779
Issue-ID: CCSDK-1186
Signed-off-by: Smokowski, Kevin (ks6305) <kevin.smokowski@att.com>
---
 .../publisher/client/impl/ClientImpl.java          | 33 ----------------------
 .../publisher/client/impl/ClientImpl.java          | 33 ++++++++++++++++++++++
 .../resources/OSGI-INF/blueprint/blueprint.xml     |  6 ++--
 3 files changed, 36 insertions(+), 36 deletions(-)
 delete mode 100755 message-router/publisher/sample.client/src/main/java/org/onap/ccsdk/messagerouter/publisher/client/impl/ClientImpl.java
 create mode 100755 message-router/publisher/sample.client/src/main/java/org/onap/ccsdk/sli/adaptors/messagerouter/publisher/client/impl/ClientImpl.java

(limited to 'message-router/publisher/sample.client/src')

diff --git a/message-router/publisher/sample.client/src/main/java/org/onap/ccsdk/messagerouter/publisher/client/impl/ClientImpl.java b/message-router/publisher/sample.client/src/main/java/org/onap/ccsdk/messagerouter/publisher/client/impl/ClientImpl.java
deleted file mode 100755
index dbf49fe94..000000000
--- a/message-router/publisher/sample.client/src/main/java/org/onap/ccsdk/messagerouter/publisher/client/impl/ClientImpl.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package org.onap.ccsdk.messagerouter.publisher.client.impl;
-
-import org.onap.ccsdk.messagerouter.publisher.api.PublisherApi;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class ClientImpl {
-	private static final Logger logger = LoggerFactory.getLogger(ClientImpl.class);
-	private String topic;
-	private PublisherApi publisher;
-
-	public void setPublisher(PublisherApi publisherApi) {
-		this.publisher = publisherApi;
-	}
-
-	public void setTopic(String topic) {
-		this.topic = topic;
-	}
-
-	public ClientImpl() {
-
-	}
-
-	public void init() {
-		for (int i = 0; i < 5; i++) {
-			String body = "{\"hello\":\"world " + String.valueOf(Math.random()) + "\"}";
-			logger.error("Loop iteration " + i + " sending body " + body + " to the topic " + topic);
-			Boolean result = publisher.publish(topic, body);
-			logger.error("Loop iteration " + i + " returned the boolean value " + result);
-		}
-	}
-
-}
\ No newline at end of file
diff --git a/message-router/publisher/sample.client/src/main/java/org/onap/ccsdk/sli/adaptors/messagerouter/publisher/client/impl/ClientImpl.java b/message-router/publisher/sample.client/src/main/java/org/onap/ccsdk/sli/adaptors/messagerouter/publisher/client/impl/ClientImpl.java
new file mode 100755
index 000000000..25fc87ead
--- /dev/null
+++ b/message-router/publisher/sample.client/src/main/java/org/onap/ccsdk/sli/adaptors/messagerouter/publisher/client/impl/ClientImpl.java
@@ -0,0 +1,33 @@
+package org.onap.ccsdk.sli.adaptors.messagerouter.publisher.client.impl;
+
+import org.onap.ccsdk.sli.adaptors.messagerouter.publisher.api.PublisherApi;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class ClientImpl {
+	private static final Logger logger = LoggerFactory.getLogger(ClientImpl.class);
+	private String topic;
+	private PublisherApi publisher;
+
+	public void setPublisher(PublisherApi publisherApi) {
+		this.publisher = publisherApi;
+	}
+
+	public void setTopic(String topic) {
+		this.topic = topic;
+	}
+
+	public ClientImpl() {
+
+	}
+
+	public void init() {
+		for (int i = 0; i < 5; i++) {
+			String body = "{\"hello\":\"world " + String.valueOf(Math.random()) + "\"}";
+			logger.error("Loop iteration " + i + " sending body " + body + " to the topic " + topic);
+			Boolean result = publisher.publish(topic, body);
+			logger.error("Loop iteration " + i + " returned the boolean value " + result);
+		}
+	}
+
+}
\ No newline at end of file
diff --git a/message-router/publisher/sample.client/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/message-router/publisher/sample.client/src/main/resources/OSGI-INF/blueprint/blueprint.xml
index c44a68adc..c2e981da2 100755
--- a/message-router/publisher/sample.client/src/main/resources/OSGI-INF/blueprint/blueprint.xml
+++ b/message-router/publisher/sample.client/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@@ -3,14 +3,14 @@
 	xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.2.0">
 
 	<bean id="client"
-		class="org.onap.ccsdk.messagerouter.publisher.client.impl.ClientImpl"
+		class="org.onap.ccsdk.sli.adaptors.messagerouter.publisher.client.impl.ClientImpl"
 		init-method="init">
 		<property name="publisher" ref="publisher" />
 		<cm:managed-properties
-			persistent-id="org.onap.ccsdk.messagerouter.publisher.client"
+			persistent-id="org.onap.ccsdk.sli.adaptors.messagerouter.publisher.client"
 			update-strategy="container-managed" />
 	</bean>
 
-	<reference id="publisher" interface="org.onap.ccsdk.messagerouter.publisher.api.PublisherApi" />
+	<reference id="publisher" interface="org.onap.ccsdk.sli.adaptors.messagerouter.publisher.api.PublisherApi" />
 
 </blueprint>
\ No newline at end of file
-- 
cgit 1.2.3-korg