From 0756759f39e125b02d63b4e93de83b3c6b13beea Mon Sep 17 00:00:00 2001 From: Patrick Brady Date: Wed, 13 Dec 2017 11:09:30 -0800 Subject: 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 Issue-ID: APPC-13 --- .../messaging/dmaap/SimpleExamplePublisher.java | 8 ++++---- .../dmaap/TestAppcDmaapAdapterActivator.java | 4 ++-- .../messaging/dmaap/TestDmaapConsuming.java | 14 +++++++------- .../messaging/dmaap/TestDmaapEventSender.java | 22 +++++++++++----------- .../messaging/dmaap/TestDmaapProducing.java | 14 +++++++------- .../dmaap/impl/TestConsumerProducerImpl.java | 14 +++++++------- .../org/openecomp/appc/default.properties | 4 ++-- 7 files changed, 40 insertions(+), 40 deletions(-) (limited to 'appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/test') diff --git a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/test/java/org/openecomp/appc/adapter/messaging/dmaap/SimpleExamplePublisher.java b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/test/java/org/openecomp/appc/adapter/messaging/dmaap/SimpleExamplePublisher.java index 2b8747a9b..8c07c0b4a 100644 --- a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/test/java/org/openecomp/appc/adapter/messaging/dmaap/SimpleExamplePublisher.java +++ b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/test/java/org/openecomp/appc/adapter/messaging/dmaap/SimpleExamplePublisher.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.adapter.messaging.dmaap; +package org.onap.appc.adapter.messaging.dmaap; import java.io.*; import java.util.List; @@ -32,7 +32,7 @@ import java.util.concurrent.TimeUnit; import com.att.nsa.mr.client.MRConsumer; import org.json.JSONObject; -import org.openecomp.appc.adapter.messaging.dmaap.impl.DmaapUtil; +import org.onap.appc.adapter.messaging.dmaap.impl.DmaapUtil; import com.att.nsa.mr.client.MRBatchingPublisher; import com.att.nsa.mr.client.MRClientFactory; @@ -51,7 +51,7 @@ public class SimpleExamplePublisher int i=0; - String topicProducerPropFileName = DmaapUtil.createProducerPropFile("org.openecomp.appc.UNIT-TEST", null); + String topicProducerPropFileName = DmaapUtil.createProducerPropFile("org.onap.appc.UNIT-TEST", null); while (i< msgCount) { publisher.publishMessage(topicProducerPropFileName,i); @@ -93,7 +93,7 @@ public class SimpleExamplePublisher try { - String topic = "org.openecomp.appc.UNIT-TEST"; + String topic = "org.onap.appc.UNIT-TEST"; Properties props = new Properties(); props.put("id", "1"); props.put("group", "group1"); diff --git a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/test/java/org/openecomp/appc/adapter/messaging/dmaap/TestAppcDmaapAdapterActivator.java b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/test/java/org/openecomp/appc/adapter/messaging/dmaap/TestAppcDmaapAdapterActivator.java index d588336a5..5473bf7e0 100644 --- a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/test/java/org/openecomp/appc/adapter/messaging/dmaap/TestAppcDmaapAdapterActivator.java +++ b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/test/java/org/openecomp/appc/adapter/messaging/dmaap/TestAppcDmaapAdapterActivator.java @@ -22,13 +22,13 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.adapter.messaging.dmaap; +package org.onap.appc.adapter.messaging.dmaap; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.fail; import org.junit.Test; -import org.openecomp.appc.adapter.messaging.dmaap.AppcDmaapAdapterActivator; +import org.onap.appc.adapter.messaging.dmaap.AppcDmaapAdapterActivator; public class TestAppcDmaapAdapterActivator { diff --git a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/test/java/org/openecomp/appc/adapter/messaging/dmaap/TestDmaapConsuming.java b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/test/java/org/openecomp/appc/adapter/messaging/dmaap/TestDmaapConsuming.java index 0bf305ce0..28c2bc4e2 100644 --- a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/test/java/org/openecomp/appc/adapter/messaging/dmaap/TestDmaapConsuming.java +++ b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/test/java/org/openecomp/appc/adapter/messaging/dmaap/TestDmaapConsuming.java @@ -22,17 +22,17 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.adapter.messaging.dmaap; +package org.onap.appc.adapter.messaging.dmaap; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; -import org.openecomp.appc.adapter.message.Consumer; -import org.openecomp.appc.adapter.messaging.dmaap.http.HttpDmaapConsumerImpl; -import org.openecomp.appc.adapter.messaging.dmaap.impl.DmaapConsumerImpl; -import org.openecomp.appc.configuration.Configuration; -import org.openecomp.appc.configuration.ConfigurationFactory; +import org.onap.appc.adapter.message.Consumer; +import org.onap.appc.adapter.messaging.dmaap.http.HttpDmaapConsumerImpl; +import org.onap.appc.adapter.messaging.dmaap.impl.DmaapConsumerImpl; +import org.onap.appc.configuration.Configuration; +import org.onap.appc.configuration.ConfigurationFactory; import org.junit.Ignore; import java.util.Arrays; @@ -41,7 +41,7 @@ import java.util.List; /** * Must have a DMaaP cluster or simulator up and running * Update the hostname, topic, client properties in - * resources/org/openecomp/appc/default.properties + * resources/org/onap/appc/default.properties * */ public class TestDmaapConsuming { diff --git a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/test/java/org/openecomp/appc/adapter/messaging/dmaap/TestDmaapEventSender.java b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/test/java/org/openecomp/appc/adapter/messaging/dmaap/TestDmaapEventSender.java index e12da25ef..bdc786337 100644 --- a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/test/java/org/openecomp/appc/adapter/messaging/dmaap/TestDmaapEventSender.java +++ b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/test/java/org/openecomp/appc/adapter/messaging/dmaap/TestDmaapEventSender.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.adapter.messaging.dmaap; +package org.onap.appc.adapter.messaging.dmaap; import org.onap.ccsdk.sli.core.sli.SvcLogicContext; import org.junit.Assert; @@ -31,16 +31,16 @@ import org.junit.Ignore; import org.junit.Test; import org.mockito.Matchers; import org.mockito.Mockito; -import org.openecomp.appc.adapter.message.MessageDestination; -import org.openecomp.appc.adapter.message.Producer; -import org.openecomp.appc.adapter.message.event.EventHeader; -import org.openecomp.appc.adapter.message.event.EventMessage; -import org.openecomp.appc.adapter.message.event.EventStatus; -import org.openecomp.appc.adapter.messaging.dmaap.impl.DmaapProducerImpl; -import org.openecomp.appc.adapter.messaging.dmaap.impl.EventSenderDmaapImpl; -import org.openecomp.appc.configuration.Configuration; -import org.openecomp.appc.configuration.ConfigurationFactory; -import org.openecomp.appc.exceptions.APPCException; +import org.onap.appc.adapter.message.MessageDestination; +import org.onap.appc.adapter.message.Producer; +import org.onap.appc.adapter.message.event.EventHeader; +import org.onap.appc.adapter.message.event.EventMessage; +import org.onap.appc.adapter.message.event.EventStatus; +import org.onap.appc.adapter.messaging.dmaap.impl.DmaapProducerImpl; +import org.onap.appc.adapter.messaging.dmaap.impl.EventSenderDmaapImpl; +import org.onap.appc.configuration.Configuration; +import org.onap.appc.configuration.ConfigurationFactory; +import org.onap.appc.exceptions.APPCException; import java.util.HashMap; import java.util.Map; diff --git a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/test/java/org/openecomp/appc/adapter/messaging/dmaap/TestDmaapProducing.java b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/test/java/org/openecomp/appc/adapter/messaging/dmaap/TestDmaapProducing.java index dc80580aa..bdfa93726 100644 --- a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/test/java/org/openecomp/appc/adapter/messaging/dmaap/TestDmaapProducing.java +++ b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/test/java/org/openecomp/appc/adapter/messaging/dmaap/TestDmaapProducing.java @@ -22,18 +22,18 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.adapter.messaging.dmaap; +package org.onap.appc.adapter.messaging.dmaap; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Ignore; import org.junit.Test; -import org.openecomp.appc.adapter.message.Producer; -import org.openecomp.appc.adapter.messaging.dmaap.http.HttpDmaapProducerImpl; -import org.openecomp.appc.adapter.messaging.dmaap.impl.DmaapProducerImpl; -import org.openecomp.appc.configuration.Configuration; -import org.openecomp.appc.configuration.ConfigurationFactory; +import org.onap.appc.adapter.message.Producer; +import org.onap.appc.adapter.messaging.dmaap.http.HttpDmaapProducerImpl; +import org.onap.appc.adapter.messaging.dmaap.impl.DmaapProducerImpl; +import org.onap.appc.configuration.Configuration; +import org.onap.appc.configuration.ConfigurationFactory; import java.util.Arrays; import java.util.List; @@ -41,7 +41,7 @@ import java.util.List; /** * Must have a DMaaP cluster or simulator up and running * Update the hostname, topic, client properties in - * resources/org/openecomp/appc/default.properties + * resources/org/onap/appc/default.properties * */ public class TestDmaapProducing { diff --git a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/test/java/org/openecomp/appc/adapter/messaging/dmaap/impl/TestConsumerProducerImpl.java b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/test/java/org/openecomp/appc/adapter/messaging/dmaap/impl/TestConsumerProducerImpl.java index 5af5e60ae..cb318dc4e 100644 --- a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/test/java/org/openecomp/appc/adapter/messaging/dmaap/impl/TestConsumerProducerImpl.java +++ b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/test/java/org/openecomp/appc/adapter/messaging/dmaap/impl/TestConsumerProducerImpl.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.adapter.messaging.dmaap.impl; +package org.onap.appc.adapter.messaging.dmaap.impl; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -34,12 +34,12 @@ import java.util.*; import org.junit.Before; import org.junit.Ignore; import org.junit.Test; -import org.openecomp.appc.adapter.message.Consumer; -import org.openecomp.appc.adapter.message.Producer; -import org.openecomp.appc.adapter.messaging.dmaap.impl.DmaapConsumerImpl; -import org.openecomp.appc.adapter.messaging.dmaap.impl.DmaapProducerImpl; -import org.openecomp.appc.configuration.Configuration; -import org.openecomp.appc.configuration.ConfigurationFactory; +import org.onap.appc.adapter.message.Consumer; +import org.onap.appc.adapter.message.Producer; +import org.onap.appc.adapter.messaging.dmaap.impl.DmaapConsumerImpl; +import org.onap.appc.adapter.messaging.dmaap.impl.DmaapProducerImpl; +import org.onap.appc.configuration.Configuration; +import org.onap.appc.configuration.ConfigurationFactory; public class TestConsumerProducerImpl { diff --git a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/test/resources/org/openecomp/appc/default.properties b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/test/resources/org/openecomp/appc/default.properties index 868e512a6..dd594515c 100644 --- a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/test/resources/org/openecomp/appc/default.properties +++ b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/test/resources/org/openecomp/appc/default.properties @@ -22,8 +22,8 @@ # ============LICENSE_END========================================================= ### -org.openecomp.appc.bootstrap.file=test.properties -org.openecomp.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},. +org.onap.appc.bootstrap.file=test.properties +org.onap.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},. # Properties commented out below are provided in appc.properties #poolMembers=:3904 -- cgit 1.2.3-korg