From 66602d43e8f06ed13d990af47c9f008429e7e17e Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Fri, 22 Apr 2011 19:25:07 -0500 Subject: [PATCH] Implement issue #1 Allow localhost on installation http://hg.idempiere.com/idempiere/issue/1/allow-localhost-on-installation --- .../src/org/compiere/install/ConfigAppServer.java | 4 +--- .../src/org/compiere/install/SetupRes.java | 6 +++--- .../src/org/compiere/install/SetupRes_ca.java | 6 +++--- .../src/org/compiere/install/SetupRes_da.java | 6 +++--- .../src/org/compiere/install/SetupRes_de.java | 6 +++--- .../src/org/compiere/install/SetupRes_el.java | 6 +++--- .../src/org/compiere/install/SetupRes_es.java | 6 +++--- .../src/org/compiere/install/SetupRes_fr.java | 6 +++--- .../src/org/compiere/install/SetupRes_hr.java | 6 +++--- .../src/org/compiere/install/SetupRes_hu.java | 6 +++--- .../src/org/compiere/install/SetupRes_in.java | 6 +++--- .../src/org/compiere/install/SetupRes_it.java | 6 +++--- .../src/org/compiere/install/SetupRes_my.java | 6 +++--- .../src/org/compiere/install/SetupRes_no.java | 6 +++--- .../src/org/compiere/install/SetupRes_pl.java | 6 +++--- .../src/org/compiere/install/SetupRes_ro.java | 6 +++--- .../src/org/compiere/install/SetupRes_ru.java | 6 +++--- .../src/org/compiere/install/SetupRes_sl.java | 6 +++--- .../src/org/compiere/install/SetupRes_sr.java | 6 +++--- .../src/org/compiere/install/SetupRes_sv.java | 6 +++--- .../src/org/compiere/install/SetupRes_vi.java | 6 +++--- .../src/org/compiere/install/SetupRes_zh.java | 6 +++--- .../src/org/compiere/install/SetupRes_zh_CN.java | 6 +++--- .../src/org/adempiere/db/oracle/config/ConfigOracle.java | 4 +--- .../adempiere/db/postgresql/config/ConfigPostgreSQL.java | 2 -- 25 files changed, 68 insertions(+), 74 deletions(-) diff --git a/org.adempiere.install/src/org/compiere/install/ConfigAppServer.java b/org.adempiere.install/src/org/compiere/install/ConfigAppServer.java index 44cd3a3f1c..a2dc8f0b57 100644 --- a/org.adempiere.install/src/org/compiere/install/ConfigAppServer.java +++ b/org.adempiere.install/src/org/compiere/install/ConfigAppServer.java @@ -56,9 +56,7 @@ public class ConfigAppServer extends Config { // AppsServer String server = p_data.getAppsServer(); - boolean pass = server != null && server.length() > 0 - && server.toLowerCase().indexOf("localhost") == -1 - && !server.equals("127.0.0.1"); + boolean pass = server != null && server.length() > 0; InetAddress appsServer = null; String error = "Not correct: AppsServer = " + server; try diff --git a/org.adempiere.install/src/org/compiere/install/SetupRes.java b/org.adempiere.install/src/org/compiere/install/SetupRes.java index 76424554be..d09c147e82 100644 --- a/org.adempiere.install/src/org/compiere/install/SetupRes.java +++ b/org.adempiere.install/src/org/compiere/install/SetupRes.java @@ -90,14 +90,14 @@ public class SetupRes extends ListResourceBundle { "ServerError", "Server Setup Error" }, { "ErrorJavaHome", "Error Java Home" }, { "ErrorAdempiereHome", "Error Adempiere Home" }, - { "ErrorAppsServer", "Error Apps Server (do not use localhost)" }, + { "ErrorAppsServer", "Error Apps Server" }, { "ErrorWebPort", "Error Web Port" }, { "ErrorJNPPort", "Error JNP Port" }, - { "ErrorDatabaseServer", "Error Database Server (do not use localhost)" }, + { "ErrorDatabaseServer", "Error Database Server" }, { "ErrorDatabasePort", "Error Database Port" }, { "ErrorJDBC", "Error JDBC Connection" }, { "ErrorTNS", "Error TNS Connection" }, - { "ErrorMailServer", "Error Mail Server (do not use localhost)" }, + { "ErrorMailServer", "Error Mail Server" }, { "ErrorMail", "Error Mail" }, { "ErrorSave", "Error Saving File" }, diff --git a/org.adempiere.install/src/org/compiere/install/SetupRes_ca.java b/org.adempiere.install/src/org/compiere/install/SetupRes_ca.java index 0d4c40dab6..115cf358f0 100644 --- a/org.adempiere.install/src/org/compiere/install/SetupRes_ca.java +++ b/org.adempiere.install/src/org/compiere/install/SetupRes_ca.java @@ -91,14 +91,14 @@ public class SetupRes_ca extends ListResourceBundle { "ServerError", "Error Configuraci\u00f3 Servidor" }, { "ErrorJavaHome", "Error Java Home" }, { "ErrorAdempiereHome", "Error Adempiere Home" }, - { "ErrorAppsServer", "Error Servidor Aplicaci\u00f3 (no utilitzar localhost)" }, + { "ErrorAppsServer", "Error Servidor Aplicaci\u00f3" }, { "ErrorWebPort", "Error Port Web" }, { "ErrorJNPPort", "Error Port JNP" }, - { "ErrorDatabaseServer", "Error Servidor Base de Dades (no utilitzar localhost)" }, + { "ErrorDatabaseServer", "Error Servidor Base de Dades" }, { "ErrorDatabasePort", "Error Port Base de Dades" }, { "ErrorJDBC", "Error Connexi\u00f3 JDBC" }, { "ErrorTNS", "Error Connexi\u00f3 TNS" }, - { "ErrorMailServer", "Error Servidor Correu (no utilitzar localhost)" }, + { "ErrorMailServer", "Error Servidor Correu" }, { "ErrorMail", "Error Correu" }, { "ErrorSave", "Error Guardant Fitxer" }, diff --git a/org.adempiere.install/src/org/compiere/install/SetupRes_da.java b/org.adempiere.install/src/org/compiere/install/SetupRes_da.java index e4cafcea86..bf5363e462 100644 --- a/org.adempiere.install/src/org/compiere/install/SetupRes_da.java +++ b/org.adempiere.install/src/org/compiere/install/SetupRes_da.java @@ -90,14 +90,14 @@ public class SetupRes_da extends ListResourceBundle { "ServerError", "Fejl: Serverops�tning" }, { "ErrorJavaHome", "Fejl: Java Home" }, { "ErrorAdempiereHome", "Fejl: Adempiere Home" }, - { "ErrorAppsServer", "Fejl: Prog.-server (brug ikke localhost)" }, + { "ErrorAppsServer", "Fejl: Prog.-server" }, { "ErrorWebPort", "Fejl: Web-port" }, { "ErrorJNPPort", "Fejl: JNP-port" }, - { "ErrorDatabaseServer", "Fejl: Databaseserver (brug ikke localhost)" }, + { "ErrorDatabaseServer", "Fejl: Databaseserver" }, { "ErrorDatabasePort", "Fejl: Databaseport" }, { "ErrorJDBC", "Fejl: JDBC-forbindelse" }, { "ErrorTNS", "Fejl: TNS-forbindelse" }, - { "ErrorMailServer", "Fejl: Mailserver (brug ikke localhost)" }, + { "ErrorMailServer", "Fejl: Mailserver" }, { "ErrorMail", "Fejl: Mail" }, { "ErrorSave", "Fejl: Swing-fil" }, diff --git a/org.adempiere.install/src/org/compiere/install/SetupRes_de.java b/org.adempiere.install/src/org/compiere/install/SetupRes_de.java index 53da745b7f..4ede141814 100644 --- a/org.adempiere.install/src/org/compiere/install/SetupRes_de.java +++ b/org.adempiere.install/src/org/compiere/install/SetupRes_de.java @@ -92,14 +92,14 @@ public class SetupRes_de extends ListResourceBundle { "ServerError", "Fehler bei Server-Konfiguration" }, { "ErrorJavaHome", "Fehler bei Java-Home" }, { "ErrorAdempiereHome", "Fehler bei ADempiere-Home" }, - { "ErrorAppsServer", "Fehler bei Applikations-Server (verwenden Sie NICHT localhost)" }, + { "ErrorAppsServer", "Fehler bei Applikations-Server" }, { "ErrorWebPort", "Fehler bei Web-Port" }, { "ErrorJNPPort", "Fehler bei JNP-Port" }, - { "ErrorDatabaseServer", "Fehler bei Datenbank-Server (verwenden Sie NICHT localhost)" }, + { "ErrorDatabaseServer", "Fehler bei Datenbank-Server" }, { "ErrorDatabasePort", "Fehler bei Datenbank-Port" }, { "ErrorJDBC", "Fehler bei JDBC-Verbindung" }, { "ErrorTNS", "Fehler bei TNS-Verbindung" }, - { "ErrorMailServer", "Fehler bei Mail-Server (verwenden Sie NICHT localhost)" }, + { "ErrorMailServer", "Fehler bei Mail-Server" }, { "ErrorMail", "Fehler bei Mail" }, { "ErrorSave", "Fehler bei Datei speichern" }, diff --git a/org.adempiere.install/src/org/compiere/install/SetupRes_el.java b/org.adempiere.install/src/org/compiere/install/SetupRes_el.java index b8604697e2..d6ce724565 100644 --- a/org.adempiere.install/src/org/compiere/install/SetupRes_el.java +++ b/org.adempiere.install/src/org/compiere/install/SetupRes_el.java @@ -90,14 +90,14 @@ public class SetupRes_el extends ListResourceBundle { "ServerError", "Server Setup Error" }, { "ErrorJavaHome", "Error Java Home" }, { "ErrorAdempiereHome", "Error Adempiere Home" }, - { "ErrorAppsServer", "Error Apps Server (do not use localhost)" }, + { "ErrorAppsServer", "Error Apps Server" }, { "ErrorWebPort", "Error Web Port" }, { "ErrorJNPPort", "Error JNP Port" }, - { "ErrorDatabaseServer", "Error Database Server (do not use localhost)" }, + { "ErrorDatabaseServer", "Error Database Server" }, { "ErrorDatabasePort", "Error Database Port" }, { "ErrorJDBC", "Error JDBC Connection" }, { "ErrorTNS", "Error TNS Connection" }, - { "ErrorMailServer", "Error Mail Server (do not use localhost)" }, + { "ErrorMailServer", "Error Mail Server" }, { "ErrorMail", "Error Mail" }, { "ErrorSave", "Error Saving File" }, 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 c1ea098ca8..8440c1541d 100644 --- a/org.adempiere.install/src/org/compiere/install/SetupRes_es.java +++ b/org.adempiere.install/src/org/compiere/install/SetupRes_es.java @@ -90,14 +90,14 @@ public class SetupRes_es extends ListResourceBundle { "ServerError", "Error Configuraci\u00f3n Servidor" }, { "ErrorJavaHome", "Error Java Home" }, { "ErrorAdempiereHome", "Error Adempiere Home" }, - { "ErrorAppsServer", "Error Servidor Aplicaci\u00f3n (no utilizar localhost)" }, + { "ErrorAppsServer", "Error Servidor Aplicaci\u00f3n" }, { "ErrorWebPort", "Error Puerto Web" }, { "ErrorJNPPort", "Error Puerto JNP" }, - { "ErrorDatabaseServer", "Error Servidor Base de Datos (no utilizar localhost)" }, + { "ErrorDatabaseServer", "Error Servidor Base de Datos" }, { "ErrorDatabasePort", "Error Puerto Base de Datos" }, { "ErrorJDBC", "Error Connexi\u00f3n JDBC" }, { "ErrorTNS", "Error Connexi\u00f3n TNS" }, - { "ErrorMailServer", "Error Servidor Correo (no utilizar localhost)" }, + { "ErrorMailServer", "Error Servidor Correo" }, { "ErrorMail", "Error Correo" }, { "ErrorSave", "Error Guardando Ficheros" }, diff --git a/org.adempiere.install/src/org/compiere/install/SetupRes_fr.java b/org.adempiere.install/src/org/compiere/install/SetupRes_fr.java index a860b5005f..07f8479237 100644 --- a/org.adempiere.install/src/org/compiere/install/SetupRes_fr.java +++ b/org.adempiere.install/src/org/compiere/install/SetupRes_fr.java @@ -91,14 +91,14 @@ public class SetupRes_fr extends ListResourceBundle { "ServerError", "Erreur de la configuration du serveur" }, { "ErrorJavaHome", "Erreur sur le r\u00E9pertoire Java" }, { "ErrorAdempiereHome", "Erreur sur le r\u00E9pertoire Adempiere" }, - { "ErrorAppsServer", "Erreur Serveur Apps (ne pas utiliser localhost)" }, + { "ErrorAppsServer", "Erreur Serveur Apps" }, { "ErrorWebPort", "Erreur port Web" }, { "ErrorJNPPort", "Erreur port JNP" }, - { "ErrorDatabaseServer", "Erreur serveur de base de donn\u00E9es (ne pas utiliser localhost)" }, + { "ErrorDatabaseServer", "Erreur serveur de base de donn\u00E9es" }, { "ErrorDatabasePort", "Erreur port de la base de donn\u00E9es" }, { "ErrorJDBC", "Erreur sur la connection JDBC" }, { "ErrorTNS", "Erreur sur la connection TNS" }, - { "ErrorMailServer", "Erreur serveur de Courriel (ne pas utiliser localhost)" }, + { "ErrorMailServer", "Erreur serveur de Courriel" }, { "ErrorMail", "Erreur Mail" }, { "ErrorSave", "Erreur lors de la sauvegarde du fichier" }, diff --git a/org.adempiere.install/src/org/compiere/install/SetupRes_hr.java b/org.adempiere.install/src/org/compiere/install/SetupRes_hr.java index 3557c10bd0..38ff2f704e 100644 --- a/org.adempiere.install/src/org/compiere/install/SetupRes_hr.java +++ b/org.adempiere.install/src/org/compiere/install/SetupRes_hr.java @@ -91,14 +91,14 @@ public class SetupRes_hr extends ListResourceBundle { "ServerError", "Server Setup Error" }, { "ErrorJavaHome", "Error Java Home" }, { "ErrorAdempiereHome", "Error Adempiere Home" }, - { "ErrorAppsServer", "Error Apps Server (do not use localhost)" }, + { "ErrorAppsServer", "Error Apps Server" }, { "ErrorWebPort", "Error Web Port" }, { "ErrorJNPPort", "Error JNP Port" }, - { "ErrorDatabaseServer", "Error Database Server (do not use localhost)" }, + { "ErrorDatabaseServer", "Error Database Server" }, { "ErrorDatabasePort", "Error Database Port" }, { "ErrorJDBC", "Error JDBC Connection" }, { "ErrorTNS", "Error TNS Connection" }, - { "ErrorMailServer", "Error Mail Server (do not use localhost)" }, + { "ErrorMailServer", "Error Mail Server" }, { "ErrorMail", "Error Mail" }, { "ErrorSave", "Error Sving File" }, diff --git a/org.adempiere.install/src/org/compiere/install/SetupRes_hu.java b/org.adempiere.install/src/org/compiere/install/SetupRes_hu.java index 5efe95b5c6..f0a774f9d7 100644 --- a/org.adempiere.install/src/org/compiere/install/SetupRes_hu.java +++ b/org.adempiere.install/src/org/compiere/install/SetupRes_hu.java @@ -90,14 +90,14 @@ public class SetupRes_hu extends ListResourceBundle { "ServerError", "Server Setup Error" }, { "ErrorJavaHome", "Error Java Home" }, { "ErrorAdempiereHome", "Error Adempiere Home" }, - { "ErrorAppsServer", "Error Apps Server (do not use localhost)" }, + { "ErrorAppsServer", "Error Apps Server" }, { "ErrorWebPort", "Error Web Port" }, { "ErrorJNPPort", "Error JNP Port" }, - { "ErrorDatabaseServer", "Error Database Server (do not use localhost)" }, + { "ErrorDatabaseServer", "Error Database Server" }, { "ErrorDatabasePort", "Error Database Port" }, { "ErrorJDBC", "Error JDBC Connection" }, { "ErrorTNS", "Error TNS Connection" }, - { "ErrorMailServer", "Error Mail Server (do not use localhost)" }, + { "ErrorMailServer", "Error Mail Server" }, { "ErrorMail", "Error Mail" }, { "ErrorSave", "Error Saving File" }, diff --git a/org.adempiere.install/src/org/compiere/install/SetupRes_in.java b/org.adempiere.install/src/org/compiere/install/SetupRes_in.java index fcf662c0a7..7b50b9c124 100644 --- a/org.adempiere.install/src/org/compiere/install/SetupRes_in.java +++ b/org.adempiere.install/src/org/compiere/install/SetupRes_in.java @@ -90,14 +90,14 @@ public class SetupRes_in extends ListResourceBundle { "ServerError", "Error Setup Server" }, { "ErrorJavaHome", "Error Java Home" }, { "ErrorAdempiereHome", "Error Adempiere Home" }, - { "ErrorAppsServer", "Error Server Aplikasi (jangan gunakan localhost)" }, + { "ErrorAppsServer", "Error Server Aplikasi" }, { "ErrorWebPort", "Error Web Port" }, { "ErrorJNPPort", "Error JNP Port" }, - { "ErrorDatabaseServer", "Error Database Server (jangan gunakan localhost)" }, + { "ErrorDatabaseServer", "Error Database Server" }, { "ErrorDatabasePort", "Error Port Database" }, { "ErrorJDBC", "Error Koneksi JDBC" }, { "ErrorTNS", "Error Koneksi TNS" }, - { "ErrorMailServer", "Error Mail Server (jangan gunakan localhost)" }, + { "ErrorMailServer", "Error Mail Server" }, { "ErrorMail", "Error Mail" }, { "ErrorSave", "Error Simpan File" }, diff --git a/org.adempiere.install/src/org/compiere/install/SetupRes_it.java b/org.adempiere.install/src/org/compiere/install/SetupRes_it.java index c3d9fc2301..3cf28e0887 100644 --- a/org.adempiere.install/src/org/compiere/install/SetupRes_it.java +++ b/org.adempiere.install/src/org/compiere/install/SetupRes_it.java @@ -90,14 +90,14 @@ public class SetupRes_it extends ListResourceBundle { "ServerError", "Errore Configurazione Server" }, { "ErrorJavaHome", "Errore Java Home" }, { "ErrorAdempiereHome", "Errore Adempiere Home" }, - { "ErrorAppsServer", "Errore Servidor Aplicaci\u00f3n (no utilizar localhost)" }, + { "ErrorAppsServer", "Errore Servidor Aplicaci\u00f3n" }, { "ErrorWebPort", "Errore Porta Web: potrebbe essere occupata dall'apache server o dal server Adempiere utilizzare 8080" }, { "ErrorJNPPort", "Errore Porta JNP potrebbe essere occupata da un'altra istanza del server adempiere" }, - { "ErrorDatabaseServer", "Errore Server DataBase (non utilizzare localhost)" }, + { "ErrorDatabaseServer", "Errore Server DataBase" }, { "ErrorDatabasePort", "Errore Porta DataBase" }, { "ErrorJDBC", "Errore connessione JDBC" }, { "ErrorTNS", "Errore Connessione al TNS" }, - { "ErrorMailServer", "Errore Connessione server Posta: Deve essere un server che risponde a chiamate SMTP sulla porta 25 (non utilizzare localhost)" }, + { "ErrorMailServer", "Errore Connessione server Posta: Deve essere un server che risponde a chiamate SMTP sulla porta 25" }, { "ErrorMail", "Errore Email" }, { "ErrorSave", "Errore Salvataggio" }, diff --git a/org.adempiere.install/src/org/compiere/install/SetupRes_my.java b/org.adempiere.install/src/org/compiere/install/SetupRes_my.java index b9ba84c097..a8853fec94 100644 --- a/org.adempiere.install/src/org/compiere/install/SetupRes_my.java +++ b/org.adempiere.install/src/org/compiere/install/SetupRes_my.java @@ -90,14 +90,14 @@ public class SetupRes_my extends ListResourceBundle { "ServerError", "Server Setup Error" }, { "ErrorJavaHome", "Error Java Home" }, { "ErrorAdempiereHome", "Error Adempiere Home" }, - { "ErrorAppsServer", "Error Apps Server (jangan guna localhost)" }, + { "ErrorAppsServer", "Error Apps Server" }, { "ErrorWebPort", "Error Web Port" }, { "ErrorJNPPort", "Error JNP Port" }, - { "ErrorDatabaseServer", "Error Database Server (jangan guna localhost)" }, + { "ErrorDatabaseServer", "Error Database Server" }, { "ErrorDatabasePort", "Error Database Port" }, { "ErrorJDBC", "Error sambungan JDBC" }, { "ErrorTNS", "Error sambungan TNS" }, - { "ErrorMailServer", "Error Mail Server (jangan guna localhost)" }, + { "ErrorMailServer", "Error Mail Server" }, { "ErrorMail", "Error Mail" }, { "ErrorSave", "Error Simpan Fail" }, diff --git a/org.adempiere.install/src/org/compiere/install/SetupRes_no.java b/org.adempiere.install/src/org/compiere/install/SetupRes_no.java index 6bf26465d0..6128e67be1 100644 --- a/org.adempiere.install/src/org/compiere/install/SetupRes_no.java +++ b/org.adempiere.install/src/org/compiere/install/SetupRes_no.java @@ -90,14 +90,14 @@ public class SetupRes_no extends ListResourceBundle { "ServerError", "Server Oppsett Feil" }, { "ErrorJavaHome", "Feil Java Hjem" }, { "ErrorAdempiereHome", "Feil Adempiere Hjem" }, - { "ErrorAppsServer", "Feil App. Server (ikke bruk localhost)" }, + { "ErrorAppsServer", "Feil App. Server" }, { "ErrorWebPort", "Feil Web Port" }, { "ErrorJNPPort", "Feil JNP Port" }, - { "ErrorDatabaseServer", "Feil Database Server (ikke bruk localhost)" }, + { "ErrorDatabaseServer", "Feil Database Server" }, { "ErrorDatabasePort", "Feil Database Port" }, { "ErrorJDBC", "Feil ved JDBC Oppkobling" }, { "ErrorTNS", "Feil ved TNS Oppkobling" }, - { "ErrorMailServer", "Feil EPost Server (ikke bruk localhost)" }, + { "ErrorMailServer", "Feil EPost Server" }, { "ErrorMail", "Feil EPost" }, { "ErrorSave", "Feil Sving Fil" }, diff --git a/org.adempiere.install/src/org/compiere/install/SetupRes_pl.java b/org.adempiere.install/src/org/compiere/install/SetupRes_pl.java index 554e11dfb6..35275ed405 100644 --- a/org.adempiere.install/src/org/compiere/install/SetupRes_pl.java +++ b/org.adempiere.install/src/org/compiere/install/SetupRes_pl.java @@ -90,14 +90,14 @@ public class SetupRes_pl extends ListResourceBundle { "ServerError", "B\u0142\u0119dne ustawienia" }, { "ErrorJavaHome", "Niepoprawny folder Javy" }, { "ErrorAdempiereHome", "Nie stwierdzono zainstalowanego systemu Adempiere w miescu wskazanym jako Folder Adempiere" }, - { "ErrorAppsServer", "Niepoprawny serwer aplikacji (nie mo\u017ce by\u0107 localhost)" }, + { "ErrorAppsServer", "Niepoprawny serwer aplikacji" }, { "ErrorWebPort", "Niepoprawny port WWW (by\u0107 mo\u017ce inna aplikacja u\u017cywa ju\u017c tego portu)" }, { "ErrorJNPPort", "Niepoprawny port JNP (by\u0107 mo\u017ce inna aplikacja u\u017cywa ju\u017c tego portu)" }, - { "ErrorDatabaseServer", "Niepoprawny serwer bazy (nie mo\u017ce by\u0107 localhost)" }, + { "ErrorDatabaseServer", "Niepoprawny serwer bazy" }, { "ErrorDatabasePort", "Niepoprawny port serwer bazy" }, { "ErrorJDBC", "Wyst\u0105pi\u0142 b\u0142\u0105d przy pr\u00f3bie po\u0142\u0105cznia si\u0119 z baz\u0105 danych" }, { "ErrorTNS", "Wyst\u0105pi\u0142 b\u0142\u0105d przy pr\u00f3bie po\u0142\u0105cznia si\u0119 z baz\u0105 danych poprzez TNS" }, - { "ErrorMailServer", "Niepoprawny serwer pocztowy (nie mo\u017ce by\u0107 localhost)" }, + { "ErrorMailServer", "Niepoprawny serwer pocztowy" }, { "ErrorMail", "B\u0142\u0105d poczty" }, { "ErrorSave", "B\u0142\u0105d przy zapisywaniu konfiguracji" }, diff --git a/org.adempiere.install/src/org/compiere/install/SetupRes_ro.java b/org.adempiere.install/src/org/compiere/install/SetupRes_ro.java index 9f28fac222..da68aa54f8 100644 --- a/org.adempiere.install/src/org/compiere/install/SetupRes_ro.java +++ b/org.adempiere.install/src/org/compiere/install/SetupRes_ro.java @@ -90,14 +90,14 @@ public class SetupRes_ro extends ListResourceBundle { "ServerError", "Eroare de configurare a serverului" }, { "ErrorJavaHome", "Eroare de loca\u0163ie Java" }, { "ErrorAdempiereHome", "Eroare de loca\u0163ie Adempiere" }, - { "ErrorAppsServer", "Eroare de server de aplica\u0163ie (nu folosi\u0163i 'localhost')" }, + { "ErrorAppsServer", "Eroare de server de aplica\u0163ie" }, { "ErrorWebPort", "Eroare de port de web" }, { "ErrorJNPPort", "Eroare de port JNP" }, - { "ErrorDatabaseServer", "Eroare de server de baz\u0103 de date (nu folosi\u0163i 'localhost')" }, + { "ErrorDatabaseServer", "Eroare de server de baz\u0103 de date" }, { "ErrorDatabasePort", "Eroare de port de baz\u0103 de date" }, { "ErrorJDBC", "Eroare de conexiune JDBC" }, { "ErrorTNS", "Eroare de conexiune TNS" }, - { "ErrorMailServer", "Eroare de server de po\u015ft\u0103 electronic\u0103 (nu folosi\u0163i 'localhost')" }, + { "ErrorMailServer", "Eroare de server de po\u015ft\u0103 electronic\u0103" }, { "ErrorMail", "Eroare de po\u015ft\u0103 electronic\u0103" }, { "ErrorSave", "Eroare la salvarea fi\u015fierului" }, diff --git a/org.adempiere.install/src/org/compiere/install/SetupRes_ru.java b/org.adempiere.install/src/org/compiere/install/SetupRes_ru.java index f42887a303..11d1445901 100644 --- a/org.adempiere.install/src/org/compiere/install/SetupRes_ru.java +++ b/org.adempiere.install/src/org/compiere/install/SetupRes_ru.java @@ -96,14 +96,14 @@ public class SetupRes_ru extends ListResourceBundle { "ServerError", "\u041e\u0448\u0438\u0431\u043a\u0430 \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u043a\u0438 \u0441\u0435\u0440\u0432\u0435\u0440\u0430"}, { "ErrorJavaHome", "\u041e\u0448\u0438\u0431\u043a\u0430 Java Home"}, { "ErrorAdempiereHome", "\u041e\u0448\u0438\u0431\u043a\u0430 Adempiere Home"}, - { "ErrorAppsServer", "\u041e\u0448\u0438\u0431\u043a\u0430 \u0441\u0435\u0440\u0432\u0435\u0440\u0430 \u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u0439 (\u043d\u0435 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0439\u0442\u0435 localhost)"}, + { "ErrorAppsServer", "\u041e\u0448\u0438\u0431\u043a\u0430 \u0441\u0435\u0440\u0432\u0435\u0440\u0430 \u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u0439"}, { "ErrorWebPort", "\u041e\u0448\u0438\u0431\u043a\u0430 \u0432\u0435\u0431 \u043f\u043e\u0440\u0442\u0430"}, { "ErrorJNPPort", "\u041e\u0448\u0438\u0431\u043a\u0430 \u043f\u043e\u0440\u0442\u0430 JNP"}, - { "ErrorDatabaseServer", "\u041e\u0448\u0438\u0431\u043a\u0430 \u0441\u0435\u0440\u0432\u0435\u0440\u0430 \u0411\u0414 (\u043d\u0435 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0439\u0442\u0435 localhost)"}, + { "ErrorDatabaseServer", "\u041e\u0448\u0438\u0431\u043a\u0430 \u0441\u0435\u0440\u0432\u0435\u0440\u0430 \u0411\u0414"}, { "ErrorDatabasePort", "\u041e\u0448\u0438\u0431\u043a\u0430 \u043f\u043e\u0440\u0442\u0430 \u0411\u0414"}, { "ErrorJDBC", "\u041e\u0448\u0438\u0431\u043a\u0430 \u0441\u043e\u0435\u0434\u0438\u043d\u0435\u043d\u0438\u044f \u043f\u043e JDBC"}, { "ErrorTNS", "\u041e\u0448\u0438\u0431\u043a\u0430 \u0441\u043e\u0435\u0434\u0438\u043d\u0435\u043d\u0438\u044f \u0447\u0435\u0440\u0435\u0437 TNS"}, - { "ErrorMailServer", "\u041e\u0448\u0438\u0431\u043a\u0430 \u0441\u0435\u0440\u0432\u0435\u0440\u0430 \u044d\u043b\u0435\u043a\u0442\u0440\u043e\u043d\u043d\u043e\u0439 \u043f\u043e\u0447\u0442\u044b (\u043d\u0435 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0439\u0442\u0435 localhost)"}, + { "ErrorMailServer", "\u041e\u0448\u0438\u0431\u043a\u0430 \u0441\u0435\u0440\u0432\u0435\u0440\u0430 \u044d\u043b\u0435\u043a\u0442\u0440\u043e\u043d\u043d\u043e\u0439 \u043f\u043e\u0447\u0442\u044b"}, { "ErrorMail", "\u041e\u0448\u0438\u0431\u043a\u0430 \u043f\u043e\u0447\u0442\u044b"}, { "ErrorSave", "\u041e\u0448\u0438\u0431\u043a\u0430 \u0441\u043e\u0445\u0440\u0430\u043d\u0435\u043d\u0438\u044f \u0444\u0430\u0439\u043b\u0430"}, { "EnvironmentSaved", "\u041f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u044b \u0441\u043e\u0445\u0440\u0430\u043d\u0435\u043d\u044b\n\u0412\u0430\u043c \u043d\u0435\u043e\u0431\u0445\u043e\u0434\u0438\u043c\u043e \u043f\u0435\u0440\u0435\u0437\u0430\u043f\u0443\u0441\u0442\u0438\u0442\u044c \u0441\u0435\u0440\u0432\u0435\u0440."}, diff --git a/org.adempiere.install/src/org/compiere/install/SetupRes_sl.java b/org.adempiere.install/src/org/compiere/install/SetupRes_sl.java index b13433f6c4..6a31ca9259 100644 --- a/org.adempiere.install/src/org/compiere/install/SetupRes_sl.java +++ b/org.adempiere.install/src/org/compiere/install/SetupRes_sl.java @@ -90,14 +90,14 @@ public class SetupRes_sl extends ListResourceBundle { "ServerError", "Napaka v nastavitvah programskega stre\u017enika" }, { "ErrorJavaHome", "Error napa\u010den doma\u010d imenik Java" }, { "ErrorAdempiereHome", "Error napa\u010den Adempiere Home imenik" }, - { "ErrorAppsServer", "Error programski stre\u017enik (ne uporabljaj imena localhost)" }, + { "ErrorAppsServer", "Error programski stre\u017enik" }, { "ErrorWebPort", "Error napa\u010dna Web vrata" }, { "ErrorJNPPort", "Error napa\u010dna JNP vrata" }, - { "ErrorDatabaseServer", "Error stre\u017enik baze podatkov (ne uporabljaj imena localhost)" }, + { "ErrorDatabaseServer", "Error stre\u017enik baze podatkov" }, { "ErrorDatabasePort", "Error napa\u010dna vrata baze podatkov" }, { "ErrorJDBC", "Error napaka v JDBC povezavi" }, { "ErrorTNS", "Error napaka v TNS povezavi" }, - { "ErrorMailServer", "Error stre\u017enik elektronske po\u0161te (ne uporabljaj imena localhost)" }, + { "ErrorMailServer", "Error stre\u017enik elektronske po\u0161te" }, { "ErrorMail", "Error napaka elektronska po\u0161ta" }, { "ErrorSave", "Error napaka pri shranjevanju datoteke" }, diff --git a/org.adempiere.install/src/org/compiere/install/SetupRes_sr.java b/org.adempiere.install/src/org/compiere/install/SetupRes_sr.java index 295c48bab8..e5d373b19f 100644 --- a/org.adempiere.install/src/org/compiere/install/SetupRes_sr.java +++ b/org.adempiere.install/src/org/compiere/install/SetupRes_sr.java @@ -90,14 +90,14 @@ public class SetupRes_sr extends ListResourceBundle { "ServerError", "\u0413\u0440\u0435\u0448\u043A\u0430 \u043F\u0440\u0438\u043B\u0438\u043A\u043E\u043C \u043F\u043E\u0434\u0435\u0448\u0430\u0432\u0430\u045A\u0430 \u0441\u0435\u0440\u0432\u0435\u0440\u0430" }, { "ErrorJavaHome", "\u0413\u0440\u0435\u0448\u043A\u0430 Java Home" }, { "ErrorAdempiereHome", "\u0413\u0440\u0435\u0448\u043A\u0430 Adempiere Home" }, - { "ErrorAppsServer", "\u0413\u0440\u0435\u0448\u043A\u0430 \u0410\u043F\u043B\u0438\u043A\u0430\u0442\u0438\u0432\u043D\u0438 \u0441\u0435\u0440\u0432\u0435\u0440 (\u043D\u0435 \u043A\u043E\u0440\u0438\u0441\u0442\u0438 localhost)" }, + { "ErrorAppsServer", "\u0413\u0440\u0435\u0448\u043A\u0430 \u0410\u043F\u043B\u0438\u043A\u0430\u0442\u0438\u0432\u043D\u0438 \u0441\u0435\u0440\u0432\u0435\u0440" }, { "ErrorWebPort", "\u0413\u0440\u0435\u0448\u043A\u0430 Web Port" }, { "ErrorJNPPort", "\u0413\u0440\u0435\u0448\u043A\u0430 JNP Port" }, - { "ErrorDatabaseServer", "\u0413\u0440\u0435\u0448\u043A\u0430 \u0421\u0435\u0440\u0432\u0435\u0440 \u0431\u0430\u0437\u0435 (\u043D\u0435 \u043A\u043E\u0440\u0438\u0441\u0442\u0438 localhost)" }, + { "ErrorDatabaseServer", "\u0413\u0440\u0435\u0448\u043A\u0430 \u0421\u0435\u0440\u0432\u0435\u0440 \u0431\u0430\u0437\u0435" }, { "ErrorDatabasePort", "\u0413\u0440\u0435\u0448\u043A\u0430 Port \u0431\u0430\u0437\u0435" }, { "ErrorJDBC", "\u0413\u0440\u0435\u0448\u043A\u0430 JDBC веза" }, { "ErrorTNS", "\u0413\u0440\u0435\u0448\u043A\u0430 TNS веза" }, - { "ErrorMailServer", "\u0413\u0440\u0435\u0448\u043A\u0430 Mail \u0441\u0435\u0440\u0432\u0435\u0440 (\u043D\u0435 \u043A\u043E\u0440\u0438\u0441\u0442\u0438 localhost)" }, + { "ErrorMailServer", "\u0413\u0440\u0435\u0448\u043A\u0430 Mail \u0441\u0435\u0440\u0432\u0435\u0440" }, { "ErrorMail", "\u0413\u0440\u0435\u0448\u043A\u0430 Mail" }, { "ErrorSave", "\u0413\u0440\u0435\u0448\u043A\u0430 \u043F\u0440\u0438\u043B\u0438\u043A\u043E\u043C \u0441\u043D\u0438\u043C\u0430\u045A\u0430 \u0444\u0430\u0458\u043B\u0430" }, diff --git a/org.adempiere.install/src/org/compiere/install/SetupRes_sv.java b/org.adempiere.install/src/org/compiere/install/SetupRes_sv.java index 8164868920..429f5ba083 100644 --- a/org.adempiere.install/src/org/compiere/install/SetupRes_sv.java +++ b/org.adempiere.install/src/org/compiere/install/SetupRes_sv.java @@ -90,14 +90,14 @@ public class SetupRes_sv extends ListResourceBundle { "ServerError", "Server inst\u00c3\u00a4llningsfel" }, { "ErrorJavaHome", "Fel Java hem" }, { "ErrorAdempiereHome", "Fel Adempiere hem" }, - { "ErrorAppsServer", "Fel applikationsserver (anv\u00c3\u00a4nd ej localhost)" }, + { "ErrorAppsServer", "Fel applikationsserver" }, { "ErrorWebPort", "Fel web port" }, { "ErrorJNPPort", "Fel JNP port" }, - { "ErrorDatabaseServer", "Fel databas server (anv\u00c3\u00a4nd ej localhost)" }, + { "ErrorDatabaseServer", "Fel databas server" }, { "ErrorDatabasePort", "Fel databas port" }, { "ErrorJDBC", "Fel JDBC anslutning" }, { "ErrorTNS", "Fel TNS anslutning" }, - { "ErrorMailServer", "Fel post server (anv\u00c3\u00a4nd ej localhost)" }, + { "ErrorMailServer", "Fel post server" }, { "ErrorMail", "Fel post" }, { "ErrorSave", "Fel swing fil" }, diff --git a/org.adempiere.install/src/org/compiere/install/SetupRes_vi.java b/org.adempiere.install/src/org/compiere/install/SetupRes_vi.java index ef31f63bac..da73818157 100644 --- a/org.adempiere.install/src/org/compiere/install/SetupRes_vi.java +++ b/org.adempiere.install/src/org/compiere/install/SetupRes_vi.java @@ -90,14 +90,14 @@ public class SetupRes_vi extends ListResourceBundle { "ServerError", "SL\u1ED7i khi c�i \u0111\u1EB7t ph\u1EA7n m\u1EC1m n�y \u1EDF m�y ch\u1EE7" }, { "ErrorJavaHome", "T�n th\u01B0 m\u1EE5c ch\u1EE9a Java kh�ng \u0111�ng" }, { "ErrorAdempiereHome", "T�n th\u01B0 m\u1EE5c ch\u1EE9a C\u0103mpia-\u01A1 kh�ng \u0111�ng" }, - { "ErrorAppsServer", "L\u1ED7i li�n quan \u0111\u1EBFn m�y ch\u1EE7 \u1EE9ng d\u1EE5ng (\u0111\u1EEBng d�ng localhost)" }, + { "ErrorAppsServer", "L\u1ED7i li�n quan \u0111\u1EBFn m�y ch\u1EE7 \u1EE9ng d\u1EE5ng" }, { "ErrorWebPort", "C\u1ED5ng Web kh�ng \u0111�ng" }, { "ErrorJNPPort", "C\u1ED5ng JNP kh�ng \u0111�ng" }, - { "ErrorDatabaseServer", "L\u1ED7i li�n quan \u0111\u1EBFn m�y ch\u1EE7 CSDL (\u0111\u1EEBng d�ng localhost)" }, + { "ErrorDatabaseServer", "L\u1ED7i li�n quan \u0111\u1EBFn m�y ch\u1EE7 CSDL" }, { "ErrorDatabasePort", "C\u1ED5ng CSDL kh�ng \u0111�ng" }, { "ErrorJDBC", "L\u1ED7i li�n quan \u0111\u1EBFn k\u1EBFt n\u1ED1i JDBC" }, { "ErrorTNS", "L\u1ED7i li�n quan \u0111\u1EBFn k\u1EBFt n\u1ED1i TNS" }, - { "ErrorMailServer", "L\u1ED7i li�n quan \u0111\u1EBFn Mail Server (\u0111\u1EEBng d�ng localhost)" }, + { "ErrorMailServer", "L\u1ED7i li�n quan \u0111\u1EBFn Mail Server" }, { "ErrorMail", "L\u1ED7i li�n quan \u0111\u1EBFn Mail" }, { "ErrorSave", "L\u1ED7i khi l\u01B0u file" }, diff --git a/org.adempiere.install/src/org/compiere/install/SetupRes_zh.java b/org.adempiere.install/src/org/compiere/install/SetupRes_zh.java index d63a03a9f1..5671c847da 100644 --- a/org.adempiere.install/src/org/compiere/install/SetupRes_zh.java +++ b/org.adempiere.install/src/org/compiere/install/SetupRes_zh.java @@ -90,14 +90,14 @@ public class SetupRes_zh extends ListResourceBundle { "ServerError", "\u4f3a\u670d\u5668\u8a2d\u5b9a\u932f\u8aa4" }, { "ErrorJavaHome", "Java \u4e3b\u76ee\u9304\u932f\u8aa4" }, { "ErrorAdempiereHome", "Adempiere \u4e3b\u76ee\u9304\u932f\u8aa4" }, - { "ErrorAppsServer", "\u61c9\u7528\u4f3a\u670d\u5668\u932f\u8aa4 (do not use localhost)" }, + { "ErrorAppsServer", "\u61c9\u7528\u4f3a\u670d\u5668\u932f\u8aa4" }, { "ErrorWebPort", "\u7db2\u9801\u4f3a\u670d\u5668\u9023\u63a5\u57e0\u932f\u8aa4" }, { "ErrorJNPPort", "JNP \u9023\u63a5\u57e0\u932f\u8aa4" }, - { "ErrorDatabaseServer", "\u8cc7\u6599\u5eab\u932f\u8aa4 (do not use localhost)" }, + { "ErrorDatabaseServer", "\u8cc7\u6599\u5eab\u932f\u8aa4" }, { "ErrorDatabasePort", "\u8cc7\u6599\u5eab Port \u932f\u8aa4" }, { "ErrorJDBC", "JDBC \u9023\u63a5\u932f\u8aa4" }, { "ErrorTNS", "TNS \u9023\u63a5\u932f\u8aa4" }, - { "ErrorMailServer", "\u90f5\u4ef6\u4f3a\u670d\u5668\u932f\u8aa4 (do not use localhost)" }, + { "ErrorMailServer", "\u90f5\u4ef6\u4f3a\u670d\u5668\u932f\u8aa4" }, { "ErrorMail", "\u90f5\u4ef6\u932f\u8aa4" }, { "ErrorSave", "\u5b58\u6a94\u932f\u8aa4" }, diff --git a/org.adempiere.install/src/org/compiere/install/SetupRes_zh_CN.java b/org.adempiere.install/src/org/compiere/install/SetupRes_zh_CN.java index 89e8cf8cff..a80d473888 100644 --- a/org.adempiere.install/src/org/compiere/install/SetupRes_zh_CN.java +++ b/org.adempiere.install/src/org/compiere/install/SetupRes_zh_CN.java @@ -99,21 +99,21 @@ public class SetupRes_zh_CN extends ListResourceBundle "Adempiere \u4e3b\u76ee\u5f55\u8bbe\u7f6e\u9519\u8bef"}, { "ErrorAppsServer", - "\u5e94\u7528\u670d\u52a1\u5668\u8bbe\u7f6e\u9519\u8bef (\u4e0d\u80fd\u4f7f\u7528\u672c\u673a-localhost)"}, + "\u5e94\u7528\u670d\u52a1\u5668\u8bbe\u7f6e\u9519\u8bef"}, { "ErrorWebPort", "Web \u670d\u52a1\u5668\u8fde\u63a5\u7aef\u53e3\u8bbe\u7f6e\u9519\u8bef"}, { "ErrorJNPPort", "JNP \u8fde\u63a5\u7aef\u53e3\u8bbe\u7f6e\u9519\u8bef"}, { "ErrorDatabaseServer", - "\u6570\u636e\u5e93\u670d\u52a1\u5668\u8bbe\u7f6e\u9519\u8bef (\u4e0d\u80fd\u4f7f\u7528\u672c\u673a-localhost)"}, + "\u6570\u636e\u5e93\u670d\u52a1\u5668\u8bbe\u7f6e\u9519\u8bef"}, { "ErrorDatabasePort", "\u6570\u636e\u5e93\u7aef\u53e3\u8bbe\u7f6e\u9519\u8bef"}, { "ErrorJDBC", "JDBC \u8fde\u63a5\u9519\u8bef"}, { "ErrorTNS", "TNS \u8fde\u63a5\u9519\u8bef"}, { "ErrorMailServer", - "\u90ae\u4ef6\u670d\u52a1\u5668\u8bbe\u7f6e\u9519\u8bef (\u4e0d\u80fd\u4f7f\u7528\u672c\u673a-localhost)"}, + "\u90ae\u4ef6\u670d\u52a1\u5668\u8bbe\u7f6e\u9519\u8bef"}, { "ErrorMail", "\u7535\u5b50\u90ae\u4ef6\u9519\u8bef"}, { "ErrorSave", "\u5b58\u6863\u9519\u8bef"}, { diff --git a/org.compiere.db.oracle.provider/src/org/adempiere/db/oracle/config/ConfigOracle.java b/org.compiere.db.oracle.provider/src/org/adempiere/db/oracle/config/ConfigOracle.java index 9b45590949..2e4bdf9f08 100644 --- a/org.compiere.db.oracle.provider/src/org/adempiere/db/oracle/config/ConfigOracle.java +++ b/org.compiere.db.oracle.provider/src/org/adempiere/db/oracle/config/ConfigOracle.java @@ -290,9 +290,7 @@ public class ConfigOracle implements IDatabaseConfig { // Database Server String server = data.getDatabaseServer(); - boolean pass = server != null && server.length() > 0 - && server.toLowerCase().indexOf("localhost") == -1 - && !server.equals("127.0.0.1"); + boolean pass = server != null && server.length() > 0; String error = "Not correct: DB Server = " + server; InetAddress databaseServer = null; try diff --git a/org.compiere.db.postgresql.provider/src/org/adempiere/db/postgresql/config/ConfigPostgreSQL.java b/org.compiere.db.postgresql.provider/src/org/adempiere/db/postgresql/config/ConfigPostgreSQL.java index 1fa190a4b8..1cbf949e17 100755 --- a/org.compiere.db.postgresql.provider/src/org/adempiere/db/postgresql/config/ConfigPostgreSQL.java +++ b/org.compiere.db.postgresql.provider/src/org/adempiere/db/postgresql/config/ConfigPostgreSQL.java @@ -83,8 +83,6 @@ public class ConfigPostgreSQL implements IDatabaseConfig // Database Server String server = data.getDatabaseServer(); boolean pass = server != null && server.length() > 0; - // vpj-cd e-evolution && server.toLowerCase().indexOf("localhost") == -1 - // vpj-cd e-evolution && !server.equals("127.0.0.1"); String error = "Not correct: DB Server = " + server; InetAddress databaseServer = null;