summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorktimoney <kevin.timoney@est.tech>2021-04-14 12:56:13 +0100
committerktimoney <kevin.timoney@est.tech>2021-04-19 15:14:55 +0100
commitfedd051f78d59205820399e8af19e2257818958b (patch)
tree1bd9b037274c6d7376c514828534f02a5285ef0c
parentae01c8d07c3b62dd9b06958a62702816e2f7bfc1 (diff)
Fix name of target-database property in persistence.xml files
Updated property javax.persistence.target-database to eclipselink.target-database Removed tools/tools-common/testing.txt Added Modifications Copyright to headers Updated Postgres references to MySQL Updated user information Issue-ID: POLICY-3059 Change-Id: I42ad294458809c0a3dca4d3ce9dd1ae5a7daa417 Signed-off-by: ktimoney <kevin.timoney@est.tech>
-rw-r--r--examples/examples-pcvs/src/test/resources/META-INF/persistence.xml9
-rw-r--r--packages/apex-pdp-package-full/src/main/resources/META-INF/persistence.xml45
-rw-r--r--testsuites/integration/integration-context-test/src/test/resources/META-INF/persistence.xml10
3 files changed, 33 insertions, 31 deletions
diff --git a/examples/examples-pcvs/src/test/resources/META-INF/persistence.xml b/examples/examples-pcvs/src/test/resources/META-INF/persistence.xml
index 4dcba14b7..632ae0fca 100644
--- a/examples/examples-pcvs/src/test/resources/META-INF/persistence.xml
+++ b/examples/examples-pcvs/src/test/resources/META-INF/persistence.xml
@@ -2,19 +2,20 @@
<!--
============LICENSE_START=======================================================
Copyright (C) 2016-2018 Ericsson. All rights reserved.
+ Modifications Copyright (C) 2019-2021 Nordix Foundation.
================================================================================
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.
-
+
SPDX-License-Identifier: Apache-2.0
============LICENSE_END=========================================================
-->
@@ -58,7 +59,7 @@
<properties>
<property name="javax.persistence.jdbc.url" value="jdbc:derby:memory:apex_test" />
- <property name="javax.persistence.target-database" value="Derby" />
+ <property name="eclipselink.target-database" value="Derby" />
<property name="javax.persistence.jdbc.driver" value="org.apache.derby.jdbc.EmbeddedDriver" />
<property name="eclipselink.ddl-generation" value="drop-and-create-tables" />
diff --git a/packages/apex-pdp-package-full/src/main/resources/META-INF/persistence.xml b/packages/apex-pdp-package-full/src/main/resources/META-INF/persistence.xml
index 670acb5f0..61f5409bd 100644
--- a/packages/apex-pdp-package-full/src/main/resources/META-INF/persistence.xml
+++ b/packages/apex-pdp-package-full/src/main/resources/META-INF/persistence.xml
@@ -2,6 +2,7 @@
<!--
============LICENSE_START=======================================================
Copyright (C) 2016-2018 Ericsson. All rights reserved.
+ Modifications Copyright (C) 2019-2021 Nordix Foundation.
================================================================================
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -65,11 +66,11 @@
<exclude-unlisted-classes>false</exclude-unlisted-classes>
<properties>
- <property name="javax.persistence.target-database" value="PostgreSQL" />
- <property name="javax.persistence.jdbc.driver" value="org.postgresql.Driver" />
- <property name="javax.persistence.jdbc.url" value="jdbc:postgresql://localhost:5432/apex" />
- <property name="javax.persistence.jdbc.user" value="postgres" />
- <property name="javax.persistence.jdbc.password" value="postgres" />
+ <property name="eclipselink.target-database" value="MySQL" />
+ <property name="javax.persistence.jdbc.driver" value="org.mariadb.jdbc.Driver" />
+ <property name="javax.persistence.jdbc.url" value="jdbc:mariadb://localhost:5432/apex" />
+ <property name="javax.persistence.jdbc.user" value="policy" />
+ <property name="javax.persistence.jdbc.password" value="P01icY" />
<property name="eclipselink.ddl-generation" value="create-or-extend-tables" />
<property name="eclipselink.logging.level" value="INFO" />
@@ -122,11 +123,11 @@
<exclude-unlisted-classes>false</exclude-unlisted-classes>
<properties>
- <property name="javax.persistence.target-database" value="PostgreSQL" />
- <property name="javax.persistence.jdbc.driver" value="org.postgresql.Driver" />
- <property name="javax.persistence.jdbc.url" value="jdbc:postgresql://localhost:5432/apex_test" />
- <property name="javax.persistence.jdbc.user" value="postgres" />
- <property name="javax.persistence.jdbc.password" value="postgres" />
+ <property name="eclipselink.target-database" value="MySQL" />
+ <property name="javax.persistence.jdbc.driver" value="org.mariadb.jdbc.Driver" />
+ <property name="javax.persistence.jdbc.url" value="jdbc:mariadb://localhost:5432/apex_test" />
+ <property name="javax.persistence.jdbc.user" value="policy" />
+ <property name="javax.persistence.jdbc.password" value="P01icY" />
<property name="eclipselink.ddl-generation" value="drop-and-create-tables" />
<property name="eclipselink.logging.level" value="INFO" />
@@ -177,13 +178,13 @@
<class>org.onap.policy.apex.domains.vpn.concepts.VPNProblem</class>
<properties>
- <property name="javax.persistence.target-database" value="PostgreSQL" />
- <property name="javax.persistence.jdbc.driver" value="org.postgresql.Driver" />
- <property name="javax.persistence.jdbc.url" value="jdbc:postgresql://localhost:5432/apex" />
- <property name="javax.persistence.jdbc.user" value="postgres" />
- <property name="javax.persistence.jdbc.password" value="postgres" />
+ <property name="eclipselink.target-database" value="MySQL" />
+ <property name="javax.persistence.jdbc.driver" value="org.mariadb.jdbc.Driver" />
+ <property name="javax.persistence.jdbc.url" value="jdbc:mariadb://localhost:5432/apex" />
+ <property name="javax.persistence.jdbc.user" value="policy" />
+ <property name="javax.persistence.jdbc.password" value="P01icY" />
- <property name="hibernate.dialect" value="org.hibernate.dialect.PostgreSQL94Dialect" />
+ <property name="hibernate.dialect" value="org.hibernate.dialect.MySQL5Dialect" />
<property name="hibernate.hbm2ddl.auto" value="update" />
<property name="hibernate.connection.provider_class"
value="org.hibernate.connection.C3P0ConnectionProvider" />
@@ -240,12 +241,12 @@
<class>org.onap.policy.apex.domains.vpn.concepts.VPNProblem</class>
<properties>
- <property name="javax.persistence.target-database" value="PostgreSQL" />
- <property name="javax.persistence.jdbc.driver" value="org.postgresql.Driver" />
- <property name="javax.persistence.jdbc.url" value="jdbc:postgresql://localhost:5432/apex_test" />
- <property name="javax.persistence.jdbc.user" value="postgres" />
- <property name="javax.persistence.jdbc.password" value="postgres" />
- <property name="hibernate.dialect" value="org.hibernate.dialect.PostgreSQL94Dialect" />
+ <property name="eclipselink.target-database" value="MySQL" />
+ <property name="javax.persistence.jdbc.driver" value="org.mariadb.jdbc.Driver" />
+ <property name="javax.persistence.jdbc.url" value="jdbc:mariadb://localhost:5432/apex_test" />
+ <property name="javax.persistence.jdbc.user" value="policy" />
+ <property name="javax.persistence.jdbc.password" value="P01icY" />
+ <property name="hibernate.dialect" value="org.hibernate.dialect.MySQL5Dialect" />
<property name="hibernate.hbm2ddl.auto" value="create" />
<property name="hibernate.connection.provider_class"
value="org.hibernate.connection.C3P0ConnectionProvider" />
diff --git a/testsuites/integration/integration-context-test/src/test/resources/META-INF/persistence.xml b/testsuites/integration/integration-context-test/src/test/resources/META-INF/persistence.xml
index b6a9a9d1e..341c33e89 100644
--- a/testsuites/integration/integration-context-test/src/test/resources/META-INF/persistence.xml
+++ b/testsuites/integration/integration-context-test/src/test/resources/META-INF/persistence.xml
@@ -2,20 +2,20 @@
<!--
============LICENSE_START=======================================================
Copyright (C) 2016-2018 Ericsson. All rights reserved.
- Modifications Copyright (C) 2019 Nordix Foundation.
+ Modifications Copyright (C) 2019-2021 Nordix Foundation.
================================================================================
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.
-
+
SPDX-License-Identifier: Apache-2.0
============LICENSE_END=========================================================
-->
@@ -40,7 +40,7 @@
<properties>
<property name="javax.persistence.jdbc.url" value="jdbc:derby:memory:apex_test" />
- <property name="javax.persistence.target-database" value="Derby" />
+ <property name="eclipselink.target-database" value="Derby" />
<property name="javax.persistence.jdbc.driver" value="org.apache.derby.jdbc.EmbeddedDriver" />
<property name="eclipselink.ddl-generation" value="drop-and-create-tables" />