clean MR codebase

Issue-ID: DMAAP-1192
Change-Id: Ic7cfa0af7ef6578be488025fe0e058d7e84dd403
Signed-off-by: sunil.unnava <sunil.unnava@att.com>

4 files changed, 12 insertions, 118 deletions

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