From 0caa44672132f6d2195c06d40f000a708ca94482 Mon Sep 17 00:00:00 2001
From: Carlos Ruiz <carg67@gmail.com>
Date: Wed, 25 Dec 2019 19:18:27 +0100
Subject: [PATCH] IDEMPIERE-1093 Database: added connection pool properties
 file support / avoid requirement for org.jfree.io

---
 org.compiere.db.oracle.provider/META-INF/MANIFEST.MF |  3 +--
 .../src/org/compiere/db/DB_Oracle.java               | 12 +++++-------
 .../META-INF/MANIFEST.MF                             |  1 -
 .../src/org/compiere/db/DB_PostgreSQL.java           |  8 +++-----
 4 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/org.compiere.db.oracle.provider/META-INF/MANIFEST.MF b/org.compiere.db.oracle.provider/META-INF/MANIFEST.MF
index da65228a03..b31535f65e 100644
--- a/org.compiere.db.oracle.provider/META-INF/MANIFEST.MF
+++ b/org.compiere.db.oracle.provider/META-INF/MANIFEST.MF
@@ -12,8 +12,7 @@ Bundle-ClassPath: .,
  lib/c3p0.jar,
  lib/mchange-commons-java.jar,
  lib/ojdbc7.jar
-Import-Package: org.jfree.io;version="1.0.23",
- org.osgi.framework,
+Import-Package: org.osgi.framework,
  org.slf4j;version="1.7.2"
 Bundle-ActivationPolicy: lazy
 Bundle-Activator: org.adempiere.db.oracle.OracleBundleActivator
diff --git a/org.compiere.db.oracle.provider/src/org/compiere/db/DB_Oracle.java b/org.compiere.db.oracle.provider/src/org/compiere/db/DB_Oracle.java
index d428b09405..d27ae1ddb0 100644
--- a/org.compiere.db.oracle.provider/src/org/compiere/db/DB_Oracle.java
+++ b/org.compiere.db.oracle.provider/src/org/compiere/db/DB_Oracle.java
@@ -19,12 +19,13 @@ package org.compiere.db;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.net.URL;
+import java.nio.file.Files;
+import java.nio.file.StandardCopyOption;
 import java.sql.Connection;
 import java.sql.DatabaseMetaData;
 import java.sql.Driver;
@@ -40,8 +41,6 @@ import java.util.logging.Level;
 
 import javax.sql.DataSource;
 
-import oracle.jdbc.OracleDriver;
-
 import org.adempiere.db.oracle.OracleBundleActivator;
 import org.adempiere.exceptions.DBException;
 import org.compiere.Adempiere;
@@ -55,10 +54,11 @@ import org.compiere.util.Ini;
 import org.compiere.util.Language;
 import org.compiere.util.Trx;
 import org.compiere.util.Util;
-import org.jfree.io.IOUtils;
 
 import com.mchange.v2.c3p0.ComboPooledDataSource;
 
+import oracle.jdbc.OracleDriver;
+
 /**
  *  Oracle Database Port
  *
@@ -640,10 +640,8 @@ public class DB_Oracle implements AdempiereDatabase
 				dir.mkdir();
 			propertyFile = new File(propertyFilename);
 			try {
-				FileOutputStream fos = new FileOutputStream(propertyFile);
 				inputStream = url.openStream();
-				IOUtils.getInstance().copyStreams(inputStream, fos);
-				fos.close();
+				Files.copy(inputStream, propertyFile.toPath(), StandardCopyOption.REPLACE_EXISTING);
 				inputStream.close();
 				inputStream = null;
 			} catch (FileNotFoundException e) {
diff --git a/org.compiere.db.postgresql.provider/META-INF/MANIFEST.MF b/org.compiere.db.postgresql.provider/META-INF/MANIFEST.MF
index 61178ac8e5..90602ada46 100644
--- a/org.compiere.db.postgresql.provider/META-INF/MANIFEST.MF
+++ b/org.compiere.db.postgresql.provider/META-INF/MANIFEST.MF
@@ -12,7 +12,6 @@ Bundle-ClassPath: .,
 Require-Bundle: org.adempiere.base;bundle-version="0.0.0",
  org.adempiere.install;bundle-version="0.0.0"
 Import-Package: junit.framework;version="3.8.2",
- org.jfree.io;version="1.0.23",
  org.junit;version="4.8.1",
  org.osgi.framework,
  org.slf4j;version="1.7.2"
diff --git a/org.compiere.db.postgresql.provider/src/org/compiere/db/DB_PostgreSQL.java b/org.compiere.db.postgresql.provider/src/org/compiere/db/DB_PostgreSQL.java
index 66d56de718..db6272b5c3 100755
--- a/org.compiere.db.postgresql.provider/src/org/compiere/db/DB_PostgreSQL.java
+++ b/org.compiere.db.postgresql.provider/src/org/compiere/db/DB_PostgreSQL.java
@@ -21,12 +21,13 @@ package org.compiere.db;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.net.URL;
+import java.nio.file.Files;
+import java.nio.file.StandardCopyOption;
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.PreparedStatement;
@@ -55,7 +56,6 @@ import org.compiere.util.Ini;
 import org.compiere.util.Language;
 import org.compiere.util.Trx;
 import org.compiere.util.Util;
-import org.jfree.io.IOUtils;
 
 import com.mchange.v2.c3p0.ComboPooledDataSource;
 
@@ -729,10 +729,8 @@ public class DB_PostgreSQL implements AdempiereDatabase
 				dir.mkdir();
 			propertyFile = new File(propertyFilename);
 			try {
-				FileOutputStream fos = new FileOutputStream(propertyFile);
 				inputStream = url.openStream();
-				IOUtils.getInstance().copyStreams(inputStream, fos);
-				fos.close();
+				Files.copy(inputStream, propertyFile.toPath(), StandardCopyOption.REPLACE_EXISTING);
 				inputStream.close();
 				inputStream = null;
 			} catch (FileNotFoundException e) {