diff options
author | Jim Hahn <jrh3@att.com> | 2020-05-29 11:59:53 -0400 |
---|---|---|
committer | Jim Hahn <jrh3@att.com> | 2020-06-01 11:08:16 -0400 |
commit | 1e39c988604c9ffb8efc38ef3cf4d635b202c7b9 (patch) | |
tree | 390dc73ef150bb99dcf00577a2838a686baf8c59 /controlloop/common/database/src/test/resources | |
parent | d00b8ebd5b28a64ae988e7424d8feb2314a8d475 (diff) |
Use OperationsHistory from models
Deleted Dbao and replaced it with the shared class in policy-models.
Also had to update the queries and the persistence.xml accordingly.
Note: with this change, the "database" project is no longer needed,
so it was deleted.
Issue-ID: POLICY-2581
Change-Id: Idfde68b28b3a27f2ee794fa477d15e0f12717373
Signed-off-by: Jim Hahn <jrh3@att.com>
Diffstat (limited to 'controlloop/common/database/src/test/resources')
-rw-r--r-- | controlloop/common/database/src/test/resources/META-INF/persistence.xml | 43 | ||||
-rw-r--r-- | controlloop/common/database/src/test/resources/test.properties | 38 |
2 files changed, 0 insertions, 81 deletions
diff --git a/controlloop/common/database/src/test/resources/META-INF/persistence.xml b/controlloop/common/database/src/test/resources/META-INF/persistence.xml deleted file mode 100644 index 202850d96..000000000 --- a/controlloop/common/database/src/test/resources/META-INF/persistence.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - ============LICENSE_START======================================================= - ONAP - ================================================================================ - Copyright (C) 2019 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========================================================= - --> - -<persistence xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/persistence persistence_1_0.xsd" version="1.0"> - - <persistence-unit name="PipEngineTest" transaction-type="RESOURCE_LOCAL"> - <provider>org.eclipse.persistence.jpa.PersistenceProvider</provider> - - <class>org.onap.policy.database.operationshistory.Dbao</class> - - <properties> - <property name="eclipselink.ddl-generation" value="create-tables" /> - <property name="eclipselink.logging.level" value="FINE" /> - <property name="hibernate.dialect" value="org.hibernate.dialect.H2Dialect" /> - <property name="javax.persistence.jdbc.driver" value="org.h2.Driver" /> - <property name="javax.persistence.jdbc.url" value="jdbc:h2:mem:testdb;DATABASE_TO_UPPER=FALSE" /> - <property name="javax.persistence.jdbc.user" value="policy" /> - <property name="javax.persistence.jdbc.password" value="P01icY" /> - <property name="javax.persistence.schema-generation.database.action" value="drop-and-create" /> - <property name="javax.persistence.schema-generation.create-source" value="metadata" /> - </properties> - </persistence-unit> - -</persistence> diff --git a/controlloop/common/database/src/test/resources/test.properties b/controlloop/common/database/src/test/resources/test.properties deleted file mode 100644 index fb3d3ce53..000000000 --- a/controlloop/common/database/src/test/resources/test.properties +++ /dev/null @@ -1,38 +0,0 @@ -# -# Properties that the embedded PDP engine uses to configure and load -# -# Standard API Factories -# -xacml.dataTypeFactory=com.att.research.xacml.std.StdDataTypeFactory -xacml.pdpEngineFactory=com.att.research.xacmlatt.pdp.ATTPDPEngineFactory -xacml.pepEngineFactory=com.att.research.xacml.std.pep.StdEngineFactory -xacml.pipFinderFactory=com.att.research.xacml.std.pip.StdPIPFinderFactory -xacml.traceEngineFactory=com.att.research.xacml.std.trace.LoggingTraceEngineFactory -# -# AT&T PDP Implementation Factories -# -xacml.att.evaluationContextFactory=com.att.research.xacmlatt.pdp.std.StdEvaluationContextFactory -xacml.att.combiningAlgorithmFactory=com.att.research.xacmlatt.pdp.std.StdCombiningAlgorithmFactory -xacml.att.functionDefinitionFactory=com.att.research.xacmlatt.pdp.std.StdFunctionDefinitionFactory -# -# ONAP PDP Implementation Factories -# -xacml.att.policyFinderFactory=org.onap.policy.pdp.xacml.application.common.OnapPolicyFinderFactory - -# -# -# -xacml.rootPolicies=rootstart -rootstart.file=src/test/resources/root.xml - -xacml.referencedPolicies=refstart1,refstart2,refstart3,refstart4 -refstart1.file=src/test/resources/ref1.xml -refstart2.file=src/test/resources/ref2.xml -refstart3.file=src/test/resources/ref3.xml -refstart4.file=src/test/resources/ref4.xml - -# -# Database persistence for PIP -# -count-recent-operations.persistenceunit=PipEngineTest -get-operation-outcome.persistenceunit=PipEngineTest |