summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/elk/client/ElasticSearchPolicyUpdate.java5
-rw-r--r--POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/ModelAttributeDictionary.html4
2 files changed, 4 insertions, 5 deletions
diff --git a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/elk/client/ElasticSearchPolicyUpdate.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/elk/client/ElasticSearchPolicyUpdate.java
index 430f9cd65..d064d052b 100644
--- a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/elk/client/ElasticSearchPolicyUpdate.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/elk/client/ElasticSearchPolicyUpdate.java
@@ -2,7 +2,7 @@
* ============LICENSE_START=======================================================
* ONAP Policy Engine
* ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-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.
@@ -96,8 +96,7 @@ public class ElasticSearchPolicyUpdate {
password = config.getProperty("policy.database.password");
databaseDriver = config.getProperty("policy.database.driver");
if(elkURL == null || databseUrl == null || userName == null || password == null || databaseDriver == null){
- LOGGER.error("One of the Property is null in policyelk.properties = elkurl:databaseurl:username:password:databasedriver "
- + elkURL + ":"+ databseUrl + ":"+ userName + ":"+ password + ":"+ databaseDriver + ":");
+ LOGGER.error("please check the elk configuration");
}
} catch (Exception e) {
LOGGER.error("Config File doesn't Exist in the specified Path " + file.toString(),e);
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/ModelAttributeDictionary.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/ModelAttributeDictionary.html
index 0531a00ae..9f8af5c20 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/ModelAttributeDictionary.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/ModelAttributeDictionary.html
@@ -36,14 +36,14 @@
<div class="form-group row">
<div class="form-group col-sm-6" ng-class="{ 'has-error' : formdata.name.$invalid && !formdata.name.$pristine }" >
<label>Enter Dictionary Name:<sup><b>*</b></sup></label><br>
- <input type="text" ng-model="editModelAttribute.name" class="form-control" name= "name" required/>
+ <input type="text" ng-model="editModelAttribute.name" class="form-control" name= "name" required="true"/>
<p ng-show="formdata.name.$invalid && !formdata.name.$pristine" class="help-block">Dictionary Name is required.</p>
</div>
</div>
<div class="form-group row">
<div class="form-group col-sm-6" ng-class="{ 'has-error' : formdata.value.$invalid && !formdata.value.$pristine }">
<label>Enter Value:<sup><b>*</b></sup></label><br>
- <input type="text" ng-model="editModelAttribute.value" class="form-control" name= "value" required"/>
+ <input type="text" ng-model="editModelAttribute.value" class="form-control" name= "value" required="true"/>
<p ng-show="formdata.value.$invalid && !formdata.value.$pristine" class="help-block">Value is required.</p>
</div>
</div>