NIHVIVO-3995 It is important that the default namespace end in "/individual/". Important enough that it becomes part of the startup smoke tests.

webapp/src/edu/cornell/mannlib/vitro/webapp/config/ConfigurationPropertiesSmokeTests.java

@@ -20,7 +20,8 @@ import edu.cornell.mannlib.vitro.webapp.startup.StartupStatus;
  * Test that gets run at servlet context startup to check for the existence and
  * validity of properties in the configuration.
  */
-public class ConfigurationPropertiesSmokeTests implements ServletContextListener {
+public class ConfigurationPropertiesSmokeTests implements
+		ServletContextListener {
 
 	private static final String PROPERTY_HOME_DIRECTORY = "vitro.home.directory";
 	private static final String PROPERTY_DB_URL = "VitroConnection.DataSource.url";
@@ -140,7 +141,8 @@ public class ConfigurationPropertiesSmokeTests implements ServletContextListener
 	}
 
 	/**
-     * Confirm that the default namespace is specified and a syntactically valid URI.
+	 * Confirm that the default namespace is specified and a syntactically valid
+	 * URI. It should also end with "/individual/".
 	 */
 	private void checkDefaultNamespace(ServletContext ctx,
 			ConfigurationProperties props, StartupStatus ss) {
@@ -148,14 +150,25 @@ public class ConfigurationPropertiesSmokeTests implements ServletContextListener
 		if (ns == null || ns.isEmpty()) {
 			ss.fatal(this, "deploy.properties does not contain a value for '"
 					+ PROPERTY_DEFAULT_NAMESPACE + "'");
-        } else {
+			return;
-            try {
-                URI uri = new URI(ns);
-            } catch (URISyntaxException e) {
-                ss.fatal(this, PROPERTY_DEFAULT_NAMESPACE + " '" + ns + 
-                        "' is not a valid URI. " + 
-                                (e.getMessage() != null ? e.getMessage() : ""));
 		}
+
+		try {
+			new URI(ns);
+		} catch (URISyntaxException e) {
+			ss.fatal(this,
+					PROPERTY_DEFAULT_NAMESPACE + " '" + ns
+							+ "' is not a valid URI. "
+							+ (e.getMessage() != null ? e.getMessage() : ""));
+			return;
+		}
+
+		String suffix = "/individual/";
+		if (!ns.endsWith(suffix)) {
+			ss.warning(this,
+					"Default namespace does not match the expected form "
+							+ "(does not end with '" + suffix + "'): '" + ns
+							+ "'");
 		}
 	}
 

webapp/src/edu/cornell/mannlib/vitro/webapp/filestorage/backend/FileStorageSetup.java

@@ -73,8 +73,8 @@ public class FileStorageSetup implements ServletContextListener {
 	 * For use by the constructor in implementations of {@link FileStorage}.
 	 */
 	private File figureBaseDir(ServletContextEvent sce) throws IOException {
-		String homeDirPath = ConfigurationProperties.getBean(sce)
+		String homeDirPath = ConfigurationProperties.getBean(sce).getProperty(
-			.getProperty(PROPERTY_VITRO_HOME_DIR);
+				PROPERTY_VITRO_HOME_DIR);
 		if (homeDirPath == null) {
 			throw new IllegalArgumentException(
 					"Configuration properties must contain a value for '"
@@ -91,8 +91,7 @@ public class FileStorageSetup implements ServletContextListener {
 		if (!baseDir.exists()) {
 			boolean created = baseDir.mkdir();
 			if (!created) {
-				throw new IOException(
+				throw new IOException("Unable to create uploads directory at '"
-						"Unable to create uploads directory at '"
 						+ baseDir + "'");
 			}
 		}
@@ -100,11 +99,8 @@ public class FileStorageSetup implements ServletContextListener {
 	}
 
 	/**
-	 * Get the configuration property for the default namespace, and confirm
+	 * Get the configuration property for the default namespace. For use by the
-	 * that it is in the proper form. The default namespace is assumed to be in
+	 * constructor in implementations of {@link FileStorage}.
-	 * this form: <code>http://vivo.mydomain.edu/individual/</code>
-	 * 
-	 * For use by the constructor in implementations of {@link FileStorage}.
 	 * 
 	 * @returns a collection containing the default namespace.
 	 */
@@ -117,14 +113,6 @@ public class FileStorageSetup implements ServletContextListener {
 							+ PROPERTY_DEFAULT_NAMESPACE + "'");
 		}
 
-		String defaultSuffix = "/individual/";
-
-		if (!defaultNamespace.endsWith(defaultSuffix)) {
-			log.warn("Default namespace does not match the expected form "
-					+ "(does not end with '" + defaultSuffix + "'): '"
-					+ defaultNamespace + "'");
-		}
-
 		return Collections.singleton(defaultNamespace);
 	}