diff options
| -rw-r--r-- | bundleconfig-local/etc/appprops/MsgRtrApi.properties | 14 | ||||
| -rw-r--r-- | pom.xml | 2 | ||||
| -rw-r--r-- | src/main/java/com/att/nsa/dmaap/util/DMaaPAuthFilter.java | 3 | ||||
| -rw-r--r-- | version.properties | 2 |
4 files changed, 10 insertions, 11 deletions
diff --git a/bundleconfig-local/etc/appprops/MsgRtrApi.properties b/bundleconfig-local/etc/appprops/MsgRtrApi.properties index 18a538b..583178a 100644 --- a/bundleconfig-local/etc/appprops/MsgRtrApi.properties +++ b/bundleconfig-local/etc/appprops/MsgRtrApi.properties @@ -139,18 +139,18 @@ maxcontentlength=10000 ############################################################################## #AAF Properties -msgRtr.namespace.aaf=com.att.dmaap.mr.topic +msgRtr.namespace.aaf=com.onap.dmaap.mr.topic msgRtr.topicfactory.aaf=org.openecomp.dmaapBC.topicFactory|:org.openecomp.dmaapBC.topic: -enforced.topic.name.AAF=com.att +enforced.topic.name.AAF=com.onap forceAAF=false transidUEBtopicreqd=false -defaultNSforUEB=com.att.dmaap.mr.ueb +defaultNSforUEB=com.onap.dmaap.mr.ueb ############################################################################## #Mirror Maker Agent -msgRtr.mirrormakeradmin.aaf=com.att.dmaap.mr.dev.mirrormaker|*|admin -msgRtr.mirrormakeruser.aaf=com.att.dmaap.mr.dev.mirrormaker|*|user -msgRtr.mirrormakeruser.aaf.create=com.att.dmaap.mr.dev.topicFactory|:com.att.dmaap.mr.dev.topic: +msgRtr.mirrormakeradmin.aaf=com.onap.dmaap.mr.dev.mirrormaker|*|admin +msgRtr.mirrormakeruser.aaf=com.onap.dmaap.mr.dev.mirrormaker|*|user +msgRtr.mirrormakeruser.aaf.create=com.onap.dmaap.mr.dev.topicFactory|:com.onap.dmaap.mr.dev.topic: msgRtr.mirrormaker.timeout=15000 -msgRtr.mirrormaker.topic=com.att.dmaap.mr.prod.mm.agent +msgRtr.mirrormaker.topic=com.onap.dmaap.mr.prod.mm.agent msgRtr.mirrormaker.consumergroup=mmagentserver msgRtr.mirrormaker.consumerid=1
\ No newline at end of file @@ -343,7 +343,7 @@ <dependency> <groupId>org.onap.dmaap.messagerouter.msgrtr</groupId> <artifactId>msgrtr</artifactId> - <version>1.1.2</version> + <version>1.1.3</version> <exclusions> <exclusion> <groupId>org.slf4j</groupId> diff --git a/src/main/java/com/att/nsa/dmaap/util/DMaaPAuthFilter.java b/src/main/java/com/att/nsa/dmaap/util/DMaaPAuthFilter.java index 04b3bf1..574e9e1 100644 --- a/src/main/java/com/att/nsa/dmaap/util/DMaaPAuthFilter.java +++ b/src/main/java/com/att/nsa/dmaap/util/DMaaPAuthFilter.java @@ -80,8 +80,7 @@ public class DMaaPAuthFilter extends CadiFilter { if (forceAAF || null != request.getHeader("Authorization") || (null != request.getHeader("AppName") && - request.getHeader("AppName").equalsIgnoreCase("invenio") && - null != request.getHeader("cookie"))) { + request.getHeader("AppName").equalsIgnoreCase("invenio") )) { if (!enabled || request.getMethod().equalsIgnoreCase("head") || diff --git a/version.properties b/version.properties index e1118ab..05dc9e5 100644 --- a/version.properties +++ b/version.properties @@ -27,7 +27,7 @@ major=1 minor=1 -patch=1 +patch=3 base_version=${major}.${minor}.${patch} |