From 0a00aee68488d43bf89cd36f65c30d696b91ede4 Mon Sep 17 00:00:00 2001
From: j2blake <jeb228@cornell.edu>
Date: Tue, 10 Dec 2013 12:07:28 -0500
Subject: [PATCH 1/2] VIVO-581 Add a smoke test for Java version

---
 .../webapp/servlet/setup/JvmSmokeTests.java     | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/JvmSmokeTests.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/JvmSmokeTests.java
index c9241320f..4a5630801 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/JvmSmokeTests.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/JvmSmokeTests.java
@@ -22,9 +22,26 @@ public class JvmSmokeTests implements ServletContextListener {
 		ServletContext ctx = sce.getServletContext();
 		StartupStatus ss = StartupStatus.getBean(ctx);
 
+		checkJvmLevel(ss);
 		checkTempDirectory(ss);
 	}
 
+	/**
+	 * We need to run at 1.7 or later.
+	 */
+	private void checkJvmLevel(StartupStatus ss) {
+		String specLevel = System.getProperty("java.specification.version", "");
+		if (specLevel.isEmpty()) {
+			ss.warning(this, "Can't determine the current level of Java. "
+					+ "VIVO requires at least Java 1.7.");
+		} else if (specLevel.compareTo("1.7") < 0) {
+			ss.warning(this, "VIVO requires at least Java 1.7 - "
+					+ "currently running on Java " + specLevel);
+		} else {
+			ss.info(this, "Java version is " + specLevel);
+		}
+	}
+
 	/**
 	 * Check the Java temp directory. Make sure that it exists, it is a
 	 * directory, we can read it, we can write to it.

From 0c791852541f7bcf2089e2d668f8edf1d0b973f9 Mon Sep 17 00:00:00 2001
From: tworrall <tlw72@cornell.edu>
Date: Tue, 10 Dec 2013 12:44:04 -0500
Subject: [PATCH 2/2] VIVO-637 date time generator changes for various date
 time properties

---
 .../generators/DateTimePropertyGenerator.java | 54 +++++++++++++++++++
 .../edit/forms/dateTimeValueForm.ftl          |  3 +-
 2 files changed, 55 insertions(+), 2 deletions(-)
 create mode 100644 webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DateTimePropertyGenerator.java

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DateTimePropertyGenerator.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DateTimePropertyGenerator.java
new file mode 100644
index 000000000..24ed50d68
--- /dev/null
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DateTimePropertyGenerator.java
@@ -0,0 +1,54 @@
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators;
+
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+
+import javax.servlet.http.HttpSession;
+
+import com.hp.hpl.jena.rdf.model.Model;
+import com.hp.hpl.jena.vocabulary.XSD;
+
+import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.DateTimeWithPrecisionVTwo;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationUtils;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo;
+import edu.cornell.mannlib.vitro.webapp.utils.FrontEndEditingUtils;
+import edu.cornell.mannlib.vitro.webapp.utils.FrontEndEditingUtils.EditMode;
+import edu.cornell.mannlib.vitro.webapp.utils.generators.EditModeUtils;
+
+/**
+ * 
+ * @author hjk54
+ *
+ * There are multiple date time properties in VIVO, all of which have a DateTimeValue individual as an object.
+ * I am extending DateTimeValueFormGenerator to enable the predicate to be utilized as the "toDateTimeValue" property, i.e. 
+ * the property associating the subject with the date time value individual.  The dateTimeValueForm template has been
+ * used as the basis for the general form for this generator that can be applied to multiple properties. 
+ */
+
+public class DateTimePropertyGenerator extends DateTimeValueFormGenerator {
+	
+	String predicate = null;
+	@Override
+	public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq,
+			HttpSession session) {
+		predicate = EditConfigurationUtils.getPredicateUri(vreq);  
+        EditConfigurationVTwo conf = super.getEditConfiguration(vreq, session);
+        return conf; 
+	} 	
+
+	//isolating the predicate in this fashion allows this class to be subclassed for other date time value
+	//properties
+	@Override
+	protected String getToDateTimeValuePredicate() {
+		return predicate;
+	}
+	
+}
\ No newline at end of file
diff --git a/webapp/web/templates/freemarker/edit/forms/dateTimeValueForm.ftl b/webapp/web/templates/freemarker/edit/forms/dateTimeValueForm.ftl
index 8596e3497..b77192f64 100644
--- a/webapp/web/templates/freemarker/edit/forms/dateTimeValueForm.ftl
+++ b/webapp/web/templates/freemarker/edit/forms/dateTimeValueForm.ftl
@@ -33,8 +33,7 @@
         <a class="cancel" href="${editConfiguration.cancelUrl}" title="${i18n().cancel_title}">${i18n().cancel_link}</a>
     </p>
 </form>
-${stylesheets.add('<link rel="stylesheet" href="${urls.base}/edit/forms/css/customForm.css" />',
-                  '<link rel="stylesheet" href="${urls.base}/edit/forms/css/personHasEducationalTraining.css" />')}
+${stylesheets.add('<link rel="stylesheet" href="${urls.base}/templates/freemarker/edit/forms/css/customForm.css" />')}
 
 ${scripts.add('<script type="text/javascript" src="${urls.base}/js/utils.js"></script>',
               '<script type="text/javascript" src="${urls.base}/js/customFormUtils.js"></script>')}
\ No newline at end of file