X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fcom%2Fatt%2Fdmf%2Fmr%2Futils%2FConfigurationReader.java;h=17de391af0a90ae5e2f77ab580737da317bb4eb9;hb=7183a01048c01c4810f2096408406cd0dbf85753;hp=fdf2d2892532df2b0f0ca1e0944b23361d8d2060;hpb=cbc506f9121f739d4727c38e3aec5e0e58ea583e;p=dmaap%2Fmessagerouter%2Fmsgrtr.git diff --git a/src/main/java/com/att/dmf/mr/utils/ConfigurationReader.java b/src/main/java/com/att/dmf/mr/utils/ConfigurationReader.java index fdf2d28..17de391 100644 --- a/src/main/java/com/att/dmf/mr/utils/ConfigurationReader.java +++ b/src/main/java/com/att/dmf/mr/utils/ConfigurationReader.java @@ -164,9 +164,9 @@ public class ConfigurationReader { fMetrics.toJson(); fMetrics.setupCambriaSender(); // add the admin authenticator - // final String adminSecret = settings.getString ( CambriaConstants.kSetting_AdminSecret, null ); + final String adminSecret = com.att.ajsc.filemonitor.AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop,CambriaConstants.kSetting_AdminSecret); - //adminSecret = "fe3cCompound"; + if ( adminSecret != null && adminSecret.length () > 0 ) { try @@ -174,7 +174,7 @@ public class ConfigurationReader { final NsaApiDb adminDb = new BaseNsaApiDbImpl ( new MemConfigDb(), new NsaSimpleApiKeyFactory() ); adminDb.createApiKey ( "admin", adminSecret ); - //nsaSecurityManager.addAuthenticator ( new OriginalUebAuthenticator ( adminDb, 10*60*1000 ) ); + fSecurityManager.addAuthenticator ( new DMaaPOriginalUebAuthenticator ( adminDb, 10*60*1000 ) ); } @@ -185,7 +185,7 @@ public class ConfigurationReader { } // setup a backend - //final String type = settings.getString(CambriaConstants.kBrokerType, CambriaConstants.kBrokerType_Kafka); + String type = com.att.ajsc.filemonitor.AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop,CambriaConstants.kBrokerType); if (type==null) type = CambriaConstants.kBrokerType_Kafka; if (CambriaConstants.kBrokerType_Kafka.equalsIgnoreCase(type)) {