12 files changed, 2 insertions, 350 deletions
diff --git a/src/main/config/caet.properties b/src/main/config/caet.properties
index 54305e4..0757a7f 100644
--- a/src/main/config/caet.properties
+++ b/src/main/config/caet.properties
@@ -19,7 +19,3 @@
 #  ECOMP is a trademark and service mark of AT&T Intellectual Property.
 #  
 ###############################################################################
-#caet_service=http://DME2RESOLVE/service=com.att.csid.CAET/version=3/envContext=TEST/routeOffer=TEST_CAET
-#caet_service=http://DME2RESOLVE/service=com.att.csid.CAET/version=3/envContext=TEST/routeOffer=D3A_CAET
-#caet_service=dme2://DME2RESOLVE/service=com.att.csid.CAET/version=4.0/envContext=TEST/routeOffer=TEST_CAET
-caet_service=http://DME2RESOLVE/service=com.att.csid.CAET/version=4.0/envContext=TEST/routeOffer=TEST_CAET
-\ No newline at end of file
diff --git a/src/main/java/org/onap/dmaap/filemonitor/ServicePropertiesListener.java b/src/main/java/org/onap/dmaap/filemonitor/ServicePropertiesListener.java
index 56cccca..6a4629c 100644
--- a/src/main/java/org/onap/dmaap/filemonitor/ServicePropertiesListener.java
+++ b/src/main/java/org/onap/dmaap/filemonitor/ServicePropertiesListener.java
@@ -23,7 +23,6 @@
 
 import java.io.File;
 
-//import com.att.ssf.filemonitor.FileChangedListener;
 /**
  * Class ServicePropertiesListener
  * @author rajashree.khare
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
diff --git a/src/main/swm/descriptor.xml b/src/main/swm/descriptor.xml
index d42cf1b..2ff49b4 100644
--- a/src/main/swm/descriptor.xml
+++ b/src/main/swm/descriptor.xml
@@ -266,7 +266,7 @@
 			required="false" />
 		<variableDescription key="SOA_CLOUD_NAMESPACE"
 			description="the Namespace used for GRM service registrations"
-			defaultValue="com.att.ajsc" required="false" />
+			defaultValue="org.onap.dmaap" required="false" />
 		<variableDescription key="AFT_SERVICE_ENV"
 			description="the AFT Servie Env found within CSI used for GRM service registrations (routeOffer)"
 			defaultValue="DEFAULT" required="false" />
diff --git a/src/main/swm/notes.txt b/src/main/swm/notes.txt
index 7c617d6..640343a 100644
--- a/src/main/swm/notes.txt
+++ b/src/main/swm/notes.txt
@@ -1,6 +1,6 @@
 # (c) 2012 AT&T Intellectual Property. All rights reserved.
 
-NOTES FOR com.att.nsa:dmaap - Version 0.0.1-SNAPSHOT
+NOTES FOR org.onap:dmaap - Version 0.0.1-SNAPSHOT
 =======================================================
 
 This package was created at ${maven.build.timestamp}.