Merge "switch to valid aaf url property"

[dmaap/dbcapi.git] / etc / dmaapbc.properties

diff --git a/etc/dmaapbc.properties b/etc/dmaapbc.properties
index 9f5142d..fa7f2cd 100644 (file)
--- a/etc/dmaapbc.properties
+++ b/etc/dmaapbc.properties
@@ -1,4 +1,25 @@
 #
+#
+# ============LICENSE_START==========================================
+# org.onap.dmaap
+# ===================================================================
+# Copyright © 2018 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.
+#
+#
 #      Configuration parameters fixed at startup for the DMaaP Bus Controller
 #
 #
@@ -97,16 +118,18 @@ MR.ClientDeleteLevel: 1
 #
 #   MR Topic Factory Namespace
 #
-MR.TopicFactoryNS: org.onap.dcae.dmaap.topicFactory
+MR.TopicFactoryNS: org.onap.dmaap.mr.topicFactory
 #
 #   MR TopicMgr Role
-MR.TopicMgrRole:    org.onap.dmaapBC.TopicMgr
+MR.TopicMgrRole:    org.onap.dmaap-bc.TopicMgr
 
 #   MR topic name style
 MR.topicStyle: FQTN_LEGACY_FORMAT
 
 #   MR topic ProjectID
 MR.projectID:  23456
+
+MR.multisite:  true
 #
 # end of MR Related Properties
 ################################################################################
@@ -151,12 +174,12 @@ CredentialCodecKeyfile:   etc/LocalKey
 #
 # This overrides the Class used for API Permission check.
 # This allows for a plugin policy check, if needed
-#ApiPermission.Class: com.company.policy.DecisionPolicy
+ApiPermission.Class: org.onap.dmaap.dbcapi.authentication.AllowAll
 
 #
 # URL of AAF environment to use.
 #
-aaf.URL:       https://localhost:8095/proxy/
+aaf.URL:       https://localhost:8100/proxy
 #
 # TopicMgr mechid@namespace
 #
@@ -178,18 +201,6 @@ aaf.AdminPassword: pwdNotSet
 #################
 #################
 # PolicyEngine Properties
-#
-# Flag to turn on/off Authentication
-UsePE: false
-#
-# Argument to decisionAttributes.put("AAF_ENVIRONMENT", X); 
-# where X is:  TEST= UAT, PROD = PROD, DEVL = TEST
-#
-PeAafEnvironment: DEVL
-PeAafUrl.DEVL:  https://localhost:8095/proxy/
-PeAafUrl.TEST:  https://aafist..onap.org:8095/proxy/
-PeAafUrl.PROD:  https://aafprod.onap.org:8095/proxy/
-
 #
 # Name of PolicyEngineApi properties file
 PolicyEngineProperties: config/PolicyEngineApi.properties