Sprint i18n with main

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 @@ private void createRootUser() {
 			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 @@ private void complainAboutWrongRootUsers() {
 			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 String toString() {
         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 String getShortHand() {
     	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/controller/admin/SparqlQueryController.java

@@ -17,6 +17,8 @@
 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 @@ private static List<Prefix> buildDefaults() {
 	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 @@ private void do500InternalServerError(String message, Exception e,
 
 	@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,14 +226,18 @@ private List<Prefix> buildPrefixList(VitroRequest vreq) {
 		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);
 
 		for (Prefix p : prefixList) {
 			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/edit/Classes2ClassesRetryController.java

@@ -43,7 +43,7 @@ public void doPost (HttpServletRequest req, HttpServletResponse response) {
             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 void doPost (HttpServletRequest req, HttpServletResponse response) {
             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/DatapropRetryController.java

@@ -50,11 +50,12 @@ public void doPost (HttpServletRequest request, HttpServletResponse response) {
 
         //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/FauxPropertyRetryController.java

@@ -106,14 +106,16 @@ private static class EpoPopulator {
 
 			this.epo = epo;
 
-			this.fpDao = ModelAccess.on(ctx).getWebappDaoFactory()
+			this.fpDao = ModelAccess.on(req).getWebappDaoFactory()
 					.getFauxPropertyDao();
 
 		}
 
 		void populate() {
 			epo.setDataAccessObject(fpDao);
 			epo.setAction(determineAction());
+			epo.setImplementationClass(FauxProperty.class);
+			epo.setBeanClass(FauxProperty.class);
 
 			if (epo.getUseRecycledBean()) {
 				beanForEditing = (FauxProperty) epo.getNewBean();

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

@@ -71,7 +71,7 @@ public void doPost(HttpServletRequest req, HttpServletResponse response) {
 
         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 void doPost (HttpServletRequest req, HttpServletResponse response) {
         }
 
         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 void doPost (HttpServletRequest req, HttpServletResponse response) {
 
         /*for testing*/
         ObjectProperty testMask = new ObjectProperty();
+        epo.setImplementationClass(ObjectProperty.class);
         epo.setBeanClass(ObjectProperty.class);
         epo.setBeanMask(testMask);
 
@@ -64,7 +65,7 @@ public void doPost (HttpServletRequest req, HttpServletResponse response) {
             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 void doPost(HttpServletRequest req, HttpServletResponse response) {
 		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 void doPost (HttpServletRequest req, HttpServletResponse response) {
         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 void doPost (HttpServletRequest req, HttpServletResponse response) {
         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 void doPost (HttpServletRequest req, HttpServletResponse response) {
             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 void doGet(HttpServletRequest request, HttpServletResponse response) {
 
         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 void doGet(HttpServletRequest request, HttpServletResponse response) {
 
         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 @@ protected ResponseValues processRequest(VitroRequest vreq) {
         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 @@ protected ResponseValues processRequest(VitroRequest vreq) {
 
         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/DeletePropertyController.java

@@ -10,6 +10,9 @@
 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.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 @@ protected ResponseValues processRequest(VitroRequest vreq) {
 
 
     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) {