From 3ea6a2a17d020cff162c8a2e88041c2ecc3f4a0a Mon Sep 17 00:00:00 2001
From: Carlos Ruiz <carg67@gmail.com>
Date: Sat, 9 Feb 2019 14:26:45 +0100
Subject: [PATCH] IDEMPIERE-3887 Setup / Console-setup improvements

---
 .../compiere/install/ConfigurationData.java   |  61 ++++++++++--------
 .../compiere/install/ConfigurationPanel.java  |   2 +
 .../src/org/compiere/install/KeyStoreMgt.java |   2 +-
 .../src/org/compiere/install/Setup_Help.java  |   3 +-
 .../install/console/ConfigurationConsole.java |   2 +-
 .../org/compiere/install/images/Cancel16.gif  | Bin 0 -> 878 bytes
 .../org/compiere/install/images/Cancel24.gif  | Bin 0 -> 1268 bytes
 .../src/org/compiere/install/images/Ok16.gif  | Bin 0 -> 626 bytes
 .../src/org/compiere/install/images/Ok24.gif  | Bin 0 -> 936 bytes
 .../org/compiere/install/util/AppsAction.java |   9 ++-
 .../org/compiere/install/util/OnlineHelp.java |   2 +-
 .../db/oracle/config/ConfigOracle.java        |  10 ++-
 .../postgresql/config/ConfigPostgreSQL.java   |  10 ++-
 13 files changed, 62 insertions(+), 39 deletions(-)
 create mode 100644 org.adempiere.install/src/org/compiere/install/images/Cancel16.gif
 create mode 100644 org.adempiere.install/src/org/compiere/install/images/Cancel24.gif
 create mode 100644 org.adempiere.install/src/org/compiere/install/images/Ok16.gif
 create mode 100644 org.adempiere.install/src/org/compiere/install/images/Ok24.gif

diff --git a/org.adempiere.install/src/org/compiere/install/ConfigurationData.java b/org.adempiere.install/src/org/compiere/install/ConfigurationData.java
index 4c26a33fc7..bd93530d99 100644
--- a/org.adempiere.install/src/org/compiere/install/ConfigurationData.java
+++ b/org.adempiere.install/src/org/compiere/install/ConfigurationData.java
@@ -296,6 +296,7 @@ public class ConfigurationData
 		}
 
 		InetAddress localhost = null;
+		@SuppressWarnings("unused")
 		String hostName = "unknown";
 		try
 		{
@@ -318,7 +319,7 @@ public class ConfigurationData
 			setKeyStore(KEYSTORE_PASSWORD);
 			//	AppsServer
 			initAppsServer();
-			setAppsServer(hostName);
+			setAppsServer("0.0.0.0");
 			//	Database Server
 			initDatabase(Database.DB_POSTGRESQL);
 			String connectionName = getDatabaseDiscovered();
@@ -326,18 +327,16 @@ public class ConfigurationData
 				setDatabaseName(resolveDatabaseName(connectionName));
 			}
 			setDatabaseSystemPassword("");
-			setDatabaseServer(hostName);
+			setDatabaseServer("localhost");
 			setDatabaseUser("adempiere");
 			setDatabasePassword("adempiere");
 			//	Mail Server
-			if (p_panel != null)
-			{
-				p_panel.fMailServer.setText(hostName);
-				p_panel.fMailUser.setText("info");
-				p_panel.fMailPassword.setText("");
-				p_panel.fAdminEMail.setText("info@" + hostName);
-			}
-			//
+			setMailServer("localhost");
+			//setMailUser("info");
+			setMailUser("");
+			setMailPassword("");
+			//setAdminEMail("info@" + hostName);
+			setAdminEMail("");
 		}	//	!envLoaded
 
 		//	Default FTP stuff
@@ -535,24 +534,28 @@ public class ConfigurationData
 			? p_panel.fAdminEMail.getText()
 			: (String)p_properties.get(ADEMPIERE_ADMIN_EMAIL);
 		InternetAddress adminEMail = null;
