From d3f6af6981320850b91f77871df11b94b07b4bf7 Mon Sep 17 00:00:00 2001
From: j2blake <jeb228@cornell.edu>
Date: Thu, 14 Nov 2013 17:05:04 -0500
Subject: [PATCH 1/9] VIVO-523 Change the way the example language files are
 presented.

---
 .../i18n/all_es.properties => es_GO/i18n/all_es_GO.properties} | 0
 .../templates/freemarker/search-help_es_GO.ftl}                | 0
 .../templates/freemarker/termsOfUse_es_GO.ftl}                 | 0
 .../freemarker/userAccounts-acctCreatedEmail_es_GO.ftl}        | 0
 .../userAccounts-acctCreatedExternalOnlyEmail_es_GO.ftl}       | 0
 .../userAccounts-confirmEmailChangedEmail_es_GO.ftl}           | 0
 .../freemarker/userAccounts-firstTimeExternalEmail_es_GO.ftl}  | 0
 .../freemarker/userAccounts-passwordCreatedEmail_es_GO.ftl}    | 0
 .../userAccounts-passwordResetCompleteEmail_es_GO.ftl}         | 0
 .../userAccounts-passwordResetPendingEmail_es_GO.ftl}          | 0
 .../vitro/webapp/i18n/selection/LocaleSelectionSetup.java      | 3 ++-
 11 files changed, 2 insertions(+), 1 deletion(-)
 rename webapp/languages/{example/i18n/all_es.properties => es_GO/i18n/all_es_GO.properties} (100%)
 rename webapp/languages/{example/templates/freemarker/search-help_es.ftl => es_GO/templates/freemarker/search-help_es_GO.ftl} (100%)
 rename webapp/languages/{example/templates/freemarker/termsOfUse_es.ftl => es_GO/templates/freemarker/termsOfUse_es_GO.ftl} (100%)
 rename webapp/languages/{example/templates/freemarker/userAccounts-acctCreatedEmail.ftl => es_GO/templates/freemarker/userAccounts-acctCreatedEmail_es_GO.ftl} (100%)
 rename webapp/languages/{example/templates/freemarker/userAccounts-acctCreatedExternalOnlyEmail.ftl => es_GO/templates/freemarker/userAccounts-acctCreatedExternalOnlyEmail_es_GO.ftl} (100%)
 rename webapp/languages/{example/templates/freemarker/userAccounts-confirmEmailChangedEmail.ftl => es_GO/templates/freemarker/userAccounts-confirmEmailChangedEmail_es_GO.ftl} (100%)
 rename webapp/languages/{example/templates/freemarker/userAccounts-firstTimeExternalEmail.ftl => es_GO/templates/freemarker/userAccounts-firstTimeExternalEmail_es_GO.ftl} (100%)
 rename webapp/languages/{example/templates/freemarker/userAccounts-passwordCreatedEmail.ftl => es_GO/templates/freemarker/userAccounts-passwordCreatedEmail_es_GO.ftl} (100%)
 rename webapp/languages/{example/templates/freemarker/userAccounts-passwordResetCompleteEmail.ftl => es_GO/templates/freemarker/userAccounts-passwordResetCompleteEmail_es_GO.ftl} (100%)
 rename webapp/languages/{example/templates/freemarker/userAccounts-passwordResetPendingEmail.ftl => es_GO/templates/freemarker/userAccounts-passwordResetPendingEmail_es_GO.ftl} (100%)

