Split search services

This reverts commit 9c5ea6f39774d9c50737fe5d3c17b92dcb464c53.

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,34 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. Windows, Linux]
+ - Browser [e.g. chrome, safari]
+ - Tomcat version [e.g. 8, 9]
+ - VIVO version [e.g. 1.11.0, 1.12.0]
+ - Apache Solr or ElasticSearch version
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,7 +1,7 @@
 **Thank you for submitting a pull request! Title this pull request with a brief description of what the pull request fixes/improves/changes. Please describe the pull request in detail using the template below.**
 * * *
 
-**[JIRA Issue](https://jira.duraspace.org/projects/VIVO)**: (please link to issue)
+**[VIVO GitHub issue](https://github.com/vivo-project/VIVO/issues)**: (please link to issue)
 
 * Other Relevant Links (Mailing list discussion, related pull requests, etc.)
 
@@ -29,6 +29,7 @@ Example:
 * Does this change add any new dependencies? 
 * Does this change require any other modifications to be made to the repository? 
 * Could this change impact execution of existing code?
+* Large pull requests should be avoided. If this PR is large (more than 1,000 lines of codes), please provide short explanation why your contribution can't be decoupled in smaller PRs. 
 
 # Interested parties
 Tag (@ mention) interested parties or, if unsure, @VIVO-project/vivo-committers

.github/workflows/build.yml

@@ -0,0 +1,32 @@
+name: Build
+
+on: [ push, pull_request, workflow_dispatch ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    env:
+      MAVEN_OPTS: -Xmx1024M
+
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          path: Vitro
+
+      - name: Maven Cache
+        uses: actions/cache@v2
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-cache-m2-${{ hashFiles('**/pom.xml') }}
+          restore-keys: ${{ runner.os }}-cache-m2-
+
+      - name: Setup Java
+        uses: actions/setup-java@v1
+        with:
+          java-version: 11
+
+      - name: Maven Build
+        run: |
+          cd ./Vitro
+          mvn clean install

.gitignore

@@ -24,3 +24,8 @@ utilities/sdb_to_tdb/.work
 **/.classpath
 **/.project
 **/bin/
+
+.fake
+.ionide
+
+.vscode

.travis.yml

@@ -1,22 +0,0 @@
-language: java
-dist: trusty
-sudo: false
-
-jdk:
-  - openjdk8
-  - oraclejdk8
-
-env:
-  # Give Maven 1GB of memory to work with
-  - MAVEN_OPTS=-Xmx1024M
-
-cache:
-  directories:
-  - .autoconf
-  - $HOME/.m2
-
-install:
-  - "echo 'Skipping install stage, dependencies will be downloaded during build and test stages.'"
-
-script:
-  - "mvn clean package -Dmaven.test.skip=false"

README.md

@@ -1,6 +1,6 @@
 # What is Vitro?
 
-[![Build Status](https://travis-ci.org/vivo-project/Vitro.png?branch=develop)](https://travis-ci.org/vivo-project/Vitro)
+[![Build](https://github.com/vivo-project/Vitro/workflows/Build/badge.svg)](https://github.com/vivo-project/Vitro/actions?query=workflow%3ABuild)
 
 Vitro is a general-purpose web-based ontology and instance editor with customizable public browsing. 
 
@@ -16,7 +16,6 @@ With Vitro, you can:
 * Search your data with Apache Solr
 
 Vitro was originally developed at Cornell University, and is used as the core of the popular
-research and scholarship portal, [VIVO](https://duraspace.org/vivo/).
-
-For more information, contact the [VIVO community](https://duraspace.org/vivo/resources/contact/).
+research and scholarship portal, [VIVO](https://vivo.lyrasis.org/).
 
+For more information, contact the [VIVO community](https://vivo.lyrasis.org/contact/).

api/pom.xml

@@ -7,13 +7,13 @@
 
     <groupId>org.vivoweb</groupId>
     <artifactId>vitro-api</artifactId>
-    <version>1.11.2-SNAPSHOT</version>
+    <version>1.14.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <parent>
         <groupId>org.vivoweb</groupId>
         <artifactId>vitro-project</artifactId>
-        <version>1.11.2-SNAPSHOT</version>
+        <version>1.14.1-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 
@@ -21,6 +21,13 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <runOrder>alphabetical</runOrder>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
@@ -66,7 +73,7 @@
         <dependency>
             <groupId>org.vivoweb</groupId>
             <artifactId>vitro-dependencies</artifactId>
-            <version>1.11.2-SNAPSHOT</version>
+            <version>1.14.1-SNAPSHOT</version>
             <type>pom</type>
         </dependency>
         <dependency>
@@ -85,7 +92,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.11</version>
+            <version>4.13.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>

api/src/main/java/edu/cornell/mannlib/vedit/beans/DynamicFieldRow.java

@@ -8,6 +8,7 @@ public class DynamicFieldRow {
 
     private int id = -1;
     private String value = null;
+    private String language = "";
     private Map parameterMap = null;
 
     public int getId() {
@@ -34,4 +35,13 @@ public class DynamicFieldRow {
         this.parameterMap = parameterMap;
     }
 
+    public String getLanguage() {
+        return language;
+    }
+
+    public void setLanguage(String language) {
+        if (language != null) {
+            this.language = language;    
+        }
+    }
 }

api/src/main/java/edu/cornell/mannlib/vedit/tags/DynamicFieldsTag.java

@@ -23,10 +23,14 @@ import edu.cornell.mannlib.vedit.beans.FormObject;
 import edu.cornell.mannlib.vedit.beans.DynamicField;
 import edu.cornell.mannlib.vedit.beans.DynamicFieldRow;
 import org.apache.commons.codec.binary.Base64;
+import org.apache.commons.lang3.StringUtils;
+
 import edu.cornell.mannlib.vedit.tags.EditTag;
 
 public class DynamicFieldsTag extends EditTag {
 
+    private static final String LANGUAGE = "language";
+
     private char PATH_SEP = File.separatorChar;
 
     public final String MARKUP_FILE_PATH = "templates"+PATH_SEP+"edit"+PATH_SEP+"specific"+PATH_SEP;
@@ -175,7 +179,12 @@ public class DynamicFieldsTag extends EditTag {
                                 String key = (String) paramIt.next();
                                 String value = (String) row.getParameterMap().get(key);
                                 byte[] valueInBase64 = Base64.encodeBase64(value.getBytes());
-                                taName.append(key).append(":").append(new String(valueInBase64)).append(";");
+                                taName.append(key).append(":").append(new String(valueInBase64));
+                                if (StringUtils.isNotBlank(row.getLanguage())) {
+                                    byte[] encodedLang = Base64.encodeBase64(row.getLanguage().getBytes());
+                                    taName.append(":").append(LANGUAGE).append(":").append(new String(encodedLang));                                    
+                                }
+                                taName.append(";");
                             }
                             if (row.getValue().length() > 0) {
                                 String templateWithVars = templateMarkup;

api/src/main/java/edu/cornell/mannlib/vedit/util/FormUtils.java

@@ -6,8 +6,6 @@ import java.lang.reflect.Method;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Arrays;
-import java.util.Collections;
-import java.util.Comparator;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -17,6 +15,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.logging.Log;
@@ -272,6 +271,37 @@ public class FormUtils {
 		return options;
 	}
 
+    public static List<Option> makeOptionListOfNotDisjointClasses(WebappDaoFactory wadf, String baseVclassUri, String selectedUri) {
+        VClassDao vClassDao = wadf.getVClassDao();
+        Set<String> uris = getNotDisjointClassUris(wadf, baseVclassUri, vClassDao);
+        uris.add(baseVclassUri);
+
+        List<Option> options = new LinkedList<>();
+        for (String vclassUri : uris) {
+            VClass vclass = vClassDao.getVClassByURI(vclassUri);
+            Option option = new Option();
+            option.setValue(vclass.getURI());
+            option.setBody(vclass.getPickListName());
+            options.add(option);
+            if (Objects.equals(selectedUri, vclass.getURI())) {
+                option.setSelected(true);
+            }
+        }
+        options.sort((o1, o2) -> o1.getBody().compareTo(o2.getBody()));
+        return options;
+    }
+
+	private static Set<String> getNotDisjointClassUris(WebappDaoFactory wadf, String classUri, VClassDao vClassDao) {
+		Set<String> allClasses = wadf.getVClassDao()
+				.getAllVclasses()
+				.stream()
+				.map(vclass -> vclass.getURI())
+				.collect(Collectors.toSet());
+		Set<String> disjointClasses = new HashSet<>(vClassDao.getDisjointWithClassURIs(classUri));
+		allClasses.removeAll(disjointClasses);
+		return allClasses;
+	}
+
     public static void beanSet(Object newObj, String field, String value) {
         beanSet (newObj, field, value, null);
     }
@@ -369,6 +399,9 @@ public class FormUtils {
         for (String aParam : param) {
             String[] p = aParam.split(":");
             beanParamMap.put(p[0], new String(Base64.decodeBase64(p[1].getBytes())));
+            if (p.length > 3) {
+                beanParamMap.put(p[2], new String(Base64.decodeBase64(p[3].getBytes())));
+            }
         }
         return beanParamMap;
     }

api/src/main/java/edu/cornell/mannlib/vitro/webapp/application/ApplicationSetup.java

@@ -62,6 +62,7 @@ public class ApplicationSetup implements ServletContextListener {
 
 	private void locateApplicationConfigFile() {
 		Path path = this.vitroHomeDir.getPath().resolve(APPLICATION_SETUP_PATH);
+
 		if (!Files.exists(path)) {
 			throw new IllegalStateException("'" + path + "' does not exist.");
 		}

api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/policy/RootUserPolicy.java

@@ -37,7 +37,14 @@ public class RootUserPolicy implements PolicyIface {
 	private static final Log log = LogFactory.getLog(RootUserPolicy.class);
 
 	private static final String PROPERTY_ROOT_USER_EMAIL = "rootUser.emailAddress";
+	/*
+	 * UQAM Add-Feature For parameterization of rootUser
+	 */
+	private static final String PROPERTY_ROOT_USER_PASSWORD = "rootUser.password";
+	private static final String PROPERTY_ROOT_USER_PASSWORD_CHANGE_REQUIRED = "rootUser.passwordChangeRequired";
+
 	private static final String ROOT_USER_INITIAL_PASSWORD = "rootPassword";
+	private static final String ROOT_USER_INITIAL_PASSWORD_CHANGE_REQUIRED = "true";
 
 	/**
 	 * This is the entire policy. If you are a root user, you are authorized.
@@ -150,10 +157,12 @@ public class RootUserPolicy implements PolicyIface {
 			ua.setEmailAddress(configuredRootUser);
 			ua.setFirstName("root");
 			ua.setLastName("user");
+			// UQAM Add-Feature using getRootPasswordFromConfig()
 			ua.setArgon2Password(Authenticator.applyArgon2iEncoding(
-					ROOT_USER_INITIAL_PASSWORD));
+					getRootPasswordFromConfig()));
 			ua.setMd5Password("");
-			ua.setPasswordChangeRequired(true);
+			// UQAM Add-Feature using getRootPasswdChangeRequiredFromConfig()
+			ua.setPasswordChangeRequired(getRootPasswdChangeRequiredFromConfig().booleanValue());
 			ua.setStatus(Status.ACTIVE);
 			ua.setRootUser(true);
 
@@ -191,7 +200,31 @@ public class RootUserPolicy implements PolicyIface {
 			ss.warning(this, "For security, "
 					+ "it is best to delete unneeded root user accounts.");
 		}
+		/*
+		 * UQAM Add-Feature
+		 * Add for getting rootUser.password property value from runtime.properties
+		 */
+		private String getRootPasswordFromConfig() {
+			String passwd = ConfigurationProperties.getBean(ctx).getProperty(
+					PROPERTY_ROOT_USER_PASSWORD);
+			if (passwd == null) {
+				passwd = ROOT_USER_INITIAL_PASSWORD;
+			}
+			return passwd;
+		}
 
+		/*
+		 * UQAM Add-Feature
+		 * Add for getting rootUser.passwordChangeRequired  property value  from runtime.properties
+		 */
+		private Boolean getRootPasswdChangeRequiredFromConfig() {
+			String passwdCR = ConfigurationProperties.getBean(ctx).getProperty(
+					PROPERTY_ROOT_USER_PASSWORD_CHANGE_REQUIRED);
+			if (passwdCR == null) {
+				passwdCR = ROOT_USER_INITIAL_PASSWORD_CHANGE_REQUIRED;
+			}
+			return new Boolean(passwdCR);
+		}
 		@Override
 		public void contextDestroyed(ServletContextEvent sce) {
 			// Nothing to destroy

api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/ApplicationBean.java

@@ -20,6 +20,7 @@ public class ApplicationBean {
     public final static int      VIVO_SEARCHBOX_SIZE         = 20;
 
     private final static String  DEFAULT_APPLICATION_NAME     = "Vitro";
+    private final static String  DEFAULT_APPLICATION_AVAILABLE_LANGS_FILE = "available-langs";
     private final static String  DEFAULT_ROOT_LOGOTYPE_IMAGE  = "";
     private final static int     DEFAULT_ROOT_LOGOTYPE_WIDTH  = 0;
     private final static int     DEFAULT_ROOT_LOGOTYPE_HEIGHT = 0;
@@ -33,6 +34,7 @@ public class ApplicationBean {
     private boolean   initialized             = false;
     private String    sessionIdStr            = null;
     private String    applicationName         = DEFAULT_APPLICATION_NAME;
+    private String    availableLangsFile      = DEFAULT_APPLICATION_AVAILABLE_LANGS_FILE;
 
     private String    rootLogotypeImage       = DEFAULT_ROOT_LOGOTYPE_IMAGE;
     private int       rootLogotypeWidth       = DEFAULT_ROOT_LOGOTYPE_WIDTH;
@@ -52,6 +54,7 @@ public class ApplicationBean {
         output += "  initialized from DB:    [" + initialized             + "]\n";
         output += "  session id:             [" + sessionIdStr            + "]\n";
         output += "  application name:       [" + applicationName         + "]\n";
+        output += "  available langs file:   [" + availableLangsFile      + "]\n";
         output += "  root logotype image:    [" + rootLogotypeImage       + "]\n";
         output += "  root logotype width:    [" + rootLogotypeWidth       + "]\n";
         output += "  root logotype height:   [" + rootLogotypeHeight      + "]\n";
@@ -177,6 +180,10 @@ public class ApplicationBean {
     	return "";
     }
 
+    public String getAvailableLangsFile() {
+        return availableLangsFile;
+    }
+
     /**
      * Directory to find the images.  Subdirectories include css, jsp and site_icons.
      * Example: "themes/enhanced/"

api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/DataProperty.java

@@ -87,6 +87,11 @@ public class DataProperty extends Property implements Comparable<DataProperty>,
     public String getRangeDatatypeURI() {
         return rangeDatatypeURI;
     }
+    
+    @Override
+    public String getRangeVClassURI() {
+        return rangeDatatypeURI;
+    }
 
     public void setRangeDatatypeURI(String rangeDatatypeURI) {
         this.rangeDatatypeURI = rangeDatatypeURI;

api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/FauxProperty.java

@@ -6,6 +6,8 @@ import static org.apache.jena.rdf.model.ResourceFactory.createResource;
 
 import java.util.Objects;
 
+import org.apache.commons.lang3.StringUtils;
+
 import edu.cornell.mannlib.vitro.webapp.auth.policy.bean.RoleRestrictedProperty;
 
 /**
@@ -20,7 +22,9 @@ public class FauxProperty extends BaseResourceBean implements ResourceBean,
 	private String configUri;
 
 	// Must not be null on insert or update. Partial identifier on delete.
-	private String rangeURI;
+	private String rangeURI = "";
+	
+	private String rootRangeURI;
 	// May be null. Partial identifier on delete.
 	private String domainURI;
 
@@ -55,7 +59,7 @@ public class FauxProperty extends BaseResourceBean implements ResourceBean,
 	 */
 	public FauxProperty(String domainURI, String baseURI, String rangeURI) {
 		super(Objects.requireNonNull(baseURI, "baseURI may not be null"));
-		this.rangeURI = rangeURI;
+		this.setRangeURI(rangeURI);
 		this.domainURI = domainURI;
 	}
 
@@ -93,7 +97,11 @@ public class FauxProperty extends BaseResourceBean implements ResourceBean,
 	}
 
 	public void setRangeURI(String rangeURI) {
-		this.rangeURI = rangeURI;
+		if (StringUtils.isEmpty(rangeURI)) {
+			this.rangeURI = "";
+		} else {
+			this.rangeURI = rangeURI;	
+		}
 	}
 
 	public String getBaseLabel() {
@@ -105,7 +113,14 @@ public class FauxProperty extends BaseResourceBean implements ResourceBean,
 	}
 
 	public String getRangeLabel() {
-		return (rangeLabel == null) ? localName(rangeURI) : rangeLabel;
+		if  (StringUtils.isEmpty(rangeLabel)) {
+			if (StringUtils.isEmpty(rangeURI)) {
+				return "untyped";
+			}
+			return localName(rangeURI);
+		} else {
+			return rangeLabel;
+		}
 	}
 
 	public void setRangeLabel(String rangeLabel) {
@@ -247,4 +262,12 @@ public class FauxProperty extends BaseResourceBean implements ResourceBean,
 	public String getRangeVClassURI() {
 		return getRangeURI();
 	}
+
+	public void setRootRangeUri(String rootRangeUri) {
+		this.rootRangeURI = rootRangeUri;
+	}
+	
+	public String getRootRangeUri() {
+		return rootRangeURI;
+	}
 }

api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/ObjectProperty.java

@@ -4,7 +4,6 @@ package edu.cornell.mannlib.vitro.webapp.beans;
 
 import java.beans.XMLEncoder;
 import java.text.Collator;
-import java.util.Collections;
 import java.util.Comparator;
 import java.util.Date;
 import java.util.Iterator;

api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/UserAccount.java

@@ -7,21 +7,15 @@ import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
 
-import edu.cornell.mannlib.vitro.webapp.controller.authenticate.Authenticator;
+import org.apache.commons.lang3.RandomStringUtils;
 
 /**
  * Information about the account of a user. URI, email, password, etc.
  *
- * The "password link expires hash" is just a string that is derived from the
- * value in the passwordLinkExpires field. It doesn't have to be a hash, and
- * there is no need for it to be cryptographic, but it seems embarrassing to
- * just send the value as a clear string. There is no real need for security
- * here, except that a brute force attack would allow someone to change the
- * password on an account that they know has a password change pending.
  */
 public class UserAccount {
 	public static final int MIN_PASSWORD_LENGTH = 6;
-	public static final int MAX_PASSWORD_LENGTH = 12;
+	public static final int MAX_PASSWORD_LENGTH = 64;
 
 	public enum Status {
 		ACTIVE, INACTIVE;
@@ -52,6 +46,7 @@ public class UserAccount {
 	private String md5Password = ""; // Never null.
 	private String oldPassword = ""; // Never null.
 	private long passwordLinkExpires = 0L; // Never negative.
+	private String emailKey = "";
 	private boolean passwordChangeRequired = false;
 
 	private int loginCount = 0; // Never negative.
@@ -133,15 +128,27 @@ public class UserAccount {
 		return passwordLinkExpires;
 	}
 
-	public String getPasswordLinkExpiresHash() {
-		return limitStringLength(8, Authenticator.applyArgon2iEncoding(String
-				.valueOf(passwordLinkExpires)));
-	}
-
 	public void setPasswordLinkExpires(long passwordLinkExpires) {
 		this.passwordLinkExpires = Math.max(0, passwordLinkExpires);
 	}
 
+	public void generateEmailKey() {
+		boolean useLetters = true;
+		boolean useNumbers = true;
+		int length = 64;
+		emailKey = RandomStringUtils.random(length, useLetters, useNumbers);
+	}
+	
+	public void setEmailKey(String emailKey) {
+		if (emailKey != null) {
+			this.emailKey = emailKey;	
+		}
+	}
+	
+	public String getEmailKey() {
+		return emailKey;
+	}
+
 	public boolean isPasswordChangeRequired() {
 		return passwordChangeRequired;
 	}
@@ -247,6 +254,7 @@ public class UserAccount {
 				+ (", oldPassword=" + oldPassword)
 				+ (", argon2password=" + argon2Password)
 				+ (", passwordLinkExpires=" + passwordLinkExpires)
+				+ (", emailKey =" + emailKey)
 				+ (", passwordChangeRequired=" + passwordChangeRequired)
 				+ (", externalAuthOnly=" + externalAuthOnly)
 				+ (", loginCount=" + loginCount) + (", status=" + status)

api/src/main/java/edu/cornell/mannlib/vitro/webapp/config/ConfigurationProperties.java

@@ -109,7 +109,7 @@ public abstract class ConfigurationProperties {
 			throw new NullPointerException("bean may not be null.");
 		}
 		context.setAttribute(ATTRIBUTE_NAME, bean);
-		log.info(bean);
+		log.debug(bean);
 	}
 
 	/** Package access, so unit tests can call it. */

api/src/main/java/edu/cornell/mannlib/vitro/webapp/config/ConfigurationPropertiesSetup.java

@@ -73,7 +73,7 @@ public class ConfigurationPropertiesSetup implements ServletContextListener {
 						vitroHomeDir, vitroHomeDirConfig);
 
 				File runtimePropertiesFile = locateRuntimePropertiesFile(
-						vitroHomeDir, vitroHomeDirConfig, ss);
+					vitroHomeDir, vitroHomeDirConfig, ss);
 				stream = new FileInputStream(runtimePropertiesFile);
 
 				Map<String, String> preempts = createPreemptiveProperties(
@@ -118,7 +118,6 @@ public class ConfigurationPropertiesSetup implements ServletContextListener {
 		}
 	}
 
-
 	private File locateRuntimePropertiesFile(File vitroHomeDir,
 			File vitroHomeDirConfig, StartupStatus ss) {
 

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

@@ -160,7 +160,7 @@ public class ConfigurationPropertiesSmokeTests implements
 				String vivoBundle = VIVO_BUNDLE_PREFIX + language + ".properties";
 				String vitroBundle = VITRO_BUNDLE_PREFIX + language + ".properties";
 				if (!i18nNames.contains(vivoBundle) && !i18nNames.contains(vitroBundle)) {
-					ss.warning(this, language + " was found in the value for "
+					ss.info(this, language + " was found in the value for "
 						+ PROPERTY_LANGUAGE_SELECTABLE + " but no corresponding "
 							+ "language file was found.");
 				}

api/src/main/java/edu/cornell/mannlib/vitro/webapp/config/RevisionInfoBean.java

@@ -2,6 +2,7 @@
 
 package edu.cornell.mannlib.vitro.webapp.config;
 
+import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -14,8 +15,6 @@ import javax.servlet.http.HttpSession;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import com.ibm.icu.text.SimpleDateFormat;
-
 /**
  * Information about the provenance of this application: release, revision
  * level, build date, etc.
@@ -41,7 +40,7 @@ public class RevisionInfoBean {
 			new Date(0), Collections.singleton(LevelRevisionInfo.DUMMY_LEVEL));
 
 	/** The bean is attached to the session by this name. */
-	static final String ATTRIBUTE_NAME = RevisionInfoBean.class.getName();
+	public static final String ATTRIBUTE_NAME = RevisionInfoBean.class.getName();
 
 	// ----------------------------------------------------------------------
 	// static methods

api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/Controllers.java

@@ -21,7 +21,6 @@ public class Controllers {
 
     public static final String ABOUT = "/about";
     public static final String CONTACT_URL = "/comments";
-    public static final String TERMS_OF_USE_URL = "/termsOfUse";
     public static final String SEARCH_URL = "/search";
     public static final String ENTITY = "/entity";
 

api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/UserAccountsSelector.java

@@ -249,6 +249,7 @@ public class UserAccountsSelector {
 			user.setMd5Password(ifLiteralPresent(solution, "md5pwd", ""));
 			user.setArgon2Password(ifLiteralPresent(solution, "a2pwd", ""));
 			user.setPasswordLinkExpires(ifLongPresent(solution, "expire", 0L));
+			user.setEmailKey(ifLiteralPresent(solution, "emailKey", ""));
 			user.setLoginCount(ifIntPresent(solution, "count", 0));
 			user.setLastLoginTime(ifLongPresent(solution, "lastLogin", 0));
 			user.setStatus(parseStatus(solution, "status", null));

api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/admin/UserAccountsAddPage.java

@@ -156,6 +156,7 @@ public class UserAccountsAddPage extends UserAccountsPage {
 		u.setOldPassword("");
 		u.setPasswordChangeRequired(false);
 		u.setPasswordLinkExpires(0);
+		u.setEmailKey("");
 		u.setLoginCount(0);
 		u.setLastLoginTime(0L);
 		u.setStatus(Status.INACTIVE);

api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/admin/UserAccountsAddPageStrategy.java

@@ -57,8 +57,6 @@ public abstract class UserAccountsAddPageStrategy extends UserAccountsPage {
 
 	private static class EmailStrategy extends UserAccountsAddPageStrategy {
 		public static final String CREATE_PASSWORD_URL = "/accounts/createPassword";
-		private static final String EMAIL_TEMPLATE_WITH_PASSWORD = "userAccounts-acctCreatedEmail.ftl";
-		private static final String EMAIL_TEMPLATE_NO_PASSWORD = "userAccounts-acctCreatedExternalOnlyEmail.ftl";
 
 		private boolean sentEmail;
 
@@ -84,6 +82,7 @@ public abstract class UserAccountsAddPageStrategy extends UserAccountsPage {
 				u.setStatus(Status.ACTIVE);
 			} else {
 				u.setPasswordLinkExpires(figureExpirationDate().getTime());
+				u.generateEmailKey();
 				u.setStatus(Status.INACTIVE);
 			}
 		}
@@ -99,15 +98,19 @@ public abstract class UserAccountsAddPageStrategy extends UserAccountsPage {
 			body.put("userAccount", page.getAddedAccount());
 			body.put("passwordLink", buildCreatePasswordLink());
 			body.put("siteName", getSiteName());
-
 			FreemarkerEmailMessage email = FreemarkerEmailFactory
 					.createNewMessage(vreq);
 			email.addRecipient(TO, page.getAddedAccount().getEmailAddress());
-			email.setSubject(i18n.text("account_created_subject", getSiteName()));
+			String subject = i18n.text("account_created_subject", getSiteName());
+			email.setSubject(subject);
 			if (page.isExternalAuthOnly()) {
-				email.setTemplate(EMAIL_TEMPLATE_NO_PASSWORD);
+				body.put("subject", subject);
+				body.put("textMessage", i18n.text("acct_created_external_only_email_plain_text"));
+				body.put("htmlMessage", i18n.text("acct_created_external_only_email_html_text"));
 			} else {
-				email.setTemplate(EMAIL_TEMPLATE_WITH_PASSWORD);
+				body.put("subject", subject);
+				body.put("textMessage", i18n.text("acct_created_email_plain_text"));
+				body.put("htmlMessage", i18n.text("acct_created_email_html_text"));
 			}
 			email.setBodyMap(body);
 			email.processTemplate();
@@ -119,10 +122,8 @@ public abstract class UserAccountsAddPageStrategy extends UserAccountsPage {
 		private String buildCreatePasswordLink() {
 			try {
 				String email = page.getAddedAccount().getEmailAddress();
-				String hash = page.getAddedAccount()
-						.getPasswordLinkExpiresHash();
-				String relativeUrl = UrlBuilder.getUrl(CREATE_PASSWORD_URL,
-						"user", email, "key", hash);
+				String key = page.getAddedAccount().getEmailKey();
+				String relativeUrl = UrlBuilder.getUrl(CREATE_PASSWORD_URL,	"user", email, "key", key);
 
 				URL context = new URL(vreq.getRequestURL().toString());
 				URL url = new URL(context, relativeUrl);

api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/admin/UserAccountsEditPage.java

@@ -274,6 +274,7 @@ public class UserAccountsEditPage extends UserAccountsPage {
 			userAccount.setOldPassword("");
 			userAccount.setPasswordChangeRequired(false);
 			userAccount.setPasswordLinkExpires(0L);
+			userAccount.setEmailKey("");
 		}
 
 		if (isRootUser()) {

api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/admin/UserAccountsEditPageStrategy.java

@@ -56,8 +56,6 @@ public abstract class UserAccountsEditPageStrategy extends UserAccountsPage {
 
 	private static class EmailStrategy extends UserAccountsEditPageStrategy {
 		private static final String PARAMETER_RESET_PASSWORD = "resetPassword";
-		private static final String EMAIL_TEMPLATE = "userAccounts-passwordResetPendingEmail.ftl";
-
 		public static final String RESET_PASSWORD_URL = "/accounts/resetPassword";
 
 		private boolean resetPassword;
@@ -82,6 +80,7 @@ public abstract class UserAccountsEditPageStrategy extends UserAccountsPage {
 		protected void setAdditionalProperties(UserAccount u) {
 			if (resetPassword && !page.isExternalAuthOnly()) {
 				u.setPasswordLinkExpires(figureExpirationDate().getTime());
+				u.generateEmailKey();
 			}
 		}
 
@@ -106,11 +105,13 @@ public abstract class UserAccountsEditPageStrategy extends UserAccountsPage {
 			body.put("userAccount", page.getUpdatedAccount());
 			body.put("passwordLink", buildResetPasswordLink());
 			body.put("siteName", getSiteName());
+			body.put("subject", i18n.text("password_reset_pending_email_subject"));
+			body.put("textMessage",i18n.text("password_reset_pending_email_plain_text"));
+			body.put("htmlMessage", i18n.text("password_reset_pending_email_html_text"));
 
 			FreemarkerEmailMessage email = FreemarkerEmailFactory
 					.createNewMessage(vreq);
 			email.addRecipient(TO, page.getUpdatedAccount().getEmailAddress());
-			email.setTemplate(EMAIL_TEMPLATE);
 			email.setBodyMap(body);
 			email.processTemplate();
 			email.send();
@@ -121,10 +122,8 @@ public abstract class UserAccountsEditPageStrategy extends UserAccountsPage {
 		private String buildResetPasswordLink() {
 			try {
 				String email = page.getUpdatedAccount().getEmailAddress();
-				String hash = page.getUpdatedAccount()
-						.getPasswordLinkExpiresHash();
-				String relativeUrl = UrlBuilder.getUrl(RESET_PASSWORD_URL,
-						"user", email, "key", hash);
+				String key = page.getUpdatedAccount().getEmailKey();
+				String relativeUrl = UrlBuilder.getUrl(RESET_PASSWORD_URL, "user", email, "key", key);
 
 				URL context = new URL(vreq.getRequestURL().toString());
 				URL url = new URL(context, relativeUrl);

api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsCreatePasswordPage.java

@@ -26,8 +26,6 @@ public class UserAccountsCreatePasswordPage extends
 			.getLog(UserAccountsCreatePasswordPage.class);
 
 	private static final String TEMPLATE_NAME = "userAccounts-createPassword.ftl";
-	private static final String EMAIL_TEMPLATE = "userAccounts-passwordCreatedEmail.ftl";
-
 	public UserAccountsCreatePasswordPage(VitroRequest vreq) {
 		super(vreq);
 	}
@@ -36,6 +34,7 @@ public class UserAccountsCreatePasswordPage extends
 		userAccount.setArgon2Password(Authenticator.applyArgon2iEncoding(newPassword));
 		userAccount.setMd5Password("");
 		userAccount.setPasswordLinkExpires(0L);
+		userAccount.setEmailKey("");
 		userAccount.setPasswordChangeRequired(false);
 		userAccount.setStatus(Status.ACTIVE);
 		userAccountsDao.updateUserAccount(userAccount);
@@ -53,6 +52,11 @@ public class UserAccountsCreatePasswordPage extends
 	protected String passwordChangeNotPendingMessage() {
 		return i18n.text("account_already_activated", userEmail);
 	}
+	
+	@Override
+	protected String passwordChangeInavlidKeyMessage() {
+		return i18n.text("password_change_invalid_key", userEmail);
+	}
 
 	@Override
 	protected String templateName() {
@@ -67,8 +71,11 @@ public class UserAccountsCreatePasswordPage extends
 		FreemarkerEmailMessage email = FreemarkerEmailFactory
 				.createNewMessage(vreq);
 		email.addRecipient(TO, userAccount.getEmailAddress());
-		email.setSubject(i18n.text("password_created_subject", getSiteName()));
-		email.setTemplate(EMAIL_TEMPLATE);
+		final String subject = i18n.text("password_created_subject", getSiteName());
+		email.setSubject(subject);
+		body.put("subject", subject);
+		body.put("textMessage", i18n.text("password_created_email_plain_text"));
+		body.put("htmlMessage", i18n.text("password_created_email_html_text"));
 		email.setBodyMap(body);
 		email.processTemplate();
 		email.send();

api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsFirstTimeExternalPage.java

@@ -195,6 +195,7 @@ public class UserAccountsFirstTimeExternalPage extends UserAccountsPage {
 		u.setExternalAuthId(externalAuthId);
 		u.setPasswordChangeRequired(false);
 		u.setPasswordLinkExpires(0);
+		u.setEmailKey("");
 		u.setExternalAuthOnly(true);
 		u.setLoginCount(0);
 		u.setStatus(Status.ACTIVE);

api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsFirstTimeExternalPageStrategy.java

@@ -52,8 +52,6 @@ public abstract class UserAccountsFirstTimeExternalPageStrategy extends
 	public static class EmailStrategy extends
 			UserAccountsFirstTimeExternalPageStrategy {
 
-		private static final String EMAIL_TEMPLATE = "userAccounts-firstTimeExternalEmail.ftl";
-
 		public EmailStrategy(VitroRequest vreq,
 				UserAccountsFirstTimeExternalPage page) {
 			super(vreq, page);
@@ -73,8 +71,11 @@ public abstract class UserAccountsFirstTimeExternalPageStrategy extends
 			FreemarkerEmailMessage email = FreemarkerEmailFactory
 					.createNewMessage(vreq);
 			email.addRecipient(TO, ua.getEmailAddress());
-			email.setSubject(i18n.text("account_created_subject", getSiteName()));
-			email.setTemplate(EMAIL_TEMPLATE);
+			final String subject = i18n.text("account_created_subject", getSiteName());
+			email.setSubject(subject);
+			body.put("subject", subject);
+			body.put("textMessage", i18n.text("first_time_external_email_plain_text"));
+			body.put("htmlMessage", i18n.text("first_time_external_email_html_text"));
 			email.setBodyMap(body);
 			email.processTemplate();
 			email.send();

api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsMyAccountPageStrategy.java

@@ -108,8 +108,6 @@ public abstract class UserAccountsMyAccountPageStrategy extends
 		private static final String ERROR_WRONG_PASSWORD_LENGTH = "errorPasswordIsWrongLength";
 		private static final String ERROR_PASSWORDS_DONT_MATCH = "errorPasswordsDontMatch";
 
-		private static final String EMAIL_TEMPLATE = "userAccounts-confirmEmailChangedEmail.ftl";
-
 		private final String originalEmail;
 
 		private String newPassword;
@@ -159,6 +157,7 @@ public abstract class UserAccountsMyAccountPageStrategy extends
 				userAccount.setMd5Password("");
 				userAccount.setPasswordChangeRequired(false);
 				userAccount.setPasswordLinkExpires(0L);
+				userAccount.setEmailKey("");
 			}
 		}
 
@@ -178,8 +177,11 @@ public abstract class UserAccountsMyAccountPageStrategy extends
 			FreemarkerEmailMessage email = FreemarkerEmailFactory
 					.createNewMessage(vreq);
 			email.addRecipient(TO, page.getUserAccount().getEmailAddress());
-			email.setSubject(i18n.text("email_changed_subject", getSiteName()));
-			email.setTemplate(EMAIL_TEMPLATE);
+			final String subject = i18n.text("email_changed_subject", getSiteName());
+			email.setSubject(subject);
+			body.put("subject", subject);
+			body.put("textMessage", i18n.text("confirm_email_changed_email_plain_text"));
+			body.put("htmlMessage", i18n.text("confirm_email_changed_email_html_text"));
 			email.setBodyMap(body);
 			email.processTemplate();
 			email.send();

api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsPasswordBasePage.java

@@ -103,12 +103,12 @@ public abstract class UserAccountsPasswordBasePage extends UserAccountsPage {
 			return;
 		}
 
-		String expectedKey = userAccount.getPasswordLinkExpiresHash();
-		if (!key.equals(expectedKey)) {
+		String expectedKey = userAccount.getEmailKey();
+		if (key.isEmpty() || !key.equals(expectedKey)) {
 			log.warn("Password request for '" + userEmail + "' is bogus: key ("
 					+ key + ") doesn't match expected key (" + expectedKey
 					+ ")");
-			bogusMessage = passwordChangeNotPendingMessage();
+			bogusMessage = passwordChangeInavlidKeyMessage();
 			return;
 		}
 
@@ -153,7 +153,7 @@ public abstract class UserAccountsPasswordBasePage extends UserAccountsPage {
 		body.put("minimumLength", UserAccount.MIN_PASSWORD_LENGTH);
 		body.put("maximumLength", UserAccount.MAX_PASSWORD_LENGTH);
 		body.put("userAccount", userAccount);
-		body.put("key", userAccount.getPasswordLinkExpiresHash());
+		body.put("key", userAccount.getEmailKey());
 		body.put("newPassword", newPassword);
 		body.put("confirmPassword", confirmPassword);
 		body.put("formUrls", buildUrlsMap());
@@ -176,6 +176,8 @@ public abstract class UserAccountsPasswordBasePage extends UserAccountsPage {
 	protected abstract String alreadyLoggedInMessage(String currentUserEmail);
 
 	protected abstract String passwordChangeNotPendingMessage();
+	
+	protected abstract String passwordChangeInavlidKeyMessage();
 
 	protected abstract String templateName();
 }

api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsResetPasswordPage.java

@@ -26,8 +26,6 @@ public class UserAccountsResetPasswordPage extends UserAccountsPasswordBasePage
 
 	private static final String TEMPLATE_NAME = "userAccounts-resetPassword.ftl";
 
-	private static final String EMAIL_TEMPLATE = "userAccounts-passwordResetCompleteEmail.ftl";
-
 	protected UserAccountsResetPasswordPage(VitroRequest vreq) {
 		super(vreq);
 	}
@@ -55,6 +53,11 @@ public class UserAccountsResetPasswordPage extends UserAccountsPasswordBasePage
 	protected String passwordChangeNotPendingMessage() {
 		return i18n.text("password_change_not_pending", userEmail);
 	}
+	
+	@Override
+	protected String passwordChangeInavlidKeyMessage() {
+		return i18n.text("password_change_invalid_key", userEmail);
+	}
 
 	@Override
 	protected String templateName() {
@@ -63,14 +66,16 @@ public class UserAccountsResetPasswordPage extends UserAccountsPasswordBasePage
 
 	private void notifyUser() {
 		Map<String, Object> body = new HashMap<String, Object>();
+		FreemarkerEmailMessage email = FreemarkerEmailFactory.createNewMessage(vreq);
+		final String subject = i18n.text("password_changed_subject");
+		email.setSubject(subject);
+
 		body.put("userAccount", userAccount);
 		body.put("siteName", getSiteName());
-
-		FreemarkerEmailMessage email = FreemarkerEmailFactory
-				.createNewMessage(vreq);
+		body.put("subject", subject);
+		body.put("textMessage", i18n.text("password_reset_complete_email_plain_text"));
+		body.put("htmlMessage", i18n.text("password_reset_complete_email_html_text"));
 		email.addRecipient(TO, userAccount.getEmailAddress());
-		email.setSubject(i18n.text("password_changed_subject"));
-		email.setTemplate(EMAIL_TEMPLATE);
 		email.setBodyMap(body);
 		email.processTemplate();
 		email.send();

api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/admin/ShowBackgroundThreadsController.java

@@ -2,6 +2,7 @@
 
 package edu.cornell.mannlib.vitro.webapp.controller.admin;
 
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
@@ -9,8 +10,6 @@ import java.util.Map;
 import java.util.SortedMap;
 import java.util.TreeMap;
 
-import com.ibm.icu.text.SimpleDateFormat;
-
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
 import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServlet;
 import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues;

api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/admin/SparqlQueryController.java

@@ -17,6 +17,8 @@ import javax.servlet.annotation.WebServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import edu.cornell.mannlib.vitro.webapp.i18n.I18n;
+import edu.cornell.mannlib.vitro.webapp.i18n.I18nBundle;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -75,8 +77,8 @@ public class SparqlQueryController extends FreemarkerHttpServlet {
 	private static final String[] SAMPLE_QUERY = { //
 			"", //
 			"#", //
-			"# This example query gets 20 geographic locations", //
-			"# and (if available) their labels", //
+			"i18n:sparql_query_description_0", //
+			"i18n:sparql_query_description_1", //
 			"#", //
 			"SELECT ?geoLocation ?label", //
 			"WHERE", //
@@ -193,9 +195,11 @@ public class SparqlQueryController extends FreemarkerHttpServlet {
 
 	@Override
 	protected ResponseValues processRequest(VitroRequest vreq) throws Exception {
+		I18nBundle i18n = I18n.bundle(vreq);
+
 		Map<String, Object> bodyMap = new HashMap<>();
-		bodyMap.put("sampleQuery", buildSampleQuery(buildPrefixList(vreq)));
-		bodyMap.put("title", "SPARQL Query");
+		bodyMap.put("sampleQuery", buildSampleQuery(i18n, buildPrefixList(vreq)));
+		bodyMap.put("title", i18n.text("sparql_query_title"));
 		bodyMap.put("submitUrl", UrlBuilder.getUrl("admin/sparqlquery"));
 		return new TemplateResponseValues(TEMPLATE_NAME, bodyMap);
 	}
@@ -222,7 +226,7 @@ public class SparqlQueryController extends FreemarkerHttpServlet {
 		return prefixList;
 	}
 
-	private String buildSampleQuery(List<Prefix> prefixList) {
+	private String buildSampleQuery(I18nBundle i18n, List<Prefix> prefixList) {
 		StringWriter sw = new StringWriter();
 		PrintWriter writer = new PrintWriter(sw);
 
@@ -230,6 +234,10 @@ public class SparqlQueryController extends FreemarkerHttpServlet {
 			writer.println(p);
 		}
 		for (String line : SAMPLE_QUERY) {
+			if (line.startsWith("i18n:")) {
+			    // Get i18n translation
+				line =  i18n.text(line.substring("i18n:".length()));
+			}
 			writer.println(line);
 		}
 

api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/api/SparqlUpdateApiController.java

@@ -8,6 +8,7 @@ import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR;
 import static javax.servlet.http.HttpServletResponse.SC_OK;
 
 import java.io.IOException;
+import java.io.InputStream;
 
 import javax.servlet.ServletException;
 import javax.servlet.annotation.WebServlet;
@@ -18,6 +19,8 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
+import static org.apache.jena.riot.web.HttpNames.paramUsingGraphURI;
+import static org.apache.jena.riot.web.HttpNames.paramUsingNamedGraphURI;
 import org.apache.jena.query.Dataset;
 import org.apache.jena.query.ReadWrite;
 import org.apache.jena.update.GraphStore;
@@ -25,6 +28,9 @@ import org.apache.jena.update.GraphStoreFactory;
 import org.apache.jena.update.UpdateAction;
 import org.apache.jena.update.UpdateFactory;
 import org.apache.jena.update.UpdateRequest;
+import org.apache.jena.graph.Node;
+import org.apache.jena.graph.NodeFactory;
+import org.apache.jena.sparql.modify.UsingList;
 
 import edu.cornell.mannlib.vitro.webapp.application.ApplicationUtils;
 import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission;
@@ -76,26 +82,47 @@ public class SparqlUpdateApiController extends VitroApiServlet {
 
 	private UpdateRequest parseUpdateString(HttpServletRequest req)
 			throws ParseException {
-		String update = req.getParameter("update");
-		if (StringUtils.isBlank(update)) {
-			log.debug("No update parameter.");
-			throw new ParseException("No 'update' parameter.");
-		}
+		InputStream update;
+		String reqtype = req.getContentType();
+		UsingList usingList = processProtocol(req);
 
-		if (!StringUtils.containsIgnoreCase(update, "GRAPH") && !StringUtils.containsIgnoreCase(update, "WITH")) {
-			if (log.isDebugEnabled()) {
-				log.debug("No GRAPH or WITH uri in '" + update + "'");
+		// Support update via both POST body and an 'update' parameter 
+		if (reqtype.equalsIgnoreCase("application/sparql-update")) {
+			try {
+				update = req.getInputStream();
+			} catch (IOException e) {
+				log.debug("Error parsing POST body.");
+				throw new ParseException("Error parsing POST body.");
+			}
+		}
+		else {
+			String updateString = req.getParameter("update");
+			if (StringUtils.isBlank(updateString)) {
+				log.debug("No update parameter.");
+				throw new ParseException("No 'update' parameter.");
+			}
+			if (!StringUtils.containsIgnoreCase(updateString, "GRAPH") && !StringUtils.containsIgnoreCase(updateString, "WITH")) {
+				if (log.isDebugEnabled()) {
+					log.debug("No GRAPH or WITH uri in '" + updateString + "'");
+				}
+				throw new ParseException("SPARQL update must specify a GRAPH ( or WITH) URI.");
+			}
+			try {
+				update = org.apache.commons.io.IOUtils.toInputStream(updateString, "UTF-8");
+			} catch (IOException e) {
+				log.debug("Error parsing POST body.");
+				throw new ParseException("Error parsing POST body.");
 			}
-			throw new ParseException("SPARQL update must specify a GRAPH ( or WITH) URI.");
 		}
 
 		try {
-			return UpdateFactory.create(update);
+			return UpdateFactory.read(usingList, update);
 		} catch (Exception e) {
 			log.debug("Problem parsing", e);
 			throw new ParseException("Failed to parse SPARQL update", e);
 		}
 	}
+	
 
 	private void executeUpdate(HttpServletRequest req, UpdateRequest parsed) {
 		VitroRequest vreq = new VitroRequest(req);
@@ -121,6 +148,35 @@ public class SparqlUpdateApiController extends VitroApiServlet {
 		}
 	}
 
+	/* 
+	 * The method below and the 'createNode' helper were 
+	 * adapted from the Fuseki source code 
+	 */
+    private UsingList processProtocol(HttpServletRequest request) {
+        UsingList toReturn = new UsingList();
+
+        String[] usingArgs = request.getParameterValues(paramUsingGraphURI);
+        String[] usingNamedArgs = request.getParameterValues(paramUsingNamedGraphURI);
+        if ( usingArgs == null && usingNamedArgs == null )
+            return toReturn;
+        if ( usingArgs == null )
+            usingArgs = new String[0];
+        if ( usingNamedArgs == null )
+            usingNamedArgs = new String[0];
+        // Impossible.
+//        if ( usingArgs.length == 0 && usingNamedArgs.length == 0 )
+//            return;
+
+        for ( String nodeUri : usingArgs ) {
+            toReturn.addUsing(createNode(nodeUri));
+        }
+        for ( String nodeUri : usingNamedArgs ) {
+            toReturn.addUsingNamed(createNode(nodeUri));
+        }
+
+        return toReturn;
+    }
+
 	private void do200response(HttpServletResponse resp) throws IOException {
 		sendShortResponse(SC_OK, "SPARQL update accepted.", resp);
 	}
@@ -158,4 +214,14 @@ public class SparqlUpdateApiController extends VitroApiServlet {
 		}
 	}
 
+	private static Node createNode(String x) {
+        try {
+            return NodeFactory.createURI(x);
+        } catch (Exception ex) {
+			log.debug("SPARQL Update: bad IRI: "+x);
+            return null;
+        }
+
+    }
+
 }

api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/authenticate/BasicAuthenticator.java

@@ -134,6 +134,7 @@ public class BasicAuthenticator extends Authenticator {
 		userAccount.setMd5Password("");
 		userAccount.setPasswordChangeRequired(false);
 		userAccount.setPasswordLinkExpires(0L);
+		userAccount.setEmailKey("");
 		getUserAccountsDao().updateUserAccount(userAccount);
 	}
 

api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/authenticate/LoginRedirector.java

@@ -108,7 +108,9 @@ public class LoginRedirector {
 			throws IOException {
 		try {
 			DisplayMessage.setMessage(request, assembleWelcomeMessage());
-			response.sendRedirect(getRedirectionUriForLoggedInUser());
+			String redirectUrl = getRedirectionUriForLoggedInUser();
+			log.debug("Sending redirect to path: " + redirectUrl);
+			response.sendRedirect(redirectUrl);
 		} catch (IOException e) {
 			log.debug("Problem with re-direction", e);
 			response.sendRedirect(getApplicationHomePageUrl());
@@ -175,21 +177,13 @@ public class LoginRedirector {
 		}
 	}
 
-	/**
-	 * The application home page can be overridden by an attribute in the
-	 * ServletContext. Further, it can either be an absolute URL, or it can be
-	 * relative to the application. Weird.
-	 */
 	private String getApplicationHomePageUrl() {
-		String contextRedirect = (String) session.getServletContext()
-				.getAttribute("postLoginRequest");
-		if (contextRedirect != null) {
-			if (contextRedirect.indexOf(":") == -1) {
-				return request.getContextPath() + contextRedirect;
-			} else {
-				return contextRedirect;
-			}
+		String contextPath = request.getContextPath();
+		if (contextPath.equals("")) {
+			return "/";
+		}
+		else {
+			return contextPath;
 		}
-		return request.getContextPath();
 	}
 }

api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/Classes2ClassesRetryController.java

@@ -43,7 +43,7 @@ public class Classes2ClassesRetryController extends BaseEditController {
             action = epo.getAction();
         }
 
-        VClassDao vcDao = ModelAccess.on(getServletContext()).getWebappDaoFactory().getVClassDao();
+        VClassDao vcDao = ModelAccess.on(request).getWebappDaoFactory().getVClassDao();
         epo.setDataAccessObject(vcDao);
         Classes2Classes objectForEditing = new Classes2Classes();
 

api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/ClassgroupRetryController.java

@@ -51,8 +51,7 @@ public class ClassgroupRetryController extends BaseEditController {
             action = epo.getAction();
         }
 
-        VClassGroupDao cgDao = ModelAccess.on(
-                getServletContext()).getWebappDaoFactory().getVClassGroupDao();
+        VClassGroupDao cgDao = ModelAccess.on(request).getWebappDaoFactory().getVClassGroupDao();
 
         epo.setDataAccessObject(cgDao);
 

api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/DatapropEditController.java

@@ -22,6 +22,7 @@ import edu.cornell.mannlib.vedit.controller.BaseEditController;
 import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission;
 import edu.cornell.mannlib.vitro.webapp.beans.ApplicationBean;
 import edu.cornell.mannlib.vitro.webapp.beans.DataProperty;
+import edu.cornell.mannlib.vitro.webapp.beans.FauxProperty;
 import edu.cornell.mannlib.vitro.webapp.beans.Ontology;
 import edu.cornell.mannlib.vitro.webapp.beans.PropertyGroup;
 import edu.cornell.mannlib.vitro.webapp.beans.VClass;
@@ -176,6 +177,11 @@ public class DatapropEditController extends BaseEditController {
                 assertionsDpDao.getEquivalentPropertyURIs(dp.getURI()), assertionsDpDao);
         sortForPickList(eqProps, vreq);
         request.setAttribute("equivalentProperties", eqProps);
+	
+        List<FauxProperty> fauxProps = vreq.getUnfilteredAssertionsWebappDaoFactory().getFauxPropertyDao().
+        		getFauxPropertiesForBaseUri(dp.getURI());
+        sortForPickList(fauxProps, vreq);
+        request.setAttribute("fauxproperties", fauxProps);	
 
         ApplicationBean appBean = vreq.getAppBean();
 

api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/DatapropRetryController.java

@@ -50,11 +50,12 @@ public class DatapropRetryController extends BaseEditController {
 
         //create an EditProcessObject for this and put it in the session
         EditProcessObject epo = super.createEpo(request);
+        epo.setImplementationClass(DataProperty.class);
         epo.setBeanClass(DataProperty.class);
 
         VitroRequest vreq = new VitroRequest(request);
 
-        WebappDaoFactory wadf = ModelAccess.on(getServletContext()).getWebappDaoFactory();
+        WebappDaoFactory wadf = ModelAccess.on(vreq).getWebappDaoFactory();
 
         DatatypeDao dDao = wadf.getDatatypeDao();
         DataPropertyDao dpDao = wadf.getDataPropertyDao();

api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/EntityRetryController.java

@@ -20,9 +20,12 @@ import javax.servlet.http.HttpServletResponse;
 
 import edu.cornell.mannlib.vitro.webapp.utils.JSPPageHandler;
 import org.apache.commons.collections4.map.ListOrderedMap;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
+import com.ctc.wstx.util.StringUtil;
+
 import edu.cornell.mannlib.vedit.beans.DynamicField;
 import edu.cornell.mannlib.vedit.beans.DynamicFieldRow;
 import edu.cornell.mannlib.vedit.beans.EditProcessObject;
@@ -250,7 +253,12 @@ public class EntityRetryController extends BaseEditController {
                         //TODO: UGH
                         //row.setId(existingValue.getId());
                         row.setParameterMap(parameterMap);
-                        row.setValue(existingValue.getData());
+                        String value = existingValue.getData();
+                        row.setValue(value);
+                        String language = existingValue.getLanguage();
+                        if (!StringUtils.isBlank(language)) {
+                            row.setLanguage(language);
+                        }
                         if (dynamo.getRowList() == null)
                             dynamo.setRowList(new ArrayList());
                         dynamo.getRowList().add(row);

api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/FauxPropertyRetryController.java

@@ -32,12 +32,14 @@ import edu.cornell.mannlib.vedit.validator.Validator;
 import edu.cornell.mannlib.vedit.validator.impl.RequiredFieldValidator;
 import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission;
 import edu.cornell.mannlib.vitro.webapp.auth.policy.bean.PropertyRestrictionListener;
+import edu.cornell.mannlib.vitro.webapp.beans.Datatype;
 import edu.cornell.mannlib.vitro.webapp.beans.FauxProperty;
 import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty;
 import edu.cornell.mannlib.vitro.webapp.beans.Property;
 import edu.cornell.mannlib.vitro.webapp.beans.PropertyGroup;
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
 import edu.cornell.mannlib.vitro.webapp.controller.edit.utils.RoleLevelOptionsSetup;
+import edu.cornell.mannlib.vitro.webapp.dao.DataPropertyDao;
 import edu.cornell.mannlib.vitro.webapp.dao.FauxPropertyDao;
 import edu.cornell.mannlib.vitro.webapp.dao.ObjectPropertyDao;
 import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
@@ -88,6 +90,8 @@ public class FauxPropertyRetryController extends BaseEditController {
 	}
 
 	private static class EpoPopulator {
+		private static final String LITERAL = "http://www.w3.org/2000/01/rdf-schema#Literal";
+		private static final String XML_LITERAL = "http://www.w3.org/1999/02/22-rdf-syntax-ns#XMLLiteral";
 		private final VitroRequest req;
 		private final ServletContext ctx;
 		private final WebappDaoFactory wadf;
@@ -98,6 +102,8 @@ public class FauxPropertyRetryController extends BaseEditController {
 
 		private FauxProperty beanForEditing;
 		private Property baseProperty;
+		
+		private boolean isFauxDataProperty = false;
 
 		EpoPopulator(HttpServletRequest req, EditProcessObject epo) {
 			this.req = new VitroRequest(req);
@@ -106,7 +112,7 @@ public class FauxPropertyRetryController extends BaseEditController {
 
 			this.epo = epo;
 
-			this.fpDao = ModelAccess.on(ctx).getWebappDaoFactory()
+			this.fpDao = ModelAccess.on(req).getWebappDaoFactory()
 					.getFauxPropertyDao();
 
 		}
@@ -114,6 +120,8 @@ public class FauxPropertyRetryController extends BaseEditController {
 		void populate() {
 			epo.setDataAccessObject(fpDao);
 			epo.setAction(determineAction());
+			epo.setImplementationClass(FauxProperty.class);
+			epo.setBeanClass(FauxProperty.class);
 
 			if (epo.getUseRecycledBean()) {
 				beanForEditing = (FauxProperty) epo.getNewBean();
@@ -125,10 +133,19 @@ public class FauxPropertyRetryController extends BaseEditController {
 			this.baseProperty = req.getUnfilteredWebappDaoFactory()
 					.getObjectPropertyDao()
 					.getObjectPropertyByURI(beanForEditing.getURI());
+			if (this.baseProperty == null) {
+				this.baseProperty = req.getUnfilteredWebappDaoFactory()
+						.getDataPropertyDao()
+						.getDataPropertyByURI(beanForEditing.getURI());
+				isFauxDataProperty = true;
+			}
 
 			addCheckboxValuesToTheRequest();
 
-			setFieldValidators();
+			if (!isFauxDataProperty) {
+				setFieldValidators();	
+			}
+			
 			setListeners();
 			setForwarders();
 
@@ -148,8 +165,7 @@ public class FauxPropertyRetryController extends BaseEditController {
 				return newFauxProperty(baseUri);
 			}
 
-			FauxProperty bean = fpDao.getFauxPropertyByUris(domainUri, baseUri,
-					rangeUri);
+			FauxProperty bean = fpDao.getFauxPropertyByUris(domainUri, baseUri, rangeUri);
 			if (bean == null) {
 				throw new IllegalArgumentException(
 						"FauxProperty does not exist for <" + domainUri
@@ -166,7 +182,16 @@ public class FauxPropertyRetryController extends BaseEditController {
 		private FauxProperty newFauxProperty(String baseUri) {
 			FauxProperty fp = new FauxProperty(null, baseUri, null);
 			ObjectPropertyDao opDao = wadf.getObjectPropertyDao();
-			ObjectProperty base = opDao.getObjectPropertyByURI(baseUri);
+			DataPropertyDao dpDao = wadf.getDataPropertyDao();
+			ObjectProperty objBase = opDao.getObjectPropertyByURI(baseUri);
+			Property base;
+			if (objBase != null) {
+				fp.setSelectFromExisting(objBase.getSelectFromExisting());
+				fp.setOfferCreateNewOption(objBase.getOfferCreateNewOption());
+				base = objBase;
+			} else {
+				base = dpDao.getDataPropertyByURI(baseUri);
+			}
 			fp.setGroupURI(base.getGroupURI());
 			fp.setRangeURI(base.getRangeVClassURI());
 			fp.setDomainURI(base.getDomainVClassURI());
@@ -268,7 +293,7 @@ public class FauxPropertyRetryController extends BaseEditController {
 				list.addAll(FormUtils.makeVClassOptionList(wadf,
 						beanForEditing.getDomainURI()));
 			} else {
-				list.addAll(FormUtils.makeOptionListOfSubVClasses(wadf,
+				list.addAll(FormUtils.makeOptionListOfNotDisjointClasses(wadf,
 						baseProperty.getDomainVClassURI(),
 						beanForEditing.getDomainURI()));
 			}
@@ -277,12 +302,20 @@ public class FauxPropertyRetryController extends BaseEditController {
 		}
 
 		private List<Option> buildRangeOptionList() {
+			if (isFauxDataProperty) {
+				return buildDataPropOptionList();
+			} else {
+				return buildObjectPropOptionList();	
+			}
+		}
+
+		private List<Option> buildObjectPropOptionList() {
 			List<Option> list = new ArrayList<>();
 			if (baseProperty.getRangeVClassURI() == null) {
 				list.addAll(FormUtils.makeVClassOptionList(wadf,
 						beanForEditing.getRangeURI()));
 			} else {
-				list.addAll(FormUtils.makeOptionListOfSubVClasses(wadf,
+				list.addAll(FormUtils.makeOptionListOfNotDisjointClasses(wadf,
 						baseProperty.getRangeVClassURI(),
 						beanForEditing.getRangeURI()));
 				if (containsVCardKind(list)) {
@@ -293,6 +326,43 @@ public class FauxPropertyRetryController extends BaseEditController {
 			return list;
 		}
 
+		private List<Option> buildDataPropOptionList() {
+			List<Option> list = new ArrayList<>();
+			String rangeUri = baseProperty.getRangeVClassURI();
+			if (rangeUri == null) {
+				Option option = new Option();
+				option.setValue("");
+				option.setBody("Untyped");
+				option.setSelected(true);
+				list.add(option);
+			} else if (rangeUri.equals(LITERAL)) {
+				Option option = new Option();
+				option.setValue(rangeUri);
+				option.setBody("Literal");
+				option.setSelected(true);
+				list.add(option);
+			} else if (rangeUri.equals(XML_LITERAL)) {
+				Option option = new Option();
+				option.setValue(rangeUri);
+				option.setBody("XML Literal");
+				option.setSelected(true);
+				list.add(option);
+			} else {
+				Datatype dataType = wadf.getDatatypeDao().getDatatypeByURI(rangeUri);
+				Option option = new Option();
+				if (dataType != null) {
+					option.setValue(dataType.getUri());
+					option.setBody(dataType.getName());
+				} else {
+					option.setValue(rangeUri);
+					option.setBody(rangeUri);
+				}
+				option.setSelected(true);
+				list.add(option);
+			}
+			return list;
+		}
+
 		private static final String VCARD_KIND_URI = "http://www.w3.org/2006/vcard/ns#Kind";
 		private static final String VCARD_NAMESPACE = "http://www.w3.org/2006/vcard/ns#";
 

api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/NamespacePrefixOperationController.java

@@ -71,7 +71,7 @@ public class NamespacePrefixOperationController extends BaseEditController {
 
         if (request.getParameter("_cancel") == null) {
 
-    		OntModel ontModel = ModelAccess.on(getServletContext()).getOntModel();
+    		OntModel ontModel = ModelAccess.on(req).getOntModel();
         	String namespaceStr = request.getParameter("namespace");
         	String prefixStr = request.getParameter("prefix");
 

api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/PropertyGroupRetryController.java

@@ -51,7 +51,7 @@ public class PropertyGroupRetryController extends BaseEditController {
         }
 
         PropertyGroupDao pgDao = ModelAccess.on(
-                getServletContext()).getWebappDaoFactory().getPropertyGroupDao();
+                req).getWebappDaoFactory().getPropertyGroupDao();
 
         epo.setDataAccessObject(pgDao);
 

api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/PropertyRetryController.java

@@ -53,6 +53,7 @@ public class PropertyRetryController extends BaseEditController {
 
         /*for testing*/
         ObjectProperty testMask = new ObjectProperty();
+        epo.setImplementationClass(ObjectProperty.class);
         epo.setBeanClass(ObjectProperty.class);
         epo.setBeanMask(testMask);
 
@@ -64,7 +65,7 @@ public class PropertyRetryController extends BaseEditController {
             action = epo.getAction();
         }
 
-        ObjectPropertyDao propDao = ModelAccess.on(getServletContext()).getWebappDaoFactory().getObjectPropertyDao();
+        ObjectPropertyDao propDao = ModelAccess.on(req).getWebappDaoFactory().getObjectPropertyDao();
         epo.setDataAccessObject(propDao);
         OntologyDao ontDao = request.getUnfilteredWebappDaoFactory().getOntologyDao();
 

api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/RestrictionOperationController.java

@@ -48,7 +48,7 @@ public class RestrictionOperationController extends BaseEditController {
 		String defaultLandingPage = getDefaultLandingPage(request);
 
 	    try {
-			OntModel ontModel = ModelAccess.on(getServletContext())
+			OntModel ontModel = ModelAccess.on(req)
 					.getOntModel(TBOX_ASSERTIONS);
 
             HashMap epoHash = null;

api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/VclassEditController.java

@@ -48,7 +48,7 @@ public class VclassEditController extends BaseEditController {
         EditProcessObject epo = super.createEpo(request, FORCE_NEW);
         request.setAttribute("epoKey", epo.getKey());
 
-        VClassDao vcwDao = ModelAccess.on(getServletContext()).getWebappDaoFactory(ASSERTIONS_ONLY).getVClassDao();
+        VClassDao vcwDao = ModelAccess.on(req).getWebappDaoFactory(ASSERTIONS_ONLY).getVClassDao();
         VClass vcl = (VClass)vcwDao.getVClassByURI(request.getParameter("uri"));
 
         if (vcl == null) {
@@ -152,8 +152,8 @@ public class VclassEditController extends BaseEditController {
         request.setAttribute("formSelect",formSelect);
 
         // if supported, we want to show only the asserted superclasses and subclasses.
-        VClassDao vcDao = ModelAccess.on(getServletContext()).getWebappDaoFactory(ASSERTIONS_ONLY).getVClassDao();
-        VClassDao displayVcDao = ModelAccess.on(getServletContext()).getWebappDaoFactory().getVClassDao();
+        VClassDao vcDao = ModelAccess.on(req).getWebappDaoFactory(ASSERTIONS_ONLY).getVClassDao();
+        VClassDao displayVcDao = ModelAccess.on(req).getWebappDaoFactory().getVClassDao();
 
         List<VClass> superVClasses = getVClassesForURIList(
                 vcDao.getSuperClassURIs(vcl.getURI(),false), displayVcDao);

api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/VclassRetryController.java

@@ -66,11 +66,10 @@ public class VclassRetryController extends BaseEditController {
             action = epo.getAction();
         }
 
-        WebappDaoFactory wadf = ModelAccess.on(getServletContext()).getWebappDaoFactory();
+        WebappDaoFactory wadf = ModelAccess.on(req).getWebappDaoFactory();
 
         VClassDao vcwDao = wadf.getVClassDao();
         epo.setDataAccessObject(vcwDao);
-        VClassGroupDao cgDao = wadf.getVClassGroupDao();
         OntologyDao oDao = wadf.getOntologyDao();
 
         VClass vclassForEditing = null;

api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/jena/NamespacesListingController.java

@@ -37,7 +37,7 @@ public class NamespacesListingController extends BaseEditController {
 
         VitroRequest vrequest = new VitroRequest(request);
 
-		OntModel ontModel = ModelAccess.on(getServletContext()).getOntModel();
+		OntModel ontModel = ModelAccess.on(vrequest).getOntModel();
 
         ArrayList results = new ArrayList();
         request.setAttribute("results",results);

api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/jena/RestrictionsListingController.java

@@ -54,7 +54,7 @@ public class RestrictionsListingController extends BaseEditController {
 
         epo = super.createEpo(request);
 
-		OntModel ontModel = ModelAccess.on(getServletContext()).getOntModel();
+		OntModel ontModel = ModelAccess.on(vrequest).getOntModel();
 
         ObjectPropertyDao opDao = vrequest.getUnfilteredWebappDaoFactory().getObjectPropertyDao();
         VClassDao vcDao = vrequest.getUnfilteredWebappDaoFactory().getVClassDao();

api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/BrowseController.java

@@ -3,6 +3,8 @@
 package edu.cornell.mannlib.vitro.webapp.controller.freemarker;
 
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -42,6 +44,8 @@ public class BrowseController extends FreemarkerHttpServlet {
         List<VClassGroup> groups = null;
         VClassGroupsForRequest vcgc = VClassGroupCache.getVClassGroups(vreq);
         groups =vcgc.getGroups();
+        Collections.sort(groups, publicNameComparator);
+//        sortGroupListByPublicName(groups);
         List<VClassGroupTemplateModel> vcgroups = new ArrayList<VClassGroupTemplateModel>(groups.size());
         for (VClassGroup group : groups) {
             vcgroups.add(new VClassGroupTemplateModel(group));
@@ -50,4 +54,35 @@ public class BrowseController extends FreemarkerHttpServlet {
 
         return new TemplateResponseValues(templateName, body);
     }
+    public Comparator<VClassGroup> publicNameComparator = new Comparator<VClassGroup>() {
+
+    	public int compare(VClassGroup s1, VClassGroup s2) {
+    	   String groupName1 = s1.getPublicName().toUpperCase();
+    	   String groupName2 = s2.getPublicName().toUpperCase();
+
+    	   //ascending order
+    	   return groupName1.compareTo(groupName2);
+
+    	   //descending order
+    	   //return groupName2.compareTo(groupName1);
+        }};
+
+//
+//    public void sortGroupListByPublicName(List<VClassGroup> groupList) {
+//        groupList.sort(new Comparator<VClassGroup>() {
+//            public int compare(VClassGroup first, VClassGroup second) {
+//                if (first != null) {
+//                    if (second != null) {
+//                        return (first.getDisplayRank() - second.getDisplayRank());
+//                    } else {
+//                        log.error("error--2nd VClassGroup is null in VClassGroupDao.getGroupList().compare()");
+//                    }
+//                } else {
+//                    log.error("error--1st VClassGroup is null in VClassGroupDao.getGroupList().compare()");
+//                }
+//                return 0;
+//            }
+//        });
+//    }
+
 }

api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/DeleteIndividualController.java

@@ -0,0 +1,211 @@
+package edu.cornell.mannlib.vitro.webapp.controller.freemarker;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
+import java.io.StringWriter;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.jena.query.Query;
+import org.apache.jena.query.QueryExecution;
+import org.apache.jena.query.QueryExecutionFactory;
+import org.apache.jena.query.QueryFactory;
+import org.apache.jena.query.QuerySolution;
+import org.apache.jena.query.QuerySolutionMap;
+import org.apache.jena.query.ResultSet;
+import org.apache.jena.rdf.model.Model;
+import org.apache.jena.rdf.model.ModelFactory;
+import org.apache.jena.rdf.model.ResourceFactory;
+import org.apache.jena.shared.Lock;
+
+import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission;
+import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest;
+import edu.cornell.mannlib.vitro.webapp.beans.Individual;
+import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.RedirectResponseValues;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues;
+import static edu.cornell.mannlib.vitro.webapp.dao.DisplayVocabulary.HAS_DELETE_QUERY;
+
+import edu.cornell.mannlib.vitro.webapp.dao.jena.event.BulkUpdateEvent;
+import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess;
+import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelNames;
+import edu.cornell.mannlib.vitro.webapp.rdfservice.ChangeSet;
+import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService;
+import edu.cornell.mannlib.vitro.webapp.rdfservice.impl.RDFServiceUtils;
+
+@WebServlet(name = "DeleteIndividualController", urlPatterns = "/deleteIndividualController")
+public class DeleteIndividualController extends FreemarkerHttpServlet {
+
+	private static final String INDIVIDUAL_URI = "individualUri";
+	private static final long serialVersionUID = 1L;
+	private static final Log log = LogFactory.getLog(DeleteIndividualController.class);
+	private static final boolean BEGIN = true;
+	private static final boolean END = !BEGIN;
+
+	private static String queryForDeleteQuery = ""
+			+ "SELECT ?deleteQueryText WHERE { "
+			+ "?associatedUri <" + HAS_DELETE_QUERY + "> ?deleteQueryText ."
+			+ "}";
+
+	private static final String DEFAULT_DELETE_QUERY_TEXT = ""
+			+ "CONSTRUCT { ?individualUri ?p1 ?o1 . ?s2 ?p2 ?individualUri . } "
+			+ "WHERE {"
+			+ "  { ?individualUri ?p1 ?o1 . } UNION { ?s2 ?p2 ?individualUri. } "
+			+ "}";
+
+	@Override
+	protected AuthorizationRequest requiredActions(VitroRequest vreq) {
+		return SimplePermission.DO_FRONT_END_EDITING.ACTION;
+	}
+
+	protected ResponseValues processRequest(VitroRequest vreq) {
+		String errorMessage = handleErrors(vreq);
+		if (!errorMessage.isEmpty()) {
+			return prepareErrorMessage(errorMessage);
+		}
+		String individualUri = vreq.getParameter(INDIVIDUAL_URI);
+		List<String> types = getObjectMostSpecificTypes(individualUri, vreq);
+		Model displayModel = vreq.getDisplayModel();
+
+		String deleteQueryText = getDeleteQueryForTypes(types, displayModel);
+		Model toRemove = getIndividualsToDelete(individualUri, deleteQueryText, vreq);
+		if (toRemove.size() > 0) {
+			deleteIndividuals(toRemove, vreq);
+		}
+		String redirectUrl = getRedirectUrl(vreq);
+
+		return new RedirectResponseValues(redirectUrl, HttpServletResponse.SC_SEE_OTHER);
+	}
+
+	private String getRedirectUrl(VitroRequest vreq) {
+		String redirectUrl = vreq.getParameter("redirectUrl");
+		if (redirectUrl != null) {
+			return redirectUrl;
+		}
+		return "/";
+	}
+
+	private TemplateResponseValues prepareErrorMessage(String errorMessage) {
+		HashMap<String, Object> map = new HashMap<String, Object>();
+		map.put("errorMessage", errorMessage);
+		return new TemplateResponseValues("error-message.ftl", map);
+	}
+
+	private String handleErrors(VitroRequest vreq) {
+		String uri = vreq.getParameter(INDIVIDUAL_URI);
+		if (uri == null) {
+			return "Individual uri is null. No object to delete.";
+		}
+		if (uri.contains("<") || uri.contains(">")) {
+			return "Individual IRI shouldn't contain '<' or '>";
+		}
+		return "";
+	}
+
+	private static String getDeleteQueryForTypes(List<String> types, Model displayModel) {
+		String deleteQueryText = DEFAULT_DELETE_QUERY_TEXT;
+		String foundType = "";
+		for ( String type: types) {
+			Query queryForTypeSpecificDeleteQuery = QueryFactory.create(queryForDeleteQuery);
+			QuerySolutionMap initialBindings = new QuerySolutionMap();
+			initialBindings.add("associatedURI", ResourceFactory.createResource(type));
+			displayModel.enterCriticalSection(Lock.READ);
+			try {
+				QueryExecution qexec = QueryExecutionFactory.create(queryForTypeSpecificDeleteQuery, displayModel,
+						initialBindings);
+				try {
+					ResultSet results = qexec.execSelect();
+					if (results.hasNext()) {
+						QuerySolution solution = results.nextSolution();
+						deleteQueryText = solution.get("deleteQueryText").toString();
+						foundType = type;
+					}
+				} finally {
+					qexec.close();
+				}
+			} finally {
+				displayModel.leaveCriticalSection();
+			}
+			if (!foundType.isEmpty()) {
+				break;
+			}
+		}
+		
+		if (!foundType.isEmpty()) {
+			log.debug("For " + foundType + " found delete query \n" + deleteQueryText);
+			if (!deleteQueryText.contains(INDIVIDUAL_URI)){
+				log.error("Safety check failed. Delete query text should contain " + INDIVIDUAL_URI + ", "
+						+ "but it didn't. To prevent bad consequences query was rejected.");
+				log.error("Delete query which caused the error: \n" + deleteQueryText);
+				deleteQueryText = DEFAULT_DELETE_QUERY_TEXT;
+			}
+		} else {
+			log.debug("For most specific types: " + types.stream().collect(Collectors.joining(",")) + " no delete query was found. Using default query \n" + deleteQueryText);
+		}
+		return deleteQueryText;
+	}
+
+	private List<String> getObjectMostSpecificTypes(String individualUri, VitroRequest vreq) {
+		List<String> types = new LinkedList<String>();
+			Individual individual = vreq.getWebappDaoFactory().getIndividualDao().getIndividualByURI(individualUri);
+			if (individual != null) {
+				types = individual.getMostSpecificTypeURIs();
+			}
+		if (types.isEmpty()) {
+			log.error("Failed to get most specific type for individual Uri " + individualUri);
+		}
+		return types;
+	}
+
+	private Model getIndividualsToDelete(String targetIndividual, String deleteQuery, VitroRequest vreq) {
+		try {
+			Query queryForTypeSpecificDeleteQuery = QueryFactory.create(deleteQuery);
+			QuerySolutionMap bindings = new QuerySolutionMap();
+			bindings.add(INDIVIDUAL_URI, ResourceFactory.createResource(targetIndividual));
+			Model ontModel = ModelAccess.on(vreq).getOntModelSelector().getABoxModel();
+			QueryExecution qexec = QueryExecutionFactory.create(queryForTypeSpecificDeleteQuery, ontModel, bindings);
+			Model results = qexec.execConstruct();
+			return results;
+
+		} catch (Exception e) {
+			log.error("Query raised an error \n" + deleteQuery);
+			log.error(e, e);
+		}
+		return ModelFactory.createDefaultModel();
+	}
+
+	private void deleteIndividuals(Model model, VitroRequest vreq) {
+		RDFService rdfService = vreq.getRDFService();
+		ChangeSet cs = makeChangeSet(rdfService);
+		try {
+			ByteArrayOutputStream out = new ByteArrayOutputStream();
+			model.write(out, "N3");
+			InputStream in = new ByteArrayInputStream(out.toByteArray());
+			cs.addRemoval(in, RDFServiceUtils.getSerializationFormatFromJenaString("N3"), ModelNames.ABOX_ASSERTIONS);
+			rdfService.changeSetUpdate(cs);
+		} catch (Exception e) {
+			StringWriter sw = new StringWriter();
+			model.write(sw, "N3");
+			log.error("Got " + e.getClass().getSimpleName() + " while removing\n" + sw.toString());
+			log.error(e,e);
+			throw new RuntimeException(e);
+		}
+	}
+
+	private ChangeSet makeChangeSet(RDFService rdfService) {
+		ChangeSet cs = rdfService.manufactureChangeSet();
+		cs.addPreChangeEvent(new BulkUpdateEvent(null, BEGIN));
+		cs.addPostChangeEvent(new BulkUpdateEvent(null, END));
+		return cs;
+	}
+
+}

api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/DeletePropertyController.java

@@ -10,6 +10,9 @@ import javax.servlet.http.HttpServletResponse;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
+import org.apache.jena.rdf.model.Property;
+import org.apache.jena.rdf.model.ResourceFactory;
+
 import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission;
 import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest;
 import edu.cornell.mannlib.vitro.webapp.beans.DataProperty;
@@ -25,6 +28,8 @@ import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationUti
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.N3EditUtils;
 import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess;
 import edu.cornell.mannlib.vitro.webapp.web.URLEncoder;
+
+
 /*
  * Custom deletion controller to which deletion requests from default property form are sent. May be replaced
  * later with additional features in process rdf form controller or alternative location.
@@ -61,14 +66,14 @@ public class DeletePropertyController extends FreemarkerHttpServlet {
 
 
     private String getRedirectUrl(VitroRequest vreq) {
-		// TODO Auto-generated method stub
+    	// TODO Auto-generated method stub
     	String subjectUri = EditConfigurationUtils.getSubjectUri(vreq);
     	String predicateUri = EditConfigurationUtils.getPredicateUri(vreq);
-    	int hashIndex = predicateUri.lastIndexOf("#");
-    	String localName = predicateUri.substring(hashIndex + 1);
+    	Property prop = ResourceFactory.createProperty(predicateUri);
+    	String localName = prop.getLocalName();
     	String redirectUrl =  "/entity?uri=" + URLEncoder.encode(subjectUri);
-		return redirectUrl + "#" + URLEncoder.encode(localName);
-	}
+    	return redirectUrl + "#" + URLEncoder.encode(localName);
+    }
 
 
 	private String handleErrors(VitroRequest vreq) {

api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FileUploadController.java

@@ -0,0 +1,417 @@
+package edu.cornell.mannlib.vitro.webapp.controller.freemarker;
+
+import static edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest.UNAUTHORIZED;
+import static edu.cornell.mannlib.vitro.webapp.controller.freemarker.ImageUploadController.PARAMETER_UPLOADED_FILE;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.fileupload.FileItem;
+import org.apache.commons.io.FilenameUtils;
+import org.apache.commons.lang3.RandomStringUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.jena.ontology.OntModel;
+import org.apache.tika.Tika;
+import org.apache.tika.mime.MimeType;
+import org.apache.tika.mime.MimeTypeException;
+import org.apache.tika.mime.MimeTypes;
+
+import edu.cornell.mannlib.vitro.webapp.application.ApplicationUtils;
+import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest;
+import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.RequestedAction;
+import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.propstmt.AddObjectPropertyStatement;
+import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.propstmt.DropObjectPropertyStatement;
+import edu.cornell.mannlib.vitro.webapp.beans.Individual;
+import edu.cornell.mannlib.vitro.webapp.beans.Property;
+import edu.cornell.mannlib.vitro.webapp.config.ConfigurationProperties;
+import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.RedirectResponseValues;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues;
+import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
+import edu.cornell.mannlib.vitro.webapp.filestorage.UploadedFileHelper;
+import edu.cornell.mannlib.vitro.webapp.filestorage.model.FileInfo;
+import edu.cornell.mannlib.vitro.webapp.i18n.I18n;
+import edu.cornell.mannlib.vitro.webapp.i18n.I18nBundle;
+import edu.cornell.mannlib.vitro.webapp.modules.fileStorage.FileStorage;
+
+@WebServlet(name = "FileUploadController", urlPatterns = { "/uploadFile" })
+public class FileUploadController extends FreemarkerHttpServlet {
+	private static final String REFERER_HEADER = "Referer";
+	private static final String TEMPLATE_VAR_FORM_ACTION = "formAction";
+	private static final String TEMPLATE_VAR_MAX_FILE_SIZE = "maxFileSize";
+	private static final String PARAM_REFERRER = "referrer";
+	private static final String TEMPLATE_VAR_SUPPORTED_MEDIA_TYPES = "supportedMediaTypes";
+
+	private static final String TEMPLATE_VAR_ERROR_MESSAGE = "errorMessage";
+	private static final String DEFAULT_FILE_NAME = "fileName";
+	/**
+	 * 
+	 */
+	private static final Log log = LogFactory.getLog(FileUploadController.class);
+	private static final long serialVersionUID = 1L;
+	private static final String PARAMETER_ACTION = "action";
+	private static final String ACTION_DELETE = "delete";
+	private static final String ACTION_UPLOAD = "upload";
+	private static final String PARAMETER_FILE_URI = "fileUri";
+	private static final String PARAMETER_SUBJECT_URI = "subjectUri";
+	private static final String CONFIG_MAX_FILE_SIZE = "fileUpload.maxFileSize";
+	private static final String ALLOWED_MEDIA_TYPES = "fileUpload.allowedMIMETypes";
+	private static final Long DEFAULT_FILE_SIZE = (long) (10 * 1024 * 1024);
+	private static final String PARAMETER_PREDICATE_URI = "predicateUri";
+	private static final String DEFAULT_TEMPLATE = "fileUpload-default.ftl";
+	private static Long maxFileSize = DEFAULT_FILE_SIZE;
+	private FileStorage fileStorage;
+	private Set<String> allowedMediaTypes;
+
+	@Override
+	public void init() throws ServletException {
+		super.init();
+		fileStorage = ApplicationUtils.instance().getFileStorage();
+		setMaxFileSize();
+		setAllowedMediaTypes();
+	}
+
+	@Override
+	protected AuthorizationRequest requiredActions(VitroRequest vreq) {
+		RequestedAction ra;
+		try {
+			Property predicate = new Property(getPredicateUri(vreq));
+			final OntModel jenaOntModel = vreq.getJenaOntModel();
+			final String subject = getSubjectUri(vreq);
+			if (isUpload(vreq)) {
+				ra = new AddObjectPropertyStatement(jenaOntModel, subject, predicate,RequestedAction.SOME_URI);
+			} else { // delete
+				ra = new DropObjectPropertyStatement(jenaOntModel, subject, predicate, getFileUri(vreq));
+			}
+			return ra;
+		} catch (Exception e) {
+			return UNAUTHORIZED;
+		}
+	}
+
+	private String getFileUri(VitroRequest vreq) {
+		return vreq.getParameter(PARAMETER_FILE_URI);
+	}
+
+	@Override
+	protected ResponseValues processRequest(VitroRequest vreq) {
+		
+		try {
+			getReferrer(vreq);
+			validateRequest(vreq);
+			if (isUpload(vreq)) {
+				uploadFile(vreq);
+			} else if (isDelete(vreq)) {
+				deleteFile(vreq);
+			}
+		} catch (Exception e) {
+			return pageResponse(vreq, e.getMessage());
+		}
+		return new RedirectResponseValues(getNextPageUrl(vreq), HttpServletResponse.SC_SEE_OTHER);
+	}
+	private String getNextPageUrl(VitroRequest vreq) {
+		return getReferrer(vreq);
+	}
+	
+	private TemplateResponseValues pageResponse(VitroRequest vreq, String error) {
+		TemplateResponseValues rv = new TemplateResponseValues(DEFAULT_TEMPLATE);
+		rv.put(PARAMETER_ACTION, vreq.getParameter(PARAMETER_ACTION));
+		rv.put(TEMPLATE_VAR_FORM_ACTION, formatRequestUrl(vreq));
+		if (!error.isEmpty()) {
+			rv.put(TEMPLATE_VAR_ERROR_MESSAGE, error);
+		}
+		rv.put(PARAM_REFERRER,getReferrer(vreq));
+		rv.put(TEMPLATE_VAR_SUPPORTED_MEDIA_TYPES, printAllowedMediaTypes());
+		rv.put(TEMPLATE_VAR_MAX_FILE_SIZE, maxFileSizeInMegabytes());
+		return rv;
+	}
+
+	private String formatRequestUrl(VitroRequest vreq) {
+		String result = vreq.getRequestURL().toString() + "?";
+		String query =  vreq.getQueryString();
+		if (query != null) {
+			result += query;
+		}
+		String referrer = vreq.getParameter(PARAM_REFERRER);
+		if (referrer == null || referrer.isEmpty()) {
+			result += "&" + PARAM_REFERRER + "=" + getReferrer(vreq);
+		}
+		return result;
+	}
+
+	private Double maxFileSizeInMegabytes() {
+		if (maxFileSize > 0) {
+			return ((double) maxFileSize/1048576);	
+		} else {
+			return 0.0;
+		}
+	}
+
+	private void validateRequest(VitroRequest vreq) throws FileUploadException {
+		I18nBundle i18nBundle = I18n.bundle(vreq);
+		if (isUpload(vreq)) {
+			validateUploadRequest(vreq,i18nBundle);
+		} else if (isDelete(vreq)) {
+			validateDeleteRequest(vreq,i18nBundle);
+		} else if (hasAction(vreq)) {
+			throw new FileUploadException(i18nBundle.text("file_upload_error_supported_actions"));
+		} else {
+			throw new FileUploadException(i18nBundle.text("file_upload_error_no_action"));
+		}
+	}
+
+	private void validateDeleteRequest(VitroRequest vreq, I18nBundle i18nBundle) throws FileUploadException {
+		validateSubjectUri(vreq, i18nBundle);
+		validatePredicateUri(vreq, i18nBundle);
+		validateFileUri(vreq,i18nBundle);
+	}
+
+	private void validateUploadRequest(VitroRequest vreq, I18nBundle i18nBundle) throws FileUploadException {
+		validateSubjectUri(vreq ,i18nBundle);
+		validatePredicateUri(vreq , i18nBundle);
+		validateFile(vreq, i18nBundle);
+	}
+
+	private void validateFile(VitroRequest vreq, I18nBundle i18nBundle) throws FileUploadException {
+		Map<String, List<FileItem>> map = vreq.getFiles();
+		if (map == null) {
+			throw new FileUploadException(i18nBundle.text("file_upload_error_file_not_found"));
+		}
+		List<FileItem> list = map.get(PARAMETER_UPLOADED_FILE);
+		if ((list == null) || list.isEmpty()) {
+			throw new FileUploadException(i18nBundle.text("file_upload_error_file_not_found"));
+		}
+		FileItem file = list.get(0);
+		if (file.getSize() == 0) {
+			throw new FileUploadException(i18nBundle.text("file_upload_error_file_size_is_zero"));
+		}
+		if (file.getSize() > maxFileSize) {
+			throw new FileUploadException(i18nBundle.text("file_upload_error_file_is_too_big", maxFileSize, file.getSize()));
+		}
+		validateMediaType(file, i18nBundle);
+	}
+
+	private void validateMediaType(FileItem file, I18nBundle i18nBundle) throws FileUploadException {
+		String mediaType = getMediaType(file);
+		if (mediaType.isEmpty()) {
+			throw new FileUploadException(i18nBundle.text("file_upload_error_file_type_not_recognized"));
+		}
+		
+		if (!allowedMediaTypes.contains(mediaType.toLowerCase())) {
+			String errorMessage = i18nBundle.text("file_upload_error_media_type_not_allowed", mediaType);
+			log.error(errorMessage);
+			throw new FileUploadException(errorMessage);
+		}
+	}
+
+	private String printAllowedMediaTypes() {
+		StringBuilder sb = new StringBuilder();
+		if (allowedMediaTypes.isEmpty()) {
+			return sb.toString();
+		}
+		for (Iterator<String> it = allowedMediaTypes.iterator(); it.hasNext();) {
+			String mediaType = (String) it.next();
+			sb.append(mediaType);
+			if (it.hasNext()) {
+				sb.append(", ");
+			} else {
+				sb.append(".");
+			}
+		}
+		return sb.toString();
+	}
+
+	private boolean hasAction(VitroRequest vreq) {
+		return vreq.getParameter(PARAMETER_ACTION) != null;
+	}
+
+	private void deleteFile(VitroRequest vreq) {
+		String subjectUri = getSubjectUri(vreq);
+		String predicateUri = getPredicateUri(vreq);
+		String fileUri = getFileUri(vreq);
+		WebappDaoFactory webAppDaoFactory = vreq.getUnfilteredWebappDaoFactory();
+		UploadedFileHelper fileHelper = new UploadedFileHelper(fileStorage, webAppDaoFactory, getServletContext());
+		fileHelper.removeUploadedFile(subjectUri, predicateUri, fileUri);
+	}
+
+	private void uploadFile(VitroRequest vreq) throws FileUploadException {
+		String subjectUri = getSubjectUri(vreq);
+		String predicateUri = getPredicateUri(vreq);
+		FileItem file = getUploadedFile(vreq);
+		String uploadedFileName = getUploadedFileName(file);
+		String storedFileName = createStoredFileName(file);
+		WebappDaoFactory webAppDaoFactory = vreq.getUnfilteredWebappDaoFactory();
+		UploadedFileHelper fileHelper = new UploadedFileHelper(fileStorage, webAppDaoFactory, getServletContext());
+		FileInfo fileInfo = createFile(file, storedFileName, fileHelper);
+		fileHelper.attachFileToSubject(fileInfo, subjectUri, predicateUri);
+		fileHelper.setPublicFileName(fileInfo, uploadedFileName);
+	}
+
+	private FileInfo createFile(FileItem file, String storedFileName, UploadedFileHelper fileHelper)
+			throws FileUploadException {
+		FileInfo fileInfo = null;
+		try {
+			fileInfo = fileHelper.createFile(storedFileName, getMediaType(file), file.getInputStream());
+		} catch (Exception e) {
+			log.error(e.getLocalizedMessage());
+			throw new FileUploadException(e.getLocalizedMessage());
+		}
+		return fileInfo;
+	}
+
+	private String createStoredFileName(FileItem file) {
+		String mediaType = getMediaType(file);
+		int length = 64;
+		boolean useLetters = true;
+		boolean useNumbers = true;
+		String storedFileName = RandomStringUtils.random(length, useLetters, useNumbers) + getExtension(mediaType);
+		return storedFileName;
+	}
+
+	private String getExtension(String mediaType) {
+		String extension = "";
+		MimeTypes types = MimeTypes.getDefaultMimeTypes();
+		try {
+			MimeType mimeType = types.forName(mediaType);
+			extension = mimeType.getExtension();
+		} catch (MimeTypeException e) {
+			log.error(e.getLocalizedMessage());
+		}
+		return extension;
+	}
+
+	private String getUploadedFileName(FileItem file) {
+		String fileName = file.getName();
+		if (fileName == null) {
+			return DEFAULT_FILE_NAME;
+		} else {
+			return FilenameUtils.getName(fileName);
+		}
+	}
+
+	private String getMediaType(FileItem file) {
+		Tika tika = new Tika();
+		InputStream is;
+		String mediaType = "";
+		try {
+			is = file.getInputStream();
+			mediaType = tika.detect(is);
+		} catch (IOException e) {
+			log.error(e.getLocalizedMessage());
+		}
+		return mediaType;
+	}
+
+	private void validateFileUri(VitroRequest vreq, I18nBundle i18nBundle) throws FileUploadException {
+		String fileUri = getFileUri(vreq);
+		validateUriNotEmpty(fileUri, i18nBundle.text("file_upload_file"), i18nBundle);
+		validateIndividual(vreq, fileUri, i18nBundle);
+	}
+
+	private void validateSubjectUri(VitroRequest vreq, I18nBundle i18nBundle) throws FileUploadException {
+		String subjectUri = getSubjectUri(vreq);
+		validateUriNotEmpty(subjectUri, i18nBundle.text("file_upload_subject"), i18nBundle);
+		validateIndividual(vreq, subjectUri, i18nBundle);
+	}
+	
+	private void validatePredicateUri(VitroRequest vreq, I18nBundle i18nBundle) throws FileUploadException {
+		String predicateUri = getPredicateUri(vreq);
+		validateUriNotEmpty(predicateUri, i18nBundle.text("file_upload_predicate"), i18nBundle);
+		validateIndividual(vreq, predicateUri, i18nBundle);
+	}
+
+	private void validateIndividual(VitroRequest vreq, String name, I18nBundle i18nBundle) throws FileUploadException {
+		Individual subject = vreq.getUnfilteredWebappDaoFactory().getIndividualDao()
+				.getIndividualByURI(name);
+		if (subject == null) {
+			throw new FileUploadException(i18nBundle.text("file_upload_error_uri_not_exists", name));
+		}
+	}
+
+	private void validateUriNotEmpty(String predicateUri, String name, I18nBundle i18nBundle) throws FileUploadException {
+		if (predicateUri == null || predicateUri.trim().isEmpty()) {
+			throw new FileUploadException(i18nBundle.text("file_upload_error_uri_not_given", name));
+		}
+	}
+
+	private String getPredicateUri(VitroRequest vreq) {
+		return vreq.getParameter(PARAMETER_PREDICATE_URI);
+	}
+
+	private String getSubjectUri(VitroRequest vreq) {
+		return vreq.getParameter(PARAMETER_SUBJECT_URI);
+	}
+
+	private FileItem getUploadedFile(VitroRequest vreq) {
+		return vreq.getFiles().get(PARAMETER_UPLOADED_FILE).get(0);
+	}
+
+	private boolean isUpload(VitroRequest vreq) {
+		String action = vreq.getParameter(PARAMETER_ACTION);
+		return ACTION_UPLOAD.equals(action);
+	}
+
+	private boolean isDelete(VitroRequest vreq) {
+		String action = vreq.getParameter(PARAMETER_ACTION);
+		return ACTION_DELETE.equals(action);
+	}
+
+	private void setAllowedMediaTypes() {
+		ConfigurationProperties config = ConfigurationProperties.getBean(getServletContext());
+		String allowedTypes = config.getProperty(ALLOWED_MEDIA_TYPES, "");
+		if (allowedTypes.isEmpty()) {
+			allowedMediaTypes = new HashSet<String>();
+		} else {
+			allowedMediaTypes = new HashSet<String>(Arrays.asList(allowedTypes.toLowerCase().trim().split("\\s*,\\s*")));	
+		}
+	}
+
+	private String getReferrer(VitroRequest vreq) {
+		String referrer = vreq.getParameter(PARAM_REFERRER);
+		if (referrer == null) {
+			referrer = vreq.getHeader(REFERER_HEADER);
+		}
+		if (referrer == null) {
+			referrer =  "/";
+		}
+		return referrer;
+	}
+	
+	private void setMaxFileSize() {
+		ConfigurationProperties config = ConfigurationProperties.getBean(getServletContext());
+		String configFileSize = config.getProperty(CONFIG_MAX_FILE_SIZE, DEFAULT_FILE_SIZE.toString());
+		try {
+			maxFileSize = Long.parseLong(configFileSize);
+		} catch (NumberFormatException e) {
+			log.error("maxFileSize parsing failed");
+			log.error(e);
+		}
+	}
+
+	static class FileUploadException extends Exception {
+		private static final long serialVersionUID = 1L;
+		private final Object[] parameters;
+
+		FileUploadException(String message, Object... parameters) {
+			super(message);
+			this.parameters = parameters;
+		}
+
+		public String formatMessage(HttpServletRequest req) {
+			return I18n.text(req, getMessage(), parameters);
+		}
+	}
+}

api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerHttpServlet.java

@@ -8,6 +8,7 @@ import static javax.mail.Message.RecipientType.TO;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.io.StringWriter;
+import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.HashMap;
@@ -17,7 +18,6 @@ import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import edu.cornell.mannlib.vitro.webapp.dao.jena.MenuDaoJena;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -41,6 +41,8 @@ import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.Tem
 import edu.cornell.mannlib.vitro.webapp.email.FreemarkerEmailFactory;
 import edu.cornell.mannlib.vitro.webapp.email.FreemarkerEmailMessage;
 import edu.cornell.mannlib.vitro.webapp.freemarker.config.FreemarkerConfiguration;
+import edu.cornell.mannlib.vitro.webapp.i18n.I18n;
+import edu.cornell.mannlib.vitro.webapp.i18n.I18nBundle;
 import edu.cornell.mannlib.vitro.webapp.web.templatemodels.Tags;
 import edu.cornell.mannlib.vitro.webapp.web.templatemodels.User;
 import edu.cornell.mannlib.vitro.webapp.web.templatemodels.menu.MainMenu;
@@ -67,7 +69,6 @@ public class FreemarkerHttpServlet extends VitroHttpServlet  {
 
         // error templates
         ERROR_DISPLAY("error-display.ftl"),
-        ERROR_EMAIL("error-email.ftl"),
         ERROR_MESSAGE("error-message.ftl"),
         STANDARD_ERROR("error-standard.ftl"),
         TITLED_ERROR_MESSAGE("error-titled.ftl"),
@@ -93,6 +94,8 @@ public class FreemarkerHttpServlet extends VitroHttpServlet  {
         throws IOException, ServletException {
 
         super.doGet(request,response);
+//UQAM-Optimization set for UTF-8
+        response.setCharacterEncoding("UTF-8");
 
         VitroRequest vreq = new VitroRequest(request);
         ResponseValues responseValues = null;
@@ -103,8 +106,8 @@ public class FreemarkerHttpServlet extends VitroHttpServlet  {
             if (!isAuthorizedToDisplayPage(request, response, requiredActions(vreq))) {
                 return;
             }
-
 			responseValues = processRequest(vreq);
+
 	        doResponse(vreq, response, responseValues);
 
     	} catch (Throwable e) {
@@ -159,7 +162,8 @@ public class FreemarkerHttpServlet extends VitroHttpServlet  {
             }
             adminErrorData.put("cause", cause);
 
-            adminErrorData.put("datetime", new Date());
+            SimpleDateFormat dateformat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss SSS");
+            adminErrorData.put("datetime", dateformat.format(new Date()));
 
             templateMap.put("errorOnHomePage", this instanceof HomePageController);
 
@@ -173,7 +177,11 @@ public class FreemarkerHttpServlet extends VitroHttpServlet  {
             } else if (FreemarkerEmailFactory.isConfigured(vreq)) {
                 FreemarkerEmailMessage email = FreemarkerEmailFactory.createNewMessage(vreq);
                 email.addRecipient(TO, email.getReplyToAddress());
-                email.setTemplate(Template.ERROR_EMAIL.toString());
+                I18nBundle i18n = I18n.bundle(vreq);
+                addSiteName(vreq, adminErrorData);
+                adminErrorData.put("subject", i18n.text("application_error_email_subject"));
+                adminErrorData.put("textMessage", i18n.text("application_error_email_plain_text"));
+                adminErrorData.put("htmlMessage", i18n.text("application_error_email_html_text"));
                 email.setBodyMap(adminErrorData);
                 email.processTemplate();
                 sentEmail = email.send();
@@ -191,6 +199,16 @@ public class FreemarkerHttpServlet extends VitroHttpServlet  {
         }
     }
 
+	private void addSiteName(VitroRequest vreq, Map<String, Object> adminErrorData) {
+		try { 
+			ApplicationBean appBean = vreq.getAppBean();
+			String appName = appBean.getApplicationName();
+			adminErrorData.put("siteName", appName);
+		} catch (Exception e) {
+			log.error(e,e);
+		}
+	}
+
     @Override
 	public void doPost(HttpServletRequest request, HttpServletResponse response)
         throws ServletException, IOException {
@@ -256,7 +274,7 @@ public class FreemarkerHttpServlet extends VitroHttpServlet  {
 	protected void doTemplate(VitroRequest vreq, HttpServletResponse response,
             ResponseValues values) throws TemplateProcessingException {
 
-        Map<String, Object> templateDataModel = new HashMap<String, Object>();
+		Map<String, Object> templateDataModel = new HashMap<String, Object>();
         templateDataModel.putAll(getPageTemplateValues(vreq));
 
         // Add the values that we got from the subcontroller processRequest() method, and merge to the template.
@@ -276,8 +294,15 @@ public class FreemarkerHttpServlet extends VitroHttpServlet  {
             // is specified in the main page template.
             bodyString = "";
         }
+
         templateDataModel.put("body", bodyString);
 
+        String lang = vreq.getLocale().getLanguage();
+        if (!vreq.getLocale().getCountry().isEmpty()) {
+            lang += "-" + vreq.getLocale().getCountry();
+        }
+        templateDataModel.put("country", lang);
+
         // Tell the template and any directives it uses that we're processing a page template.
         templateDataModel.put("templateType", PAGE_TEMPLATE_TYPE);
 
@@ -462,7 +487,7 @@ public class FreemarkerHttpServlet extends VitroHttpServlet  {
 
     protected MainMenu getDisplayModelMenu(VitroRequest vreq){
         String url = vreq.getRequestURI().substring(vreq.getContextPath().length());
-        return vreq.getWebappDaoFactory().getMenuDao().getMainMenu(vreq, url);
+        return vreq.getWebappDaoFactory().getMenuDao().getMainMenu(url);
     }
 
     // NIHVIVO-3307: we need this here instead of FreemarkerConfiguration.java so that updates to

api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/IndividualListController.java

@@ -6,9 +6,11 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 
-import edu.cornell.mannlib.vitro.webapp.web.templatemodels.individuallist.ListedIndividualBuilder;
+import javax.servlet.annotation.WebServlet;
+
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -16,6 +18,7 @@ import org.apache.commons.logging.LogFactory;
 import edu.cornell.mannlib.vitro.webapp.beans.Individual;
 import edu.cornell.mannlib.vitro.webapp.beans.VClass;
 import edu.cornell.mannlib.vitro.webapp.beans.VClassGroup;
+import edu.cornell.mannlib.vitro.webapp.config.ConfigurationProperties;
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
 import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ExceptionResponseValues;
 import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues;
@@ -27,8 +30,7 @@ import edu.cornell.mannlib.vitro.webapp.modules.searchEngine.SearchEngineExcepti
 import edu.cornell.mannlib.vitro.webapp.modules.searchEngine.SearchQuery;
 import edu.cornell.mannlib.vitro.webapp.utils.searchengine.SearchQueryUtils;
 import edu.cornell.mannlib.vitro.webapp.web.templatemodels.individuallist.ListedIndividual;
-
-import javax.servlet.annotation.WebServlet;
+import edu.cornell.mannlib.vitro.webapp.web.templatemodels.individuallist.ListedIndividualBuilder;
 
 /**
  * Generates a list of individuals for display in a template
@@ -43,6 +45,7 @@ public class IndividualListController extends FreemarkerHttpServlet {
     private static final int MAX_PAGES = 40;  // must be even
 
     private static final String TEMPLATE_DEFAULT = "individualList.ftl";
+    private static final String LANGUAGE_FILTER_PROPERTY = "RDFService.languageFilter";
 
     @Override
     protected ResponseValues processRequest(VitroRequest vreq) {
@@ -152,12 +155,12 @@ public class IndividualListController extends FreemarkerHttpServlet {
         return SearchQueryUtils.getPageParameter(request);
     }
 
-    public static IndividualListResults getResultsForVClass(String vclassURI, int page, String alpha, VitroRequest vreq)
+    public static IndividualListResults getResultsForVClass(String vclassURI,
+            int page, String alpha, VitroRequest vreq)
     throws SearchException{
    	 	try{
-            List<String> classUris = Collections.singletonList(vclassURI);
-			IndividualListQueryResults results = buildAndExecuteVClassQuery(classUris, alpha, page, INDIVIDUALS_PER_PAGE, vreq.getWebappDaoFactory().getIndividualDao());
-	        return getResultsForVClassQuery(results, page, INDIVIDUALS_PER_PAGE, alpha, vreq);
+   	        List<String> classUris = Collections.singletonList(vclassURI);
+            return buildAndExecuteVClassQuery(classUris, page, INDIVIDUALS_PER_PAGE, alpha, vreq);
    	 	} catch (SearchEngineException e) {
    	 	    String msg = "An error occurred retrieving results for vclass query";
    	 	    log.error(msg, e);
@@ -169,16 +172,27 @@ public class IndividualListController extends FreemarkerHttpServlet {
 	    }
     }
 
-    public static IndividualListResults getResultsForVClassIntersections(List<String> vclassURIs, int page, int pageSize, String alpha, VitroRequest vreq) {
+    public static IndividualListResults getResultsForVClassIntersections(
+            List<String> classUris, int page, int pageSize, String alpha, VitroRequest vreq) {
         try{
-            IndividualListQueryResults results = buildAndExecuteVClassQuery(vclassURIs, alpha, page, pageSize, vreq.getWebappDaoFactory().getIndividualDao());
-	        return getResultsForVClassQuery(results, page, pageSize, alpha, vreq);
+            return buildAndExecuteVClassQuery(classUris, page, pageSize, alpha, vreq);
         } catch(Throwable th) {
-       	    log.error("Error retrieving individuals corresponding to intersection multiple classes." + vclassURIs.toString(), th);
+       	    log.error("Error retrieving individuals corresponding to intersection multiple classes." + classUris.toString(), th);
        	    return IndividualListResults.EMPTY;
         }
     }
 
+	private static IndividualListResults buildAndExecuteVClassQuery(List<String> classUris, int page, int pageSize,
+			String alpha, VitroRequest vreq) throws SearchEngineException {
+		ConfigurationProperties props = ConfigurationProperties.getBean(vreq);
+		boolean languageFilter = Boolean.valueOf(props.getProperty(LANGUAGE_FILTER_PROPERTY, "false"));
+		IndividualListQueryResults results = buildAndExecuteVClassQuery(classUris, alpha,
+				((languageFilter) ? vreq.getLocale() : null), page, pageSize,
+				vreq.getWebappDaoFactory().getIndividualDao());
+		IndividualListResults indListResults = getResultsForVClassQuery(results, page, pageSize, alpha, vreq);
+		return indListResults;
+	}
+
     public static IndividualListResults getRandomResultsForVClass(String vclassURI, int page, int pageSize, VitroRequest vreq) {
    	 	try{
             List<String> classUris = Collections.singletonList(vclassURI);
@@ -201,9 +215,10 @@ public class IndividualListController extends FreemarkerHttpServlet {
 
 
     private static IndividualListQueryResults buildAndExecuteVClassQuery(
-			List<String> vclassURIs, String alpha, int page, int pageSize, IndividualDao indDao)
+			List<String> vclassURIs, String alpha, Locale locale, int page,
+			int pageSize, IndividualDao indDao)
 			throws SearchEngineException {
-		 SearchQuery query = SearchQueryUtils.getQuery(vclassURIs, alpha, page, pageSize);
+		 SearchQuery query = SearchQueryUtils.getQuery(vclassURIs, alpha, locale, page, pageSize);
 		 IndividualListQueryResults results = IndividualListQueryResults.runQuery(query, indDao);
 		 log.debug("Executed search query for " + vclassURIs);
 		 if (results.getIndividuals().isEmpty()) {
@@ -250,8 +265,7 @@ public class IndividualListController extends FreemarkerHttpServlet {
         }else if ( requiredPages > MAX_PAGES && selectedPage > requiredPages - MAX_PAGES ){
             //the selected page is in the end of the list
             int startPage = requiredPages - MAX_PAGES;
-            double max = Math.ceil(size/pageSize);
-            for(int page = startPage; page <= max; page++ ){
+            for(int page = startPage; page <= requiredPages; page++ ){
                 records.add( new PageRecord( "page=" + page, Integer.toString(page), Integer.toString(page), selectedPage == page ) );
             }
         }else{

api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListFauxPropertiesController.java

@@ -8,39 +8,40 @@ import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
 
+import org.apache.commons.lang3.StringUtils;
 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.requestedAction.AuthorizationRequest;
+import edu.cornell.mannlib.vitro.webapp.beans.DataProperty;
 import edu.cornell.mannlib.vitro.webapp.beans.FauxProperty;
 import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty;
+import edu.cornell.mannlib.vitro.webapp.beans.Property;
 import edu.cornell.mannlib.vitro.webapp.beans.PropertyGroup;
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
 import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues;
 import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues;
+import edu.cornell.mannlib.vitro.webapp.dao.DataPropertyDao;
 import edu.cornell.mannlib.vitro.webapp.dao.FauxPropertyDao;
 import edu.cornell.mannlib.vitro.webapp.dao.ObjectPropertyDao;
 import edu.cornell.mannlib.vitro.webapp.dao.PropertyGroupDao;
 
 import javax.servlet.annotation.WebServlet;
 
-@WebServlet(name = "ListFauxPropertiesController", urlPatterns = {"/listFauxProperties"} )
+@WebServlet(name = "ListFauxPropertiesController", urlPatterns = { "/listFauxProperties" })
 public class ListFauxPropertiesController extends FreemarkerHttpServlet {
 
-	private static final Log log = LogFactory.getLog(ListFauxPropertiesController.class.getName());
+    private static final Log log = LogFactory.getLog(ListFauxPropertiesController.class.getName());
 
     private static final String TEMPLATE_NAME = "siteAdmin-fauxPropertiesList.ftl";
 
-    private ObjectPropertyDao opDao = null;
-    private PropertyGroupDao pgDao = null;
-    private FauxPropertyDao fpDao = null;
-	private String notFoundMessage = "";
+    private String notFoundMessage = "";
 
     @Override
-	protected AuthorizationRequest requiredActions(VitroRequest vreq) {
-		return SimplePermission.EDIT_ONTOLOGY.ACTION;
-	}
+    protected AuthorizationRequest requiredActions(VitroRequest vreq) {
+        return SimplePermission.EDIT_ONTOLOGY.ACTION;
+    }
 
     @Override
     protected ResponseValues processRequest(VitroRequest vreq) {
@@ -50,176 +51,303 @@ public class ListFauxPropertiesController extends FreemarkerHttpServlet {
 
             String displayOption = "";
 
-            if ( vreq.getParameter("displayOption") != null ) {
+            if (vreq.getParameter("displayOption") != null) {
                 displayOption = vreq.getParameter("displayOption");
-            }
-            else {
+            } else {
                 displayOption = "listing";
             }
             body.put("displayOption", displayOption);
 
-            if ( displayOption.equals("listing") ) {
+            if (displayOption.equals("listing")) {
                 body.put("pageTitle", "Faux Property Listing");
-            }
-            else {
+            } else {
                 body.put("pageTitle", "Faux Properties by Base Property");
             }
+            List<ObjectProperty> objectProps = getOPDao(vreq).getRootObjectProperties();
+            List<DataProperty> dataProps = getDPDao(vreq).getRootDataProperties();
+            Map<String, Object> allFauxProps = new TreeMap<String, Object>();
 
-            opDao = vreq.getUnfilteredAssertionsWebappDaoFactory().getObjectPropertyDao();
-			fpDao = vreq.getUnfilteredAssertionsWebappDaoFactory().getFauxPropertyDao();
-			pgDao = vreq.getUnfilteredAssertionsWebappDaoFactory().getPropertyGroupDao();
-
-			List<ObjectProperty> objectProps = null;
-            objectProps = opDao.getRootObjectProperties();
-
-			Map<String, Object> allFauxProps = new TreeMap<String, Object>();
-			// get the faux depending on the display option
-			if ( displayOption.equals("listing") ) {
-                allFauxProps = getFauxPropertyList(objectProps);
+            // get the faux depending on the display option
+            if (displayOption.equals("listing")) {
+                allFauxProps.putAll(getFauxPropertyList(objectProps, vreq));
+                allFauxProps.putAll(getFauxDataPropertyList(dataProps, vreq));
+            } else {
+                allFauxProps.putAll(getFauxByBaseList(objectProps, vreq));
+                allFauxProps.putAll(getFauxDataPropsByBaseList(dataProps, vreq));
             }
-			else {
-				allFauxProps = getFauxByBaseList(objectProps);
-			}
 
-			log.debug(allFauxProps.toString());
+            log.debug(allFauxProps.toString());
 
-			if ( notFoundMessage.length() == 0 ) {
-				body.put("message", notFoundMessage);
-			}
-			else {
-            	body.put("fauxProps", allFauxProps);
-			}
+            if (notFoundMessage.length() == 0) {
+                body.put("message", notFoundMessage);
+            } else {
+                body.put("fauxProps", allFauxProps);
+            }
 
         } catch (Throwable t) {
-            t.printStackTrace();
+            log.error(t, t);
         }
         return new TemplateResponseValues(TEMPLATE_NAME, body);
 
     }
 
-	private TreeMap<String, Object> getFauxPropertyList(List<ObjectProperty> objectProps) {
-		List<FauxProperty> fauxProps = null;
-		TreeMap<String, Object> theFauxProps = new TreeMap<String, Object>();
-        if ( objectProps != null ) {
+    private PropertyGroupDao getPGDao(VitroRequest vreq) {
+        return vreq.getUnfilteredAssertionsWebappDaoFactory().getPropertyGroupDao();
+    }
+
+    private FauxPropertyDao getFPDao(VitroRequest vreq) {
+        return vreq.getUnfilteredAssertionsWebappDaoFactory().getFauxPropertyDao();
+    }
+
+    private DataPropertyDao getDPDao(VitroRequest vreq) {
+        return vreq.getUnfilteredAssertionsWebappDaoFactory().getDataPropertyDao();
+    }
+
+    private ObjectPropertyDao getOPDao(VitroRequest vreq) {
+        return vreq.getUnfilteredAssertionsWebappDaoFactory().getObjectPropertyDao();
+    }
+
+    private TreeMap<String, Object> getFauxPropertyList(List<ObjectProperty> objectProps, VitroRequest vreq) {
+        List<FauxProperty> fauxProps = null;
+        TreeMap<String, Object> theFauxProps = new TreeMap<String, Object>();
+        if (objectProps != null) {
             Iterator<ObjectProperty> opIt = objectProps.iterator();
-            if ( !opIt.hasNext()) {
+            if (!opIt.hasNext()) {
                 notFoundMessage = "No object properties found.";
-            }
-			else {
+            } else {
                 while (opIt.hasNext()) {
 
                     ObjectProperty op = opIt.next();
-					String baseURI = op.getURI();
-                    fauxProps = fpDao.getFauxPropertiesForBaseUri(baseURI);
-					if ( fauxProps != null ) {
-						Iterator<FauxProperty> fpIt = fauxProps.iterator();
-						if ( !fpIt.hasNext()) {
-							notFoundMessage = "No faux properties found.";
-						}
-						else {
-							while (fpIt.hasNext()) {
-								// No point in getting these unless we have a faux property
-								String baseLabel = getDisplayLabel(op) == null ? "(no name)" : getDisplayLabel(op);
-								String baseLocalName = op.getLocalNameWithPrefix();
-								baseLabel = baseLabel.substring(0,baseLabel.indexOf("("));
-								baseLabel += "(" + baseLocalName + ")";
-								// get the info we need from the faux property
-								FauxProperty fp = fpIt.next();
-								String fauxLabel = fp.getDisplayName();
-								String rangeLabel = fp.getRangeLabel();
-								String rangeURI = fp.getRangeURI();
-								String domainLabel = fp.getDomainLabel();
-								String domainURI = fp.getDomainURI();
-								String groupURI = fp.getGroupURI();
-								// FauxProperty only gets groupURI but we want the label
-								PropertyGroup pGroup = pgDao.getGroupByURI(groupURI);
-								String groupLabel = ( pGroup == null ) ? "unspecified" : pGroup.getName();
-								// store all the strings in a hash with the faux property label as the key
-								Map<String, Object> tmpHash = new HashMap<String, Object>();
-								tmpHash.put("base", baseLabel);
-								tmpHash.put("baseURI", baseURI);
-								tmpHash.put("group", groupLabel);
-								tmpHash.put("range", rangeLabel);
-								tmpHash.put("rangeURI", rangeURI);
-								tmpHash.put("domain", domainLabel);
-								tmpHash.put("domainURI", domainURI);
-								// add the faux and its details to the treemap
-								theFauxProps.put(fauxLabel + "@@" + domainLabel, tmpHash);
-							}
-						}
-					}
-            	}
+                    String baseURI = op.getURI();
+                    fauxProps = getFPDao(vreq).getFauxPropertiesForBaseUri(baseURI);
+                    if (fauxProps != null) {
+                        Iterator<FauxProperty> fpIt = fauxProps.iterator();
+                        if (!fpIt.hasNext()) {
+                            notFoundMessage = "No faux properties found.";
+                        } else {
+                            while (fpIt.hasNext()) {
+                                // No point in getting these unless we have a
+                                // faux property
+                                String baseLabel = getBaseLabel(op, false);
+                                // get the info we need from the faux property
+                                FauxProperty fp = fpIt.next();
+                                String fauxLabel = fp.getDisplayName();
+                                String rangeLabel = fp.getRangeLabel();
+                                String rangeURI = fp.getRangeURI();
+                                String domainLabel = fp.getDomainLabel();
+                                String domainURI = fp.getDomainURI();
+                                String groupURI = fp.getGroupURI();
+                                // FauxProperty only gets groupURI but we want
+                                // the label
+                                PropertyGroup pGroup = getPGDao(vreq).getGroupByURI(groupURI);
+                                String groupLabel = (pGroup == null) ? "unspecified" : pGroup.getName();
+                                // store all the strings in a hash with the faux
+                                // property label as the key
+                                Map<String, Object> tmpHash = new HashMap<String, Object>();
+                                tmpHash.put("base", baseLabel);
+                                tmpHash.put("baseURI", baseURI);
+                                tmpHash.put("group", groupLabel);
+                                tmpHash.put("range", rangeLabel);
+                                tmpHash.put("rangeURI", rangeURI);
+                                tmpHash.put("domain", domainLabel);
+                                tmpHash.put("domainURI", domainURI);
+                                tmpHash.put("editUrl", "propertyEdit");
+
+                                // add the faux and its details to the treemap
+                                theFauxProps.put(fauxLabel + "@@" + domainLabel, tmpHash);
+                            }
+                        }
+                    }
+                }
             }
         }
         return theFauxProps;
-	}
+    }
 
-	private TreeMap<String, Object> getFauxByBaseList(List<ObjectProperty> objectProps) {
-		List<FauxProperty> fauxProps = null;
-		TreeMap<String, Object> fauxByBaseProps = new TreeMap<String, Object>();
-        if ( objectProps != null ) {
+    private TreeMap<String, Object> getFauxByBaseList(List<ObjectProperty> objectProps, VitroRequest vreq) {
+        List<FauxProperty> fauxProps = null;
+        TreeMap<String, Object> fauxByBaseProps = new TreeMap<String, Object>();
+        if (objectProps != null) {
             Iterator<ObjectProperty> opIt = objectProps.iterator();
-            if ( !opIt.hasNext()) {
+            if (!opIt.hasNext()) {
                 notFoundMessage = "No object properties found.";
-            }
-			else {
+            } else {
                 while (opIt.hasNext()) {
-					TreeMap<String, Object> fauxForGivenBase = new TreeMap<String, Object>();
+                    TreeMap<String, Object> fauxForGivenBase = new TreeMap<String, Object>();
                     ObjectProperty op = opIt.next();
-					String baseURI = op.getURI();
-                    fauxProps = fpDao.getFauxPropertiesForBaseUri(baseURI);
+                    String baseURI = op.getURI();
+                    fauxProps = getFPDao(vreq).getFauxPropertiesForBaseUri(baseURI);
 
-					if ( fauxProps != null ) {
-						Iterator<FauxProperty> fpIt = fauxProps.iterator();
-						if ( !fpIt.hasNext()) {
-							notFoundMessage = "No faux properties found.";
-						}
-						else {
-							String baseLabel = getDisplayLabel(op) == null ? "(no name)" : getDisplayLabel(op);
-							String baseLocalName = op.getLocalNameWithPrefix();
-							baseLabel = baseLabel.substring(0,baseLabel.indexOf("("));
-							baseLabel += "(" + baseLocalName + ")" + "|" + baseURI;
-							while (fpIt.hasNext()) {
-								// get the info we need from the faux property
-								FauxProperty fp = fpIt.next();
-								String fauxLabel = fp.getDisplayName();
-								String rangeLabel = fp.getRangeLabel();
-								String rangeURI = fp.getRangeURI();
-								String domainLabel = fp.getDomainLabel();
-								String domainURI = fp.getDomainURI();
-								String groupURI = fp.getGroupURI();
-								// FauxProperty only gets groupURI but we want the label
-								PropertyGroup pGroup = pgDao.getGroupByURI(groupURI);
-								String groupLabel = ( pGroup == null ) ? "unspecified" : pGroup.getName();
-								// store all the strings in a hash with the faux property label as the key
-								Map<String, Object> tmpHash = new HashMap<String, Object>();
-								tmpHash.put("baseURI", baseURI);
-								tmpHash.put("group", groupLabel);
-								tmpHash.put("range", rangeLabel);
-								tmpHash.put("rangeURI", rangeURI);
-								tmpHash.put("domain", domainLabel);
-								tmpHash.put("domainURI", domainURI);
-								// add the faux and its details to the treemap
-								fauxForGivenBase.put(fauxLabel + "@@" + domainLabel, tmpHash);
-							}
-							 fauxByBaseProps.put(baseLabel, fauxForGivenBase);
-						}
-					}
-            	}
+                    if (fauxProps != null) {
+                        Iterator<FauxProperty> fpIt = fauxProps.iterator();
+                        if (!fpIt.hasNext()) {
+                            notFoundMessage = "No faux properties found.";
+                        } else {
+                            String baseLabel = getBaseLabel(op, true);
+                            while (fpIt.hasNext()) {
+                                // get the info we need from the faux property
+                                FauxProperty fp = fpIt.next();
+                                String fauxLabel = fp.getDisplayName();
+                                String rangeLabel = fp.getRangeLabel();
+                                String rangeURI = fp.getRangeURI();
+                                String domainLabel = fp.getDomainLabel();
+                                String domainURI = fp.getDomainURI();
+                                String groupURI = fp.getGroupURI();
+                                // FauxProperty only gets groupURI but we want
+                                // the label
+                                PropertyGroup pGroup = getPGDao(vreq).getGroupByURI(groupURI);
+                                String groupLabel = (pGroup == null) ? "unspecified" : pGroup.getName();
+                                // store all the strings in a hash with the faux
+                                // property label as the key
+                                Map<String, Object> tmpHash = new HashMap<String, Object>();
+                                tmpHash.put("baseURI", baseURI);
+                                tmpHash.put("group", groupLabel);
+                                tmpHash.put("range", rangeLabel);
+                                tmpHash.put("rangeURI", rangeURI);
+                                tmpHash.put("domain", domainLabel);
+                                tmpHash.put("domainURI", domainURI);
+
+                                // add the faux and its details to the treemap
+                                fauxForGivenBase.put(fauxLabel + "@@" + domainLabel, tmpHash);
+                                fauxForGivenBase.put("editUrl", "propertyEdit");
+                            }
+                            fauxByBaseProps.put(baseLabel, fauxForGivenBase);
+                        }
+                    }
+                }
             }
         }
         return fauxByBaseProps;
-	}
+    }
 
-    /*
-     * should never be null
-     */
-    public static String getDisplayLabel(ObjectProperty op) {
-        String displayLabel = op.getPickListName();
-    	displayLabel = (displayLabel != null && displayLabel.length() > 0)
-			? displayLabel
-			: op.getLocalName();
-		return (displayLabel != null) ? displayLabel : "[object property]" ;
+    private TreeMap<String, Object> getFauxDataPropertyList(List<DataProperty> dataProps, VitroRequest vreq) {
+        List<FauxProperty> fauxProps = null;
+        TreeMap<String, Object> theFauxProps = new TreeMap<String, Object>();
+        if (dataProps != null) {
+            Iterator<DataProperty> opIt = dataProps.iterator();
+            if (!opIt.hasNext()) {
+                notFoundMessage = "No data properties found.";
+            } else {
+                while (opIt.hasNext()) {
+                    DataProperty dp = opIt.next();
+                    String baseURI = dp.getURI();
+                    fauxProps = getFPDao(vreq).getFauxPropertiesForBaseUri(baseURI);
+                    if (fauxProps != null) {
+                        Iterator<FauxProperty> fpIt = fauxProps.iterator();
+                        if (!fpIt.hasNext()) {
+                            notFoundMessage = "No faux properties found.";
+                        } else {
+                            while (fpIt.hasNext()) {
+                                // No point in getting these unless we have a
+                                // faux property
+                                String baseLabel = getBaseLabel(dp, false);
+                                // get the info we need from the faux property
+                                FauxProperty fp = fpIt.next();
+                                String fauxLabel = fp.getDisplayName();
+                                String rangeLabel = fp.getRangeLabel();
+                                String rangeURI = fp.getRangeURI();
+                                String domainLabel = fp.getDomainLabel();
+                                String domainURI = fp.getDomainURI();
+                                String groupURI = fp.getGroupURI();
+                                // FauxProperty only gets groupURI but we want
+                                // the label
+                                PropertyGroup pGroup = getPGDao(vreq).getGroupByURI(groupURI);
+                                String groupLabel = (pGroup == null) ? "unspecified" : pGroup.getName();
+                                // store all the strings in a hash with the faux
+                                // property label as the key
+                                Map<String, Object> tmpHash = new HashMap<String, Object>();
+                                tmpHash.put("base", baseLabel);
+                                tmpHash.put("baseURI", baseURI);
+                                tmpHash.put("group", groupLabel);
+                                tmpHash.put("range", rangeLabel);
+                                tmpHash.put("rangeURI", rangeURI);
+                                tmpHash.put("domain", domainLabel);
+                                tmpHash.put("domainURI", domainURI);
+                                tmpHash.put("editUrl", "datapropEdit");
+                                // add the faux and its details to the treemap
+                                theFauxProps.put(fauxLabel + "@@" + domainLabel, tmpHash);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        return theFauxProps;
+    }
+
+    private TreeMap<String, Object> getFauxDataPropsByBaseList(List<DataProperty> dataProps, VitroRequest vreq) {
+        List<FauxProperty> fauxProps = null;
+        TreeMap<String, Object> fauxByBaseProps = new TreeMap<String, Object>();
+        if (dataProps != null) {
+            Iterator<DataProperty> opIt = dataProps.iterator();
+            if (!opIt.hasNext()) {
+                notFoundMessage = "No data properties found.";
+            } else {
+                while (opIt.hasNext()) {
+                    TreeMap<String, Object> fauxForGivenBase = new TreeMap<String, Object>();
+                    DataProperty dp = opIt.next();
+                    String baseURI = dp.getURI();
+                    fauxProps = getFPDao(vreq).getFauxPropertiesForBaseUri(baseURI);
+
+                    if (fauxProps != null) {
+                        Iterator<FauxProperty> fpIt = fauxProps.iterator();
+                        if (!fpIt.hasNext()) {
+                            notFoundMessage = "No faux properties found.";
+                        } else {
+                            String baseLabel = getBaseLabel(dp, true);
+                            while (fpIt.hasNext()) {
+                                // get the info we need from the faux property
+                                FauxProperty fp = fpIt.next();
+                                String fauxLabel = fp.getDisplayName();
+                                String rangeLabel = fp.getRangeLabel();
+                                String rangeURI = fp.getRangeURI();
+                                String domainLabel = fp.getDomainLabel();
+                                String domainURI = fp.getDomainURI();
+                                String groupURI = fp.getGroupURI();
+                                // FauxProperty only gets groupURI but we want
+                                // the label
+                                PropertyGroup pGroup = getPGDao(vreq).getGroupByURI(groupURI);
+                                String groupLabel = (pGroup == null) ? "unspecified" : pGroup.getName();
+                                // store all the strings in a hash with the faux
+                                // property label as the key
+                                Map<String, Object> tmpHash = new HashMap<String, Object>();
+                                tmpHash.put("baseURI", baseURI);
+                                tmpHash.put("group", groupLabel);
+                                tmpHash.put("range", rangeLabel);
+                                tmpHash.put("rangeURI", rangeURI);
+                                tmpHash.put("domain", domainLabel);
+                                tmpHash.put("domainURI", domainURI);
+                                // add the faux and its details to the treemap
+                                fauxForGivenBase.put(fauxLabel + "@@" + domainLabel, tmpHash);
+                                fauxForGivenBase.put("editUrl", "datapropEdit");
+                            }
+                            fauxByBaseProps.put(baseLabel, fauxForGivenBase);
+                        }
+                    }
+                }
+            }
+        }
+        return fauxByBaseProps;
+    }
+
+    private String getBaseLabel(Property property, boolean addUri) {
+        String baseLabel = property.getPickListName();
+        if (StringUtils.isEmpty(baseLabel)) {
+            baseLabel = property.getLocalName();
+        }
+        if (StringUtils.isEmpty(baseLabel)) {
+            baseLabel = "[property]";
+        }
+        String baseLocalName = property.getLocalNameWithPrefix();
+        int indexOf = baseLabel.indexOf("(");
+        if (indexOf > 0) {
+            baseLabel = baseLabel.substring(0, indexOf);
+        }
+        baseLabel += "(" + baseLocalName + ")";
+        if (addUri) {
+            baseLabel += "|" + property.getURI();
+        }
+        return baseLabel;
     }
 
 }

api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/TemplateProcessingHelper.java

@@ -42,7 +42,7 @@ public class TemplateProcessingHelper {
 
         try {
             Environment env = template.createProcessingEnvironment(map, writer);
-
+ 
             // Define a setup template to be included by every page template
             String templateType = (String) map.get("templateType");
             if (FreemarkerHttpServlet.PAGE_TEMPLATE_TYPE.equals(templateType)) {

api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/TermsOfUseController.java

@@ -1,49 +0,0 @@
-/* $This file is distributed under the terms of the license in LICENSE$ */
-
-package edu.cornell.mannlib.vitro.webapp.controller.freemarker;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import edu.cornell.mannlib.vitro.webapp.beans.ApplicationBean;
-import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues;
-
-import javax.servlet.annotation.WebServlet;
-
-@WebServlet(name = "TermsOfUseController", urlPatterns = {"/termsOfUse"} )
-public class TermsOfUseController extends FreemarkerHttpServlet {
-
-    private static final long serialVersionUID = 1L;
-    private static final Log log = LogFactory.getLog(TermsOfUseController.class);
-    private static final String TEMPLATE_DEFAULT = "termsOfUse.ftl";
-
-    @Override
-    protected ResponseValues processRequest(VitroRequest vreq) {
-
-        Map<String, Object> map = new HashMap<String, Object>();
-        Map<String, String> termsOfUse = new HashMap<String, String>();
-
-        ApplicationBean appBean = vreq.getAppBean();
-
-        termsOfUse.put("siteName", appBean.getApplicationName());
-
-        String siteHost = appBean.getCopyrightAnchor();
-        if (siteHost == null) {
-            siteHost = "the hosting institution";
-        }
-        termsOfUse.put("siteHost", siteHost);
-
-        map.put("termsOfUse", termsOfUse);
-        return new TemplateResponseValues(TEMPLATE_DEFAULT, map);
-    }
-
-    @Override
-    protected String getTitle(String siteName, VitroRequest vreq) {
-        return siteName + " Terms of Use";
-    }
-}

api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/UrlBuilder.java

@@ -37,6 +37,7 @@ public class UrlBuilder {
         LOGIN("/login"),
         LOGOUT("/logout"),
         OBJECT_PROPERTY_EDIT("/propertyEdit"),
+        EXTENDED_SEARCH("/extendedsearch"),
         SEARCH("/search"),
         SITE_ADMIN("/siteAdmin"),
         TERMS_OF_USE("/termsOfUse"),

api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ViewLabelsServlet.java

@@ -11,28 +11,29 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Set;
 
 import javax.servlet.ServletException;
 import javax.servlet.annotation.WebServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.apache.commons.lang3.LocaleUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-
 import org.apache.jena.query.QuerySolution;
 import org.apache.jena.query.ResultSet;
 import org.apache.jena.rdf.model.Literal;
 
 import edu.cornell.mannlib.vitro.webapp.beans.Individual;
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServlet;
 import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ExceptionResponseValues;
 import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues;
 import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues;
 import edu.cornell.mannlib.vitro.webapp.dao.jena.QueryUtils;
 import edu.cornell.mannlib.vitro.webapp.i18n.selection.SelectedLocale;
+import edu.cornell.mannlib.vitro.webapp.rdfservice.filter.LanguageFilteringUtils;
 
 
 /*Servlet to view all labels in various languages for individual*/
@@ -47,12 +48,13 @@ public class ViewLabelsServlet extends FreemarkerHttpServlet{
 		String subjectUri = vreq.getParameter("subjectUri");
 		body.put("subjectUri", subjectUri);
 		try {
-			//Get all language codes/labels in the system, and this list is sorted by language name
-	        List<HashMap<String, String>> locales = this.getLocales(vreq);
+	        //the labels already added by the user
+            ArrayList<Literal> existingLabels = this.getExistingLabels(subjectUri, vreq);
+			//Get all language codes/labels used in the list of existing labels
+	        List<HashMap<String, String>> locales = this.getLocales(vreq, existingLabels);
 	        //Get code to label hashmap - we use this to get the language name for the language code returned in the rdf literal
 	        HashMap<String, String> localeCodeToNameMap = this.getFullCodeToLanguageNameMap(locales);
-			//the labels already added by the user
-			ArrayList<Literal> existingLabels = this.getExistingLabels(subjectUri, vreq);
+
 			//existing labels keyed by language name and each of the list of labels is sorted by language name
 			HashMap<String, List<LabelInformation>> existingLabelsByLanguageName = this.getLabelsSortedByLanguageName(existingLabels, localeCodeToNameMap, vreq, subjectUri);
 			//Get available locales for the drop down for adding a new label, also sorted by language name
@@ -137,20 +139,26 @@ public class ViewLabelsServlet extends FreemarkerHttpServlet{
 		doGet(request, response);
 	}
 
-    //get locales
-    public List<HashMap<String, String>> getLocales(VitroRequest vreq) {
-    	List<Locale> selectables = SelectedLocale.getSelectableLocales(vreq);
-		if (selectables.isEmpty()) {
+    //get locales present in list of literals
+    public List<HashMap<String, String>> getLocales(VitroRequest vreq, 
+            List<Literal> existingLiterals) {
+        Set<Locale> locales = new HashSet<Locale>();
+        for(Literal literal : existingLiterals) {
+            String language = literal.getLanguage();
+            if(!StringUtils.isEmpty(language)) {
+                locales.add(LanguageFilteringUtils.languageToLocale(language));
+            }
+        }
+		if (locales.isEmpty()) {
 			return Collections.emptyList();
 		}
 		List<HashMap<String, String>> list = new ArrayList<HashMap<String, String>>();
 		Locale currentLocale = SelectedLocale.getCurrentLocale(vreq);
-		for (Locale locale : selectables) {
+		for (Locale locale : locales) {
 			try {
 				list.add(buildLocaleMap(locale, currentLocale));
 			} catch (FileNotFoundException e) {
-				log.warn("Can't show the Locale selector for '" + locale
-						+ "': " + e);
+				log.warn("Can't show locale '" + locale + "': " + e);
 			}
 		}
 
@@ -162,7 +170,7 @@ public class ViewLabelsServlet extends FreemarkerHttpServlet{
 			Locale currentLocale) throws FileNotFoundException {
 		HashMap<String, String> map = new HashMap<String, String>();
 		//Replacing the underscore with a hyphen because that is what is represented in the actual literals
-		map.put("code", locale.toString().replace("_", "-"));
+		map.put("code", locale.toLanguageTag().replace("_", "-"));
 		map.put("label", locale.getDisplayName(currentLocale));
 		return map;
 	}
@@ -188,8 +196,8 @@ public class ViewLabelsServlet extends FreemarkerHttpServlet{
 
         ArrayList<Literal>  labels = new ArrayList<Literal>();
         try {
-        	//We want to get the labels for all the languages, not just the display language
-            ResultSet results = QueryUtils.getLanguageNeutralQueryResults(queryStr, vreq);
+        	// Show only labels with current language filtering
+            ResultSet results = QueryUtils.getQueryResults(queryStr, vreq);
             while (results.hasNext()) {
                 QuerySolution soln = results.nextSolution();
                 Literal nodeLiteral = soln.get("label").asLiteral();

api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/grefine/JSONReconcileServlet.java

@@ -338,7 +338,7 @@ public class JSONReconcileServlet extends VitroHttpServlet {
 							}
 
 							resultJson.put("type", typesJsonArr);
-							resultJson.put("match", "false");
+							resultJson.put("match", false);
 							resultJsonArr.add(resultJson);
 
 						} catch (Exception e) {

api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/individual/IndividualResponseBuilder.java

@@ -6,14 +6,13 @@ import java.io.IOException;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
-import org.apache.jena.rdf.model.RDFNode;
-import edu.cornell.mannlib.vitro.webapp.web.templatemodels.individual.IndividualTemplateModelBuilder;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-
 import org.apache.jena.query.QuerySolution;
 import org.apache.jena.query.ResultSet;
 
@@ -36,6 +35,7 @@ import edu.cornell.mannlib.vitro.webapp.i18n.selection.SelectedLocale;
 import edu.cornell.mannlib.vitro.webapp.utils.dataGetter.ExecuteDataRetrieval;
 import edu.cornell.mannlib.vitro.webapp.web.beanswrappers.ReadOnlyBeansWrapper;
 import edu.cornell.mannlib.vitro.webapp.web.templatemodels.individual.IndividualTemplateModel;
+import edu.cornell.mannlib.vitro.webapp.web.templatemodels.individual.IndividualTemplateModelBuilder;
 import edu.ucsf.vitro.opensocial.OpenSocialManager;
 import freemarker.ext.beans.BeansWrapper;
 import freemarker.template.TemplateModel;
@@ -94,6 +94,7 @@ class IndividualResponseBuilder {
 		body.put("relatedSubject", getRelatedSubject());
 		body.put("namespaces", namespaces);
 		body.put("temporalVisualizationEnabled", getTemporalVisualizationFlag());
+        body.put("mapOfScienceVisualizationEnabled", getMapOfScienceVisualizationFlag());
 		body.put("profilePageTypesEnabled", getprofilePageTypesFlag());
 		body.put("verbosePropertySwitch", getVerbosePropertyValues());
 
@@ -123,8 +124,10 @@ class IndividualResponseBuilder {
 		 * into the data model: no real data can be modified.
 		 */
 		// body.put("individual", wrap(itm, BeansWrapper.EXPOSE_SAFE));
-	    body.put("labelCount", getLabelCount(itm.getUri(), vreq));
-	    body.put("languageCount", getLanguagesRepresentedCount(itm.getUri(), vreq));
+		LabelAndLanguageCount labelAndLanguageCount = getLabelAndLanguageCount(
+		        itm.getUri(), vreq);
+	    body.put("labelCount", labelAndLanguageCount.getLabelCount());
+	    body.put("languageCount", labelAndLanguageCount.getLanguageCount());
 	    //We also need to know the number of available locales
 	    body.put("localesCount", SelectedLocale.getSelectableLocales(vreq).size());
 	    body.put("profileType", getProfileType(itm.getUri(), vreq));
@@ -193,6 +196,12 @@ class IndividualResponseBuilder {
 		return "enabled".equals(property);
 	}
 
+    private boolean getMapOfScienceVisualizationFlag() {
+        String property = ConfigurationProperties.getBean(vreq).getProperty(
+                "visualization.mapOfScience");
+        return "enabled".equals(property);
+    }
+
 	private boolean getprofilePageTypesFlag() {
 		String property = ConfigurationProperties.getBean(vreq).getProperty(
 				"multiViews.profilePageTypes");
@@ -282,61 +291,103 @@ class IndividualResponseBuilder {
     	return map;
     }
 
-    private static String LABEL_COUNT_QUERY = ""
-        + "PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> \n"
-        + "SELECT ( str(COUNT(?label)) AS ?labelCount ) WHERE { \n"
-        + "    ?subject rdfs:label ?label \n"
-        + "    FILTER isLiteral(?label) \n"
-        + "}" ;
-
-    private static String DISTINCT_LANGUAGE_QUERY = ""
+    private static String LABEL_QUERY = ""
             + "PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> \n"
-            + "SELECT ( str(COUNT(DISTINCT lang(?label))) AS ?languageCount ) WHERE { \n"
+            + "SELECT ?label WHERE { \n"
             + "    ?subject rdfs:label ?label \n"
             + "    FILTER isLiteral(?label) \n"
             + "}" ;
+    
+//    Queries that were previously used for counts via RDFService that didn't
+//        filter results by language.  With language filtering, aggregate 
+//        functions like COUNT() cannot be used.
+    
+//    private static String LABEL_COUNT_QUERY = ""
+//        + "PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> \n"
+//        + "SELECT ( str(COUNT(?label)) AS ?labelCount ) WHERE { \n"
+//        + "    ?subject rdfs:label ?label \n"
+//        + "    FILTER isLiteral(?label) \n"
+//        + "}" ;
 
-    private static Integer getLabelCount(String subjectUri, VitroRequest vreq) {
-        String queryStr = QueryUtils.subUriForQueryVar(LABEL_COUNT_QUERY, "subject", subjectUri);
+//    private static String DISTINCT_LANGUAGE_QUERY = ""
+//            + "PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> \n"
+//            + "SELECT ( str(COUNT(DISTINCT lang(?label))) AS ?languageCount ) WHERE { \n"
+//            + "    ?subject rdfs:label ?label \n"
+//            + "    FILTER isLiteral(?label) \n"
+//            + "}" ;
+
+    private static LabelAndLanguageCount getLabelAndLanguageCount(
+            String subjectUri, VitroRequest vreq) {
+        // 1.12.0 Now filtering to only the labels for the current locale so as
+        // to be consistent with other editing forms.  Because the language
+        // filter can only act on a result set containing actual literals,
+        // we can't do the counting with a COUNT() in the query itself.  So
+        // we will now use the LABEL_QUERY instead of LABEL_COUNT_QUERY and 
+        // count the rows and the number of distinct languages represented.
+        Set<String> distinctLanguages = new HashSet<String>();
+        String queryStr = QueryUtils.subUriForQueryVar(LABEL_QUERY, "subject", subjectUri);
         log.debug("queryStr = " + queryStr);
-        int theCount = 0;
-        try {
-            //ResultSet results = QueryUtils.getQueryResults(queryStr, vreq);
-            //Get query results across all languages in order for template to show manage labels link correctly
-            ResultSet results = QueryUtils.getLanguageNeutralQueryResults(queryStr, vreq);
-            if (results.hasNext()) {
-                QuerySolution soln = results.nextSolution();
-                RDFNode labelCount = soln.get("labelCount");
-                if (labelCount != null && labelCount.isLiteral()) {
-                    theCount = labelCount.asLiteral().getInt();
+        int labelCount = 0;
+        try {   
+            ResultSet results = QueryUtils.getQueryResults(queryStr, vreq);
+            while(results.hasNext()) {
+                QuerySolution qsoln = results.next();
+                labelCount++;
+                String lang = qsoln.getLiteral("label").getLanguage();
+                if(lang == null) {
+                    lang = "";
                 }
+                distinctLanguages.add(lang);
             }
         } catch (Exception e) {
             log.error(e, e);
         }
-        return theCount;
+        return new LabelAndLanguageCount(labelCount, distinctLanguages.size());
+    }
+    
+    private static class LabelAndLanguageCount {
+        
+        private Integer labelCount;
+        private Integer languageCount;
+        
+        public LabelAndLanguageCount(Integer labelCount, Integer languageCount) {
+            this.labelCount = labelCount;
+            this.languageCount = languageCount;
+        }
+        
+        public Integer getLabelCount() {
+            return this.labelCount;
+        }
+        
+        public Integer getLanguageCount() {
+            return this.languageCount;
+        }
+        
     }
 
     //what is the number of languages represented across the labels
-    private static Integer getLanguagesRepresentedCount(String subjectUri, VitroRequest vreq) {
-    	   String queryStr = QueryUtils.subUriForQueryVar(DISTINCT_LANGUAGE_QUERY, "subject", subjectUri);
-           log.debug("queryStr = " + queryStr);
-           int theCount = 0;
-           try {
-
-               ResultSet results = QueryUtils.getLanguageNeutralQueryResults(queryStr, vreq);
-               if (results.hasNext()) {
-                   QuerySolution soln = results.nextSolution();
-                   RDFNode languageCount = soln.get("languageCount");
-                   if (languageCount != null && languageCount.isLiteral()) {
-                       theCount = languageCount.asLiteral().getInt();
-                   }
-               }
-           } catch (Exception e) {
-               log.error(e, e);
-           }
-           return theCount;
-    }
+    // This version not compatible with language-filtering RDF services
+//    private static Integer getLanguagesRepresentedCount(String subjectUri, VitroRequest vreq) {
+//    	   String queryStr = QueryUtils.subUriForQueryVar(DISTINCT_LANGUAGE_QUERY, "subject", subjectUri);
+//           log.debug("queryStr = " + queryStr);
+//           int theCount = 0;
+//           try {
+//
+//               ResultSet results = QueryUtils.getLanguageNeutralQueryResults(queryStr, vreq);
+//               if (results.hasNext()) {
+//                   QuerySolution soln = results.nextSolution();
+//                   RDFNode languageCount = soln.get("languageCount");
+//                   if (languageCount != null && languageCount.isLiteral()) {
+//                       theCount = languageCount.asLiteral().getInt();
+//                       log.info("Language count is " + theCount);
+//                   }
+//               }
+//           } catch (Exception e) {
+//               log.error(e, e);
+//           }
+//           log.info("Returning language count " + theCount);
+//           return theCount;
+//    }
 
     private static String PROFILE_TYPE_QUERY = ""
         + "PREFIX display: <http://vitro.mannlib.cornell.edu/ontologies/display/1.1#> \n"

api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaIngestController.java

@@ -17,6 +17,7 @@ import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -34,6 +35,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import edu.cornell.mannlib.vitro.webapp.utils.JSPPageHandler;
+import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.lang3.StringEscapeUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -290,13 +292,16 @@ public class JenaIngestController extends BaseEditController {
     private void processOutputModelRequest(VitroRequest vreq,
                                            HttpServletResponse response) {
         String modelNameStr = vreq.getParameter("modelName");
+        DateTimeFormatter timeStampPattern = DateTimeFormatter.ofPattern("yyyy-MM-dd-HHmmss");
+        String fileName = FilenameUtils.getName(modelNameStr) + "-" + timeStampPattern.format(java.time.LocalDateTime.now());
         Model model = getModel(modelNameStr,vreq);
         JenaOutputUtils.setNameSpacePrefixes(model,vreq.getWebappDaoFactory());
         model.enterCriticalSection(Lock.READ);
         try {
             OutputStream out = response.getOutputStream();
             response.setContentType("application/x-turtle");
-            //out.write("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n".getBytes());
+            response.setHeader("Content-Transfer-Encoding", "binary");
+            response.setHeader("Content-disposition", "attachment; filename=" + fileName + ".ttl");
             model.write(out, "TTL");
             out.flush();
             out.close();

api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/GetRandomSearchIndividualsByVClass.java

@@ -4,6 +4,7 @@ package edu.cornell.mannlib.vitro.webapp.controller.json;
 
 import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 
 import com.fasterxml.jackson.databind.node.ArrayNode;
@@ -15,6 +16,7 @@ import org.apache.commons.logging.LogFactory;
 import edu.cornell.mannlib.vitro.webapp.beans.Individual;
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
 import edu.cornell.mannlib.vitro.webapp.dao.IndividualDao;
+import edu.cornell.mannlib.vitro.webapp.i18n.selection.SelectedLocale;
 import edu.cornell.mannlib.vitro.webapp.services.shortview.ShortViewService;
 import edu.cornell.mannlib.vitro.webapp.services.shortview.ShortViewService.ShortViewContext;
 import edu.cornell.mannlib.vitro.webapp.services.shortview.ShortViewServiceSetup;
@@ -73,7 +75,11 @@ public class GetRandomSearchIndividualsByVClass extends GetSearchIndividualsByVC
 		modelMap.put("individual",
 				IndividualTemplateModelBuilder.build(individual, vreq));
 		modelMap.put("vclass", vclassName);
-
+		String langCtx = vreq.getLocale().getLanguage();  //UQAM-Linguistic-Management build the linguistic context
+		if (!vreq.getLocale().getCountry().isEmpty()) {
+			langCtx += "-" + vreq.getLocale().getCountry();
+		}
+		modelMap.put("langCtx", langCtx); // UQAM-Linguistic-Management add the linguistic context to map
 		ShortViewService svs = ShortViewServiceSetup.getService(ctx);
 		return svs.renderShortView(individual, ShortViewContext.BROWSE,
 				modelMap, vreq);

api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/DisplayVocabulary.java

@@ -53,6 +53,8 @@ public class DisplayVocabulary {
     //specific case for internal class, value is true or false
     public static final String 	RESTRICT_RESULTS_BY_INTERNAL = NS + "restrictResultsByInternalClass";
 
+    public static final String HAS_DELETE_QUERY = NS + "hasDeleteQuery";
+
 
     /* Data Properties */
     public static final DatatypeProperty URL_MAPPING = m_model.createDatatypeProperty(NS + "urlMapping");

api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/VitroVocabulary.java

@@ -155,6 +155,7 @@ public class VitroVocabulary {
     public static final String USERACCOUNT_LAST_LOGIN_TIME = VITRO_AUTH + "lastLoginTime";
     public static final String USERACCOUNT_STATUS = VITRO_AUTH + "status";
     public static final String USERACCOUNT_PASSWORD_LINK_EXPIRES = VITRO_AUTH + "passwordLinkExpires";
+    public static final String USERACCOUNT_EMAIL_KEY = VITRO_AUTH + "emailKey";
     public static final String USERACCOUNT_PASSWORD_CHANGE_REQUIRED = VITRO_AUTH + "passwordChangeRequired";
     public static final String USERACCOUNT_EXTERNAL_AUTH_ID = VITRO_AUTH + "externalAuthId";
     public static final String USERACCOUNT_EXTERNAL_AUTH_ONLY = VITRO_AUTH + "externalAuthOnly";
@@ -233,6 +234,9 @@ public class VitroVocabulary {
     public static final String IND_MAIN_IMAGE = VITRO_PUBLIC + "mainImage";
     public static final String IND_IMAGE = VITRO_PUBLIC + "image";
 
+    public static final String STORED_FILE = VITRO_PUBLIC + "storedFile";
+    public static final String PUBLIC_FILENAME = VITRO_PUBLIC + "publicFilename";
+
     // =============== Date Time with Precision vocabulary ===============
     private static final String DATETIME_NS = "http://vivoweb.org/ontology/core#";
 

api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/WebappDaoFactory.java

@@ -5,6 +5,8 @@ package edu.cornell.mannlib.vitro.webapp.dao;
 import java.util.List;
 import java.util.Set;
 
+import edu.cornell.mannlib.vitro.webapp.i18n.I18nBundle;
+
 public interface WebappDaoFactory {
 
     /**
@@ -132,4 +134,6 @@ public interface WebappDaoFactory {
 
     public MenuDao getMenuDao();
 
+    public I18nBundle getI18nBundle();
+
 }

api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/WebappDaoFactoryConfig.java

@@ -5,21 +5,25 @@ package edu.cornell.mannlib.vitro.webapp.dao;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
 
 import edu.cornell.mannlib.vitro.webapp.dao.PropertyDao.FullPropertyKey;
+import edu.cornell.mannlib.vitro.webapp.rdfservice.filter.LanguageFilteringUtils;
 
 public class WebappDaoFactoryConfig {
 
 	private List<String> preferredLanguages;
+	private List<Locale> preferredLocales;
 	private String defaultNamespace;
 	private Set<String> nonUserNamespaces;
 	private boolean isUnderlyingStoreReasoned = false;
 	public Map<FullPropertyKey, String> customListViewConfigFileMap;
 
 	public WebappDaoFactoryConfig() {
-	    preferredLanguages = Arrays.asList("en-US", "en", "EN");
+		preferredLanguages = Arrays.asList("en-US", "en", "EN");
+		preferredLocales = LanguageFilteringUtils.languagesToLocales(preferredLanguages);
 		defaultNamespace = "http://vitro.mannlib.cornell.edu/ns/default#";
 		nonUserNamespaces = new HashSet<String>();
 		nonUserNamespaces.add(VitroVocabulary.vitroURI);
@@ -33,6 +37,14 @@ public class WebappDaoFactoryConfig {
 		this.preferredLanguages = pl;
 	}
 
+	public List<Locale> getPreferredLocales() {
+		return this.preferredLocales;
+	}
+
+	public void setPreferredLocales(List<Locale> pl) {
+		this.preferredLocales = pl;
+	}
+
 	public String getDefaultNamespace() {
 		return defaultNamespace;
 	}

api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/DataPropertyDaoFiltering.java

@@ -17,7 +17,7 @@ import edu.cornell.mannlib.vitro.webapp.dao.DataPropertyDao;
 import edu.cornell.mannlib.vitro.webapp.dao.InsertException;
 import edu.cornell.mannlib.vitro.webapp.dao.filtering.filters.VitroFilters;
 
-class DataPropertyDaoFiltering extends BaseFiltering implements DataPropertyDao{
+public class DataPropertyDaoFiltering extends BaseFiltering implements DataPropertyDao{
     final DataPropertyDao innerDataPropertyDao;
     final VitroFilters filters;
 

api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/DataPropertyStatementDaoFiltering.java

@@ -18,7 +18,7 @@ import edu.cornell.mannlib.vitro.webapp.beans.Individual;
 import edu.cornell.mannlib.vitro.webapp.dao.DataPropertyStatementDao;
 import edu.cornell.mannlib.vitro.webapp.dao.filtering.filters.VitroFilters;
 
-class DataPropertyStatementDaoFiltering extends BaseFiltering implements DataPropertyStatementDao{
+public class DataPropertyStatementDaoFiltering extends BaseFiltering implements DataPropertyStatementDao{
 
     final DataPropertyStatementDao innerDataPropertyStatementDao;
     final VitroFilters filters;

api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/FauxPropertyDaoFiltering.java

@@ -26,47 +26,34 @@ public class FauxPropertyDaoFiltering extends BaseFiltering implements FauxPrope
 
 	@Override
 	public List<FauxProperty> getFauxPropertiesForBaseUri(String uri) {
-		// TODO Auto-generated method stub
-		throw new RuntimeException(
-				"FauxPropertyDao.getFauxPropertiesForBaseUri() not implemented.");
+		return innerFauxPropertyDao.getFauxPropertiesForBaseUri(uri);
 	}
 
 	@Override
 	public FauxProperty getFauxPropertyFromContextUri(String contextUri) {
-		// TODO Auto-generated method stub
-		throw new RuntimeException(
-				"FauxPropertyDaoFiltering.getFauxPropertyFromConfigContextUri() not implemented.");
-
+		return innerFauxPropertyDao.getFauxPropertyFromContextUri(contextUri);
 	}
 
 	@Override
 	public FauxProperty getFauxPropertyByUris(String domainUri, String baseUri,
 			String rangeUri) {
-		// TODO Auto-generated method stub
-		throw new RuntimeException(
-				"FauxPropertyDaoFiltering.getFauxPropertyByUris() not implemented.");
-
+		return innerFauxPropertyDao.getFauxPropertyByUris(domainUri, baseUri, 
+		        rangeUri);
 	}
 
 	@Override
 	public void updateFauxProperty(FauxProperty fp) {
-		// TODO Auto-generated method stub
-		throw new RuntimeException("FauxPropertyDaoFiltering.updateFauxProperty() not implemented.");
-
+		innerFauxPropertyDao.updateFauxProperty(fp);
 	}
 
 	@Override
 	public void deleteFauxProperty(FauxProperty fp) {
-		// TODO Auto-generated method stub
-		throw new RuntimeException("FauxPropertyDao.deleteFauxProperty() not implemented.");
-
+		innerFauxPropertyDao.deleteFauxProperty(fp);
 	}
 
 	@Override
 	public void insertFauxProperty(FauxProperty fp) {
-		// TODO Auto-generated method stub
-		throw new RuntimeException("FauxPropertyDao.insertFauxProperty() not implemented.");
-
+		innerFauxPropertyDao.insertFauxProperty(fp);
 	}
 
 }

api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/IndividualDaoFiltering.java

@@ -20,7 +20,7 @@ import edu.cornell.mannlib.vitro.webapp.dao.filtering.filters.VitroFilters;
 import edu.cornell.mannlib.vitro.webapp.edit.EditLiteral;
 
 
-class IndividualDaoFiltering extends BaseFiltering implements IndividualDao{
+public class IndividualDaoFiltering extends BaseFiltering implements IndividualDao{
     IndividualDao innerIndividualDao;
     VitroFilters filters;
 

api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/ObjectPropertyDaoFiltering.java

@@ -17,7 +17,7 @@ import edu.cornell.mannlib.vitro.webapp.dao.InsertException;
 import edu.cornell.mannlib.vitro.webapp.dao.ObjectPropertyDao;
 import edu.cornell.mannlib.vitro.webapp.dao.filtering.filters.VitroFilters;
 
-class ObjectPropertyDaoFiltering extends BaseFiltering implements ObjectPropertyDao{
+public class ObjectPropertyDaoFiltering extends BaseFiltering implements ObjectPropertyDao{
     final ObjectPropertyDao innerObjectPropertyDao;
     final VitroFilters filters;
 

api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/ObjectPropertyStatementDaoFiltering.java

@@ -16,7 +16,7 @@ import edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatementImpl;
 import edu.cornell.mannlib.vitro.webapp.dao.ObjectPropertyStatementDao;
 import edu.cornell.mannlib.vitro.webapp.dao.filtering.filters.VitroFilters;
 
-class ObjectPropertyStatementDaoFiltering extends BaseFiltering implements ObjectPropertyStatementDao{
+public class ObjectPropertyStatementDaoFiltering extends BaseFiltering implements ObjectPropertyStatementDao{
     final ObjectPropertyStatementDao innerObjectPropertyStatementDao;
     final VitroFilters filters;
 

api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/WebappDaoFactoryFiltering.java

@@ -24,6 +24,7 @@ import edu.cornell.mannlib.vitro.webapp.dao.VClassDao;
 import edu.cornell.mannlib.vitro.webapp.dao.VClassGroupDao;
 import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
 import edu.cornell.mannlib.vitro.webapp.dao.filtering.filters.VitroFilters;
+import edu.cornell.mannlib.vitro.webapp.i18n.I18nBundle;
 
 /**
  * This wraps a WebappDaoFactory and applies filtering.
@@ -67,7 +68,7 @@ public class WebappDaoFactoryFiltering implements WebappDaoFactory {
     transient private PropertyGroupDao filteringPropertyGroupDao=null;
     transient private PropertyInstanceDao filteringPropertyInstanceDao=null;
 
-    public WebappDaoFactoryFiltering( WebappDaoFactory innerDao, VitroFilters filters){
+    public WebappDaoFactoryFiltering(WebappDaoFactory innerDao, VitroFilters filters){
         if( innerDao == null )
             throw new Error("innerWebappDaoFactory must be non-null");
         this.filters = filters;
@@ -276,4 +277,9 @@ public class WebappDaoFactoryFiltering implements WebappDaoFactory {
     public void close() {
         innerWebappDaoFactory.close();
     }
+
+    @Override
+    public I18nBundle getI18nBundle() {
+        return innerWebappDaoFactory.getI18nBundle();
+    }
 }

api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/ApplicationDaoJena.java

@@ -83,22 +83,21 @@ public class ApplicationDaoJena extends JenaBaseDao implements ApplicationDao {
     	}
     	ontModel.enterCriticalSection(Lock.WRITE);
     	try {
-    		appInd.setLabel(application.getApplicationName(), null);
-	        updatePropertyStringValue(
-	        		appInd, APPLICATION_ABOUTTEXT, application.getAboutText(),
-	        		    ontModel);
-	        updatePropertyStringValue(
+    		updateRDFSLabel(appInd, application.getApplicationName());
+	        updatePlainLiteralValue(
+	        		appInd, APPLICATION_ABOUTTEXT, application.getAboutText());
+	        updatePlainLiteralValue(
 	        		appInd, APPLICATION_ACKNOWLEGETEXT,
-	        		    application.getAcknowledgeText(), ontModel);
+	        		    application.getAcknowledgeText());
 	        updatePropertyStringValue(
 	        		appInd, APPLICATION_CONTACTMAIL,
 	        		    application.getContactMail(), ontModel);
 	        updatePropertyStringValue(
 	        		appInd, APPLICATION_CORRECTIONMAIL,
 	        		    application.getCorrectionMail(), ontModel);
-	        updatePropertyStringValue(
+	        updatePlainLiteralValue(
 	        		appInd, APPLICATION_COPYRIGHTANCHOR,
-	        		    application.getCopyrightAnchor(), ontModel);
+	        		    application.getCopyrightAnchor());
             updatePropertyStringValue(
             		appInd, APPLICATION_COPYRIGHTURL,
             		    application.getCopyrightURL(), ontModel);

api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/BlankNodeFilteringGraph.java

@@ -24,6 +24,10 @@ public class BlankNodeFilteringGraph implements Graph {
 
     private Graph graph;
 
+	public Graph getInnerGraph() {
+		return graph;
+	}
+
 	public BlankNodeFilteringGraph(Graph graph) {
         this.graph = graph;
     }

api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/DataPropertyDaoJena.java

@@ -516,9 +516,9 @@ public class DataPropertyDaoJena extends PropertyDaoJena implements
             if (dtp.getFunctional()) {
                	ontModel.add(jDataprop,RDF.type,OWL.FunctionalProperty);
             }
-            addPropertyStringValue(jDataprop, EXAMPLE, dtp.getExample(), ontModel);
-            addPropertyStringValue(jDataprop, DESCRIPTION_ANNOT, dtp.getDescription(), ontModel);
-            addPropertyStringValue(jDataprop, PUBLIC_DESCRIPTION_ANNOT, dtp.getPublicDescription(), ontModel);
+            updatePlainLiteralValue(jDataprop, EXAMPLE, dtp.getExample());
+            updatePlainLiteralValue(jDataprop, DESCRIPTION_ANNOT, dtp.getDescription());
+            updatePlainLiteralValue(jDataprop, PUBLIC_DESCRIPTION_ANNOT, dtp.getPublicDescription());
             addPropertyStringValue(jDataprop, EDITING, dtp.getEditing(), ontModel);
             addPropertyNonNegativeIntValue(jDataprop, DISPLAY_RANK_ANNOT, dtp.getDisplayTier(), ontModel);
             addPropertyNonNegativeIntValue(jDataprop, DISPLAY_LIMIT, dtp.getDisplayLimit(), ontModel);
@@ -587,9 +587,9 @@ public class DataPropertyDaoJena extends PropertyDaoJena implements
             	}
             }
 
-            updatePropertyStringValue(jDataprop, EXAMPLE, dtp.getExample(), ontModel);
-            updatePropertyStringValue(jDataprop, DESCRIPTION_ANNOT, dtp.getDescription(), ontModel);
-            updatePropertyStringValue(jDataprop, PUBLIC_DESCRIPTION_ANNOT, dtp.getPublicDescription(), ontModel);
+            updatePlainLiteralValue(jDataprop, EXAMPLE, dtp.getExample());
+            updatePlainLiteralValue(jDataprop, DESCRIPTION_ANNOT, dtp.getDescription());
+            updatePlainLiteralValue(jDataprop, PUBLIC_DESCRIPTION_ANNOT, dtp.getPublicDescription());
             updatePropertyStringValue(jDataprop, EDITING, dtp.getEditing(), ontModel);
             updatePropertyNonNegativeIntValue(jDataprop, DISPLAY_RANK_ANNOT, dtp.getDisplayTier(), ontModel);
             updatePropertyNonNegativeIntValue(jDataprop, DISPLAY_LIMIT, dtp.getDisplayLimit(), ontModel);

api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/FauxPropertyDaoJena.java

@@ -14,6 +14,7 @@ import java.util.List;
 import java.util.Random;
 import java.util.Set;
 
+import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.jena.ontology.ObjectProperty;
@@ -152,20 +153,22 @@ public class FauxPropertyDaoJena extends JenaBaseDao implements FauxPropertyDao
 
 			Collection<String> rangeUris = getPropertyResourceURIValues(
 					context, QUALIFIED_BY_RANGE);
-			if (rangeUris.isEmpty()) {
-				log.debug("'" + contextUri + "' has no value for '"
-						+ QUALIFIED_BY_RANGE + "'");
-				return null;
+			String rangeUri = null;
+			if (!rangeUris.isEmpty()) {
+				rangeUri = rangeUris.iterator().next();
 			}
-			String rangeUri = rangeUris.iterator().next();
-
 			// domainURI is optional.
 			Collection<String> domainUris = getPropertyResourceURIValues(
 					context, QUALIFIED_BY_DOMAIN);
 			String domainUri = domainUris.isEmpty() ? null : domainUris
 					.iterator().next();
 
+			Collection<String> rootRangeUris = getPropertyResourceURIValues(context, QUALIFIED_BY_ROOT);
+			
 			FauxProperty fp = new FauxProperty(domainUri, baseUri, rangeUri);
+			if (!rootRangeUris.isEmpty()) {
+				fp.setRootRangeUri(rootRangeUris.iterator().next());
+			}
 			fp.setContextUri(contextUri);
 			populateInstance(fp);
 			log.debug("Loaded FauxProperty: " + fp);
@@ -214,7 +217,7 @@ public class FauxPropertyDaoJena extends JenaBaseDao implements FauxPropertyDao
 			addPropertyResourceValue(context, RDF.type, CONFIG_CONTEXT);
 			addPropertyResourceURIValue(context, CONFIG_CONTEXT_FOR,
 					fp.getBaseURI());
-			addPropertyResourceURIValue(context, QUALIFIED_BY_RANGE,
+			addPropertyResourceURINotEmpty(context, QUALIFIED_BY_RANGE,
 					fp.getRangeURI());
 			addPropertyResourceURINotEmpty(context, QUALIFIED_BY_DOMAIN,
 					fp.getDomainURI());
@@ -230,10 +233,9 @@ public class FauxPropertyDaoJena extends JenaBaseDao implements FauxPropertyDao
 					OBJECT_PROPERTY_DISPLAY_CONFIG);
 			addPropertyResourceURINotEmpty(config, PROPERTY_GROUP,
 					fp.getGroupURI());
-			addPropertyStringValue(config, DISPLAY_NAME, fp.getDisplayName(),
-					displayModel);
-			addPropertyStringValue(config, PUBLIC_DESCRIPTION_ANNOT,
-					fp.getPublicDescription(), displayModel);
+			updatePlainLiteralValue(config, DISPLAY_NAME, fp.getDisplayName());
+			updatePlainLiteralValue(config, PUBLIC_DESCRIPTION_ANNOT,
+					fp.getPublicDescription());
 			addPropertyIntValue(config, DISPLAY_RANK_ANNOT,
 					fp.getDisplayTier(), displayModel);
 			addPropertyIntValue(config, DISPLAY_LIMIT, fp.getDisplayLimit(),
@@ -328,10 +330,10 @@ public class FauxPropertyDaoJena extends JenaBaseDao implements FauxPropertyDao
 					.getConfigUri());
 			updatePropertyResourceURIValue(config, PROPERTY_GROUP,
 					fp.getGroupURI());
-			updatePropertyStringValue(config, DISPLAY_NAME,
-					fp.getDisplayName(), displayModel);
-			updatePropertyStringValue(config, PUBLIC_DESCRIPTION_ANNOT,
-					fp.getPublicDescription(), displayModel);
+			updatePlainLiteralValue(config, DISPLAY_NAME,
+					fp.getDisplayName());
+			updatePlainLiteralValue(config, PUBLIC_DESCRIPTION_ANNOT,
+					fp.getPublicDescription());
 			updatePropertyIntValue(config, DISPLAY_RANK_ANNOT,
 					fp.getDisplayTier(), displayModel);
 			updatePropertyIntValue(config, DISPLAY_LIMIT, fp.getDisplayLimit(),
@@ -494,31 +496,22 @@ public class FauxPropertyDaoJena extends JenaBaseDao implements FauxPropertyDao
 	// ConfigContext
 	// ----------------------------------------------------------------------
 
-	private static final String QUERY_LOCATE_CONFIG_CONTEXT_WITH_DOMAIN = "" //
-			+ "PREFIX : <http://vitro.mannlib.cornell.edu/ns/vitro/ApplicationConfiguration#> \n" //
-			+ "\n" //
-			+ "SELECT DISTINCT ?context ?config \n" //
-			+ "WHERE { \n" //
-			+ "    ?context a :ConfigContext ; \n" //
-			+ "        :configContextFor ?baseUri ; \n" //
-			+ "        :qualifiedByDomain ?domainUri ; \n" //
-			+ "        :qualifiedBy ?rangeUri ; \n" //
-			+ "        :hasConfiguration ?config . \n" //
-			+ "} \n"; //
+	private static String queryLocateConfigContext(boolean hasDomain, boolean hasRange) {
+		return  "PREFIX : <http://vitro.mannlib.cornell.edu/ns/vitro/ApplicationConfiguration#> \n" 
+				+ "SELECT DISTINCT ?context ?config \n" 
+				+ "WHERE { \n" 
+				+ "    ?context a :ConfigContext . \n" 
+				+ "    ?context :configContextFor ?baseUri . \n"
+				+ ( hasDomain ? "" : " FILTER NOT EXISTS { \n " ) 
+				+ "    ?context :qualifiedByDomain ?domainUri . \n"
+				+ ( hasDomain ? "" : "} \n" )
+				+ ( hasRange ? "" : " FILTER NOT EXISTS { \n " ) 
+				+ "    ?context :qualifiedBy ?rangeUri . \n"
+				+ ( hasRange ? "" : "} \n" )
+				+ "    ?context :hasConfiguration ?config . \n" 
+				+ "} \n"; 
 
-	private static final String QUERY_LOCATE_CONFIG_CONTEXT_WITH_NO_DOMAIN = "" //
-			+ "PREFIX : <http://vitro.mannlib.cornell.edu/ns/vitro/ApplicationConfiguration#> \n" //
-			+ "\n" //
-			+ "SELECT DISTINCT ?context ?config \n" //
-			+ "WHERE { \n" //
-			+ "    ?context a :ConfigContext ; \n" //
-			+ "        :configContextFor ?baseUri ; \n" //
-			+ "        :qualifiedBy ?rangeUri ; \n" //
-			+ "        :hasConfiguration ?config . \n" //
-			+ "     FILTER NOT EXISTS { \n" //
-			+ "        ?context :qualifiedByDomain ?domainUri \n" //
-			+ "     } \n" //
-			+ "} \n"; //
+	}
 
 	private static class ParserLocateConfigContext extends
 			ResultSetParser<Set<ConfigContext>> {
@@ -557,22 +550,16 @@ public class FauxPropertyDaoJena extends JenaBaseDao implements FauxPropertyDao
 
 	private static class ConfigContext {
 		public static Set<ConfigContext> findByQualifiers(
-				LockableOntModel lockableDisplayModel, String domainUri,
-				String baseUri, String rangeUri) {
+				LockableOntModel lockableDisplayModel, String domainUri, String baseUri, String rangeUri) {
 			try (LockedOntModel displayModel = lockableDisplayModel.read()) {
-				QueryHolder qHolder;
-				if (domainUri == null || domainUri.trim().isEmpty()
-						|| domainUri.equals(OWL.Thing.getURI())) {
-					qHolder = queryHolder(
-							QUERY_LOCATE_CONFIG_CONTEXT_WITH_NO_DOMAIN)
-							.bindToUri("baseUri", baseUri).bindToUri(
-									"rangeUri", rangeUri);
-				} else {
-					qHolder = queryHolder(
-							QUERY_LOCATE_CONFIG_CONTEXT_WITH_DOMAIN)
-							.bindToUri("baseUri", baseUri)
-							.bindToUri("rangeUri", rangeUri)
-							.bindToUri("domainUri", domainUri);
+				boolean hasDomain = !StringUtils.isEmpty(domainUri) && !domainUri.equals(OWL.Thing.getURI());
+				boolean hasRange = !StringUtils.isEmpty(rangeUri);
+				QueryHolder qHolder = queryHolder(queryLocateConfigContext(hasDomain, hasRange)).bindToUri("baseUri", baseUri);
+				if (hasDomain) {
+					qHolder = qHolder.bindToUri("domainUri", domainUri);
+				}
+				if (hasRange) {
+					qHolder = qHolder.bindToUri("rangeUri", rangeUri);
 				}
 				if (log.isDebugEnabled()) {
 					log.debug("domainUri=" + domainUri + ", baseUri=" + baseUri

api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualDaoJena.java

@@ -14,6 +14,7 @@ import java.util.Random;
 import java.util.Set;
 
 import org.apache.commons.lang3.NotImplementedException;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -286,15 +287,14 @@ public class IndividualDaoJena extends JenaBaseDao implements IndividualDao {
             ontModel.getBaseModel().notifyEvent(new IndividualUpdateEvent(getWebappDaoFactory().getUserURI(),true,ent.getURI()));
             org.apache.jena.ontology.Individual ind = ontModel.getIndividual(ent.getURI());
             if (ind != null) {
-                if (ent.getName() != null && ( (ind.getLabel(getDefaultLanguage())==null) || (ind.getLabel(getDefaultLanguage())!=null && ent.getName()!=null && !ent.getName().equals(ind.getLabel(getDefaultLanguage())) ) ) ) {
-
-                	// removal of existing values done this odd way to trigger
-                	// the change listeners
-                	Model temp = ModelFactory.createDefaultModel();
-                	temp.add(ontModel.listStatements(ind, RDFS.label, (RDFNode) null));
-                	ontModel.remove(temp);
-
-                    ind.setLabel(ent.getName(), getDefaultLanguage());
+               
+                String newLabel = ent.getName();
+                String oldLabel = ind.getLabel(getDefaultLanguage());
+                if ( newLabel != null && !newLabel.equals(oldLabel) ) {
+                    if (oldLabel == null) {
+                        oldLabel = "";
+                    }
+                    replaceOldLabelWithNewInDefaultLanguage(ontModel, ind, newLabel, oldLabel);
                 }
                 Set<String> oldTypeURIsSet = new HashSet<String>();
                 for (Iterator<Resource> typeIt = ind.listRDFTypes(true); typeIt.hasNext();) {
@@ -347,6 +347,23 @@ public class IndividualDaoJena extends JenaBaseDao implements IndividualDao {
         }
     }
 
+    private void replaceOldLabelWithNewInDefaultLanguage(OntModel ontModel, org.apache.jena.ontology.Individual ind,
+        final String newLabel, final String oldLabel) {
+        Model temp = ModelFactory.createDefaultModel();
+        StmtIterator statements = ontModel.listStatements(ind, RDFS.label, (RDFNode) null);
+        while (statements.hasNext()) {
+            Statement statement = (Statement) statements.next();
+            Literal object = statement.getLiteral();
+            String lexicalForm = object.getLexicalForm();
+            String language = object.getLanguage();
+            if (oldLabel.equals(lexicalForm) && language.equals(getDefaultLanguage()) ) {
+                temp.add(statement);
+            }
+        }
+        ontModel.remove(temp);
+        ind.addLabel(newLabel, getDefaultLanguage());    
+    }
+
     public void markModified(Individual ind) {
         markModified(ind,getOntModel());
     }

api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaBaseDao.java

@@ -5,8 +5,8 @@ package edu.cornell.mannlib.vitro.webapp.dao.jena;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.Comparator;
 import java.util.Date;
 import java.util.HashSet;
@@ -14,14 +14,14 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 
+import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.jena.iri.IRI;
-import org.apache.jena.iri.IRIFactory;
-
 import org.apache.jena.datatypes.xsd.XSDDatatype;
 import org.apache.jena.graph.Node;
 import org.apache.jena.graph.NodeFactory;
+import org.apache.jena.iri.IRI;
+import org.apache.jena.iri.IRIFactory;
 import org.apache.jena.ontology.DatatypeProperty;
 import org.apache.jena.ontology.ObjectProperty;
 import org.apache.jena.ontology.OntClass;
@@ -39,6 +39,7 @@ import org.apache.jena.rdf.model.NodeIterator;
 import org.apache.jena.rdf.model.Property;
 import org.apache.jena.rdf.model.RDFNode;
 import org.apache.jena.rdf.model.Resource;
+import org.apache.jena.rdf.model.ResourceFactory;
 import org.apache.jena.rdf.model.Statement;
 import org.apache.jena.rdf.model.StmtIterator;
 import org.apache.jena.shared.Lock;
@@ -642,7 +643,7 @@ public class JenaBaseDao extends JenaBaseDaoCon {
 
                 if (existingValue == null ) {
                      model.add(res, prop, model.createResource(uri));
-                } else if (!(existingValue.getURI()).equals(uri)) {
+                } else if (!isEqual(uri, existingValue)) {
              		 model.removeAll(res, prop, null);
               		 model.add(res, prop, model.createResource(uri));
                 }
@@ -650,6 +651,15 @@ public class JenaBaseDao extends JenaBaseDaoCon {
         }
     }
 
+	private boolean isEqual(String uri, Resource existingValue) {
+		if (existingValue.asNode().isBlank()) {
+			final String blankNodeId = existingValue.asNode().getBlankNodeId().toString();
+			return uri.endsWith(blankNodeId);
+		} else {
+			return existingValue.getURI().equals(uri);			
+		}
+	}
+
     /**
      * convenience method for use with functional object properties
      */
@@ -752,22 +762,111 @@ public class JenaBaseDao extends JenaBaseDaoCon {
 			}
 		}
 	}
+	
+	/**
+     * Add to an OntResource an rdfs:label value with lexical form and default
+     * language tag. Remove any other existing values in default language.
+     * If lexicalForm parameter is null, remove all plain literal values of 
+     * Property in default language.
+     * @param ontRes may not be null
+     * @param lexicalForm may be null.  If null, existing values will be deleted
+     *        but none will be added.
+     */
+	protected void updateRDFSLabel(OntResource ontRes, String lexicalForm) {
+        updatePlainLiteralValue(ontRes, RDFS.label, lexicalForm);
+    }
+	
+	/**
+     * Add to an OntResource an rdfs:label value with lexical form and optional
+     * language tag. Remove any other existing plain literal values that match 
+     * specified language or lack language tags if no language is supplied.
+     * If lexicalForm parameter is null, remove all plain literal labels in 
+     * specified language, or all existing language-less labels
+     * if no language is specified.
+     * @param ontRes may not be null
+     * @param lexicalForm may be null.  If null, existing values will be deleted
+     *        but none will be added.
+     * @param lang may be null.  If null, method acts on language-less plain 
+     *        literal labels and ignores those with language tags.
+     */	
+	protected void updateRDFSLabel(OntResource ontRes, String lexicalForm, String lang) {
+	    updatePlainLiteralValue(ontRes, RDFS.label, lexicalForm, lang);
+	}
 
     /**
-     * convenience method for updating the RDFS label
+     * Add to an OntResource a Property value with lexical form and default
+     * language tag. Remove any other existing values in default language.
+     * If lexicalForm parameter is null, remove all plain literal values of 
+     * Property in default language.
+     * @param ontRes may not be null
+     * @param lexicalForm may be null.  If null, existing values will be deleted
+     *        but none will be added.
      */
-    protected void updateRDFSLabel(OntResource ontRes, String label) {
-
-    	if (label != null && label.length() > 0) {
-
-    		String existingValue = ontRes.getLabel(getDefaultLanguage());
-
-    		if (existingValue == null || !existingValue.equals(label)) {
-    			ontRes.setLabel(label, getDefaultLanguage());
-    	    }
-    	} else {
-    		ontRes.removeAll(RDFS.label);
-    	}
+	protected void updatePlainLiteralValue(OntResource ontRes, Property property, 
+            String lexicalForm) {
+        updatePlainLiteralValue(ontRes, property, lexicalForm, getDefaultLanguage());
+    }
+    
+    /**
+     * Add to an OntResource a Property value with lexical form and optional
+     * language tag. Remove any other existing plain literal values that match 
+     * specified language or lack language tags if no language is supplied.
+     * If lexicalForm parameter is null, remove all plain literal values of 
+     * Property in specified language, or all existing language-less literals
+     * if no language is specified.
+     * @param ontRes may not be null
+     * @param lexicalForm may be null.  If null, existing values will be deleted
+     *        but none will be added.
+     * @param lang may be null.  If null, method acts on language-less
+     *        plain literal values and ignores those with language tags.
+     */
+    protected void updatePlainLiteralValue(OntResource ontRes, Property property,
+            String lexicalForm, String lang) {
+        if(ontRes == null) {
+            throw new IllegalArgumentException("ontRes may not be null.");
+        }
+        boolean addNew = true;
+        List<Statement> toRemove = new ArrayList<Statement>();
+        StmtIterator existingStmts = ontRes.listProperties(property);
+        while(existingStmts.hasNext()) {
+            Statement stmt = existingStmts.next();
+            if(stmt.getObject().isLiteral()) {                
+                Literal lit = stmt.getObject().asLiteral();
+                if( (lang == null && isLanguageLessPlainLiteral(lit))  
+                        || (lang != null && lang.equals(lit.getLanguage())) ) {
+                    if(!lit.getLexicalForm().equals(lexicalForm)) {
+                        toRemove.add(stmt);
+                    } else {
+                        // New literal already exists in the model.
+                        // Do not add it again.
+                        addNew = false;
+                    }
+                }
+            }
+        }
+        if(!toRemove.isEmpty()) {
+            ontRes.getModel().remove(toRemove);
+        }
+        if (addNew && (lexicalForm != null)) {
+            if(!StringUtils.isEmpty(lang)) {
+                ontRes.addProperty(property, ResourceFactory.createLangLiteral(
+                        lexicalForm, lang));    
+            } else {
+                ontRes.addProperty(property, ResourceFactory.createPlainLiteral(
+                        lexicalForm));
+            }            
+        }
+    }
+    
+    private boolean isLanguageLessPlainLiteral(Literal lit) {
+        // In RDF 1.1 all the language-less literals get datatype xsd:string.
+        // The null datatype check is here just in case this gets run on an older
+        // version of Jena.  rdf:PlainLiteral is also a datatype, but doesn't
+        // (yet) seem to be used by Jena.        
+        return StringUtils.isEmpty(lit.getLanguage()) 
+                && ((lit.getDatatype() == null) 
+                || XSDDatatype.XSDstring.equals(lit.getDatatype()) ||
+                (RDF.getURI() + "PlainLiteral").equals(lit.getDatatypeURI()));
     }
 
     private Literal getLabel(String lang, List<RDFNode>labelList) {
@@ -780,6 +879,13 @@ public class JenaBaseDao extends JenaBaseDaoCon {
                 }
                 if ((lang != null) && (lang.equals(labelLanguage))) {
                     return labelLit;
+                } else
+                    /*
+                     * UQAM-Linguistic-Management
+                     * Check for country-part of lang (ex: 'en' for default consideration of labelLanguage in english but not encoded by 'en-US' most case of labels in vivo.owl)
+                     */
+                	if ((lang != null) && (Arrays.asList(lang.split("-")).get(0).equals(labelLanguage))) {
+                    return labelLit;
                 }
             }
         }

api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaBaseDaoCon.java

@@ -121,6 +121,7 @@ public class JenaBaseDaoCon {
     protected  DatatypeProperty   USERACCOUNT_LAST_LOGIN_TIME = _constModel.createDatatypeProperty(VitroVocabulary.USERACCOUNT_LAST_LOGIN_TIME);
     protected  DatatypeProperty   USERACCOUNT_STATUS = _constModel.createDatatypeProperty(VitroVocabulary.USERACCOUNT_STATUS);
     protected  DatatypeProperty   USERACCOUNT_PASSWORD_LINK_EXPIRES = _constModel.createDatatypeProperty(VitroVocabulary.USERACCOUNT_PASSWORD_LINK_EXPIRES);
+    protected  DatatypeProperty   USERACCOUNT_EMAIL_KEY = _constModel.createDatatypeProperty(VitroVocabulary.USERACCOUNT_EMAIL_KEY);
     protected  DatatypeProperty   USERACCOUNT_PASSWORD_CHANGE_REQUIRED = _constModel.createDatatypeProperty(VitroVocabulary.USERACCOUNT_PASSWORD_CHANGE_REQUIRED);
     protected  DatatypeProperty   USERACCOUNT_EXTERNAL_AUTH_ID = _constModel.createDatatypeProperty(VitroVocabulary.USERACCOUNT_EXTERNAL_AUTH_ID);
     protected  DatatypeProperty   USERACCOUNT_EXTERNAL_AUTH_ONLY = _constModel.createDatatypeProperty(VitroVocabulary.USERACCOUNT_EXTERNAL_AUTH_ONLY);

api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaModelUtils.java

@@ -2,15 +2,17 @@
 
 package edu.cornell.mannlib.vitro.webapp.dao.jena;
 
+import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
+import java.util.concurrent.ConcurrentLinkedQueue;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-
+import org.apache.jena.graph.Triple;
 import org.apache.jena.ontology.Individual;
 import org.apache.jena.ontology.OntClass;
 import org.apache.jena.ontology.OntModel;
@@ -21,12 +23,16 @@ import org.apache.jena.query.Query;
 import org.apache.jena.query.QueryExecution;
 import org.apache.jena.query.QueryExecutionFactory;
 import org.apache.jena.query.QueryFactory;
+import org.apache.jena.query.QuerySolution;
+import org.apache.jena.query.ResultSet;
 import org.apache.jena.rdf.model.Model;
 import org.apache.jena.rdf.model.ModelFactory;
 import org.apache.jena.rdf.model.Property;
 import org.apache.jena.rdf.model.RDFNode;
 import org.apache.jena.rdf.model.Resource;
 import org.apache.jena.rdf.model.ResourceFactory;
+import org.apache.jena.rdf.model.Statement;
+import org.apache.jena.rdf.model.StmtIterator;
 import org.apache.jena.shared.Lock;
 import org.apache.jena.vocabulary.OWL;
 import org.apache.jena.vocabulary.RDF;
@@ -39,6 +45,8 @@ import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactoryConfig;
 
 public class JenaModelUtils {
 
+	public static final String BNODE_ROOT_QUERY =
+	        "SELECT DISTINCT ?s WHERE { ?s ?p ?o OPTIONAL { ?ss ?pp ?s } FILTER (!isBlank(?s) || !bound(?ss)) }";
     private static final Log log = LogFactory.getLog(JenaModelUtils.class.getName());
 
     private static final Set<String>  nonIndividualTypeURIs ;
@@ -398,5 +406,190 @@ public class JenaModelUtils {
         return aboxModel;
 
     }
+    
+    /**
+     * Remove statements from a model by separating statements
+     * containing blank nodes from those that have no blank nodes.
+     * The blank node statements are removed by treating blank nodes as variables and
+     * constructing the matching subgraphs for deletion.
+     * The other statements are removed normally.
+     * @param toRemove containing statements to be removed
+     * @param removeFrom from which statements should be removed
+     */
+    public static void removeWithBlankNodesAsVariables(Model toRemove, Model removeFrom) {
+    	List<Statement> blankNodeStatements = new ArrayList<Statement>();
+    	List<Statement> nonBlankNodeStatements = new ArrayList<Statement>();
+    	StmtIterator stmtIt = toRemove.listStatements();
+        while (stmtIt.hasNext()) {
+            Statement stmt = stmtIt.nextStatement();
+            if (stmt.getSubject().isAnon() || stmt.getObject().isAnon()) {
+                blankNodeStatements.add(stmt);
+            } else {
+            	nonBlankNodeStatements.add(stmt);
+            }
+        }
+        if(!blankNodeStatements.isEmpty()) {
+        	Model blankNodeModel = ModelFactory.createDefaultModel();
+        	blankNodeModel.add(blankNodeStatements);
+        	removeBlankNodesUsingSparqlConstruct(blankNodeModel, removeFrom);	
+        }
+        if(!nonBlankNodeStatements.isEmpty()) {
+            try {
+            	removeFrom.enterCriticalSection(Lock.WRITE);
+            	removeFrom.remove(nonBlankNodeStatements);
+            } finally {
+            	removeFrom.leaveCriticalSection();
+            }        	
+        }
+    }
+    
+    private static void removeBlankNodesUsingSparqlConstruct(Model blankNodeModel,
+    		Model removeFrom) {
+        log.debug("blank node model size " + blankNodeModel.size());
+        if (blankNodeModel.size() == 1) {
+            log.debug("Deleting single triple with blank node: " + blankNodeModel);
+            log.debug("This could result in the deletion of multiple triples"
+            		+ " if multiple blank nodes match the same triple pattern.");
+        }
+        Query rootFinderQuery = QueryFactory.create(BNODE_ROOT_QUERY);
+        QueryExecution qe = QueryExecutionFactory.create(rootFinderQuery, blankNodeModel);
+        try {
+            ResultSet rs = qe.execSelect();
+            while (rs.hasNext()) {
+                QuerySolution qs = rs.next();
+                Resource s = qs.getResource("s");
+                String treeFinder = makeDescribe(s);
+                Query treeFinderQuery = QueryFactory.create(treeFinder);
+                QueryExecution qee = QueryExecutionFactory.create(treeFinderQuery, blankNodeModel);
+                try {
+                    Model tree = qee.execDescribe();
+                    JenaModelUtils.removeUsingSparqlConstruct(tree, removeFrom);
+                } finally {
+                    qee.close();
+                }
+            }
+        } finally {
+            qe.close();
+        }
+    }
+
+    private static String makeDescribe(Resource s) {
+        StringBuilder query = new StringBuilder("DESCRIBE <") ;
+        if (s.isAnon()) {
+            query.append("_:").append(s.getId().toString());
+        } else {
+            query.append(s.getURI());
+        }
+        query.append(">");
+        return query.toString();
+    }
+
+    private static final boolean WHERE_CLAUSE = true;
+    
+    /**
+     * Remove statements from a model by first constructing
+     * the statements to be removed with a SPARQL query that treats
+     * each blank node ID as a variable.
+     * This allows matching blank node structures to be removed even though
+     * the internal blank node IDs are different.
+     * @param toRemove containing statements to be removed
+     * @param removeFrom from which statements should be removed
+     */
+    public static void removeUsingSparqlConstruct(Model toRemove, Model removeFrom) {
+        if(toRemove.isEmpty()) {
+        	return;
+        }
+        List<Statement> stmts = toRemove.listStatements().toList();
+        stmts = sort(stmts);
+        StringBuffer queryBuff = new StringBuffer();
+        queryBuff.append("CONSTRUCT { \n");
+        addStatementPatterns(stmts, queryBuff, !WHERE_CLAUSE);
+        queryBuff.append("} WHERE { \n");
+        addStatementPatterns(stmts, queryBuff, WHERE_CLAUSE);
+        queryBuff.append("} \n");
+        String queryStr = queryBuff.toString();
+        log.debug(queryBuff.toString());
+        Query construct = QueryFactory.create(queryStr);
+        QueryExecution qe = QueryExecutionFactory.create(construct, removeFrom);
+        try {
+            Model constructedRemovals = qe.execConstruct();
+            try {
+            	removeFrom.enterCriticalSection(Lock.WRITE);
+            	removeFrom.remove(constructedRemovals);
+            } finally {
+            	removeFrom.leaveCriticalSection();
+            }
+        } finally {
+            qe.close();
+        }
+    }
+    
+    private static List<Statement> sort(List<Statement> stmts) {
+        List<Statement> output = new ArrayList<Statement>();
+        int originalSize = stmts.size();
+        if(originalSize == 1) {
+            return stmts;
+        }
+        List <Statement> remaining = stmts;
+        ConcurrentLinkedQueue<Resource> subjQueue = new ConcurrentLinkedQueue<Resource>();
+        for(Statement stmt : remaining) {
+            if(stmt.getSubject().isURIResource()) {
+                subjQueue.add(stmt.getSubject());
+                break;
+            }
+        }
+        if (subjQueue.isEmpty()) {
+            log.warn("No named subject in statement patterns");
+            return stmts;
+        }
+        while(remaining.size() > 0) {
+            if(subjQueue.isEmpty()) {
+                subjQueue.add(remaining.get(0).getSubject());
+            }
+            while(!subjQueue.isEmpty()) {
+                Resource subj = subjQueue.poll();
+                List<Statement> temp = new ArrayList<Statement>();
+                for (Statement stmt : remaining) {
+                    if(stmt.getSubject().equals(subj)) {
+                        output.add(stmt);
+                        if (stmt.getObject().isResource()) {
+                            subjQueue.add((Resource) stmt.getObject());
+                        }
+                    } else {
+                        temp.add(stmt);
+                    }
+                }
+                remaining = temp;
+            }
+        }
+        if(output.size() != originalSize) {
+            throw new RuntimeException("original list size was " + originalSize +
+                    " but sorted size is " + output.size());
+        }
+        return output;
+    }
+
+    private static void addStatementPatterns(List<Statement> stmts,
+    		StringBuffer patternBuff, boolean whereClause) {
+        for(Statement stmt : stmts) {
+            Triple t = stmt.asTriple();
+            patternBuff.append(SparqlGraph.sparqlNodeDelete(t.getSubject(), null));
+            patternBuff.append(" ");
+            patternBuff.append(SparqlGraph.sparqlNodeDelete(t.getPredicate(), null));
+            patternBuff.append(" ");
+            patternBuff.append(SparqlGraph.sparqlNodeDelete(t.getObject(), null));
+            patternBuff.append(" .\n");
+            if (whereClause) {
+                if (t.getSubject().isBlank()) {
+                    patternBuff.append("    FILTER(isBlank(").append(
+                    		SparqlGraph.sparqlNodeDelete(t.getSubject(), null)).append(")) \n");
+                }
+                if (t.getObject().isBlank()) {
+                    patternBuff.append("    FILTER(isBlank(").append(
+                    		SparqlGraph.sparqlNodeDelete(t.getObject(), null)).append(")) \n");
+                }
+            }
+        }
+    }
 
 }

api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/MenuDaoJena.java

@@ -72,6 +72,7 @@ public class MenuDaoJena extends JenaBaseDao implements MenuDao {
         return getMenu( getOntModelSelector().getDisplayModel(), url );
     }
 
+    @Override
     public MainMenu getMainMenu( ServletRequest req, String url ) {
         OntModel displayModel = LanguageFilteringUtils.wrapOntModelInALanguageFilter(getOntModelSelector().getDisplayModel(), req );
         return getMenu(displayModel,  url) ;

api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyDaoJena.java

@@ -714,14 +714,14 @@ public class ObjectPropertyDaoJena extends PropertyDaoJena implements ObjectProp
             }
         }
 
-        updatePropertyStringValue(p,EXAMPLE_ANNOT,prop.getExample(),getOntModel());
-        updatePropertyStringValue(p,DESCRIPTION_ANNOT,prop.getDescription(),getOntModel());
-        updatePropertyStringValue(p,PUBLIC_DESCRIPTION_ANNOT,prop.getPublicDescription(),getOntModel());
+        updatePlainLiteralValue(p, EXAMPLE_ANNOT, prop.getExample());
+        updatePlainLiteralValue(p, DESCRIPTION_ANNOT, prop.getDescription());
+        updatePlainLiteralValue(p, PUBLIC_DESCRIPTION_ANNOT, prop.getPublicDescription());
         updatePropertyNonNegativeIntegerValue(p,DISPLAY_LIMIT,prop.getDomainDisplayLimitInteger(),getOntModel());
         updatePropertyStringValue(p,PROPERTY_ENTITYSORTDIRECTION,prop.getDomainEntitySortDirection(),getOntModel());
         if (inv != null) {
-            updatePropertyStringValue(inv,EXAMPLE_ANNOT,prop.getExample(),getOntModel());
-            updatePropertyStringValue(inv,DESCRIPTION_ANNOT,prop.getDescription(),getOntModel());
+            updatePlainLiteralValue(inv, EXAMPLE_ANNOT, prop.getExample());
+            updatePlainLiteralValue(inv, DESCRIPTION_ANNOT, prop.getDescription());
             updatePropertyNonNegativeIntegerValue(inv,DISPLAY_LIMIT,prop.getRangeDisplayLimitInteger(),getOntModel());
             updatePropertyStringValue(inv,PROPERTY_ENTITYSORTDIRECTION,prop.getRangeEntitySortDirection(),getOntModel());
         }

api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/PropertyDaoJena.java

@@ -813,7 +813,9 @@ public class PropertyDaoJena extends JenaBaseDao implements PropertyDao {
         List<ObjectProperty> stragglers = getAdditionalFauxSubpropertiesForVClasses(
                 vclasses, propInsts);
         for (ObjectProperty op : stragglers) {
-            propInsts.add(makePropInst(op));
+        	if (op != null) {
+        		propInsts.add(makePropInst(op));	
+        	}
         }
 
         return propInsts;

api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/PropertyGroupDaoJena.java

@@ -31,6 +31,7 @@ import edu.cornell.mannlib.vitro.webapp.dao.InsertException;
 import edu.cornell.mannlib.vitro.webapp.dao.ObjectPropertyDao;
 import edu.cornell.mannlib.vitro.webapp.dao.PropertyGroupDao;
 import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
+import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactoryConfig;
 
 public class PropertyGroupDaoJena extends JenaBaseDao implements PropertyGroupDao {
 
@@ -142,7 +143,7 @@ public class PropertyGroupDaoJena extends JenaBaseDao implements PropertyGroupDa
 
     	edu.cornell.mannlib.vitro.webapp.beans.Individual groupInd =
     		new IndividualImpl(); // We should make a factory for these
-    	groupInd.setNamespace(DEFAULT_NAMESPACE+"vitroPropertyGroup");
+    	groupInd.setNamespace(DEFAULT_NAMESPACE + "vitroPropertyGroup");
     	groupInd.setName(group.getName());
     	groupInd.setVClassURI(PROPERTYGROUP.getURI());
     	groupInd.setURI(group.getURI());
@@ -156,8 +157,12 @@ public class PropertyGroupDaoJena extends JenaBaseDao implements PropertyGroupDa
 
         WebappDaoFactory wadfForURIGeneration = null;
         try {
-            wadfForURIGeneration = new WebappDaoFactoryJena(
-                    unionForURIGeneration);
+            // Ensure that the temporary WebappDaoFactory has the same
+            // preferred languages as the main one for this DAO.
+            WebappDaoFactoryConfig wadfConfig = new WebappDaoFactoryConfig();
+            wadfConfig.setPreferredLanguages(getWebappDaoFactory().getPreferredLanguages());
+            wadfForURIGeneration = new WebappDaoFactoryJena(new SimpleOntModelSelector(
+                    unionForURIGeneration), wadfConfig, null);
             groupURI = wadfForURIGeneration
                     .getIndividualDao().insertNewIndividual(groupInd);
     	} catch (InsertException ie) {
@@ -183,11 +188,9 @@ public class PropertyGroupDaoJena extends JenaBaseDao implements PropertyGroupDa
 	            if (group.getPublicDescription() != null
 	                    && group.getPublicDescription().length()>0) {
 		            try {
-		                groupJenaInd.addProperty(
-		                        PUBLIC_DESCRIPTION_ANNOT,
-		                        group.getPublicDescription(),
-		                        XSDDatatype.XSDstring);
-		            } catch (Exception ex) {
+                        updatePlainLiteralValue(groupJenaInd, PUBLIC_DESCRIPTION_ANNOT,
+                                group.getPublicDescription(), getDefaultLanguage());
+                    } catch (Exception ex) {
 		                log.error(
 		                        "error setting public description for "
 		                                + groupInd.getURI());
@@ -225,15 +228,13 @@ public class PropertyGroupDaoJena extends JenaBaseDao implements PropertyGroupDa
 	    try {
 	        Individual groupInd = ontModel.getIndividual(group.getURI());
 	        try {
-	            groupInd.setLabel(group.getName(), getDefaultLanguage());
+                updateRDFSLabel(groupInd, group.getName(), getDefaultLanguage());
 	        } catch (Exception e) {
 	            log.error("error updating name for "+groupInd.getURI());
 	        }
 	        try {
-	            groupInd.removeAll(PUBLIC_DESCRIPTION_ANNOT);
-	            if (group.getPublicDescription()!=null && group.getPublicDescription().length()>0) {
-	                groupInd.addProperty(PUBLIC_DESCRIPTION_ANNOT, group.getPublicDescription(), XSDDatatype.XSDstring);
-	            }
+                updatePlainLiteralValue(groupInd, PUBLIC_DESCRIPTION_ANNOT,
+	                    group.getPublicDescription(), getDefaultLanguage());	            
 	        } catch (Exception e) {
 	            log.error("Error updating public description for "+groupInd.getURI());
 	        }

api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/RDFServiceGraph.java

@@ -12,10 +12,10 @@ import java.util.function.Supplier;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-
 import org.apache.jena.graph.Capabilities;
 import org.apache.jena.graph.Graph;
 import org.apache.jena.graph.GraphEventManager;
+import org.apache.jena.graph.GraphListener;
 import org.apache.jena.graph.GraphStatisticsHandler;
 import org.apache.jena.graph.Node;
 import org.apache.jena.graph.TransactionHandler;
@@ -23,7 +23,6 @@ import org.apache.jena.graph.Triple;
 import org.apache.jena.graph.impl.GraphWithPerform;
 import org.apache.jena.graph.impl.SimpleEventManager;
 import org.apache.jena.query.QuerySolution;
-import org.apache.jena.rdf.listeners.StatementListener;
 import org.apache.jena.rdf.model.Model;
 import org.apache.jena.rdf.model.ModelFactory;
 import org.apache.jena.rdf.model.StmtIterator;
@@ -290,10 +289,15 @@ public class RDFServiceGraph implements GraphWithPerform {
             literalBuff.append("\"");
             pyString(literalBuff, node.getLiteralLexicalForm());
             literalBuff.append("\"");
-            if (node.getLiteralDatatypeURI() != null) {
-                literalBuff.append("^^<").append(node.getLiteralDatatypeURI()).append(">");
-            } else if (!StringUtils.isEmpty(node.getLiteralLanguage())) {
+            /*
+             * UQAM-Bug-Correction
+             * reversing the condition tests.
+             * It is important to prioritize the language typology test in order to exploit the linguistic context in testing the type of data
+             */
+            if (!StringUtils.isEmpty(node.getLiteralLanguage())) {
                 literalBuff.append("@").append(node.getLiteralLanguage());
+            } else if (node.getLiteralDatatypeURI() != null) {
+                literalBuff.append("^^<").append(node.getLiteralDatatypeURI()).append(">");
             }
             return literalBuff.toString();
         } else {
@@ -404,7 +408,18 @@ public class RDFServiceGraph implements GraphWithPerform {
     @Override
     public GraphEventManager getEventManager() {
         if (eventManager == null) {
-            eventManager = new SimpleEventManager(this);
+            eventManager = new SimpleEventManager() {                
+                @Override
+                public void notifyEvent(Graph g, Object event) {
+                    ChangeSet changeSet = rdfService.manufactureChangeSet();
+                    changeSet.addPreChangeEvent(event);
+                    try {
+                        rdfService.changeSetUpdate(changeSet);
+                    } catch (RDFServiceException e) {
+                        throw new RuntimeException(e);
+                    }   
+                }                
+            };
         }
         return eventManager;
     }
@@ -590,21 +605,7 @@ public class RDFServiceGraph implements GraphWithPerform {
     }
 
     public static Model createRDFServiceModel(final RDFServiceGraph g) {
-        Model m = VitroModelFactory.createModelForGraph(g);
-        m.register(new StatementListener() {
-            @Override
-            public void notifyEvent(Model m, Object event) {
-                ChangeSet changeSet = g.getRDFService().manufactureChangeSet();
-                changeSet.addPreChangeEvent(event);
-                try {
-                    g.getRDFService().changeSetUpdate(changeSet);
-                } catch (RDFServiceException e) {
-                    throw new RuntimeException(e);
-                }
-            }
-
-        });
-        return m;
+        return VitroModelFactory.createModelForGraph(g);
     }
 
 	@Override

api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/RDFServiceModelMaker.java

@@ -2,6 +2,7 @@
 
 package edu.cornell.mannlib.vitro.webapp.dao.jena;
 
+import java.text.Collator;
 import java.util.Set;
 import java.util.TreeSet;
 
@@ -17,7 +18,6 @@ import org.apache.jena.shared.CannotCreateException;
 import org.apache.jena.shared.DoesNotExistException;
 import org.apache.jena.util.iterator.ExtendedIterator;
 import org.apache.jena.util.iterator.WrappedIterator;
-import com.ibm.icu.text.Collator;
 
 import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService;
 import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceException;
@@ -103,7 +103,7 @@ public class RDFServiceModelMaker implements ModelMaker {
 	@Override
 	public void removeModel(String name) {
 		Model m = getModel(name);
-		m.removeAll(null, null, null);
+		m.removeAll();
 	}
 
 	@Override

api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/SparqlGraph.java

@@ -232,10 +232,10 @@ public class SparqlGraph implements GraphWithPerform {
             literalBuff.append("\"");
             pyString(literalBuff, node.getLiteralLexicalForm());
             literalBuff.append("\"");
-            if (node.getLiteralDatatypeURI() != null) {
-                literalBuff.append("^^<").append(node.getLiteralDatatypeURI()).append(">");
-            } else if (!StringUtils.isEmpty(node.getLiteralLanguage())) {
+            if (!StringUtils.isEmpty(node.getLiteralLanguage())) {
                 literalBuff.append("@").append(node.getLiteralLanguage());
+            } else if (node.getLiteralDatatypeURI() != null) {
+                literalBuff.append("^^<").append(node.getLiteralDatatypeURI()).append(">");
             }
             return literalBuff.toString();
         } else {

api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/UserAccountsDaoJena.java

@@ -4,7 +4,6 @@ package edu.cornell.mannlib.vitro.webapp.dao.jena;
 
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 import java.util.Random;
@@ -98,6 +97,8 @@ public class UserAccountsDaoJena extends JenaBaseDao implements UserAccountsDao
 			u.setOldPassword(getPropertyStringValue(r, USERACCOUNT_OLD_PASSWORD));
 			u.setPasswordLinkExpires(getPropertyLongValue(r,
 					USERACCOUNT_PASSWORD_LINK_EXPIRES));
+			u.setEmailKey(getPropertyStringValue(r,USERACCOUNT_EMAIL_KEY));
+			
 			u.setPasswordChangeRequired(getPropertyBooleanValue(r,
 					USERACCOUNT_PASSWORD_CHANGE_REQUIRED));
 			u.setExternalAuthOnly(getPropertyBooleanValue(r,
@@ -240,6 +241,8 @@ public class UserAccountsDaoJena extends JenaBaseDao implements UserAccountsDao
 					userAccount.getLoginCount(), model);
 			addPropertyLongValue(res, USERACCOUNT_LAST_LOGIN_TIME,
 					userAccount.getLastLoginTime(), model);
+			addPropertyStringValue(res, USERACCOUNT_EMAIL_KEY,
+					userAccount.getEmailKey(), model);
 			if (userAccount.getStatus() != null) {
 				addPropertyStringValue(res, USERACCOUNT_STATUS, userAccount
 						.getStatus().toString(), model);
@@ -306,6 +309,8 @@ public class UserAccountsDaoJena extends JenaBaseDao implements UserAccountsDao
 					userAccount.getLoginCount(), model);
 			updatePropertyLongValue(res, USERACCOUNT_LAST_LOGIN_TIME,
 					userAccount.getLastLoginTime(), model);
+			updatePropertyStringValue(res, USERACCOUNT_EMAIL_KEY,
+					userAccount.getEmailKey(), model);
 			if (userAccount.getStatus() == null) {
 				updatePropertyStringValue(res, USERACCOUNT_STATUS, null, model);
 			} else {

api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassDaoJena.java

@@ -2,6 +2,8 @@
 
 package edu.cornell.mannlib.vitro.webapp.dao.jena;
 
+import static java.lang.String.format;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashSet;
@@ -60,15 +62,18 @@ import edu.cornell.mannlib.vitro.webapp.dao.OntologyDao;
 import edu.cornell.mannlib.vitro.webapp.dao.VClassDao;
 import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
 import edu.cornell.mannlib.vitro.webapp.dao.jena.event.EditEvent;
+import edu.cornell.mannlib.vitro.webapp.i18n.I18nBundle;
 import edu.cornell.mannlib.vitro.webapp.web.URLEncoder;
 
 public class VClassDaoJena extends JenaBaseDao implements VClassDao {
 
     protected static final Log log = LogFactory.getLog(VClassDaoJena.class);
+    private final I18nBundle i18n;
     private boolean isUnderlyingStoreReasoned = false;
 
     public VClassDaoJena(WebappDaoFactoryJena wadf, boolean isUnderlyingStoreReasoned) {
         super(wadf);
+        this.i18n = wadf.getI18nBundle();
         this.isUnderlyingStoreReasoned = isUnderlyingStoreReasoned;
     }
 
@@ -91,17 +96,19 @@ public class VClassDaoJena extends JenaBaseDao implements VClassDao {
                     Restriction rest = cls.asRestriction();
                     OntProperty onProperty = rest.getOnProperty();
                     StringBuilder labelStr = new StringBuilder();
-                    labelStr.append("restriction on ").append(getLabelOrId(onProperty)).append(": ");
+                    labelStr.append(format("%s ", i18n.text("restriction_on")))
+                        .append(getLabelOrId(onProperty))
+                        .append(": ");
                     if (rest.isAllValuesFromRestriction() || rest.isSomeValuesFromRestriction()) {
                         Resource fillerRes = null;
                         if (rest.isAllValuesFromRestriction()) {
                             AllValuesFromRestriction avfRest = rest.asAllValuesFromRestriction();
                             fillerRes = avfRest.getAllValuesFrom();
-                            labelStr.append("all values from ");
+                            labelStr.append(format("%s ", i18n.text("all_values_from")));
                         } else {
                             SomeValuesFromRestriction svfRest = rest.asSomeValuesFromRestriction();
                             fillerRes = svfRest.getSomeValuesFrom();
-                            labelStr.append("some values from ");
+                            labelStr.append(format("%s ", i18n.text("some_values_from")));
                         }
                         if (fillerRes.canAs(OntClass.class)) {
                             OntClass avf = fillerRes.as(OntClass.class);
@@ -115,7 +122,7 @@ public class VClassDaoJena extends JenaBaseDao implements VClassDao {
                         }
                     } else if (rest.isHasValueRestriction()) {
                         HasValueRestriction hvRest = rest.asHasValueRestriction();
-                        labelStr.append("has value ");
+                        labelStr.append(format("%s ", i18n.text("has_value")));
                         RDFNode fillerNode = hvRest.getHasValue();
                         try {
                             if (fillerNode.isResource()) {
@@ -128,22 +135,22 @@ public class VClassDaoJena extends JenaBaseDao implements VClassDao {
                         }
                     } else if (rest.isMinCardinalityRestriction()) {
                         MinCardinalityRestriction mcRest = rest.asMinCardinalityRestriction();
-                        labelStr.append("minimum cardinality ");
+                        labelStr.append(format("%s ", i18n.text("minimum_cardinality")));
                         labelStr.append(mcRest.getMinCardinality());
                     } else if (rest.isMaxCardinalityRestriction()) {
                         MaxCardinalityRestriction mcRest = rest.asMaxCardinalityRestriction();
-                        labelStr.append("maximum cardinality ");
+                        labelStr.append(format("%s ", i18n.text("maximum_cardinality")));
                         labelStr.append(mcRest.getMaxCardinality());
                     } else if (rest.isCardinalityRestriction()) {
                         CardinalityRestriction cRest = rest.asCardinalityRestriction();
-                        labelStr.append("cardinality ");
+                        labelStr.append(format("%s ", i18n.text("cardinality")));
                         labelStr.append(cRest.getCardinality());
                     }
                     return labelStr.toString();
                 } else if (isBooleanClassExpression(cls)) {
                     StringBuilder labelStr = new StringBuilder("(");
                     if (cls.isComplementClass()) {
-                        labelStr.append("not ");
+                        labelStr.append(format("%s ", i18n.text("not")));
                         ComplementClass ccls = cls.as(ComplementClass.class);
                         labelStr.append(getLabelForClass(ccls.getOperand(), withPrefix, forPickList));
                     } else if (cls.isIntersectionClass()) {
@@ -153,7 +160,7 @@ public class VClassDaoJena extends JenaBaseDao implements VClassDao {
                             OntClass operand = operandIt.next();
                             labelStr.append(getLabelForClass(operand, withPrefix, forPickList));
                             if (operandIt.hasNext()) {
-                                labelStr.append(" and ");
+                                labelStr.append(format(" %s ", i18n.text("and")));
                             }
                         }
                     } else if (cls.isUnionClass()) {
@@ -163,7 +170,7 @@ public class VClassDaoJena extends JenaBaseDao implements VClassDao {
                             OntClass operand = operandIt.next();
                             labelStr.append(getLabelForClass(operand, withPrefix, forPickList));
                             if (operandIt.hasNext()) {
-                                labelStr.append(" or ");
+                                labelStr.append(format(" %s ", i18n.text("or")));
                             }
                         }
                     }
@@ -257,6 +264,7 @@ public class VClassDaoJena extends JenaBaseDao implements VClassDao {
         } catch (ProfileException pe) {
             // Current language profile does not support disjointWith axioms.
             // We'd prefer to return an empty list instead of throwing an exception.
+        	log.error(pe, pe);
         } finally {
             getOntModel().leaveCriticalSection();
         }
@@ -952,9 +960,9 @@ public class VClassDaoJena extends JenaBaseDao implements VClassDao {
             } catch (Exception e) {
                 log.error("error linking class "+cls.getURI()+" to class group");
             }
-            addPropertyStringValue(ontCls,SHORTDEF,cls.getShortDef(),ontModel);
-            addPropertyStringValue(ontCls,EXAMPLE_ANNOT,cls.getExample(),ontModel);
-            addPropertyStringValue(ontCls,DESCRIPTION_ANNOT,cls.getDescription(),ontModel);
+            updatePlainLiteralValue(ontCls, SHORTDEF, cls.getShortDef());
+            updatePlainLiteralValue(ontCls, EXAMPLE_ANNOT, cls.getExample());
+            updatePlainLiteralValue(ontCls, DESCRIPTION_ANNOT, cls.getDescription());
             addPropertyIntValue(ontCls,DISPLAY_LIMIT,cls.getDisplayLimit(),ontModel);
             addPropertyIntValue(ontCls,DISPLAY_RANK_ANNOT,cls.getDisplayRank(),ontModel);
 
@@ -1011,9 +1019,9 @@ public class VClassDaoJena extends JenaBaseDao implements VClassDao {
             if (ontCls != null) {
                 updateRDFSLabel(ontCls, cls.getName());
                 updatePropertyResourceURIValue(ontCls,IN_CLASSGROUP,cls.getGroupURI(),ontModel);
-                updatePropertyStringValue(ontCls,SHORTDEF,cls.getShortDef(),ontModel);
-                updatePropertyStringValue(ontCls,EXAMPLE_ANNOT,cls.getExample(),ontModel);
-                updatePropertyStringValue(ontCls,DESCRIPTION_ANNOT,cls.getDescription(),ontModel);
+                updatePlainLiteralValue(ontCls, SHORTDEF, cls.getShortDef());
+                updatePlainLiteralValue(ontCls, EXAMPLE_ANNOT, cls.getExample());
+                updatePlainLiteralValue(ontCls, DESCRIPTION_ANNOT, cls.getDescription());
                 updatePropertyNonNegativeIntValue(ontCls,DISPLAY_LIMIT,cls.getDisplayLimit(),ontModel);
                 updatePropertyNonNegativeIntValue(ontCls,DISPLAY_RANK_ANNOT,cls.getDisplayRank(),ontModel);
                 updatePropertyFloatValue(ontCls, SEARCH_BOOST_ANNOT, cls.getSearchBoost(), ontModel);

api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassGroupDaoJena.java

@@ -5,14 +5,12 @@ package edu.cornell.mannlib.vitro.webapp.dao.jena;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
-import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.ListIterator;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-
 import org.apache.jena.datatypes.xsd.XSDDatatype;
 import org.apache.jena.ontology.Individual;
 import org.apache.jena.ontology.OntModel;
@@ -30,6 +28,7 @@ import edu.cornell.mannlib.vitro.webapp.dao.InsertException;
 import edu.cornell.mannlib.vitro.webapp.dao.VClassDao;
 import edu.cornell.mannlib.vitro.webapp.dao.VClassGroupDao;
 import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
+import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactoryConfig;
 
 public class VClassGroupDaoJena extends JenaBaseDao implements VClassGroupDao {
 
@@ -191,9 +190,9 @@ public class VClassGroupDaoJena extends JenaBaseDao implements VClassGroupDao {
     	edu.cornell.mannlib.vitro.webapp.beans.Individual groupInd =
     		new IndividualImpl(); // We should make a factory for these
     	groupInd.setURI(vcg.getURI());
-    	groupInd.setNamespace(DEFAULT_NAMESPACE+"vitroClassGroup");
-    	groupInd.setName(vcg.getPublicName());
+    	groupInd.setNamespace(DEFAULT_NAMESPACE + "vitroClassGroup");
     	groupInd.setVClassURI(CLASSGROUP.getURI());
+    	groupInd.setName(vcg.getPublicName());
 
     	String groupURI = null;
 
@@ -204,8 +203,12 @@ public class VClassGroupDaoJena extends JenaBaseDao implements VClassGroupDao {
 
     	WebappDaoFactory wadfForURIGeneration = null;
     	try {
-    	    wadfForURIGeneration = new WebappDaoFactoryJena(
-    	            unionForURIGeneration);
+            // Ensure that the temporary WebappDaoFactory has the same
+            // preferred languages as the main one for this DAO.
+            WebappDaoFactoryConfig wadfConfig = new WebappDaoFactoryConfig();
+            wadfConfig.setPreferredLanguages(getWebappDaoFactory().getPreferredLanguages());
+    	    wadfForURIGeneration = new WebappDaoFactoryJena(new SimpleOntModelSelector(
+                    unionForURIGeneration), wadfConfig, null);
     		groupURI = wadfForURIGeneration
                     .getIndividualDao().insertNewIndividual(groupInd);
     	} catch (InsertException ie) {
@@ -276,7 +279,7 @@ public class VClassGroupDaoJena extends JenaBaseDao implements VClassGroupDao {
         try {
             Individual groupInd = ontModel.getIndividual(vcg.getURI());
             try {
-                groupInd.setLabel(vcg.getPublicName(), getDefaultLanguage());
+                updateRDFSLabel(groupInd, vcg.getPublicName(), getDefaultLanguage());
             } catch (Exception e) {
                 log.error("error updating name for "+groupInd.getURI());
             }

api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/WebappDaoFactoryJena.java

@@ -50,6 +50,8 @@ import edu.cornell.mannlib.vitro.webapp.dao.VClassGroupDao;
 import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
 import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
 import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactoryConfig;
+import edu.cornell.mannlib.vitro.webapp.i18n.I18n;
+import edu.cornell.mannlib.vitro.webapp.i18n.I18nBundle;
 import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelNames;
 import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService;
 import edu.cornell.mannlib.vitro.webapp.rdfservice.impl.jena.model.RDFServiceModel;
@@ -611,5 +613,10 @@ public class WebappDaoFactoryJena implements WebappDaoFactory {
         }
     }
 
+    @Override
+    public I18nBundle getI18nBundle() {
+        // return context based bundle for preferred locales
+        return I18n.bundle(config.getPreferredLocales());
+    }
 
 }

api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/EditLiteral.java

@@ -132,6 +132,11 @@ public class EditLiteral implements Literal {
         throw new UnsupportedOperationException();
     }
 
+    @Override
+    public boolean isStmtResource() {
+        throw new UnsupportedOperationException();
+    }
+
     public Literal inModel(Model model) {
         throw new UnsupportedOperationException();
     }

api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/listener/impl/IndividualDataPropertyStatementProcessor.java

@@ -4,7 +4,6 @@ package edu.cornell.mannlib.vitro.webapp.edit.listener.impl;
 
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.Map;
 
 import org.apache.commons.logging.Log;
@@ -23,7 +22,8 @@ import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.BasicValidationVTwo;
 
 public class IndividualDataPropertyStatementProcessor implements ChangeListener {
 
-	private static final Log log = LogFactory.getLog(IndividualDataPropertyStatementProcessor.class.getName());
+    private static final String LANGUAGE = "language";
+    private static final Log log = LogFactory.getLog(IndividualDataPropertyStatementProcessor.class.getName());
 
     public void doInserted(Object newObj, EditProcessObject epo) {
         processDataprops(epo);
@@ -54,6 +54,9 @@ public class IndividualDataPropertyStatementProcessor implements ChangeListener
                 try {
                     Map beanParamMap = FormUtils.beanParamMapFromString(keyArg[3]);
                     String dataPropertyURI = (String) beanParamMap.get("DatatypePropertyURI");
+                    if (beanParamMap.containsKey(LANGUAGE)) {
+                        dataPropertyStmt.setLanguage((String) beanParamMap.get(LANGUAGE));
+                    }
                     if (!deletedDataPropertyURIs.contains(dataPropertyURI)) {
                         deletedDataPropertyURIs.add(dataPropertyURI);
                         dataPropertyStatementDao.deleteDataPropertyStatementsForIndividualByDataProperty(((Individual) epo.getNewBean()).getURI(), dataPropertyURI);