Changes for AAF integration

Issue-ID: DMAAP-374
Change-Id: Ic9e4fa00178e9a8c4d11f2db5174cb9b468c814d
Signed-off-by: su622b <sunil.unnava@att.com>

diff --git a/pom.xml b/pom.xml
index f405389..436d696 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
        <modelVersion>4.0.0</modelVersion>
        <groupId>org.onap.dmaap.messagerouter.msgrtr</groupId>
        <artifactId>msgrtr</artifactId>
-       <version>1.1.2-SNAPSHOT</version>
+       <version>1.1.3-SNAPSHOT</version>
        <packaging>jar</packaging>
        <name>dmaap-messagerouter-msgrtr</name>
        <description>Message Router - Restful interface built for kafka</description>

diff --git a/src/main/java/com/att/nsa/cambria/security/DMaaPAAFAuthenticatorImpl.java b/src/main/java/com/att/nsa/cambria/security/DMaaPAAFAuthenticatorImpl.java
index 97ca1fd..6f4d9c9 100644 (file)
--- a/src/main/java/com/att/nsa/cambria/security/DMaaPAAFAuthenticatorImpl.java
+++ b/src/main/java/com/att/nsa/cambria/security/DMaaPAAFAuthenticatorImpl.java
@@ -62,7 +62,7 @@ public class DMaaPAAFAuthenticatorImpl implements DMaaPAAFAuthenticator {
                
                String permission = "";
                String nameSpace ="";
-               if(topicName.contains(".") && (topicName.contains("com.att")||topicName.contains("org"))) {
+               if(topicName.contains(".") && (topicName.contains("com.onap")||topicName.contains("org"))) {
                        //String topic = topicName.substring(topicName.lastIndexOf(".")+1);
                        nameSpace = topicName.substring(0,topicName.lastIndexOf("."));
                }
@@ -70,7 +70,7 @@ public class DMaaPAAFAuthenticatorImpl implements DMaaPAAFAuthenticator {
                        nameSpace = null;
                         nameSpace= com.att.ajsc.filemonitor.AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop,"defaultNSforUEB");
                        
-                       if(null==nameSpace)nameSpace="com.att.dmaap.mr.ueb";
+                       if(null==nameSpace)nameSpace="com.onap.dmaap.mr.ueb";
                        
                        
                        /*ErrorResponse errRes = new ErrorResponse(HttpStatus.SC_FORBIDDEN,

diff --git a/version.properties b/version.properties
index ac02ac5..05dc9e5 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -27,7 +27,7 @@
 
 major=1
 minor=1
-patch=2
+patch=3
 
 base_version=${major}.${minor}.${patch}