-		try
-		{
-			adminEMail = new InternetAddress (adminEMailString);
-		}
-		catch (Exception e)
-		{
-			error = "Not valid: " +  adminEMailString + " - " + e.getMessage();
+		if (adminEMailString != null && adminEMailString.length() > 0) {
+			try
+			{
+				adminEMail = new InternetAddress (adminEMailString);
+			}
+			catch (Exception e)
+			{
+				error = "Not valid: " +  adminEMailString + " - " + e.getMessage();
+				pass = false;
+			}
+			//
+			if (pass)
+			{
+				error = "Not verified EMail = " + adminEMail;
+				pass = testMailServer(mailServer, adminEMail, mailUser, mailPassword);
+			}
+			if (p_panel != null)
+				p_panel.signalOK(p_panel.okMailUser, "ErrorMail",
+						pass, false, error);
+		} else {
 			pass = false;
 		}
-		//
-		if (pass)
-		{
-			error = "Not verified EMail = " + adminEMail;
-			pass = testMailServer(mailServer, adminEMail, mailUser, mailPassword);
-		}
-		if (p_panel != null)
-			p_panel.signalOK(p_panel.okMailUser, "ErrorMail",
-					pass, false, error);
 		if (pass)
 		{
 			if (log.isLoggable(Level.INFO)) log.info("OK: EMail = " + adminEMail);
@@ -563,7 +566,11 @@ public class ConfigurationData
 		}
 		else
 		{
-			log.warning(error);
+			if (adminEMailString != null && adminEMailString.length() > 0) {
+				log.warning(error);
+			} else {
+				if (log.isLoggable(Level.INFO)) log.info("OK: EMail not configured");
+			}
 			p_properties.setProperty(ADEMPIERE_ADMIN_EMAIL, "");
 			p_properties.setProperty(ADEMPIERE_MAIL_USER, "");
 			p_properties.setProperty(ADEMPIERE_MAIL_PASSWORD, "");
diff --git a/org.adempiere.install/src/org/compiere/install/ConfigurationPanel.java b/org.adempiere.install/src/org/compiere/install/ConfigurationPanel.java
index 41bb66d8bc..ed04030599 100644
--- a/org.adempiere.install/src/org/compiere/install/ConfigurationPanel.java
+++ b/org.adempiere.install/src/org/compiere/install/ConfigurationPanel.java
@@ -602,6 +602,8 @@ public class ConfigurationPanel extends JPanel implements ActionListener, IDBCon
 		}
 		if (!pass && critical)
 			cb.setBackground(Color.RED);
+		else if (!pass && !critical)
+			cb.setBackground(Color.YELLOW);
 		else
 			cb.setBackground(Color.GREEN);
 	}	//	setOK
diff --git a/org.adempiere.install/src/org/compiere/install/KeyStoreMgt.java b/org.adempiere.install/src/org/compiere/install/KeyStoreMgt.java
index 024bc3da14..bcb480413c 100644
--- a/org.adempiere.install/src/org/compiere/install/KeyStoreMgt.java
+++ b/org.adempiere.install/src/org/compiere/install/KeyStoreMgt.java
@@ -300,7 +300,7 @@ public class KeyStoreMgt
 			: System.getProperty("user.name");
 		String o = mgt.organizationUnit != null
 			? mgt.organizationUnit
-			: "AdempiereUser";
+			: "iDempiereUser";
 		String l = mgt.location != null
 			? mgt.location
 			: "MyTown";
diff --git a/org.adempiere.install/src/org/compiere/install/Setup_Help.java b/org.adempiere.install/src/org/compiere/install/Setup_Help.java
index 735dd1f779..5fa158c77e 100644
--- a/org.adempiere.install/src/org/compiere/install/Setup_Help.java
+++ b/org.adempiere.install/src/org/compiere/install/Setup_Help.java
@@ -99,6 +99,7 @@ public class Setup_Help extends JDialog implements ActionListener
 		}
 		catch (Exception ex)
 		{
+			ex.printStackTrace();
 		}
 	}	//	init
 
