From 221f5e6522d19576b6d806d4f734a4157996f281 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Fri, 26 Oct 2012 14:34:34 -0500 Subject: [PATCH] IDEMPIERE-472 Allow postgresql connection via SSL / Minor --- org.adempiere.base/src/org/adempiere/base/BaseActivator.java | 2 +- org.adempiere.install/src/org/compiere/install/SetupRes_es.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/org.adempiere.base/src/org/adempiere/base/BaseActivator.java b/org.adempiere.base/src/org/adempiere/base/BaseActivator.java index 098a7e9d5b..12f9897050 100644 --- a/org.adempiere.base/src/org/adempiere/base/BaseActivator.java +++ b/org.adempiere.base/src/org/adempiere/base/BaseActivator.java @@ -50,7 +50,7 @@ public class BaseActivator implements BundleActivator { */ @Override public void start(BundleContext context) throws Exception { - //Load SSL + //Load Init Properties loadInitProperties(Adempiere.getAdempiereHome()); bundleContext = context; context.registerService(CommandProvider.class.getName(), new StackTraceCommand(), null); diff --git a/org.adempiere.install/src/org/compiere/install/SetupRes_es.java b/org.adempiere.install/src/org/compiere/install/SetupRes_es.java index 021bcc950b..8f536d5a74 100644 --- a/org.adempiere.install/src/org/compiere/install/SetupRes_es.java +++ b/org.adempiere.install/src/org/compiere/install/SetupRes_es.java @@ -61,7 +61,7 @@ public class SetupRes_es extends ListResourceBundle { "MailServer", "Servidor Correo" }, { "AdminEMailInfo", "Email Administrador iDempiere" }, { "AdminEMail", "Email Admin" }, - { "DbExists", "Base de Datos Existe" }, // ?? OJO!!! + { "DbExists", "Base de Datos Existe" }, { "DatabaseServerInfo", "Nombre Servidor Base de Datos" }, { "DatabaseServer", "Servidor Base de Datos" }, { "JavaHomeInfo", "Carpeta Java Home" },