Fix various errors in test logs

Changed license comment style in ddl files from C-style to SQL-style.
Added value for NOTIFICATION_DELAY.
Don't overwrite property and pom updates from previous commit.

Change-Id: I8c9fd50343c3503c797cb4165bbff5809e4d0740
Issue-ID: POLICY-1285
Signed-off-by: Jim Hahn <jrh3@att.com>

5 files changed, 26 insertions, 26 deletions

diff --git a/ONAP-PDP-REST/src/test/resources/META-INF/drop.ddl b/ONAP-PDP-REST/src/test/resources/META-INF/drop.ddl
index 2949aef88..062169345 100644
--- a/ONAP-PDP-REST/src/test/resources/META-INF/drop.ddl
+++ b/ONAP-PDP-REST/src/test/resources/META-INF/drop.ddl
@@ -1,22 +1,22 @@
-/*
- * ============LICENSE_START==================================================
- * ONAP Policy Engine
- * ===========================================================================
- * 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.
- * 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====================================================
- */
+--
+-- ============LICENSE_START==================================================
+-- ONAP Policy Engine
+-- ===========================================================================
+-- 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.
+-- 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====================================================
+--
 
 DROP TABLE IF EXISTS ConfigurationDataEntity
 DROP TABLE IF EXISTS PolicyEntity
diff --git a/ONAP-PDP-REST/src/test/resources/xacml.pdp.dmaap.properties b/ONAP-PDP-REST/src/test/resources/xacml.pdp.dmaap.properties
index 5ec9fe307..ea95104a0 100644
--- a/ONAP-PDP-REST/src/test/resources/xacml.pdp.dmaap.properties
+++ b/ONAP-PDP-REST/src/test/resources/xacml.pdp.dmaap.properties
@@ -73,7 +73,7 @@ xacml.jmx.port=0
 NOTIFICATION_TYPE=dmaap
 NOTIFICATION_SERVERS=
 NOTIFICATION_TOPIC=
-NOTIFICATION_DELAY=
+NOTIFICATION_DELAY=0
 UEB_API_KEY=
 UEB_API_SECRET=
 DMAAP_AAF_LOGIN=
diff --git a/ONAP-PDP-REST/src/test/resources/xacml.pdp.properties b/ONAP-PDP-REST/src/test/resources/xacml.pdp.properties
index bb174b9fd..0a11aaba8 100644
--- a/ONAP-PDP-REST/src/test/resources/xacml.pdp.properties
+++ b/ONAP-PDP-REST/src/test/resources/xacml.pdp.properties
@@ -2,7 +2,7 @@
 # ============LICENSE_START=======================================================
 # ONAP-PDP-REST
 # ================================================================================
-# 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.
@@ -73,7 +73,7 @@ xacml.jmx.port=0
 NOTIFICATION_TYPE=websocket
 NOTIFICATION_SERVERS=
 NOTIFICATION_TOPIC=
-NOTIFICATION_DELAY=
+NOTIFICATION_DELAY=0
 UEB_API_KEY=
 UEB_API_SECRET=
 DMAAP_AAF_LOGIN=
@@ -173,4 +173,4 @@ policy.aaf.namespace =
 policy.aaf.resource = 
 # Decision Response settings. 
 # can be either PERMIT or DENY. 
-decision.indeterminate.response=PERMIT
\ No newline at end of file
+decision.indeterminate.response=PERMIT
diff --git a/ONAP-PDP-REST/src/test/resources/xacml.pdp.ueb.properties b/ONAP-PDP-REST/src/test/resources/xacml.pdp.ueb.properties
index e74966157..065813477 100644
--- a/ONAP-PDP-REST/src/test/resources/xacml.pdp.ueb.properties
+++ b/ONAP-PDP-REST/src/test/resources/xacml.pdp.ueb.properties
@@ -73,7 +73,7 @@ xacml.jmx.port=0
 NOTIFICATION_TYPE=ueb
 NOTIFICATION_SERVERS=
 NOTIFICATION_TOPIC=
-NOTIFICATION_DELAY=
+NOTIFICATION_DELAY=0
 UEB_API_KEY=
 UEB_API_SECRET=
 DMAAP_AAF_LOGIN=
diff --git a/ONAP-PDP-REST/xacml.pdp.properties b/ONAP-PDP-REST/xacml.pdp.properties
index a707678c3..b6050ff58 100644
--- a/ONAP-PDP-REST/xacml.pdp.properties
+++ b/ONAP-PDP-REST/xacml.pdp.properties
@@ -73,7 +73,7 @@ xacml.jmx.port=0
 NOTIFICATION_TYPE=websocket
 NOTIFICATION_SERVERS=
 NOTIFICATION_TOPIC=
-NOTIFICATION_DELAY=
+NOTIFICATION_DELAY=0
 UEB_API_KEY=
 UEB_API_SECRET=
 DMAAP_AAF_LOGIN=
@@ -195,4 +195,4 @@ gui_url=https://aaf-onap-test.osaaf.org:8095/AAF_NS.gui.2.1
 
 # Decision Response settings. 
 # can be either PERMIT or DENY. 
-decision.indeterminate.response=PERMIT
\ No newline at end of file
+decision.indeterminate.response=PERMIT