more

Author: mherman22

maven-plugin/src/main/java/org/openmrs/maven/plugins/utility/DBConnector.java

@@ -27,7 +27,7 @@ public DBConnector(String url, String user, String pass, String dbName) throws S
 			} catch (SQLException e2) {
 				if (e2.getMessage().contains("Access denied")) {
 					throw new SQLException("Invalid database credentials. Please check your username and password.", e2);
-				} else if (e2.getMessage().contains("No suitable driver found for")) {
+				} else if (e2.getMessage().contains("No suitable driver found for") || e2.getMessage().contains("Communications link failure")) {
 					throw new SQLException("Incorrect Database Uri. Please provide a correct database uri.", e2);
 				}
 				throw e2;

sdk-commons/src/main/java/org/openmrs/maven/plugins/utility/DefaultWizard.java

@@ -1033,7 +1033,7 @@ private URIBuilder addDefaultParamsIfMissing(String dbUri) throws MojoExecutionE
 			uri = new URIBuilder(noJdbc);
 		}
 		catch (URISyntaxException e) {
-			throw new MojoExecutionException("Database URI \"" + noJdbc + "\" is not a valid URI " + e.getMessage(),  e);
+			throw new MojoExecutionException("Database URI \"" + noJdbc + "\" is not a valid URI. " + e.getMessage(),  e);
 		}
 		uri.setParameter("autoReconnect", "true");
 		uri.setParameter("useUnicode", "true");