Author: bpapez
Date: Thu May 24 13:17:41 2007
New Revision: 17377
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17377&repname=
=3Djahia
Log:
issue JAHIA-1861: Install wizard: Error message when there's an error while=
connecting to the database is not relevant
(url: http://www.jahia.net/jira/browse/JAHIA-1861)
Fix for Damiens second problem, when DB is not created with UTF-8
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/admin/database/Dat=
abaseConnection.java
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/admin/databa=
se/DatabaseConnection.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/admin/database/DatabaseConnection.java&rev=
=3D17377&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/admin/database/Dat=
abaseConnection.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/admin/database/Dat=
abaseConnection.java Thu May 24 13:17:41 2007
@@ -170,6 +170,8 @@
} catch (SQLException sqle) {
testStatus++;
logger.debug("Error executing query [SELECT testfield =
FROM jahia_db_test]", sqle);
+ hashMap.put("testDatabaseConnectionError", Boolean.TRU=
E); // the connection generate error(s).
+ hashMap.put("testDatabaseConnectionMessage", "This dat=
abase doesn't seem to support extended charsets"); =
}
}
=
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