diff --git a/webapp/languages/example/i18n/all_es.properties b/webapp/languages/es_GO/i18n/all_es_GO.properties
similarity index 100%
rename from webapp/languages/example/i18n/all_es.properties
rename to webapp/languages/es_GO/i18n/all_es_GO.properties
diff --git a/webapp/languages/example/templates/freemarker/search-help_es.ftl b/webapp/languages/es_GO/templates/freemarker/search-help_es_GO.ftl
similarity index 100%
rename from webapp/languages/example/templates/freemarker/search-help_es.ftl
rename to webapp/languages/es_GO/templates/freemarker/search-help_es_GO.ftl
diff --git a/webapp/languages/example/templates/freemarker/termsOfUse_es.ftl b/webapp/languages/es_GO/templates/freemarker/termsOfUse_es_GO.ftl
similarity index 100%
rename from webapp/languages/example/templates/freemarker/termsOfUse_es.ftl
rename to webapp/languages/es_GO/templates/freemarker/termsOfUse_es_GO.ftl
diff --git a/webapp/languages/example/templates/freemarker/userAccounts-acctCreatedEmail.ftl b/webapp/languages/es_GO/templates/freemarker/userAccounts-acctCreatedEmail_es_GO.ftl
similarity index 100%
rename from webapp/languages/example/templates/freemarker/userAccounts-acctCreatedEmail.ftl
rename to webapp/languages/es_GO/templates/freemarker/userAccounts-acctCreatedEmail_es_GO.ftl
diff --git a/webapp/languages/example/templates/freemarker/userAccounts-acctCreatedExternalOnlyEmail.ftl b/webapp/languages/es_GO/templates/freemarker/userAccounts-acctCreatedExternalOnlyEmail_es_GO.ftl
similarity index 100%
rename from webapp/languages/example/templates/freemarker/userAccounts-acctCreatedExternalOnlyEmail.ftl
rename to webapp/languages/es_GO/templates/freemarker/userAccounts-acctCreatedExternalOnlyEmail_es_GO.ftl
diff --git a/webapp/languages/example/templates/freemarker/userAccounts-confirmEmailChangedEmail.ftl b/webapp/languages/es_GO/templates/freemarker/userAccounts-confirmEmailChangedEmail_es_GO.ftl
similarity index 100%
rename from webapp/languages/example/templates/freemarker/userAccounts-confirmEmailChangedEmail.ftl
rename to webapp/languages/es_GO/templates/freemarker/userAccounts-confirmEmailChangedEmail_es_GO.ftl
diff --git a/webapp/languages/example/templates/freemarker/userAccounts-firstTimeExternalEmail.ftl b/webapp/languages/es_GO/templates/freemarker/userAccounts-firstTimeExternalEmail_es_GO.ftl
similarity index 100%
rename from webapp/languages/example/templates/freemarker/userAccounts-firstTimeExternalEmail.ftl
rename to webapp/languages/es_GO/templates/freemarker/userAccounts-firstTimeExternalEmail_es_GO.ftl
diff --git a/webapp/languages/example/templates/freemarker/userAccounts-passwordCreatedEmail.ftl b/webapp/languages/es_GO/templates/freemarker/userAccounts-passwordCreatedEmail_es_GO.ftl
similarity index 100%
rename from webapp/languages/example/templates/freemarker/userAccounts-passwordCreatedEmail.ftl
rename to webapp/languages/es_GO/templates/freemarker/userAccounts-passwordCreatedEmail_es_GO.ftl
diff --git a/webapp/languages/example/templates/freemarker/userAccounts-passwordResetCompleteEmail.ftl b/webapp/languages/es_GO/templates/freemarker/userAccounts-passwordResetCompleteEmail_es_GO.ftl
similarity index 100%
rename from webapp/languages/example/templates/freemarker/userAccounts-passwordResetCompleteEmail.ftl
rename to webapp/languages/es_GO/templates/freemarker/userAccounts-passwordResetCompleteEmail_es_GO.ftl
diff --git a/webapp/languages/example/templates/freemarker/userAccounts-passwordResetPendingEmail.ftl b/webapp/languages/es_GO/templates/freemarker/userAccounts-passwordResetPendingEmail_es_GO.ftl
similarity index 100%
rename from webapp/languages/example/templates/freemarker/userAccounts-passwordResetPendingEmail.ftl
rename to webapp/languages/es_GO/templates/freemarker/userAccounts-passwordResetPendingEmail_es_GO.ftl
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/i18n/selection/LocaleSelectionSetup.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/i18n/selection/LocaleSelectionSetup.java
index c89819421..081019a04 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/i18n/selection/LocaleSelectionSetup.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/i18n/selection/LocaleSelectionSetup.java
@@ -134,7 +134,8 @@ public class LocaleSelectionSetup implements ServletContextListener {
 			throws IllegalArgumentException {
 		Locale locale = LocaleUtils.toLocale(localeString);
 
-		if (!LocaleUtils.isAvailableLocale(locale)) {
+		if (!"es_GO".equals(localeString) && // No complaint about bogus locale
+				!LocaleUtils.isAvailableLocale(locale)) {
 			ssWarning("'" + locale + "' is not a recognized locale.");
 		}
 		return locale;

From 35251e89f43a6992fd1ec3f5af6528f3ea56f8ba Mon Sep 17 00:00:00 2001
From: hudajkhan <hjk54@cornell.edu>
Date: Fri, 15 Nov 2013 12:33:47 -0500
Subject: [PATCH 2/9] enable check for creating new individual to get faux
 property information correctly

---
 .../generators/DefaultAddMissingIndividualFormGenerator.java | 5 ++++-
 .../edit/forms/defaultOfferCreateNewOptionForm.ftl           | 2 ++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DefaultAddMissingIndividualFormGenerator.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DefaultAddMissingIndividualFormGenerator.java
index 2f53d3619..0a8a866a3 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DefaultAddMissingIndividualFormGenerator.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DefaultAddMissingIndividualFormGenerator.java
@@ -56,7 +56,10 @@ public class DefaultAddMissingIndividualFormGenerator implements EditConfigurati
 	public static boolean isCreateNewIndividual(VitroRequest vreq, HttpSession session) {
 		String command = vreq.getParameter("cmd");
 		String predicateUri = EditConfigurationUtils.getPredicateUri(vreq);
-		ObjectProperty objProp = vreq.getWebappDaoFactory().getObjectPropertyDao().getObjectPropertyByURI(predicateUri);
+		//This method also looks at domain and range uris and so is different than just getting the
+		//object property based on predicate uri alone
+		ObjectProperty objProp = EditConfigurationUtils.getObjectPropertyForPredicate(vreq, 
+	            predicateUri);
 		if(objProp != null) {
 			return(objProp.getOfferCreateNewOption() && 
 					(
diff --git a/webapp/web/templates/freemarker/edit/forms/defaultOfferCreateNewOptionForm.ftl b/webapp/web/templates/freemarker/edit/forms/defaultOfferCreateNewOptionForm.ftl
index 578f017c6..1f6279ba5 100644
--- a/webapp/web/templates/freemarker/edit/forms/defaultOfferCreateNewOptionForm.ftl
+++ b/webapp/web/templates/freemarker/edit/forms/defaultOfferCreateNewOptionForm.ftl
@@ -17,6 +17,8 @@
     <input type="hidden" value="${editConfiguration.subjectUri}" name="subjectUri" role="input" />  
     <input type="hidden" value="${editConfiguration.predicateUri}" name="predicateUri" role="input" />  
     <input type="hidden" value="${objectUri}" name="objectUri" role="input" />      
+   <input type="hidden" name="domainUri" value="${editConfiguration.domainUri!}"/>
+    <input type="hidden" name="rangeUri" value="${editConfiguration.rangeUri!}"/>
     <input type="hidden" value="create" name="cmd" role="input" />     
         
     <select id="typeOfNew" name="typeOfNew" role="selection">

From 0fce9f6a7b07bf6bbbffda88f4209f99ef843530 Mon Sep 17 00:00:00 2001
From: j2blake <jeb228@cornell.edu>
Date: Sun, 17 Nov 2013 11:50:06 -0500
Subject: [PATCH 3/9] VIVO-541 First cut at the developer panel.

---
 doc/install.html                              |  59 ----
 webapp/build.xml                              |   7 +-
 webapp/config/example.developer.properties    | 107 ++++++++
 webapp/config/example.runtime.properties      |  32 ---
 .../rdf/auth/everytime/permission_config.n3   |   1 +
 .../auth/permissions/SimplePermission.java    |   2 +
 .../config/FreemarkerConfiguration.java       |  38 ++-
 .../config/FreemarkerConfigurationImpl.java   |   1 +
 .../mannlib/vitro/webapp/i18n/I18n.java       |  17 +-
 .../mannlib/vitro/webapp/i18n/I18nBundle.java |  29 +-
 .../mannlib/vitro/webapp/i18n/I18nLogger.java |  47 ++++
 .../impl/logging/RDFServiceLogger.java        |  24 +-
 .../utils/developer/DeveloperSettings.java    | 251 ++++++++++++++++++
 .../developer/DeveloperSettingsServlet.java   |  93 +++++++
 .../mannlib/vitro/webapp/i18n/I18nStub.java   |   2 +-
 webapp/themes/vitro/templates/menu.ftl        |   2 +
 webapp/web/WEB-INF/web.xml                    |   9 +
 webapp/web/js/developer/developerPanel.js     |  82 ++++++
 .../freemarker/page/partials/developer.ftl    |   5 +
 .../page/partials/developerPanel.ftl          |  91 +++++++
 .../freemarker/page/partials/menu.ftl         |   2 +
 21 files changed, 762 insertions(+), 139 deletions(-)
 create mode 100644 webapp/config/example.developer.properties
 create mode 100644 webapp/src/edu/cornell/mannlib/vitro/webapp/i18n/I18nLogger.java
 create mode 100644 webapp/src/edu/cornell/mannlib/vitro/webapp/utils/developer/DeveloperSettings.java
 create mode 100644 webapp/src/edu/cornell/mannlib/vitro/webapp/utils/developer/DeveloperSettingsServlet.java
 create mode 100644 webapp/web/js/developer/developerPanel.js
 create mode 100644 webapp/web/templates/freemarker/page/partials/developer.ftl
 create mode 100644 webapp/web/templates/freemarker/page/partials/developerPanel.ftl

diff --git a/doc/install.html b/doc/install.html
index cd048e367..dd40c7a09 100644
--- a/doc/install.html
+++ b/doc/install.html
@@ -780,65 +780,6 @@
                         </td>
                     </tr>
 
-                    <tr>
-                        <td colspan="2">
-                          <b>For developers only.</b>
-                          Defeat the Freemarker template cache, so each template
-                          is read from disk on each request. This permits developers to immediately
-                          see the effect of changes to the template. The default is <code>false</code>, which
-                          means that a cached copy of each template will be used for 60 seconds 
-                          before the disk is checked for a new version.
-                          <br/><b>Setting this option to "true" slows down Vitro performance.</b>
-                        </td>
-                    </tr>
-                    <tr class="odd_row">
-                        <td>
-                          developer.defeatFreemarkerCache
-                        </td>
-                        <td>
-                          false
-                        </td>
-                    </tr>
-
-                    <tr>
-                        <td colspan="2">
-                          <b>For developers only.</b>
-                          Defeat the cache of language-specific text strings,
-                          so the language file is read from disk on each request.
-                          This permits developers to immediately
-                          see the effect of changes to the text strings. 
-                          The default is <code>false</code>, which means that the language file is 
-                          read when VIVO starts up, or when a new theme is selected.
-                          <br/><b>Setting this option to "true" slows down Vitro performance.</b>
-                        </td>
-                    </tr>
-                    <tr class="odd_row">
-                        <td>
-                          developer.defeatI18nCache = true
-                        </td>
-                        <td>
-                          false
-                        </td>
-                    </tr>
-                    
-                    <tr>
-                        <td colspan="2">
-                          <b>For developers only.</b>
-                          Add starting and ending delimiters to each Freemarker template, so you can see
-                          which template were invoked by viewing the generated HTML. 
-                          The default is <code>false</code>.
-                          <br/><b>Setting this option to "true" slows down Vitro performance.</b>
-                        </td>
-                    </tr>
-                    <tr class="odd_row blue">
-                        <td>
-                          developer.insertFreemarkerDelimiters = true
-                        </td>
-                        <td>
-                          false
-                        </td>
-                    </tr>
-                    
                 </tbody>
             </table>
 
diff --git a/webapp/build.xml b/webapp/build.xml
index 00f61f423..93927a7f7 100644
--- a/webapp/build.xml
+++ b/webapp/build.xml
@@ -263,7 +263,12 @@
 	<target name="prepareVitroHomeDir" depends="prepare">
 		<mkdir dir="${vitrohome.build.dir}" />
 		<mkdir dir="${vitrohome.image.dir}" />
-		<copy todir="${vitrohome.image.dir}" file="${appbase.dir}/config/example.runtime.properties" />
+		<copy todir="${vitrohome.image.dir}" >
+			<fileset dir="${appbase.dir}/config" >
+				<include name="example.runtime.properties" />
+				<include name="example.developer.properties" />
+			</fileset>
+		</copy>
 		<copy todir="${vitrohome.image.dir}" >
 			<fileset dir="${appbase.dir}" >
 				<include name="rdf/**/*" />
diff --git a/webapp/config/example.developer.properties b/webapp/config/example.developer.properties
new file mode 100644
index 000000000..482cecd21
--- /dev/null
+++ b/webapp/config/example.developer.properties
@@ -0,0 +1,107 @@
+#
+# -----------------------------------------------------------------------------
+# Runtime properties for developer mode.
+#
+# If the developer.properties file is present in your VIVO home directory, it
+# will be loaded as VIVO starts up, taking effect immediately. 
+#
+# Each of these properties can be set or changed while VIVO is running, but it 
+# can be convenient to set them in advance.
+#
+# WARNING: Some of these options can seriously degrade performance. They should
+# not be enabled in a production instance of VIVO.
+#
+# -----------------------------------------------------------------------------
+#
+
+#------------------------------------------------------------------------------
+# General options
+#------------------------------------------------------------------------------
+
+#
+# The "master switch" for developer mode. If this is not set to true, then none
+# of the other properties have any effect.
+#
+# developer.enabled = true
+
+#
+# If developer mode is enabled, this will determine who can modify the 
+# developer settings. If 'true', then any user can modify the settings. If 
+# false, then only a site administrator (or root) can modify the settings.
+# The default is 'false'. 
+#
+# developer.permitAnonymousControl
+
+#------------------------------------------------------------------------------
+# Freemarker 
+#------------------------------------------------------------------------------
+
+#
+# Add HTML comments to each Freemarker template, so you can see what each
+# templates to the page, by viewing the source of the page in the browser.
+# The default is 'false'.
+#
+# developer.insertFreemarkerDelimiters = true
+
+#
+# Defeat the Freemarker template cache, so each template is read from disk 
+# on each request. This permits developers to immediately see the effect of 
+# changes to the template. The default is 'false', which means that a cached 
+# copy of each template will be used for 60 seconds before the disk is checked 
+# for a new version.
+#
+# developer.defeatFreemarkerCache = true
+
+#------------------------------------------------------------------------------
+# Internationalization 
+#------------------------------------------------------------------------------
+
+#
+# Defeat the cache of language-specific text strings, so the language file 
+# is read from disk on each request. This permits developers to immediately
+# see the effect of changes to the text strings. The default is 'false', which 
+# means that the language file is only read when VIVO starts up, or when a new 
+# theme is selected.
+#
+# developer.i18n.defeatCache = true
+
+#
+# Write a line to the log every time a template or a controller requests a
+# language-specific string from the properties files.
+#
+# developer.i18n.logStringRequests
+
+
+#------------------------------------------------------------------------------
+# Logging SPARQL queries
+#------------------------------------------------------------------------------
+
+#
+# Turn on logging of all SPARQL queries. The logging is at the INFO level. 
+# Each entry includes:
+#  - the elapsed time spent on the query, in seconds,
+#  - the name of the method on RDFService that received the query,
+#  - the format of the result stream from the RDFService method,
+#  - the text of the query.
+# Note that all access to the content models is done through SPARQL queries,
+# but some go through translation layers before reaching the RDFService for
+# logging and execution. The default is 'false'.
+#
+# developer.loggingRDFService.enable = true
+
+#
+# If SPARQL query logging is enabled, this will add a stack trace to each log 
+# entry. The stack trace is abridged, so it starts after the 
+# ApplicationFilterChain, omits any Jena classes, and ends at the RDFService.
+# The default is 'false'.
+#
+# developer.loggingRDFService.stackTrace = true
+
+#
+# If SPARQL query logging is enabled, a regular expression can be used to 
+# restrict the number of entries that are produced. The expression is
+# tested against each line in the (unabridged) stack trace. If the 
+# expression doesn't match any line in the stack trace, then no log entry
+# is made. The default is 'false'.
+#
+# developer.loggingRDFService.restriction = true
diff --git a/webapp/config/example.runtime.properties b/webapp/config/example.runtime.properties
index d72d632d7..d680c1621 100644
--- a/webapp/config/example.runtime.properties
+++ b/webapp/config/example.runtime.properties
@@ -152,35 +152,3 @@ RDFService.languageFilter = true
 # This should not be used with languages.forceLocale, which will override it.
 #
 # languages.selectableLocales = en, es, fr
-
-#
-# For developers only: Setting this option to "true" slows down Vitro performance.
-#
-# Defeat the Freemarker template cache, so each template is read from disk 
-# on each request. This permits developers to immediately see the effect of 
-# changes to the template. The default is <code>false</code>, which means 
-# that a cached copy of each template will be used for 60 seconds before 
-# the disk is checked for a new version.
-#
-# developer.defeatFreemarkerCache = true
-
-#
-# For developers only: Setting this option to "true" slows down Vitro performance.
-#
-# Defeat the cache of language-specific text strings, so the language file 
-# is read from disk on each request. This permits developers to immediately
-# see the effect of changes to the text strings. The default is 
-# <code>false</code>, which means that the language file is read when 
-# VIVO starts up, or when a new theme is selected.
-#
-# developer.defeatI18nCache = true
-
-#
-# For developers only: Setting this option to "true" slows down Vitro performance.
-#
-# Add starting and ending delimiters to each Freemarker template, so you can see
-# which template were invoked by viewing the generated HTML. The default is 
-# <code>false</code>.
-#
-# developer.insertFreemarkerDelimiters = true
-
diff --git a/webapp/rdf/auth/everytime/permission_config.n3 b/webapp/rdf/auth/everytime/permission_config.n3
index 9b61615f2..c4a88018a 100644
--- a/webapp/rdf/auth/everytime/permission_config.n3
+++ b/webapp/rdf/auth/everytime/permission_config.n3
@@ -24,6 +24,7 @@ auth:ADMIN
     auth:hasPermission simplePermission:UseMiscellaneousAdminPages ;
     auth:hasPermission simplePermission:UseSparqlQueryPage ;
    	auth:hasPermission simplePermission:PageViewableAdmin ;    
+   	auth:hasPermission simplePermission:EnableDeveloperPanel ;    
     
     # permissions for CURATOR and above.
     auth:hasPermission simplePermission:EditOntology ;
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/permissions/SimplePermission.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/permissions/SimplePermission.java
index cf0a7e272..33c609c5b 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/permissions/SimplePermission.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/permissions/SimplePermission.java
@@ -76,6 +76,8 @@ public class SimplePermission extends Permission {
 		NAMESPACE + "UseAdvancedDataToolsPages");
 	public static final SimplePermission USE_SPARQL_QUERY_PAGE = new SimplePermission(
 		NAMESPACE + "UseSparqlQueryPage");
+	public static final SimplePermission ENABLE_DEVELOPER_PANEL = new SimplePermission(
+			NAMESPACE + "EnableDeveloperPanel");
 	
 
 	// ----------------------------------------------------------------------
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/freemarker/config/FreemarkerConfiguration.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/freemarker/config/FreemarkerConfiguration.java
index 17ad1fd0b..7872974bb 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/freemarker/config/FreemarkerConfiguration.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/freemarker/config/FreemarkerConfiguration.java
@@ -18,7 +18,6 @@ import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import edu.cornell.mannlib.vitro.webapp.config.ConfigurationProperties;
 import edu.cornell.mannlib.vitro.webapp.config.RevisionInfoBean;
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
 import edu.cornell.mannlib.vitro.webapp.controller.freemarker.DelimitingTemplateLoader;
@@ -27,6 +26,8 @@ import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.EditConfigurationConstants;
 import edu.cornell.mannlib.vitro.webapp.i18n.freemarker.I18nMethodModel;
 import edu.cornell.mannlib.vitro.webapp.startup.StartupStatus;
+import edu.cornell.mannlib.vitro.webapp.utils.developer.DeveloperSettings;
+import edu.cornell.mannlib.vitro.webapp.utils.developer.DeveloperSettings.Keys;
 import edu.cornell.mannlib.vitro.webapp.web.directives.IndividualShortViewDirective;
 import edu.cornell.mannlib.vitro.webapp.web.directives.UrlDirective;
 import edu.cornell.mannlib.vitro.webapp.web.directives.WidgetDirective;
@@ -55,18 +56,17 @@ import freemarker.template.TemplateModelException;
  * own locale, etc.
  * 
  * Each time a request asks for the configuration, check to see whether the
- * cache is still valid, and whether the theme has changed (needs a new
- * TemplateLoader). Store the request info to the ThreadLocal.
+ * cache is still valid, whether the theme has changed (needs a new
+ * TemplateLoader), and whether the DeveloperSettings have changed (might need a
+ * new TemplateLoader). Store the request info to the ThreadLocal.
  */
 public abstract class FreemarkerConfiguration {
 	private static final Log log = LogFactory
 			.getLog(FreemarkerConfiguration.class);
 
-	private static final String PROPERTY_DEFEAT_CACHE = "developer.defeatFreemarkerCache";
-	private static final String PROPERTY_INSERT_DELIMITERS = "developer.insertFreemarkerDelimiters";
-
 	private static volatile FreemarkerConfigurationImpl instance;
 	private static volatile String previousThemeDir;
+	private static volatile Map<String, Object> previousSettingsMap;
 
 	public static Configuration getConfig(HttpServletRequest req) {
 		confirmInstanceIsSet();
@@ -92,14 +92,12 @@ public abstract class FreemarkerConfiguration {
 		}
 	}
 
+	/** If the developer doesn't want the cache, it's invalid. */
 	private static boolean isTemplateCacheInvalid(HttpServletRequest req) {
-		ConfigurationProperties props = ConfigurationProperties.getBean(req);
-
-		// If the developer doesn't want the cache, it's invalid.
-		if (Boolean.valueOf(props.getProperty(PROPERTY_DEFEAT_CACHE))) {
+		DeveloperSettings settings = DeveloperSettings.getBean(req);
+		if (settings.getBoolean(Keys.DEFEAT_FREEMARKER_CACHE)) {
 			return true;
 		}
-
 		return false;
 	}
 
@@ -113,7 +111,8 @@ public abstract class FreemarkerConfiguration {
 	private static void keepTemplateLoaderCurrentWithThemeDirectory(
 			HttpServletRequest req) {
 		String themeDir = getThemeDirectory(req);
-		if (hasThemeDirectoryChanged(themeDir)) {
+		if (hasThemeDirectoryChanged(themeDir)
+				|| haveDeveloperSettingsChanged(req)) {
 			TemplateLoader tl = createTemplateLoader(req, themeDir);
 			instance.setTemplateLoader(tl);
 		}
@@ -134,10 +133,20 @@ public abstract class FreemarkerConfiguration {
 		}
 	}
 
+	private static boolean haveDeveloperSettingsChanged(HttpServletRequest req) {
+		Map<String, Object> settingsMap = DeveloperSettings.getBean(req)
+				.getSettingsMap();
+		if (settingsMap.equals(previousSettingsMap)) {
+			return false;
+		} else {
+			previousSettingsMap = settingsMap;
+			return true;
+		}
+	}
+
 	private static TemplateLoader createTemplateLoader(HttpServletRequest req,
 			String themeDir) {
 		ServletContext ctx = req.getSession().getServletContext();
-		ConfigurationProperties props = ConfigurationProperties.getBean(ctx);
 
 		List<TemplateLoader> loaders = new ArrayList<TemplateLoader>();
 
@@ -167,7 +176,8 @@ public abstract class FreemarkerConfiguration {
 		MultiTemplateLoader mtl = new MultiTemplateLoader(loaderArray);
 
 		// If requested, add delimiters to the templates.
-		if (Boolean.valueOf(props.getProperty(PROPERTY_INSERT_DELIMITERS))) {
+		DeveloperSettings settings = DeveloperSettings.getBean(req);
+		if (settings.getBoolean(Keys.INSERT_FREEMARKER_DELIMITERS)) {
 			return new DelimitingTemplateLoader(mtl);
 		} else {
 			return mtl;
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/freemarker/config/FreemarkerConfigurationImpl.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/freemarker/config/FreemarkerConfigurationImpl.java
index b4318c97f..617a09f6c 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/freemarker/config/FreemarkerConfigurationImpl.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/freemarker/config/FreemarkerConfigurationImpl.java
@@ -287,6 +287,7 @@ public class FreemarkerConfigurationImpl extends Configuration {
 			urls.put("images", UrlBuilder.getUrl("/images"));
 			urls.put("theme", UrlBuilder.getUrl(themeDir));
 			urls.put("index", UrlBuilder.getUrl("/browse"));
+			urls.put("developerAjax", UrlBuilder.getUrl("/admin/developerAjax"));
 
 			return urls;
 		}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/i18n/I18n.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/i18n/I18n.java
index 38a1bc059..05758f26b 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/i18n/I18n.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/i18n/I18n.java
@@ -15,8 +15,9 @@ import javax.servlet.http.HttpServletRequest;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import edu.cornell.mannlib.vitro.webapp.config.ConfigurationProperties;
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.utils.developer.DeveloperSettings;
+import edu.cornell.mannlib.vitro.webapp.utils.developer.DeveloperSettings.Keys;
 
 /**
  * Provides access to a bundle of text strings, based on the name of the bundle,
@@ -31,7 +32,6 @@ public class I18n {
 	private static final Log log = LogFactory.getLog(I18n.class);
 
 	public static final String DEFAULT_BUNDLE_NAME = "all";
-	private static final String PROPERTY_DEVELOPER_DEFEAT_CACHE = "developer.defeatI18nCache";
 
 	/**
 	 * If this attribute is present on the request, then the cache has already
@@ -103,6 +103,7 @@ public class I18n {
 	protected I18nBundle getBundle(String bundleName, HttpServletRequest req) {
 		log.debug("Getting bundle '" + bundleName + "'");
 
+		I18nLogger i18nLogger = new I18nLogger(req);
 		try {
 			checkDevelopmentMode(req);
 			checkForChangeInThemeDirectory(req);
@@ -113,13 +114,13 @@ public class I18n {
 			ResourceBundle.Control control = new ThemeBasedControl(ctx, dir);
 			ResourceBundle rb = ResourceBundle.getBundle(bundleName,
 					req.getLocale(), control);
-			return new I18nBundle(bundleName, rb);
+			return new I18nBundle(bundleName, rb, i18nLogger);
 		} catch (MissingResourceException e) {
 			log.warn("Didn't find text bundle '" + bundleName + "'");
-			return I18nBundle.emptyBundle(bundleName);
+			return I18nBundle.emptyBundle(bundleName, i18nLogger);
 		} catch (Exception e) {
 			log.error("Failed to create text bundle '" + bundleName + "'", e);
-			return I18nBundle.emptyBundle(bundleName);
+			return I18nBundle.emptyBundle(bundleName, i18nLogger);
 		}
 	}
 
@@ -127,11 +128,7 @@ public class I18n {
 	 * If we are in development mode, clear the cache on each request.
 	 */
 	private void checkDevelopmentMode(HttpServletRequest req) {
-		ConfigurationProperties bean = ConfigurationProperties.getBean(req);
-
-		String flag = bean
-				.getProperty(PROPERTY_DEVELOPER_DEFEAT_CACHE, "false");
-		if (Boolean.valueOf(flag.trim())) {
+		if (DeveloperSettings.getBean(req).getBoolean(Keys.I18N_DEFEAT_CACHE) ) {
 			log.debug("In development mode - clearing the cache.");
 			clearCacheOnRequest(req);
 		}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/i18n/I18nBundle.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/i18n/I18nBundle.java
index 44b930089..02793529c 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/i18n/I18nBundle.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/i18n/I18nBundle.java
@@ -24,24 +24,28 @@ public class I18nBundle {
 	private static final String MESSAGE_BUNDLE_NOT_FOUND = "Text bundle ''{0}'' not found.";
 	private static final String MESSAGE_KEY_NOT_FOUND = "Text bundle ''{0}'' has no text for ''{1}''";
 
-	public static I18nBundle emptyBundle(String bundleName) {
-		return new I18nBundle(bundleName);
+	public static I18nBundle emptyBundle(String bundleName,
+			I18nLogger i18nLogger) {
+		return new I18nBundle(bundleName, i18nLogger);
 	}
 
 	private final String bundleName;
 	private final ResourceBundle resources;
 	private final String notFoundMessage;
+	private final I18nLogger i18nLogger;
 
-	private I18nBundle(String bundleName) {
-		this(bundleName, new EmptyResourceBundle(), MESSAGE_BUNDLE_NOT_FOUND);
+	private I18nBundle(String bundleName, I18nLogger i18nLogger) {
+		this(bundleName, new EmptyResourceBundle(), MESSAGE_BUNDLE_NOT_FOUND,
+				i18nLogger);
 	}
 
-	public I18nBundle(String bundleName, ResourceBundle resources) {
-		this(bundleName, resources, MESSAGE_KEY_NOT_FOUND);
+	public I18nBundle(String bundleName, ResourceBundle resources,
+			I18nLogger i18nLogger) {
+		this(bundleName, resources, MESSAGE_KEY_NOT_FOUND, i18nLogger);
 	}
 
 	private I18nBundle(String bundleName, ResourceBundle resources,
-			String notFoundMessage) {
+			String notFoundMessage, I18nLogger i18nLogger) {
 		if (bundleName == null) {
 			throw new IllegalArgumentException("bundleName may not be null");
 		}
@@ -57,22 +61,27 @@ public class I18nBundle {
 		this.bundleName = bundleName;
 		this.resources = resources;
 		this.notFoundMessage = notFoundMessage;
+		this.i18nLogger = i18nLogger;
 	}
 
 	public String text(String key, Object... parameters) {
-
 		String textString;
 		if (resources.containsKey(key)) {
 			textString = resources.getString(key);
 			log.debug("In '" + bundleName + "', " + key + "='" + textString
 					+ "')");
-			return formatString(textString, parameters);
 		} else {
 			String message = MessageFormat.format(notFoundMessage, bundleName,
 					key);
 			log.warn(message);
-			return "ERROR: " + message;
+			textString = "ERROR: " + message;
 		}
+		String result = formatString(textString, parameters);
+
+		if (i18nLogger != null) {
+			i18nLogger.log(bundleName, key, parameters, textString, result);
+		}
+		return result;
 	}
 
 	private static String formatString(String textString, Object... parameters) {
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/i18n/I18nLogger.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/i18n/I18nLogger.java
new file mode 100644
index 000000000..8889195b6
--- /dev/null
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/i18n/I18nLogger.java
@@ -0,0 +1,47 @@
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.i18n;
+
+import java.util.Arrays;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import edu.cornell.mannlib.vitro.webapp.utils.developer.DeveloperSettings;
+import edu.cornell.mannlib.vitro.webapp.utils.developer.DeveloperSettings.Keys;
+
+/**
+ * If enabled in developer mode, write a message to the log each time someone
+ * asks for a language string.
+ * 
+ * The I18nBundle has a life span of one HTTP request, and so does this.
+ */
+public class I18nLogger {
+	private static final Log log = LogFactory.getLog(I18nLogger.class);
+
+	private final boolean isLogging;
+
+	public I18nLogger(HttpServletRequest req) {
+		DeveloperSettings settings = DeveloperSettings.getBean(req);
+		this.isLogging = settings.getBoolean(Keys.ENABLED)
+				&& settings.getBoolean(Keys.I18N_LOG_STRINGS)
+				&& log.isInfoEnabled();
+	}
+
+	public void log(String bundleName, String key, Object[] parameters,
+			String rawText, String formattedText) {
+		if (isLogging) {
+			String message = String.format(
+					"Retrieved from %s.%s with %s: '%s'", bundleName, key,
+					Arrays.toString(parameters), rawText);
+			
+			if (!rawText.equals(formattedText)) {
+				message += String.format(" --> '%s'", formattedText);
+			}
+			
+			log.info(message);
+		}
+	}
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/logging/RDFServiceLogger.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/logging/RDFServiceLogger.java
index aecdffdec..8428f7aee 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/logging/RDFServiceLogger.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/logging/RDFServiceLogger.java
@@ -15,7 +15,8 @@ import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import edu.cornell.mannlib.vitro.webapp.config.ConfigurationProperties;
+import edu.cornell.mannlib.vitro.webapp.utils.developer.DeveloperSettings;
+import edu.cornell.mannlib.vitro.webapp.utils.developer.DeveloperSettings.Keys;
 
 /**
  * Writes the log message for the LoggingRDFService.
@@ -41,10 +42,6 @@ import edu.cornell.mannlib.vitro.webapp.config.ConfigurationProperties;
 public class RDFServiceLogger implements AutoCloseable {
 	private static final Log log = LogFactory.getLog(RDFServiceLogger.class);
 
-	private static final String PROPERTY_ENABLED = "developer.loggingRDFService.enable";
-	private static final String PROPERTY_STACK_TRACE = "developer.loggingRDFService.stackTrace";
-	private static final String PROPERTY_RESTRICTION = "developer.loggingRDFService.restriction";
-
 	private final ServletContext ctx;
 	private final Object[] args;
 
@@ -72,18 +69,21 @@ public class RDFServiceLogger implements AutoCloseable {
 	}
 
 	private void getProperties() {
-		ConfigurationProperties props = ConfigurationProperties.getBean(ctx);
-		isEnabled = Boolean.valueOf(props.getProperty(PROPERTY_ENABLED));
-		traceRequested = Boolean.valueOf(props
-				.getProperty(PROPERTY_STACK_TRACE));
+		DeveloperSettings settings = DeveloperSettings.getBean(ctx);
+		isEnabled = settings.getBoolean(Keys.LOGGING_RDF_ENABLE);
+		traceRequested = settings.getBoolean(Keys.LOGGING_RDF_STACK_TRACE);
 
-		String restrictionString = props.getProperty(PROPERTY_RESTRICTION);
-		if (StringUtils.isNotBlank(restrictionString)) {
+		String restrictionString = settings
+				.getString(Keys.LOGGING_RDF_RESTRICTION);
+		if (StringUtils.isBlank(restrictionString)) {
+			restriction = null;
+		} else {
 			try {
 				restriction = Pattern.compile(restrictionString);
 			} catch (Exception e) {
 				log.error("Failed to compile the pattern for "
-						+ PROPERTY_RESTRICTION + " = " + restriction + " " + e);
+						+ Keys.LOGGING_RDF_RESTRICTION.key() + " = "
+						+ restriction + " " + e);
 				isEnabled = false;
 			}
 		}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/developer/DeveloperSettings.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/developer/DeveloperSettings.java
new file mode 100644
index 000000000..5ab41ef6a
--- /dev/null
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/developer/DeveloperSettings.java
@@ -0,0 +1,251 @@
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.utils.developer;
+
+import java.io.File;
+import java.io.FileReader;
+import java.nio.file.Paths;
+import java.util.Arrays;
+import java.util.EnumMap;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import edu.cornell.mannlib.vitro.webapp.config.ConfigurationProperties;
+
+/**
+ * Hold the global developer settings. Render to JSON when requested.
+ * 
+ * On first request, the "developer.properties" file is loaded from the Vitro
+ * home directory. If the file doesn't exist, or doesn't contain values for
+ * certain properties, those propertiew will keep their default values.
+ * 
+ * An AJAX request can be used to update the properties. If the request has
+ * multiple values for a property, the first value will be used. If the request
+ * does not contain a value for a property, that property will keep its current
+ * value.
+ */
+public class DeveloperSettings {
+	private static final Log log = LogFactory.getLog(DeveloperSettings.class);
+
+	public enum Keys {
+		/**
+		 * Developer mode and developer panel is enabled.
+		 */
+		ENABLED("developer.enabled", true),
+
+		/**
+		 * Users don't need authority to use the developer panel. But they still
+		 * can't enable it without authority.
+		 */
+		PERMIT_ANONYMOUS_CONTROL("developer.permitAnonymousControl", true),
+
+		/**
+		 * Load Freemarker templates every time they are requested.
+		 */
+		DEFEAT_FREEMARKER_CACHE("developer.defeatFreemarkerCache", true),
+
+		/**
+		 * Show where each Freemarker template starts and stops.
+		 */
+		INSERT_FREEMARKER_DELIMITERS("developer.insertFreemarkerDelimiters",
+				true),
+
+		/**
+		 * Load language property files every time they are requested.
+		 */
+		I18N_DEFEAT_CACHE("developer.i18n.defeatCache", true),
+
+		/**
+		 * Enable the I18nLogger to log each string request.
+		 */
+		I18N_LOG_STRINGS("developer.i18n.logStringRequests", true),
+		
+		/**
+		 * Enable the LoggingRDFService
+		 */
+		LOGGING_RDF_ENABLE("developer.loggingRDFService.enable", true),
+
+		/**
+		 * When logging with the LoggingRDFService, include a stack trace
+		 */
+		LOGGING_RDF_STACK_TRACE("developer.loggingRDFService.stackTrace", true),
+
+		/**
+		 * Don't log with the LoggingRDFService unless the calling stack meets
+		 * this restriction.
+		 */
+		LOGGING_RDF_RESTRICTION("developer.loggingRDFService.restriction",
+				false);
+
+		private final String key;
+		private final boolean bool;
+
+		Keys(String key, boolean bool) {
+			this.key = key;
+			this.bool = bool;
+		}
+
+		public String key() {
+			return key;
+		}
+
+		boolean isBoolean() {
+			return bool;
+		}
+	}
+
+	// ----------------------------------------------------------------------
+	// The factory
+	// ----------------------------------------------------------------------
+
+	private static final String ATTRIBUTE_NAME = DeveloperSettings.class
+			.getName();
+
+	public static DeveloperSettings getBean(HttpServletRequest req) {
+		return getBean(req.getSession().getServletContext());
+	}
+
+	public static DeveloperSettings getBean(ServletContext ctx) {
+		Object o = ctx.getAttribute(ATTRIBUTE_NAME);
+		if (o instanceof DeveloperSettings) {
+			return (DeveloperSettings) o;
+		} else {
+			DeveloperSettings ds = new DeveloperSettings(ctx);
+			ctx.setAttribute(ATTRIBUTE_NAME, ds);
+			return ds;
+		}
+	}
+
+	// ----------------------------------------------------------------------
+	// The instance
+	// ----------------------------------------------------------------------
+
+	private final Map<Keys, Object> settings = new EnumMap<>(Keys.class);
+
+	private DeveloperSettings(ServletContext ctx) {
+		updateFromFile(ctx);
+	}
+	
+	/**
+	 * Read the initial settings from "developer.properties" in the Vitro home
+	 * directory.
+	 * 
+	 * This method is "protected" so we can override it for unit tests.
+	 */
+	protected void updateFromFile(ServletContext ctx) {
+		Map<String, String> fromFile = new HashMap<>();
+
+		ConfigurationProperties props = ConfigurationProperties.getBean(ctx);
+		String home = props.getProperty("vitro.home");
+		File dsFile = Paths.get(home, "developer.properties").toFile();
+
+		if (dsFile.isFile()) {
+			try (FileReader reader = new FileReader(dsFile)) {
+				Properties dsProps = new Properties();
+				dsProps.load(reader);
+				for (String key : dsProps.stringPropertyNames()) {
+					fromFile.put(key, dsProps.getProperty(key));
+				}
+			} catch (Exception e) {
+				log.warn("Failed to load 'developer.properties' file.", e);
+			}
+		} else {
+			log.debug("No developer.properties file.");
+		}
+
+		log.debug("Properties from file: " + fromFile);
+		update(fromFile);
+	}
+
+	/** Provide the parameter map from the HttpServletRequest */
+	public void updateFromRequest(Map<String, String[]> parameterMap) {
+		if (log.isDebugEnabled()) {
+			dumpParameterMap(parameterMap);
+		}
+
+		Map<String, String> fromRequest = new HashMap<>();
+		for (String key : parameterMap.keySet()) {
+			fromRequest.put(key, parameterMap.get(key)[0]);
+		}
+		update(fromRequest);
+	}
+
+	private void update(Map<String, String> changedSettings) {
+		for (Keys key : Keys.values()) {
+			String s = changedSettings.get(key.key());
+			if (s != null) {
+				if (key.isBoolean()) {
+					settings.put(key, Boolean.valueOf(s));
+				} else {
+					settings.put(key, s);
+				}
+			}
+		}
+		log.debug("DeveloperSettings: " + this);
+	}
+
+	public Object get(Keys key) {
+		if (key.isBoolean()) {
+			return getBoolean(key);
+		} else {
+			return getString(key);
+		}
+	}
+	
+	public boolean getBoolean(Keys key) {
+		if (!key.isBoolean()) {
+			throw new IllegalArgumentException("Key '" + key.key()
+					+ "' does not take a boolean value.");
+		}
+		if (settings.containsKey(key)) {
+			if (Boolean.TRUE.equals(settings.get(Keys.ENABLED))) {
+				return (Boolean) settings.get(key);
+			}
+		}
+		return false;
+	}
+
+	public String getString(Keys key) {
+		if (key.isBoolean()) {
+			throw new IllegalArgumentException("Key '" + key.key()
+					+ "' takes a boolean value.");
+		}
+		if (settings.containsKey(key)) {
+			if (Boolean.TRUE.equals(settings.get(Keys.ENABLED))) {
+				return (String) settings.get(key);
+			}
+		}
+		return "";
+	}
+
+	public Map<String, Object> getSettingsMap() {
+		Map<String, Object> map = new HashMap<>();
+		for (Keys key : Keys.values()) {
+			map.put(key.key(), get(key));
+		}
+		return map;
+	}
+
+	@Override
+	public String toString() {
+		return "DeveloperSettings" + settings;
+	}
+
+	/* For debugging. */
+	private void dumpParameterMap(Map<String, String[]> parameterMap) {
+		Map<String, List<String>> map = new HashMap<>();
+		for (String key : parameterMap.keySet()) {
+			map.put(key, Arrays.asList(parameterMap.get(key)));
+		}
+		log.debug("Parameter map: " + map);
+	}
+
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/developer/DeveloperSettingsServlet.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/developer/DeveloperSettingsServlet.java
new file mode 100644
index 000000000..7422137ab
--- /dev/null
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/developer/DeveloperSettingsServlet.java
@@ -0,0 +1,93 @@
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.utils.developer;
+
+import static edu.cornell.mannlib.vitro.webapp.utils.developer.DeveloperSettings.Keys.PERMIT_ANONYMOUS_CONTROL;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission;
+import edu.cornell.mannlib.vitro.webapp.auth.policy.PolicyHelper;
+import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.controller.ajax.VitroAjaxController;
+import edu.cornell.mannlib.vitro.webapp.services.freemarker.FreemarkerProcessingService.TemplateProcessingException;
+import edu.cornell.mannlib.vitro.webapp.services.freemarker.FreemarkerProcessingServiceSetup;
+
+/**
+ * Accept an AJAX request to update the developer settings. Return an HTML
+ * representation of the developer panel from the settings and a Freemarker
+ * template.
+ * 
+ * If developer mode is not enabled, the HTML response is empty.
+ * 
+ * You may only control the panel if you are logged in with sufficient
+ * authorization, or if anonymous control is permitted by the settings.
+ * 
+ * If you are not allowed to control the panel, then the HTML response
+ * is only a statement that developer mode is enabled. Otherwise, it
+ * is a full panel (collapsed at first).
+ */
+public class DeveloperSettingsServlet extends VitroAjaxController {
+	private static final Log log = LogFactory
+			.getLog(DeveloperSettingsServlet.class);
+
+	@Override
+	protected void doRequest(VitroRequest vreq, HttpServletResponse resp)
+			throws ServletException, IOException {
+		DeveloperSettings settings = DeveloperSettings.getBean(vreq);
+
+		/*
+		 * Are they allowed to control the panel?
+		 */
+		if (isAuthorized(vreq)) {
+			// Update the settings.
+			settings.updateFromRequest(vreq.getParameterMap());
+		} else {
+			log.debug("Not authorized to update settings.");
+		}
+
+		/*
+		 * Build the response.
+		 */
+		try {
+			Map<String, Object> bodyMap = buildBodyMap(isAuthorized(vreq),
+					settings);
+			String rendered = renderTemplate(vreq, bodyMap);
+			resp.getWriter().write(rendered);
+		} catch (Exception e) {
+			doError(resp, e.toString(), 500);
+		}
+	}
+
+	private Map<String, Object> buildBodyMap(boolean authorized,
+			DeveloperSettings settings) {
+		Map<String, Object> settingsMap = new HashMap<>();
+		settingsMap.putAll(settings.getSettingsMap());
+		settingsMap.put("mayControl", authorized);
+		Map<String, Object> bodyMap = new HashMap<>();
+		bodyMap.put("settings", settingsMap);
+		return bodyMap;
+	}
+
+	private String renderTemplate(VitroRequest vreq, Map<String, Object> bodyMap)
+			throws TemplateProcessingException {
+		return FreemarkerProcessingServiceSetup.getService(getServletContext())
+				.renderTemplate("developerPanel.ftl", bodyMap, vreq);
+	}
+
+	private boolean isAuthorized(VitroRequest vreq) {
+		boolean authBySetting = DeveloperSettings.getBean(vreq).getBoolean(
+				PERMIT_ANONYMOUS_CONTROL);
+		boolean authByPolicy = PolicyHelper.isAuthorizedForActions(vreq,
+				SimplePermission.ENABLE_DEVELOPER_PANEL.ACTION);
+		return authBySetting || authByPolicy;
+	}
+}
diff --git a/webapp/test/stubs/edu/cornell/mannlib/vitro/webapp/i18n/I18nStub.java b/webapp/test/stubs/edu/cornell/mannlib/vitro/webapp/i18n/I18nStub.java
index 4fd6b7add..fbc802b5a 100644
--- a/webapp/test/stubs/edu/cornell/mannlib/vitro/webapp/i18n/I18nStub.java
+++ b/webapp/test/stubs/edu/cornell/mannlib/vitro/webapp/i18n/I18nStub.java
@@ -51,7 +51,7 @@ public class I18nStub extends I18n {
 
 	private class I18nBundleStub extends I18nBundle {
 		public I18nBundleStub(String bundleName) {
-			super(bundleName, new DummyResourceBundle());
+			super(bundleName, new DummyResourceBundle(), null);
 		}
 
 		@Override
diff --git a/webapp/themes/vitro/templates/menu.ftl b/webapp/themes/vitro/templates/menu.ftl
index 09bb02473..badb45f0a 100644
--- a/webapp/themes/vitro/templates/menu.ftl
+++ b/webapp/themes/vitro/templates/menu.ftl
@@ -2,6 +2,8 @@
 
 </header>
 
+<#include "developer.ftl">
+
 <nav role="navigation">
     <ul id="main-nav" role="list">
         <#list menu.items as item>
diff --git a/webapp/web/WEB-INF/web.xml b/webapp/web/WEB-INF/web.xml
index 245f6116c..3a5377bda 100644
--- a/webapp/web/WEB-INF/web.xml
+++ b/webapp/web/WEB-INF/web.xml
@@ -814,6 +814,15 @@
     <url-pattern>/searchHelp</url-pattern>
   </servlet-mapping>
 
+  <servlet>
+    <servlet-name>DeveloperAjax</servlet-name>
+    <servlet-class>edu.cornell.mannlib.vitro.webapp.utils.developer.DeveloperSettingsServlet</servlet-class>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>DeveloperAjax</servlet-name>
+    <url-pattern>/admin/developerAjax</url-pattern>
+  </servlet-mapping>
+
   <!-- for now, need to make sure the links on CALS' site doesn't break -->
   <servlet-mapping>
     <servlet-name>SearchController</servlet-name>
diff --git a/webapp/web/js/developer/developerPanel.js b/webapp/web/js/developer/developerPanel.js
new file mode 100644
index 000000000..601e65de8
--- /dev/null
+++ b/webapp/web/js/developer/developerPanel.js
@@ -0,0 +1,82 @@
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+ function DeveloperPanel(developerAjaxUrl) {
+ 	this.setupDeveloperPanel = updateDeveloperPanel;
+ 	
+ 	function updateDeveloperPanel(data) {
+	    $.ajax({
+	        url: developerAjaxUrl,
+	        dataType: "json",
+	        data: data,
+	        complete: function(xhr, status) {
+	        	updatePanelContents(xhr.responseText);
+	        	if (document.getElementById("developerPanelSaveButton")) {
+	        		enablePanelOpener();
+	        		addBehaviorToElements();
+	        		updateDisabledFields();
+	        	}
+	        }
+	    });
+	}
+		
+	function updatePanelContents(contents) {
+		document.getElementById("developerPanel").innerHTML = contents;
+	}
+	
+	function enablePanelOpener() {
+		document.getElementById("developerPanelClickMe").onclick = function() {
+					document.getElementById("developerPanelClickText").style.display = "none";
+					document.getElementById("developerPanelBody").style.display = "block";
+				};
+	}
+	
+	function addBehaviorToElements() {
+	    document.getElementById("developerPanelSaveButton").onclick = function() {
+			updateDeveloperPanel(collectFormData());
+	    }
+	    document.getElementById("developer.enabled").onchange = updateDisabledFields
+	    document.getElementById("developer.loggingRDFService.enable").onchange = updateDisabledFields
+	}
+	
+	function updateDisabledFields() {
+		var developerEnabled = document.getElementById("developer.enabled").checked;
+		document.getElementById("developer.defeatFreemarkerCache").disabled = !developerEnabled;
+		document.getElementById("developer.insertFreemarkerDelimiters").disabled = !developerEnabled;
+		document.getElementById("developer.i18n.defeatCache").disabled = !developerEnabled;
+		document.getElementById("developer.i18n.logStringRequests").disabled = !developerEnabled;
+		document.getElementById("developer.loggingRDFService.enable").disabled = !developerEnabled;
+	
+		var rdfServiceEnabled = developerEnabled && document.getElementById("developer.loggingRDFService.enable").checked;
+		document.getElementById("developer.loggingRDFService.stackTrace").disabled = !rdfServiceEnabled;
+		document.getElementById("developer.loggingRDFService.restriction").disabled = !rdfServiceEnabled;
+	}
+
+	function collectFormData() {
+		var data = new Object();
+		data["developer.panelOpen"] = false;
+		getCheckbox("developer.enabled", data);
+		getCheckbox("developer.defeatFreemarkerCache", data);
+		getCheckbox("developer.insertFreemarkerDelimiters", data);
+		getCheckbox("developer.i18n.defeatCache", data);
+		getCheckbox("developer.i18n.logStringRequests", data);
+		getCheckbox("developer.loggingRDFService.enable", data);
+		getCheckbox("developer.loggingRDFService.stackTrace", data);
+		getText("developer.loggingRDFService.restriction", data);
+		return data;
+	}
+
+	function getCheckbox(key, dest) {
+		dest[key] = document.getElementById(key).checked;
+	}
+	
+	function getText(key, dest) {
+		dest[key] = document.getElementById(key).value;
+	}
+}	
+
+/*
+ * Relies on the global variable for the AJAX URL.
+ */
+$(document).ready(function() {   
+	new DeveloperPanel(developerAjaxUrl).setupDeveloperPanel({});	
+}); 
diff --git a/webapp/web/templates/freemarker/page/partials/developer.ftl b/webapp/web/templates/freemarker/page/partials/developer.ftl
new file mode 100644
index 000000000..aad2772f6
--- /dev/null
+++ b/webapp/web/templates/freemarker/page/partials/developer.ftl
@@ -0,0 +1,5 @@
+<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
+
+<div id="developerPanel" > </div>
+<script>developerAjaxUrl = '${urls.developerAjax}'</script>
+${scripts.add('<script type="text/javascript" src="${urls.base}/js/developer/developerPanel.js"></script>')}   
diff --git a/webapp/web/templates/freemarker/page/partials/developerPanel.ftl b/webapp/web/templates/freemarker/page/partials/developerPanel.ftl
new file mode 100644
index 000000000..56da326b1
--- /dev/null
+++ b/webapp/web/templates/freemarker/page/partials/developerPanel.ftl
@@ -0,0 +1,91 @@
+<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
+
+
+<#macro showCheckbox key>
+	<input type="checkbox" id="${key}" <#if settings[key]>checked</#if>>
+</#macro>
+
+<#macro showTextbox key>
+	<input type="text" id="${key}" size="40" value="${settings[key]}" >
+</#macro>
+
+
+<style>
+div.developer {
+	background-color: red; 
+	padding: 0px 10px 0px 10px;
+	font-size: small;
+	font-variant: small-caps;
+}
+
+div.developer #developerPanelBody {
+	display: none;
+}
+
+div.developer .container {
+	border: thin groove black
+}
+</style>
+
+<#if !settings["developer.enabled"]>
+<#elseif !settings["mayControl"]>
+	<div class="developer">
+		<h1>${siteName} is running in developer mode.</h1>
+	</div>
+<#else>
+	<div class="developer">
+		<h1 id="developerPanelClickMe">${siteName} is running in developer mode.  
+			<span id="developerPanelClickText">(click for Options)</span>
+		</h1>
+		<div id="developerPanelBody">
+			<form>
+				<label>
+					<@showCheckbox "developer.enabled" />
+					Enable developer mode
+				</label>
+				
+				<div class="container">
+					Freemarker templates
+					<label>
+						<@showCheckbox "developer.defeatFreemarkerCache" />
+						Defeat the template cache
+					</label>
+					<label>
+						<@showCheckbox "developer.insertFreemarkerDelimiters" />
+						Insert HTML comments at start and end of templates
+					</label>
+				</div>
+				
+				<div class="container">
+					SPARQL Queries
+					<label>
+						<@showCheckbox "developer.loggingRDFService.enable" />
+						Log each query 
+					</label>
+					<label>
+						<@showCheckbox "developer.loggingRDFService.stackTrace" />
+						Add stack trace
+					</label>
+					<label>
+						Restrict by calling stack
+						<@showTextbox "developer.loggingRDFService.restriction" />
+					</label>
+				</div>
+
+				<div class="container">
+					Language support
+					<label>
+						<@showCheckbox "developer.i18n.defeatCache" />
+						Defeat the cache of language property files
+					</label>
+					<label>
+						<@showCheckbox "developer.i18n.logStringRequests" />
+						Log the retrieval of language strings
+					</label>
+				</div>
+
+				<input type="button" id="developerPanelSaveButton" value="Save Settings" name="foo" />
+			</form>
+		</div>
+	</div>
+</#if>	
\ No newline at end of file
diff --git a/webapp/web/templates/freemarker/page/partials/menu.ftl b/webapp/web/templates/freemarker/page/partials/menu.ftl
index e0543117e..e193960fd 100644
--- a/webapp/web/templates/freemarker/page/partials/menu.ftl
+++ b/webapp/web/templates/freemarker/page/partials/menu.ftl
@@ -1,5 +1,7 @@
 <#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
 
+<#include "developer.ftl">
+
 <nav role="navigation">
     <ul id="main-nav" role="list">
         <#list menu.items as item>

From bfa274528ce2052434ee8aaa3a5637c87c16f853 Mon Sep 17 00:00:00 2001
From: j2blake <jeb228@cornell.edu>
Date: Sun, 17 Nov 2013 12:54:29 -0500
Subject: [PATCH 4/9] Reduce chatter in the log on startup.

---
 .../mannlib/vitro/webapp/servlet/setup/FileGraphSetup.java     | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/FileGraphSetup.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/FileGraphSetup.java
index b882faba1..193cae0e5 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/FileGraphSetup.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/FileGraphSetup.java
@@ -187,8 +187,7 @@ public class FileGraphSetup implements ServletContextListener {
                         } else {
                             baseModel.add(model);
                         }
-                        log.info("Attached file graph as " + type + " submodel " + p.getFileName());
-
+                        log.debug("Attached file graph as " + type + " submodel " + p.getFileName());
                     } 
 
                     modelChanged = modelChanged | updateGraphInDB(dataset, model, type, p);

From 4619571f12d56f405e8722bdf5ddb2ca6b9f7f6d Mon Sep 17 00:00:00 2001
From: j2blake <jeb228@cornell.edu>
Date: Sun, 17 Nov 2013 12:56:57 -0500
Subject: [PATCH 5/9] =?UTF-8?q?VIVO-552=20Reduce=20=E2=80=9Cmemory=20leak?=
 =?UTF-8?q?=E2=80=9D=20messages=20at=20shutdown.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

ThreadLocal stores objects in the threads. If the key type of the ThreadLocal is a class that is specific to the webapp, then that class cannot be unloaded when the app is shutdown, unless the threads themselves are garbage-collected. By using HttpServletRequest as the key to the ThreadLocal, that should be avoided.
---
 .../config/FreemarkerConfigurationImpl.java   | 32 ++++++++++---------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/freemarker/config/FreemarkerConfigurationImpl.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/freemarker/config/FreemarkerConfigurationImpl.java
index 617a09f6c..74ddff2f3 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/freemarker/config/FreemarkerConfigurationImpl.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/freemarker/config/FreemarkerConfigurationImpl.java
@@ -3,12 +3,14 @@
 package edu.cornell.mannlib.vitro.webapp.freemarker.config;
 
 import java.io.IOException;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
+import java.util.WeakHashMap;
 
 import javax.servlet.ServletContext;
 import javax.servlet.http.HttpServletRequest;
@@ -48,15 +50,22 @@ public class FreemarkerConfigurationImpl extends Configuration {
 	private static final Log log = LogFactory
 			.getLog(FreemarkerConfigurationImpl.class);
 
-	private final ThreadLocal<RequestBasedInformation> rbiRef = new ThreadLocal<>();
+	private final ThreadLocal<HttpServletRequest> currentRequest = new ThreadLocal<>();
+	private final Map<HttpServletRequest, RequestBasedInformation> rbiMap = Collections
+			.synchronizedMap(new WeakHashMap<HttpServletRequest, RequestBasedInformation>());
 
-	void setRequestInfo(HttpServletRequest req) {
-		rbiRef.set(new RequestBasedInformation(req, this));
+	protected void setRequestInfo(HttpServletRequest req) {
+		currentRequest.set(req);
+		rbiMap.put(req, new RequestBasedInformation(req, this));
+	}
+
+	private RequestBasedInformation getRequestInfo() {
+		return rbiMap.get(currentRequest.get());
 	}
 
 	@Override
 	public Object getCustomAttribute(String name) {
-		Map<String, Object> attribs = rbiRef.get().getCustomAttributes();
+		Map<String, Object> attribs = getRequestInfo().getCustomAttributes();
 		if (attribs.containsKey(name)) {
 			return attribs.get(name);
 		} else {
@@ -66,13 +75,13 @@ public class FreemarkerConfigurationImpl extends Configuration {
 
 	@Override
 	public String[] getCustomAttributeNames() {
-		Set<String> rbiNames = rbiRef.get().getCustomAttributes().keySet();
+		Set<String> rbiNames = getRequestInfo().getCustomAttributes().keySet();
 		return joinNames(rbiNames, super.getCustomAttributeNames());
 	}
 
 	@Override
 	public TemplateModel getSharedVariable(String name) {
-		Map<String, TemplateModel> vars = rbiRef.get().getSharedVariables();
+		Map<String, TemplateModel> vars = getRequestInfo().getSharedVariables();
 		if (vars.containsKey(name)) {
 			return vars.get(name);
 		} else {
@@ -82,7 +91,7 @@ public class FreemarkerConfigurationImpl extends Configuration {
 
 	@Override
 	public Set<String> getSharedVariableNames() {
-		Set<String> rbiNames = rbiRef.get().getSharedVariables().keySet();
+		Set<String> rbiNames = getRequestInfo().getSharedVariables().keySet();
 
 		@SuppressWarnings("unchecked")
 		Set<String> superNames = super.getSharedVariableNames();
@@ -94,7 +103,7 @@ public class FreemarkerConfigurationImpl extends Configuration {
 
 	@Override
 	public Locale getLocale() {
-		return rbiRef.get().getReq().getLocale();
+		return currentRequest.get().getLocale();
 	}
 
 	private String[] joinNames(Set<String> nameSet, String[] nameArray) {
@@ -226,23 +235,16 @@ public class FreemarkerConfigurationImpl extends Configuration {
 	 * custom attribute, and the locale. In the future, it could be more.
 	 */
 	private static class RequestBasedInformation {
-		private final HttpServletRequest req;
 		private final Configuration c;
 		private final Map<String, Object> customAttributes = new HashMap<>();
 		private final Map<String, TemplateModel> sharedVariables = new HashMap<>();
 
 		public RequestBasedInformation(HttpServletRequest req, Configuration c) {
-			this.req = req;
 			this.c = c;
-
 			setSharedVariables(req);
 			setCustomAttributes(req);
 		}
 
-		public HttpServletRequest getReq() {
-			return req;
-		}
-
 		public Map<String, Object> getCustomAttributes() {
 			return customAttributes;
 		}

From 2064bbd7e024015d01b03c03b65bf72cb98ba875 Mon Sep 17 00:00:00 2001
From: j2blake <jeb228@cornell.edu>
Date: Sun, 17 Nov 2013 13:20:18 -0500
Subject: [PATCH 6/9] =?UTF-8?q?VIVO-453=20language=20filtering=20defaults?=
 =?UTF-8?q?=20to=20=E2=80=9Cfalse=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 doc/install.html                                  | 15 +++++++++++++++
 webapp/config/example.runtime.properties          |  4 ++--
 .../vitro/webapp/filters/RequestModelsPrep.java   |  4 ++--
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/doc/install.html b/doc/install.html
index dd40c7a09..22932f888 100644
--- a/doc/install.html
+++ b/doc/install.html
@@ -745,6 +745,21 @@
                         </td>
                     </tr>
                     
+                    <tr>
+                        <td colspan="2">
+							Show only the most appropriate data values based on the Accept-Language 
+							header supplied by the browser.  Default is false if not set.
+                        </td>
+                    </tr>
+                    <tr class="odd_row">
+                        <td>
+                          RDFService.languageFilter
+                        </td>
+                        <td>
+                           false
+                        </td>
+                    </tr>
+
                     <tr>
                         <td colspan="2">
                           Force VIVO to use a specific language or Locale instead of those 
diff --git a/webapp/config/example.runtime.properties b/webapp/config/example.runtime.properties
index d680c1621..fa1100def 100644
--- a/webapp/config/example.runtime.properties
+++ b/webapp/config/example.runtime.properties
@@ -116,9 +116,9 @@ proxy.eligibleTypeList = http://www.w3.org/2002/07/owl#Thing
 
 #
 # Show only the most appropriate data values based on the Accept-Language 
-# header supplied by the browser.  Default is true if not set.
+# header supplied by the browser.  Default is false if not set.
 #
-RDFService.languageFilter = true
+# RDFService.languageFilter = true
 
 #
 # Tell VIVO to generate HTTP headers on its responses to facilitate caching the 
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/filters/RequestModelsPrep.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/filters/RequestModelsPrep.java
index d4da08f70..032795028 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/filters/RequestModelsPrep.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/filters/RequestModelsPrep.java
@@ -336,11 +336,11 @@ public class RequestModelsPrep implements Filter {
 	}
 
 	/**
-	 * Language awareness is enabled unless they explicitly disable it.
+	 * Language awareness is disabled unless they explicitly enable it.
 	 */
 	private Boolean isLanguageAwarenessEnabled() {
 		return Boolean.valueOf(props.getProperty("RDFService.languageFilter",
-				"true"));
+				"false"));
 	}
 
 	private RDFService addLanguageAwareness(HttpServletRequest req,

From ebe1e1430e1898ceb4cc0b8a62bba5ae92f79351 Mon Sep 17 00:00:00 2001
From: j2blake <jeb228@cornell.edu>
Date: Sun, 17 Nov 2013 13:34:56 -0500
Subject: [PATCH 7/9] =?UTF-8?q?VIVO-552=20Reduce=20=E2=80=9Cmemory=20leak?=
 =?UTF-8?q?=E2=80=9D=20messages=20at=20shutdown.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Tomcat also complains if the VALUE of a ThreadLocal is an instance of a class that is defined in the Webapp. So even though the key type was HttpServleetRequest, some of the values were VitroRequest objects. Refactor so the value is the hash code of the request.
---
 .../config/FreemarkerConfigurationImpl.java   | 22 ++++++++++++-------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/freemarker/config/FreemarkerConfigurationImpl.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/freemarker/config/FreemarkerConfigurationImpl.java
index 74ddff2f3..30a40bc85 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/freemarker/config/FreemarkerConfigurationImpl.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/freemarker/config/FreemarkerConfigurationImpl.java
@@ -10,7 +10,6 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
-import java.util.WeakHashMap;
 
 import javax.servlet.ServletContext;
 import javax.servlet.http.HttpServletRequest;
@@ -50,17 +49,17 @@ public class FreemarkerConfigurationImpl extends Configuration {
 	private static final Log log = LogFactory
 			.getLog(FreemarkerConfigurationImpl.class);
 
-	private final ThreadLocal<HttpServletRequest> currentRequest = new ThreadLocal<>();
-	private final Map<HttpServletRequest, RequestBasedInformation> rbiMap = Collections
-			.synchronizedMap(new WeakHashMap<HttpServletRequest, RequestBasedInformation>());
+	private final ThreadLocal<Integer> currentRequestHash = new ThreadLocal<>();
+	private final Map<Integer, RequestBasedInformation> rbiMap = Collections
+			.synchronizedMap(new HashMap<Integer, RequestBasedInformation>());
 
 	protected void setRequestInfo(HttpServletRequest req) {
-		currentRequest.set(req);
-		rbiMap.put(req, new RequestBasedInformation(req, this));
+		currentRequestHash.set(req.hashCode());
+		rbiMap.put(req.hashCode(), new RequestBasedInformation(req, this));
 	}
 
 	private RequestBasedInformation getRequestInfo() {
-		return rbiMap.get(currentRequest.get());
+		return rbiMap.get(currentRequestHash.get());
 	}
 
 	@Override
@@ -103,7 +102,7 @@ public class FreemarkerConfigurationImpl extends Configuration {
 
 	@Override
 	public Locale getLocale() {
-		return currentRequest.get().getLocale();
+		return getRequestInfo().getReq().getLocale();
 	}
 
 	private String[] joinNames(Set<String> nameSet, String[] nameArray) {
@@ -235,16 +234,23 @@ public class FreemarkerConfigurationImpl extends Configuration {
 	 * custom attribute, and the locale. In the future, it could be more.
 	 */
 	private static class RequestBasedInformation {
+		private final HttpServletRequest req;
 		private final Configuration c;
 		private final Map<String, Object> customAttributes = new HashMap<>();
 		private final Map<String, TemplateModel> sharedVariables = new HashMap<>();
 
 		public RequestBasedInformation(HttpServletRequest req, Configuration c) {
+			this.req = req;
 			this.c = c;
+
 			setSharedVariables(req);
 			setCustomAttributes(req);
 		}
 
+		public HttpServletRequest getReq() {
+			return req;
+		}
+
 		public Map<String, Object> getCustomAttributes() {
 			return customAttributes;
 		}

From d0458047cbbaabbd4514a7a17a75aa1c84fb95fa Mon Sep 17 00:00:00 2001
From: j2blake <jeb228@cornell.edu>
Date: Sun, 17 Nov 2013 15:27:24 -0500
Subject: [PATCH 8/9] =?UTF-8?q?VIVO-552=20Reduce=20=E2=80=9Cmemory=20leak?=
 =?UTF-8?q?=E2=80=9D=20messages=20at=20shutdown.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Back out the changes - locks up on the develop branch.
---
 .../config/FreemarkerConfigurationImpl.java   | 24 +++++++------------
 1 file changed, 8 insertions(+), 16 deletions(-)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/freemarker/config/FreemarkerConfigurationImpl.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/freemarker/config/FreemarkerConfigurationImpl.java
index 30a40bc85..617a09f6c 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/freemarker/config/FreemarkerConfigurationImpl.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/freemarker/config/FreemarkerConfigurationImpl.java
@@ -3,7 +3,6 @@
 package edu.cornell.mannlib.vitro.webapp.freemarker.config;
 
 import java.io.IOException;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -49,22 +48,15 @@ public class FreemarkerConfigurationImpl extends Configuration {
 	private static final Log log = LogFactory
 			.getLog(FreemarkerConfigurationImpl.class);
 
-	private final ThreadLocal<Integer> currentRequestHash = new ThreadLocal<>();
-	private final Map<Integer, RequestBasedInformation> rbiMap = Collections
-			.synchronizedMap(new HashMap<Integer, RequestBasedInformation>());
+	private final ThreadLocal<RequestBasedInformation> rbiRef = new ThreadLocal<>();
 
-	protected void setRequestInfo(HttpServletRequest req) {
-		currentRequestHash.set(req.hashCode());
-		rbiMap.put(req.hashCode(), new RequestBasedInformation(req, this));
-	}
-
-	private RequestBasedInformation getRequestInfo() {
-		return rbiMap.get(currentRequestHash.get());
+	void setRequestInfo(HttpServletRequest req) {
+		rbiRef.set(new RequestBasedInformation(req, this));
 	}
 
 	@Override
 	public Object getCustomAttribute(String name) {
-		Map<String, Object> attribs = getRequestInfo().getCustomAttributes();
+		Map<String, Object> attribs = rbiRef.get().getCustomAttributes();
 		if (attribs.containsKey(name)) {
 			return attribs.get(name);
 		} else {
@@ -74,13 +66,13 @@ public class FreemarkerConfigurationImpl extends Configuration {
 
 	@Override
 	public String[] getCustomAttributeNames() {
-		Set<String> rbiNames = getRequestInfo().getCustomAttributes().keySet();
+		Set<String> rbiNames = rbiRef.get().getCustomAttributes().keySet();
 		return joinNames(rbiNames, super.getCustomAttributeNames());
 	}
 
 	@Override
 	public TemplateModel getSharedVariable(String name) {
-		Map<String, TemplateModel> vars = getRequestInfo().getSharedVariables();
+		Map<String, TemplateModel> vars = rbiRef.get().getSharedVariables();
 		if (vars.containsKey(name)) {
 			return vars.get(name);
 		} else {
@@ -90,7 +82,7 @@ public class FreemarkerConfigurationImpl extends Configuration {
 
 	@Override
 	public Set<String> getSharedVariableNames() {
-		Set<String> rbiNames = getRequestInfo().getSharedVariables().keySet();
+		Set<String> rbiNames = rbiRef.get().getSharedVariables().keySet();
 
 		@SuppressWarnings("unchecked")
 		Set<String> superNames = super.getSharedVariableNames();
@@ -102,7 +94,7 @@ public class FreemarkerConfigurationImpl extends Configuration {
 
 	@Override
 	public Locale getLocale() {
-		return getRequestInfo().getReq().getLocale();
+		return rbiRef.get().getReq().getLocale();
 	}
 
 	private String[] joinNames(Set<String> nameSet, String[] nameArray) {

From 67cc2c81f23e14caf06c8e5bbe1b0b5539a5c77d Mon Sep 17 00:00:00 2001
From: tworrall <tlw72@cornell.edu>
Date: Mon, 18 Nov 2013 10:11:12 -0500
Subject: [PATCH 9/9] VIVO-543 fix template exception

---
 .../templates/freemarker/edit/forms/defaultPropertyForm.ftl    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/webapp/web/templates/freemarker/edit/forms/defaultPropertyForm.ftl b/webapp/web/templates/freemarker/edit/forms/defaultPropertyForm.ftl
index 99ac5704b..1aafe02c9 100644
--- a/webapp/web/templates/freemarker/edit/forms/defaultPropertyForm.ftl
+++ b/webapp/web/templates/freemarker/edit/forms/defaultPropertyForm.ftl
@@ -6,8 +6,9 @@
 <#if (rangeOptions?keys?size > 0)>
 	<#assign rangeOptionsExist = true/>
 </#if>
+<#assign rangeUri = editConfiguration.objectPredicateProperty.rangeVClassURI!"" />
 <#assign formTitle = editConfiguration.formTitle />
-<#if editConfiguration.objectPredicateProperty.rangeVClassURI?contains("IAO_0000030")>
+<#if rangeUri?contains("IAO_0000030")>
     <#assign formTitle = "${i18n().select_an_existing_document}" + " ${i18n().for} " + editConfiguration.subjectName/>
 </#if>
 <h2>${formTitle}</h2>