From ed14575517e4a6ea92e61886ddab011ced907e6f Mon Sep 17 00:00:00 2001 From: j2blake Date: Mon, 26 Sep 2011 14:33:09 +0000 Subject: [PATCH] NIHVIVO-336 Add a warning message to StartupStatus when the namespaces don't match. --- .../vitro/webapp/servlet/setup/JenaDataSourceSetup.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/JenaDataSourceSetup.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/JenaDataSourceSetup.java index d9ec1fb14..e827b52be 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/JenaDataSourceSetup.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/JenaDataSourceSetup.java @@ -317,6 +317,14 @@ public class JenaDataSourceSetup extends JenaDataSourceSetupBase implements java "\" Namespace from an existing portal: \"" + portalUri + "\" To get the application to start with this " + "database change the default namespace in deploy.properties " + portalUri.substring(0, portalUri.lastIndexOf("/")+1) + " Another possibility is that deploy.properties does not specify the intended database."); + + StartupStatus ss = StartupStatus.getBean(ctx); + ss.warning(this, "Namespace mismatch between db and deploy.properties."); + ss.warning(this, "Vivo will not start up correctly because the default namespace specified in deploy.properties does not match the namespace of " + + "a portal in the database. Namespace from deploy.properties: \"" + defaultNamespaceFromDeployProperites + + "\" Namespace from an existing portal: \"" + portalUri + "\" To get the application to start with this " + + "database change the default namespace in deploy.properties " + portalUri.substring(0, portalUri.lastIndexOf("/")+1) + + " Another possibility is that deploy.properties does not specify the intended database."); } } }