16 files changed, 15 insertions, 467 deletions
diff --git a/src/main/java/org/onap/dmaap/dmf/mr/metrics/publisher/DMaaPCambriaClientFactory.java b/src/main/java/org/onap/dmaap/dmf/mr/metrics/publisher/DMaaPCambriaClientFactory.java
index ff46ce3..fedb14f 100644
--- a/src/main/java/org/onap/dmaap/dmf/mr/metrics/publisher/DMaaPCambriaClientFactory.java
+++ b/src/main/java/org/onap/dmaap/dmf/mr/metrics/publisher/DMaaPCambriaClientFactory.java
@@ -54,7 +54,6 @@ public class DMaaPCambriaClientFactory {
 	 * @param hostList
 	 *            A comma separated list of hosts to use to connect to Cambria.
 	 *            You can include port numbers (3904 is the default). For
-	 *            example, "ueb01hydc.it.att.com:8080,ueb02hydc.it.att.com"
 	 * 
 	 * @param topic
 	 *            The topic to consume
@@ -171,7 +170,6 @@ public class DMaaPCambriaClientFactory {
 	 * @param hostList
 	 *            A comma separated list of hosts to use to connect to Cambria.
 	 *            You can include port numbers (3904 is the default). For
-	 *            example, "ueb01hydc.it.att.com:8080,ueb02hydc.it.att.com"
 	 * @param topic
 	 *            The topic to consume
 	 * @param consumerGroup
diff --git a/src/main/java/org/onap/dmaap/dmf/mr/service/MMService.java b/src/main/java/org/onap/dmaap/dmf/mr/service/MMService.java
index 1bd28e7..fdee82b 100644
--- a/src/main/java/org/onap/dmaap/dmf/mr/service/MMService.java
+++ b/src/main/java/org/onap/dmaap/dmf/mr/service/MMService.java
@@ -35,7 +35,6 @@ import com.att.nsa.security.ReadWriteSecuredResource.AccessDeniedException;
 /**
  * Contains the logic for executing calls to the Mirror Maker agent tool.
  * 
- * @author <a href="mailto:kawsar.jahan@att.com">Kawsar Jahan</a>
  *
  * @since May 25, 2016
  */
diff --git a/src/main/java/org/onap/dmaap/dmf/mr/service/impl/ApiKeysServiceImpl.java b/src/main/java/org/onap/dmaap/dmf/mr/service/impl/ApiKeysServiceImpl.java
index 47da903..d9559bb 100644
--- a/src/main/java/org/onap/dmaap/dmf/mr/service/impl/ApiKeysServiceImpl.java
+++ b/src/main/java/org/onap/dmaap/dmf/mr/service/impl/ApiKeysServiceImpl.java
@@ -171,7 +171,7 @@ public class ApiKeysServiceImpl implements ApiKeysService {
 			{
 				String body = "\n" + "Your email address was provided as the creator of new API key \""
 				+ apiKey + "\".\n" + "\n" + "If you did not make this request, please let us know."
-				+ " See http://sa2020.it.att.com:8888 for contact information, " + "but don't worry -"
+				 + "but don't worry -"
 				+ " the API key is useless without the information below, which has been provided "
 				+ "only to you.\n" + "\n\n" + "For API key \"" + apiKey + "\", use API key secret:\n\n\t"
 				+ sharedSecret + "\n\n" + "Note that it's normal to share the API key"
diff --git a/src/main/java/org/onap/dmaap/dmf/mr/utils/Emailer.java b/src/main/java/org/onap/dmaap/dmf/mr/utils/Emailer.java
index cb4fcdc..51de9e2 100644
--- a/src/main/java/org/onap/dmaap/dmf/mr/utils/Emailer.java
+++ b/src/main/java/org/onap/dmaap/dmf/mr/utils/Emailer.java
@@ -156,7 +156,7 @@ public class Emailer
 				makeSetting ( prop, "mail.smtp.port", kSetting_SmtpServerPort, 587 );
 				prop.put ( "mail.smtp.socketFactory.fallback", "false" );
 				prop.put ( "mail.smtp.quitwait", "false" );
-				makeSetting ( prop, "mail.smtp.host", kSetting_SmtpServer, "smtp.it.att.com" );
+				makeSetting ( prop, "mail.smtp.host", kSetting_SmtpServer, "smtp.it.onap.com" );
 				makeSetting ( prop, "mail.smtp.auth", kSetting_SmtpServerUseAuth, true );
 				makeSetting ( prop, "mail.smtp.starttls.enable", kSetting_SmtpServerSsl, true );
 
@@ -176,7 +176,7 @@ public class Emailer
 				final Message msg = new MimeMessage ( session );
 
 				final InternetAddress from = new InternetAddress (
-					getSetting ( kSetting_MailFromEmail, "team@sa2020.it.att.com" ),
+					getSetting ( kSetting_MailFromEmail, "team@dmaap.mr.onap.com" ),
 					getSetting ( kSetting_MailFromName, "The GFP/SA2020 Team" ) );
 				msg.setFrom ( from );
 				msg.setReplyTo ( new InternetAddress[] { from } );
diff --git a/src/main/resources/DMaaPUrl.properties b/src/main/resources/DMaaPUrl.properties
index a0cf9ab..2f4dee2 100644
--- a/src/main/resources/DMaaPUrl.properties
+++ b/src/main/resources/DMaaPUrl.properties
@@ -36,4 +36,4 @@ url=http://hltd436.hydc.sbc.com:8080/DMaaP/dmaaprest/
 date=2015-11-23T8:56:19-0700
 
 # topic
-topicName=com.att.app.dmaap.mr.sharjeel
-\ No newline at end of file
+topicName=org.onap.dmaap.mr.testtopic
+\ No newline at end of file
diff --git a/src/main/resources/dme2testcase.properties b/src/main/resources/dme2testcase.properties
index ad38c43..a1b09f6 100644
--- a/src/main/resources/dme2testcase.properties
+++ b/src/main/resources/dme2testcase.properties
@@ -23,33 +23,33 @@ Version =1.0
 Environment =TEST
 Latitude =37.66
 Longitude =-122.096839
-ServiceName =dmaap-v1.dev.dmaap.dt.saat.acsi.att.com/apiKeys
+ServiceName =org.onap.dmaap.mr/apiKeys
 Partner =MR1
 
 #producerConsumer
 SubContextPathproducer =/events/
 SubContextPathConsumer=/events/
 group=group
-id=rk229m@csp.att.com
+id=user@me.dmaap.onap.com
 
 #filter
 SubContextPathConsumerFilter=/events/
-filterType=filter={"class":"Equals", "field":"email", "value":"ai039a@att.com"}
+filterType=filter={"class":"Equals", "field":"email", "value":"test@onap.com"}
 
 #topics
 subContextPathGetAllTopic=/topics
 subContextPathGetOneTopic=/topics/
-SubContextPathGetPublisher=/topics/com.att.app.dmaap.mr.sharjeel/producers
-SubContextPathGetPermitPublisher=/topics/com.att.app.dmaap.mr.sharjeel/producers/rk229m@csp.att.com
-SubContextPathGetConsumer=/topics/com.att.app.dmaap.mr.sharjeel/consumers
+SubContextPathGetPublisher=/topics/test/producers
+SubContextPathGetPermitPublisher=/topics/test/producers/test@onap.com
+SubContextPathGetConsumer=/topics/test/consumers
 SubContextPathCreateTopic=/topics/create
-SubContextPathGetPermitConsumer=/topics/com.att.app.dmaap.mr.sharjeel/consumers/rk229m@att.com
-newTopic=com.att.dmaap.mr.junittestingtopic
+SubContextPathGetPermitConsumer=/topics/test/consumers/test@onap.com
+newTopic=org.onap.dmaap.mr.junittestingtopic
 topicDescription=new topic creation
 partition=1
 replication=1
 txenabled=true
-deleteTopic=com.att.dmaap.mr.deleteTopic
+deleteTopic=org.onap.dmaap.mr.deleteTopic
 
 
 #Admin
@@ -75,7 +75,7 @@ MethodTypePost =POST
 MethodTypeGet=GET
 MethodTypePut=PUT
 MethodTypeDelete=DELETE
-message ={"id": "example@att.com"}
+message ={"id": "test@onap.com"}
 
 user=<user_id>
 password=<password>
diff --git a/src/main/resources/endpoint.properties b/src/main/resources/endpoint.properties
index 34e222f..63742ef 100644
--- a/src/main/resources/endpoint.properties
+++ b/src/main/resources/endpoint.properties
@@ -22,7 +22,7 @@
 Latitude =37.66
 Longitude =-122.096839
 Version =1.0.0
-ServiceName =com.att.acsi.saat.dt.dmaap.dev.demo1
+ServiceName =org.onap.dmaap.dmaap.demo1
 Environment =DEV
 RouteOffer =LA
 HostName =hltd436.hydc.sbc.com
diff --git a/src/main/resources/routes.conf b/src/main/resources/routes.conf
deleted file mode 100644
index ccaa94d..0000000
--- a/src/main/resources/routes.conf
+++ /dev/null
@@ -1,106 +0,0 @@
-package com.att.nsa.cambria.endpoints
-
-#
-#	We need to deprecate the original non-versioned paths and use /v1/ for them.
-#	Non-versioned paths will be supported "permanently."
-#
-
-#
-#	metrics
-#
-GET  /metrics  CambriaMetrics.get
-GET  /metrics/{metricName}  CambriaMetrics.getMetricByName
-
-GET  /v1/metrics  CambriaMetrics.get
-GET  /v1/metrics/{metricName}  CambriaMetrics.getMetricByName
-
-#
-#	get and post events
-#
-GET		/events/{topic}/{consumerGroup}/{clientId}		CambriaEvents.getEvents
-POST	/events/{topic}									CambriaEvents.pushEvents
-POST	/events/{topic}/{partition}						CambriaEvents.pushEvents
-
-GET		/v1/events/{topic}/{consumerGroup}/{clientId}		CambriaEvents.getEvents
-POST	/v1/events/{topic}									CambriaEvents.pushEvents
-POST	/v1/events/{topic}/{partition}						CambriaEvents.pushEvents
-
-
-#
-#	api keys
-#
-GET		/apiKeys  CambriaApiKeys.getAllApiKeys
-POST	/apiKeys/create  CambriaApiKeys.createApiKey
-GET		/apiKeys/{apiKey}  CambriaApiKeys.getApiKey
-PATCH 	/apiKeys/{apiKey}  CambriaApiKeys.updateApiKey
-DELETE	/apiKeys/{apiKey}  CambriaApiKeys.deleteApiKey
-
-GET		/v1/apiKeys  CambriaApiKeys.getAllApiKeys
-POST	/v1/apiKeys/create  CambriaApiKeys.createApiKey
-GET		/v1/apiKeys/{apiKey}  CambriaApiKeys.getApiKey
-PATCH	/v1/apiKeys/{apiKey}  CambriaApiKeys.updateApiKey
-DELETE	/v1/apiKeys/{apiKey}  CambriaApiKeys.deleteApiKey
-
-#
-#	topics
-#
-POST 	/topics/create			CambriaTopics.createTopic
-GET		/topics					CambriaTopics.getTopics
-GET		/topics/{topicName}		CambriaTopics.getTopic
-DELETE	/topics/{topicName}		CambriaTopics.deleteTopic
-
-POST 	/v1/topics/create			CambriaTopics.createTopic
-GET		/v1/topics					CambriaTopics.getTopics
-GET		/v1/topics/{topicName}		CambriaTopics.getTopic
-DELETE	/v1/topics/{topicName}		CambriaTopics.deleteTopic
-
-#
-#	topic permissions
-#
-GET		/topics/{topicName}/producers					CambriaTopics.getPublishersByTopicName
-PUT		/topics/{topicName}/producers/{producerId}		CambriaTopics.permitPublisherForTopic
-DELETE	/topics/{topicName}/producers/{producerId}		CambriaTopics.denyPublisherForTopic
-
-GET		/topics/{topicName}/consumers					CambriaTopics.getConsumersByTopicName
-PUT		/topics/{topicName}/consumers/{consumerId}		CambriaTopics.permitConsumerForTopic
-DELETE	/topics/{topicName}/consumers/{consumerId}		CambriaTopics.denyConsumerForTopic
-
-GET		/v1/topics/{topicName}/producers					CambriaTopics.getPublishersByTopicName
-PUT		/v1/topics/{topicName}/producers/{producerId}		CambriaTopics.permitPublisherForTopic
-DELETE	/v1/topics/{topicName}/producers/{producerId}		CambriaTopics.denyPublisherForTopic
-
-GET		/v1/topics/{topicName}/consumers					CambriaTopics.getConsumersByTopicName
-PUT		/v1/topics/{topicName}/consumers/{consumerId}		CambriaTopics.permitConsumerForTopic
-DELETE	/v1/topics/{topicName}/consumers/{consumerId}		CambriaTopics.denyConsumerForTopic
-
-#
-#	Admin
-#
-GET		/admin/consumerCache							CambriaAdmin.showConsumerCache
-POST	/admin/dropConsumerCache						CambriaAdmin.dropConsumerCache
-
-GET		/v1/admin/consumerCache							CambriaAdmin.showConsumerCache
-POST	/v1/admin/dropConsumerCache						CambriaAdmin.dropConsumerCache
-
-###############################################################################
-#
-#	UI routes don't need to be versioned
-#
-
-#
-#	UI
-#
-GET	/							CambriaUi.hello
-GET	/ui/apikeys					CambriaUi.getApiKeysTable
-GET	/ui/apikeys/{apiKey}		CambriaUi.getApiKey
-GET	/ui/topics					CambriaUi.getTopicsTable
-GET	/ui/topics/{topic}			CambriaUi.getTopic
-
-
-# typical static file paths
-GET		/css/				staticDir:css
-GET		/js/				staticDir:js
-GET		/images/			staticDir:images
-GET		/font/				staticDir:font
-GET		/favicon.ico		staticFile:images/attLogo.gif
-GET		/font-awesome/		staticDir:font-awesome
diff --git a/src/main/scripts/cambria.sh b/src/main/scripts/cambria.sh
deleted file mode 100644
index f74aa7b..0000000
--- a/src/main/scripts/cambria.sh
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/sh
-#*******************************************************************************
-#  ============LICENSE_START=======================================================
-#  org.onap.dmaap
-#  ================================================================================
-#  Copyright © 2017 AT&T Intellectual Property. All rights reserved.
-#  ================================================================================
-#  Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-#  You may obtain a copy of the License at
-#        http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
-#  ============LICENSE_END=========================================================
-#
-#  ECOMP is a trademark and service mark of AT&T Intellectual Property.
-#  
-#*******************************************************************************
-
-# switched this from CAMBRIA_API_HOME, which should be declared in the env.
-# harmless to overwrite it here, but it's confusing to do so.
-BASE_DIR=`dirname "$0"`/..
-
-# use JAVA_HOME if provided
-if [ -n "${CAMBRIA_JAVA_HOME}" ]; then
-    JAVA=${CAMBRIA_JAVA_HOME}/bin/java
-elif [ -n "${JAVA_HOME}" ]; then
-    JAVA=${JAVA_HOME}/bin/java
-else
-    JAVA=java
-fi
-
-# use the logs dir set in environment, or the installation's logs dir if not set
-if [ -z "$CAMBRIA_LOGS_HOME" ]; then
-	CAMBRIA_LOGS_HOME=$BASE_DIR/logs
-fi
-
-mkdir -p ${CAMBRIA_LOGS_HOME}
-# run java. The classpath is the etc dir for config files, and the lib dir
-# for all the jars.
-#
-# don't pipe stdout/stderr to /dev/null here - some diagnostic info is available only there.
-# also don't assume the run is in the background. the caller should take care of that.
-#
-$JAVA -cp ${BASE_DIR}/etc:${BASE_DIR}/lib/* com.att.nsa.cambria.CambriaApiServer $* >${CAMBRIA_LOGS_HOME}/console.log 2>&1
diff --git a/src/main/scripts/cambriaJsonPublisher.sh b/src/main/scripts/cambriaJsonPublisher.sh
deleted file mode 100644
index 9dbc4c7..0000000
--- a/src/main/scripts/cambriaJsonPublisher.sh
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/bash
-#*******************************************************************************
-#  ============LICENSE_START=======================================================
-#  org.onap.dmaap
-#  ================================================================================
-#  Copyright © 2017 AT&T Intellectual Property. All rights reserved.
-#  ================================================================================
-#  Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-#  You may obtain a copy of the License at
-#        http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
-#  ============LICENSE_END=========================================================
-#
-#  ECOMP is a trademark and service mark of AT&T Intellectual Property.
-#  
-#*******************************************************************************
-
-#
-#	act as a simple cambria publisher, requires wget
-#
-#	usage:
-#		cambriaPublisher <broker> <topic>
-#
-
-KEY=$3
-if [ "$3" == "" ]
-then
-	KEY=`hostname -f`
-fi
-
-while read LINE
-do
-	wget -q --header "Content-Type: application/json" --post-data="{ \"cambria.partition\":\"$KEY\", \"msg\":\"$LINE\" }" -O - $1/events/$2 >/dev/null
-done 
-
diff --git a/src/main/scripts/cambriaMonitor.sh b/src/main/scripts/cambriaMonitor.sh
deleted file mode 100644
index 0a8727c..0000000
--- a/src/main/scripts/cambriaMonitor.sh
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-#*******************************************************************************
-#  ============LICENSE_START=======================================================
-#  org.onap.dmaap
-#  ================================================================================
-#  Copyright © 2017 AT&T Intellectual Property. All rights reserved.
-#  ================================================================================
-#  Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-#  You may obtain a copy of the License at
-#        http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
-#  ============LICENSE_END=========================================================
-#
-#  ECOMP is a trademark and service mark of AT&T Intellectual Property.
-#  
-#*******************************************************************************
-
-#
-#	act as a simple cambria consumer, requires wget
-#
-#	usage:
-#		cambriaMonitor <broker> <topic> <group> <id> <timeout>
-#
-
-while :
-do
-	wget -q -O - $1/events/$2/$3/$4?timeout=$5\&pretty=1
-	if [ $? -ne 0 ]
-	then
-		sleep 10
-	fi
-	echo
-done
-
diff --git a/src/main/scripts/cambriaMonitorWithAuth.sh b/src/main/scripts/cambriaMonitorWithAuth.sh
deleted file mode 100644
index 4ee2908..0000000
--- a/src/main/scripts/cambriaMonitorWithAuth.sh
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/bash
-#*******************************************************************************
-#  ============LICENSE_START=======================================================
-#  org.onap.dmaap
-#  ================================================================================
-#  Copyright © 2017 AT&T Intellectual Property. All rights reserved.
-#  ================================================================================
-#  Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-#  You may obtain a copy of the License at
-#        http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
-#  ============LICENSE_END=========================================================
-#
-#  ECOMP is a trademark and service mark of AT&T Intellectual Property.
-#  
-#*******************************************************************************
-
-#
-#	act as a simple cambria consumer, requires wget
-#
-#	usage:
-#		cambriaMonitor <broker> <topic> <group> <id> <timeout>
-#
-
-while :
-do
-	DATE=`date`
-	SIGNATURE=`echo -n "$DATE" | openssl sha1 -hmac $CAMBRIA_APISECRET -binary | openssl base64`
-
-	wget -q --header "X-CambriaAuth: $CAMBRIA_APIKEY:$SIGNATURE" --header "X-CambriaDate: $DATE" -O - $1/events/$2/$3/$4?timeout=$5\&pretty=1
-	if [ $? -ne 0 ]
-	then
-		sleep 10
-	fi
-	echo
-done
-
diff --git a/src/main/scripts/cambriaSimpleTextPubWithAuth.sh b/src/main/scripts/cambriaSimpleTextPubWithAuth.sh
deleted file mode 100644
index 1623726..0000000
--- a/src/main/scripts/cambriaSimpleTextPubWithAuth.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-#*******************************************************************************
-#  ============LICENSE_START=======================================================
-#  org.onap.dmaap
-#  ================================================================================
-#  Copyright © 2017 AT&T Intellectual Property. All rights reserved.
-#  ================================================================================
-#  Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-#  You may obtain a copy of the License at
-#        http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
-#  ============LICENSE_END=========================================================
-#
-#  ECOMP is a trademark and service mark of AT&T Intellectual Property.
-#  
-#*******************************************************************************
-
-#
-#	act as a simple cambria publisher, requires wget
-#
-#	usage:
-#		cambriaPublisher <broker> <topic>
-#
-
-DATE=`date`
-SIGNATURE=`echo -n "$DATE" | openssl sha1 -hmac $CAMBRIA_APISECRET -binary | openssl base64`
-
-while read LINE
-do
-	wget -q --header "Content-Type: text/plain" --header "X-CambriaAuth: $CAMBRIA_APIKEY:$SIGNATURE" --header "X-CambriaDate: $DATE" --post-data="$LINE" -O - $1/events/$2 >/dev/null
-done 
-
diff --git a/src/main/scripts/cambriaSimpleTextPublisher.sh b/src/main/scripts/cambriaSimpleTextPublisher.sh
deleted file mode 100644
index 4aacd8a..0000000
--- a/src/main/scripts/cambriaSimpleTextPublisher.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-#*******************************************************************************
-#  ============LICENSE_START=======================================================
-#  org.onap.dmaap
-#  ================================================================================
-#  Copyright © 2017 AT&T Intellectual Property. All rights reserved.
-#  ================================================================================
-#  Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-#  You may obtain a copy of the License at
-#        http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
-#  ============LICENSE_END=========================================================
-#
-#  ECOMP is a trademark and service mark of AT&T Intellectual Property.
-#  
-#*******************************************************************************
-
-#
-#	act as a simple cambria publisher, requires wget
-#
-#	usage:
-#		cambriaPublisher <broker> <topic>
-#
-
-while read LINE
-do
-	wget -q --header "Content-Type: text/plain" --post-data="$LINE" -O - $1/events/$2 >/dev/null
-done 
-
diff --git a/src/main/scripts/cambriaTool.sh b/src/main/scripts/cambriaTool.sh
deleted file mode 100644
index a9d6e15..0000000
--- a/src/main/scripts/cambriaTool.sh
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/bin/sh
-#*******************************************************************************
-#  ============LICENSE_START=======================================================
-#  org.onap.dmaap
-#  ================================================================================
-#  Copyright © 2017 AT&T Intellectual Property. All rights reserved.
-#  ================================================================================
-#  Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-#  You may obtain a copy of the License at
-#        http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
-#  ============LICENSE_END=========================================================
-#
-#  ECOMP is a trademark and service mark of AT&T Intellectual Property.
-#  
-#*******************************************************************************
-
-# switched this from CAMBRIA_API_HOME, which should be declared in the env.
-# harmless to overwrite it here, but it's confusing to do so.
-BASE_DIR=`dirname "$0"`/..
-
-# determin a path separator that works for this platform
-PATHSEP=":"
-case "$(uname -s)" in
-
-	Darwin)
-		;;
-
-	 Linux)
-	 	;;
-
-	 CYGWIN*|MINGW32*|MSYS*)
-		PATHSEP=";"
-		;;
-
-	*)
-		;;
-esac
-
-# use JAVA_HOME if provided
-if [ -n "${CAMBRIA_JAVA_HOME}" ]; then
-    JAVA=${CAMBRIA_JAVA_HOME}/bin/java
-elif [ -n "${JAVA_HOME}" ]; then
-    JAVA=${JAVA_HOME}/bin/java
-else
-    JAVA=java
-fi
-
-$JAVA -cp ${BASE_DIR}/etc${PATHSEP}${BASE_DIR}/lib/* com.att.nsa.cambria.tools.ConfigTool $*
diff --git a/src/main/scripts/swmpkgclean.sh b/src/main/scripts/swmpkgclean.sh
deleted file mode 100644
index 7e6bc51..0000000
--- a/src/main/scripts/swmpkgclean.sh
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/bash
-#*******************************************************************************
-#  ============LICENSE_START=======================================================
-#  org.onap.dmaap
-#  ================================================================================
-#  Copyright © 2017 AT&T Intellectual Property. All rights reserved.
-#  ================================================================================
-#  Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-#  You may obtain a copy of the License at
-#        http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
-#  ============LICENSE_END=========================================================
-#
-#  ECOMP is a trademark and service mark of AT&T Intellectual Property.
-#  
-#*******************************************************************************
-
-# SWM can only store a finite amount of packages in its repository, so this script deletes the oldest package.
-# This script is run by Jenkins after the build is finished (post SWM upload).
-
-SWM_COMPONENT="com.att.nsa:msgrtr"
-
-SWM_PKGS=`/opt/app/swm/aftswmcli/bin/swmcli "component pkglist -c $SWM_COMPONENT -df -dh -dj -sui"`
-SWM_PKGS_COUNT=`echo "$SWM_PKGS" | wc -l`
-SWM_PKGS_OLDEST=`echo "$SWM_PKGS" | head -1`
-SWM_PKGS_MAX_COUNT=2
-
-if [ $SWM_PKGS_COUNT > $SWM_PKGS_MAX_COUNT ]
-then
-	SWM_PKG_OLDEST_VERSION=`echo $SWM_PKGS_OLDEST | awk '{print $2}'`
-
-	# Delete the oldest package for this component from the SWM repository
-	/opt/app/swm/aftswmcli/bin/swmcli "component pkgdelete -c $SWM_COMPONENT:$SWM_PKG_OLDEST_VERSION"
-else
-	echo "No need to clean up SWM, package count ($SWM_PKGS_COUNT) is below threshold ($SWM_PKGS_MAX_COUNT)"
-fi