From 49f60702c82398abadb0bc28bf9a3b902b1deee7 Mon Sep 17 00:00:00 2001
From: deepikasatheesh <deepika.s84@wipro.com>
Date: Thu, 4 Feb 2021 14:54:53 +0000
Subject: Refactored & enhanced code check-in RANSim Controller and RANSim GUI

Issue-ID: INT-1849

Signed-off-by: deepikasatheesh <deepika.s84@wipro.com>
Change-Id: I8f92d8eae6eb67708098ccd696dbfff0eaa5f87f
---
 .../src/main/resources/META-INF/persistence.xml    | 43 ----------------------
 .../src/main/resources/application.properties      |  8 ++++
 .../src/main/resources/dumpfileNames.properties    |  1 +
 3 files changed, 9 insertions(+), 43 deletions(-)
 delete mode 100644 ransim/ransimctrlr/RANSIM-CTRLR/src/main/resources/META-INF/persistence.xml
 create mode 100644 ransim/ransimctrlr/RANSIM-CTRLR/src/main/resources/application.properties
 create mode 100644 ransim/ransimctrlr/RANSIM-CTRLR/src/main/resources/dumpfileNames.properties

(limited to 'ransim/ransimctrlr/RANSIM-CTRLR/src/main/resources')

diff --git a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/resources/META-INF/persistence.xml b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/resources/META-INF/persistence.xml
deleted file mode 100644
index bbfb0f3..0000000
--- a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/resources/META-INF/persistence.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============LICENSE_START=======================================================
-  ONAP-PAP-REST
-  ================================================================================
-  Copyright (C) 2017 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 http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd"
-         version="2.0">
-	<persistence-unit name="ransimctrlrdb" transaction-type="RESOURCE_LOCAL">
-		<provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
-		<class>org.onap.ransim.rest.api.models.CellDetails</class>
-		<class>org.onap.ransim.rest.api.models.CellNeighbor</class>
-		<class>org.onap.ransim.rest.api.models.NetconfServers</class>
-		<class>org.onap.ransim.rest.api.models.OperationLog</class>	
-		<class>org.onap.ransim.rest.api.models.NeighborDetails</class>
-	        
-		<properties>
-			<property name="javax.persistence.jdbc.driver" value="org.mariadb.jdbc.Driver" />
-			<property name="javax.persistence.jdbc.url" value="jdbc:mariadb://mariadb:3306/ransim_db"/>
-			<property name="javax.persistence.jdbc.user" value="root"/>
-			<property name="javax.persistence.jdbc.password" value="secret"/>
-      			<property name="eclipselink.target-database" value="MySQL"/>
-      			<property name="eclipselink.ddl-generation" value="create-or-extend-tables"/>
-      			<property name="eclipselink.logging.level" value="FINEST"/>
-		</properties>
-	</persistence-unit>
-</persistence>
diff --git a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/resources/application.properties b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/resources/application.properties
new file mode 100644
index 0000000..02a81ec
--- /dev/null
+++ b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/resources/application.properties
@@ -0,0 +1,8 @@
+spring.datasource.username=root
+spring.datasource.password=secret
+spring.datasource.driver-class-name=org.mariadb.jdbc.Driver
+spring.jpa.hibernate.ddl-auto=update
+spring.datasource.url=jdbc:mariadb://mariadb:3306/ransim_db
+hibernate.dialect=org.hibernate.dialect.MariaDBDialect
+spring.config.location=/tmp/ransim-install/config/
+spring.config.name=ransim
diff --git a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/resources/dumpfileNames.properties b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/resources/dumpfileNames.properties
new file mode 100644
index 0000000..4f9be36
--- /dev/null
+++ b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/resources/dumpfileNames.properties
@@ -0,0 +1 @@
+defaultFiles=latestDump.json,1050cells.json,sample.json
\ No newline at end of file
-- 
cgit 1.2.3-korg