@@ -139,7 +140,7 @@ public class Setup_Help extends JDialog implements ActionListener
 	{
 		try
 		{
-			editorPane.setPage("http://www.adempiere.com/wiki/index.php/ServerSetupHelp");
+			editorPane.setPage("http://wiki.idempiere.org/en/Server_Setup_Help");
 		}
 		catch (IOException ex)
 		{
diff --git a/org.adempiere.install/src/org/compiere/install/console/ConfigurationConsole.java b/org.adempiere.install/src/org/compiere/install/console/ConfigurationConsole.java
index 643b12273e..ed2928aa95 100644
--- a/org.adempiere.install/src/org/compiere/install/console/ConfigurationConsole.java
+++ b/org.adempiere.install/src/org/compiere/install/console/ConfigurationConsole.java
@@ -322,7 +322,7 @@ public class ConfigurationConsole {
 					cn = System.getProperty("user.name");
 				String ou = data.getProperty(ConfigurationData.ADEMPIERE_CERT_ORG_UNIT);
 				if (ou == null)
-					ou = "AdempiereUser";
+					ou = "iDempiereUser";
 				String o = data.getProperty(ConfigurationData.ADEMPIERE_CERT_ORG);
 				if (o == null)
 					o = System.getProperty("user.name");
diff --git a/org.adempiere.install/src/org/compiere/install/images/Cancel16.gif b/org.adempiere.install/src/org/compiere/install/images/Cancel16.gif
new file mode 100644
index 0000000000000000000000000000000000000000..9beb8fcec140f157c945ea0c69220c7880f02741
GIT binary patch
literal 878
zcmV-!1CjiRP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS0000PbVXQnQ*UN;cVTj60C#tHE@^ISb7Ns}WiD@WXPfRk8UO$T07*naR5*=&
zlh02S2NcIYZ)O%|X0gVDF^y7)8WLs0x~VA$w2BpLtA(V8dYFTUCLWCV&v-^JJETbu
zZ44!)AV`Tct!>#ZWtGIbU=uGYE5CMTf6Tld+HEXp`jU6~=KFnlc`qMS6;&k*r+oM=
z3-30x-JONE$Nuu1ZD<C7FLK(jtm%&P=Q|C{`o<S|k6q=9bc@Kn_DrVJblq`Z<Sc+>
zVbFA(uim+O)onR=kgX?A_;GZ!9M@_ed8%`Nhx^1ZCewq1$u|xhV5?MOX?i-W2f;=0
zVJYQ#sW&qjD$C0>9XiDJ^XL3<>sC3gRxbguVObL=hlkyyZ4=~jB+_Y~E-v!N!-va~
zg^Xp}^W7sON!PZCR#!>1wz9Ln&cf~6fvD1b`Lg3$7GXY5;>Z!!U%VhcI~%C#fT$|I
zNU!NQQ@tZ2uA4{@6^kTVTM4$eK@~fSs1^zsZEb9BZ17-wJXF<-p6ZMN;HfS|K`^v%
z^JY+~)kw6r6R)k2v~64w;$o4ewl;z=<mZWrimHC<sm=h1s=j{dAuE~ueBk<Zr&)w}
zWd(iq4BfYnYBI@pckWc`wc2N%s^7>MyS^nvk)Vq1><~SAglueJsA2+Q7%|ZDuRvo1
zU*v+-)bwTFwQIIhE>oSFqB)g9RH+pTNJj^OY4ZK#WKgfyuXw6o{4>B888A%q>&%%m
z&Yn0XT3NwPrwL3G5y6Qfs!L0l$B(mBuk+LFY#7J!u&4U1WT96KV=CR>@3x3gFBEW2
zoM01JoS6v)<m9<?%}G@%`8-xv7n|iWx%>Cas`|bmFxGbTsGHoommr@fkxEgjR{7=b
z-5`#l52Gmh<iYfGxKXcTb#@Zwa_rf^pSKPlb`2Oc6mG0NejIL>N;v)flqwZ|ou3ah
zjz92J?|G^daTI;LI5!u*s?})f>0$HbOP&^sVGK7KlnsqpRxp3;nEE0+S?K!@5>NYv
zQC{fk(lN^lvT#9FdEGGN!|z$>`5&B5jlpUbE;Y120h+YAyCRB#FaQ7m07*qoM6N<$
Ef^$rr6951J

literal 0
HcmV?d00001

diff --git a/org.adempiere.install/src/org/compiere/install/images/Cancel24.gif b/org.adempiere.install/src/org/compiere/install/images/Cancel24.gif
new file mode 100644
index 0000000000000000000000000000000000000000..d91a52dc0c631b17dc1132962d0b4495ab7c4221
GIT binary patch
literal 1268
zcmV<Q1Pl9#P)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX00004b3#c}2nYxW
zd<bNS0000PbVXQnQ*UN;cVTj60C#tHE@^ISb7Ns}WiD@WXPfRk8UO$UhDk(0R5*>b
z(_KtcXBY?Y|8q`(bEJGzTCnXYW*5jzP+<}SUTJU_+_21y7Nf2Z0`V(uce<Nhc(p{M
z(fCESv5Yp0(+f?+4+OFsr^v>|#6_)?uS$t6R-mWSp7ZQtEg~@E&7S0+yf@D;@B2RQ
zOU#V_qlDDrGLh&Zy6}r6g}p?_J{0f}9rp;rjF;%*Wg_t%xSz-n2d<baEB9_adNj|d
zDBpO9PJ94*MlL8gvbnxK*H~D%I}TjwCo(L;FMtc?%F0haZfwjD=jKr9c1u}`((WZX
z`95?_VWE3dU7c)r^$O+Nw#nHhQ(XW!zX%IiSzna7Tp4;e3@sQ0Pfw$2-##f@QQAC2
zr&dEVi;CQv>+5CB=R@4*gBA#2T~(DVh~j69Fwf4OdF=JRF_=s+<mZDU5ny^6ReSeJ
zxr);2B|5zn&9YeBRSgX?`~Bch2x%oH5N$U6egA$;*R)drK&e;ZB|2NMX;bq?mn%ab
z8-pGSLCnemnavpJ?2JW5M>_<7j8?0=s-Z#Fo<2o<Vgi(x2eR4l@YbzZEEGEDV*ctK
zIECj|RJb=cHA%YP4-SVRW@iItGahty#sFZ;u3eJu^C2-g3Cha@uU(6Q8#iKVFnHd{
zd?aPj@^|bdI-9>?gS)b+Ny69|^dv4?EP$p#^ZSvQoCI=mpcfb8;k9eA*%vP^x|k0y
zbymPBJg>aG`IFtdGiY=a91cUs%>~8dNK8xs>FLnSX58=Yj?GU^U2-xXT5hZgr-qbY
zR@Sn0&z=nS`@z8=I1m6!5(I|>zjb%V)R!+i8krBS)^Au<1t0*Nn4f1P65#oH=ue(N
z1i-Qk5P_JPmi*jR`d5~h=(N#pZ`s<?A}tIJVd36Aki`NnC_o|*fadd|dgo4A&d>kS
zLv(I6W5rc?h)x+zrq(T=e=hOk$IzcWLz=?@gQ9>00h-T;_~az0xEQ+Kj)6OO)acC2
zPfq5x|Af6nCo_wR+BVkKN<2Ia%*-IYv=n5w<M-RQRY4F?T~{ab$Oz)&;}A+pz;-(Z
z@7|3@BatpAbL$G&Lv$k3WNNRdsgbltkAP4J=?(|P(ozic^r&hi@;v~Sa&nrtB=LpO
zQHWM6SW)mtU!NL_M7o?nE0|eG?(|ru$<)4~x>{No8bTr%glM$_{~k3OjYNKEWIoWy
zd{B)<Iv(7-sp?iMM4Jt7Mn<4Le~yaUT3Iq0o4mkxZ-*xcUw>3lA!*~|SV*CYg2CS2
zX!P~#ADztmQ%7_%ABxV-UV7Nmqv|CkFgP4|<MTnEnnGDkjm)Chwg|JXUwu9}7!#~k
zq?eb26a|0w_p9nMG*vF<!?C%!3xmDAs%EhuZT)(X*$n^iunJAP3;<we^Z|x0;QIBV
zBK6UZ9emYjjCz2x%#8P?3pnwsEJy#^zMXH_Y|$>@dLLk5=C{N9mMDE4&>;#!Lrm8@
znt|g0(g29b2mlBG1JD6z0JMw1fi*<!I`g%kf&I6EC^PdSOhlAyHYAg_EMgMYl8G-#
eA{A!V0pK56lQvXF5;zk80000<MNUMnLSTZ}SWC13

literal 0
HcmV?d00001

diff --git a/org.adempiere.install/src/org/compiere/install/images/Ok16.gif b/org.adempiere.install/src/org/compiere/install/images/Ok16.gif
new file mode 100644
index 0000000000000000000000000000000000000000..caa44b5049d959cf9a7694c45cb44fdbb278336c
GIT binary patch
literal 626
zcmV-&0*(ENP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY4c7nw4c7reD4Tcy000McNliru)(Qs}4<q7$$MpaJ0sl!v
zK~y-))swMn6JZ#Kf8Y1rHF&+`(!^YoGbOdqKrw>{4jS-Z5L(c|=3j8IP(;yaC`GjG
z<PaD4Dt2{q=+xEC=`1ED?Ol_jN$wic`|i%6BwDSYgM;t(4$lKGJTLIy&2mMaUn)zB
z!=3#Nd~YRMN@vwqvH19n!ey_yv+aE#e+u7URZ8h>s>;F%+2<TSIdmE|>ka{cyXA8v
zrN-a(`^STo<@W8L;RjFSC2eZ58W9pQ_W+;!2&oIxY<^@*k0g@TlAANLxrM}e<<gaF
z;oSRo&ejlq_$*P%=F-*ZxGK}|<l>MVq0?y_y^edGEi6uM&dla+X0;rR$_iy;m^+d5
zw#sYC($sY3<%E)vDG@*j;KPA!n@0PfTimD|SpuPCj4=v96af%i(54wcZmqruRW*~k
zswOol2q?JcW8m3nw@ssEb&DGn*8%`m(D@tAk99T{<l{<$00dDvMj{fum`Z9QqXGcH
z9kgKXn})S_ID!Fy?QDA}==?S3p3X!sA5#=U!5~R7P(r|iJ{;G?Uehx68+LL1$#;0v
z!ARo!IupITB!|Qgdf-71j@w0}eqc1~zrv?N8cKXW(8Y+5k0}yyoUf?uTE>^pt>XG)
z$2zNzQziZ=A&lgkb^B9o*D9|420k<8p``B&axJSf|GeC@|LJpm1Ax5dNw1t*Bme*a
M07*qoM6N<$f+b-iI{*Lx

literal 0
HcmV?d00001

diff --git a/org.adempiere.install/src/org/compiere/install/images/Ok24.gif b/org.adempiere.install/src/org/compiere/install/images/Ok24.gif
new file mode 100644
index 0000000000000000000000000000000000000000..027d18f53194005ce4fd7feb1cacdd34079a2f86
GIT binary patch
literal 936
zcmV;Z16TZsP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY4c7nw4c7reD4Tcy000McNliru)(Qs}2`bG7*w+9612suR
zK~zY`?bT0j8$}q$@!vBuJL?_W`A5<u#Es&lm5Gpgpo)Z*L&XJILR1K;An^(~o4b+n
z0wRum2T(x|ULnMR1HI4}&;x}wHKa(?ZlpMCd%b^VXE-=XlO~~&$gRwAr1^YzM|w2C
z|LYZtE()qQ6an}g!0pYA&>rlw3&J^L?ECq}sjrCW$9hBY3;Tn5Lvb!x^KyB%hAhV|
z8)n;2+CN!iKiJ#|Gy1Q%5WKm#GFwAd<Y~k}JOzn<w%r;<_^|_DDq4Tf{p^>YlLzO*
z9noC6I#=U%g4;|0L@*fxAlSsTEC=1e8b5M?DJAbNU77ph+B^E%+B&~`|6Y0~?l_`Z
zzB*rX#UzK3AQ0^SofFFdicQcBAMgV_pU-`_vRb-%X=YyL3Zl~A3*TN_XD1@{hT>8>
z&E?9QHBY|5$-2NkO#~2+VOUT9)q3t5V?O2ehGO|b?%S2s(#?hWMKM;Ggd=lIdZ_eX
ziqsp5yY2`tcr%>A1&BcVpKd9Fwt;@ydhTbLxwW|w8vg!=V|T8sUjC@Guq2B4aR3%l
zxRBCiQlZl8jw00?4$tLebNQ`OZM-nc1<Q?a*wNi%h$P$7+glw!)7h=fjnDvq07wxL
zIYNN(gRw9u=Eq?#K>+me)~`>$F|gAsmC}ugu{q93BFoI-7$sR3QM#+Qw>rK)f&&1*
z{x0tHgRsh7Q_iablhQpL4oA3fq-3t5%GAu*^7PaKlaBXdfCz|_U4(I0Z$Iw%X{wLm
z0Ko6xOYQY4eccbjs&I8#DUV6%9g9dQSusCJ((wQ~m`;mfyn{iwr~iE1@ss2v4geeg
zUPOjfA+xfl9OgO-L?cQH7n}=#EXWd!jW8H?&>QshACEeI9H*z^hk@gfsOm^tc0J96
zumB8<O<-&SZ3alQT@0fDK`_v*M{Pfjk~8sRftMrF6=hEe#)XElF^r92twt25*zNXp
z>-V-F4gVcK5jZWPRE{~0000c51Uox{ZvFPmABOQO@lyk*M)EF8k`(QBS3i09%n#3r
zpBXqU67(ap_3&?hFo@2LpX)uSHxw@vy&uw42XT~sa`d%&J=Q-U(WIS3N#DKz0000<
KMNUMnLSTaOowC6I

literal 0
HcmV?d00001

diff --git a/org.adempiere.install/src/org/compiere/install/util/AppsAction.java b/org.adempiere.install/src/org/compiere/install/util/AppsAction.java
index d7c712dc55..294367cdbf 100644
--- a/org.adempiere.install/src/org/compiere/install/util/AppsAction.java
+++ b/org.adempiere.install/src/org/compiere/install/util/AppsAction.java
@@ -20,6 +20,7 @@ import java.awt.Dimension;
 import java.awt.Insets;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.net.URL;
 
 import javax.swing.AbstractAction;
 import javax.swing.AbstractButton;
@@ -33,6 +34,7 @@ import javax.swing.JMenuItem;
 import javax.swing.JToggleButton;
 import javax.swing.KeyStroke;
 
+import org.compiere.install.ConfigurationPanel;
 import org.compiere.util.Env;
 import org.compiere.util.Msg;
 
@@ -178,8 +180,11 @@ public final class AppsAction extends AbstractAction
 	 */
 	private ImageIcon getIcon(String name, boolean small)
 	{
-		String fullName = name + (small ? "16" : "24");
-		return Env.getImageIcon2(fullName);
+		String fullName = name + (small ? "16" : "24") + ".gif";
+		URL imageURL = ConfigurationPanel.class.getResource("images/"+fullName);
+		if (imageURL == null)
+			return null;
+		return new ImageIcon(imageURL);
 	}	//	getIcon
 
 	/**
diff --git a/org.adempiere.install/src/org/compiere/install/util/OnlineHelp.java b/org.adempiere.install/src/org/compiere/install/util/OnlineHelp.java
index 5761627216..a58465507a 100644
--- a/org.adempiere.install/src/org/compiere/install/util/OnlineHelp.java
+++ b/org.adempiere.install/src/org/compiere/install/util/OnlineHelp.java
@@ -94,7 +94,7 @@ public class OnlineHelp extends JEditorPane implements HyperlinkListener
 	}   //  OnlineHelp
 
 	/** Base of Online Help System      */
-	protected static final String   BASE_URL = "http://www.adempiere.com/wiki/index.php/OnlineLoginHelp";
+	protected static final String   BASE_URL = "http://wiki.idempiere.org/en/Server_Setup_Help";
 
 	public static void openInDefaultBrowser()
 	{
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 2e4ad68249..7aa242a26c 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
@@ -392,9 +392,13 @@ public class ConfigOracle implements IDatabaseConfig
 		//	Ignore result as it might not be imported
 		pass = testJDBC(url, databaseUser, databasePassword);
 		error = "Cannot connect to User: " + databaseUser + "/" + databasePassword + " - Database may not be imported yet (OK on initial run).";
-		if (monitor != null)
-			monitor.update(new DBConfigStatus(DBConfigStatus.DATABASE_USER, "ErrorJDBC",
-				pass, true, error));
+		if (monitor != null) {
+			boolean critical = true;
+			if (!isDBExists) {
+				critical = false;
+			}
+			monitor.update(new DBConfigStatus(DBConfigStatus.DATABASE_USER, "ErrorJDBC", pass, critical, error));
+		}
 		if (pass)
 		{
 			if (log.isLoggable(Level.INFO)) log.info("OK: Database User = " + databaseUser);
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 f7019eab34..6454a9d52c 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
@@ -158,9 +158,13 @@ public class ConfigPostgreSQL implements IDatabaseConfig
 		//	Ignore result as it might not be imported
 		pass = testJDBC(url, databaseUser, databasePassword);
 		error = "Database imported? Cannot connect to User: " + databaseUser + "/" + databasePassword;
-		if (monitor != null)
-			monitor.update(new DBConfigStatus(DBConfigStatus.DATABASE_USER, "ErrorJDBC",
-				pass, true, error));
+		if (monitor != null) {
+			boolean critical = true;
+			if (!isDBExists) {
+				critical = false;
+			}
+			monitor.update(new DBConfigStatus(DBConfigStatus.DATABASE_USER, "ErrorJDBC", pass, critical, error));
+		}
 		if (pass)
 		{
 			if (log.isLoggable(Level.INFO)) log.info("OK: Database User = " + databaseUser);