aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--BRMSGateway/src/test/resources/META-INF/drop.ddl38
-rw-r--r--ONAP-PAP-REST/src/main/resources/META-INF/drop.ddl38
-rw-r--r--ONAP-PDP-REST/src/test/resources/META-INF/drop.ddl38
-rw-r--r--ONAP-PDP-REST/src/test/resources/xacml.pdp.dmaap.properties2
-rw-r--r--ONAP-PDP-REST/src/test/resources/xacml.pdp.properties6
-rw-r--r--ONAP-PDP-REST/src/test/resources/xacml.pdp.ueb.properties2
-rw-r--r--ONAP-PDP-REST/xacml.pdp.properties4
-rw-r--r--PolicyEngineUtils/pom.xml9
-rw-r--r--PolicyEngineUtils/src/test/resources/META-INF/drop.ddl38
9 files changed, 91 insertions, 84 deletions
diff --git a/BRMSGateway/src/test/resources/META-INF/drop.ddl b/BRMSGateway/src/test/resources/META-INF/drop.ddl
index 8bb53e6f0..8e6b29f6f 100644
--- a/BRMSGateway/src/test/resources/META-INF/drop.ddl
+++ b/BRMSGateway/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 brmsgroup_info
DROP TABLE IF EXISTS brmsgroup_policy \ No newline at end of file
diff --git a/ONAP-PAP-REST/src/main/resources/META-INF/drop.ddl b/ONAP-PAP-REST/src/main/resources/META-INF/drop.ddl
index 2949aef88..062169345 100644
--- a/ONAP-PAP-REST/src/main/resources/META-INF/drop.ddl
+++ b/ONAP-PAP-REST/src/main/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/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
diff --git a/PolicyEngineUtils/pom.xml b/PolicyEngineUtils/pom.xml
index 4d552b85f..76a48620b 100644
--- a/PolicyEngineUtils/pom.xml
+++ b/PolicyEngineUtils/pom.xml
@@ -17,7 +17,9 @@
limitations under the License.
============LICENSE_END=========================================================
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.onap.policy.engine</groupId>
@@ -111,5 +113,10 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>com.h2database</groupId>
+ <artifactId>h2</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
diff --git a/PolicyEngineUtils/src/test/resources/META-INF/drop.ddl b/PolicyEngineUtils/src/test/resources/META-INF/drop.ddl
index 13d52cfa2..ddfa95d3d 100644
--- a/PolicyEngineUtils/src/test/resources/META-INF/drop.ddl
+++ b/PolicyEngineUtils/src/test/resources/META-INF/drop.ddl
@@ -1,21 +1,21 @@
-/*
- * ============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 BackUpMonitorEntity \ No newline at end of file