From 66078a71ab33c3c0eb776c737555e5465468aa0d Mon Sep 17 00:00:00 2001 From: j2blake Date: Mon, 9 Sep 2013 13:34:39 -0400 Subject: [PATCH 1/4] Add license line --- .../webapp/dao/jena/ObjectPropertyStatementDaoJenaTest.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/webapp/test/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyStatementDaoJenaTest.java b/webapp/test/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyStatementDaoJenaTest.java index 9493c3691..fe79e90f0 100644 --- a/webapp/test/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyStatementDaoJenaTest.java +++ b/webapp/test/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyStatementDaoJenaTest.java @@ -1,3 +1,5 @@ +/* $This file is distributed under the terms of the license in /doc/license.txt$ */ + package edu.cornell.mannlib.vitro.webapp.dao.jena; import static org.junit.Assert.*; From d275140f7bc509e80a6c61fe91dcac74c1324c11 Mon Sep 17 00:00:00 2001 From: j2blake Date: Mon, 9 Sep 2013 13:39:40 -0400 Subject: [PATCH 2/4] VIVO-262 Fix error in build script --- webapp/build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/build.xml b/webapp/build.xml index 0387483af..e8c5320cb 100644 --- a/webapp/build.xml +++ b/webapp/build.xml @@ -170,7 +170,7 @@ echo(e, "Adding language: " + languages[i]) } } else { - ps.appendExcludes(["**/*"]) + ps.setExcludes(["**/*"]) } ]]> From e7efe28ae7f5592b72eb2ff6b09f770ac3142695 Mon Sep 17 00:00:00 2001 From: j2blake Date: Mon, 9 Sep 2013 14:19:40 -0400 Subject: [PATCH 3/4] VIVO-262 Document the language support configuration --- doc/install.html | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/doc/install.html b/doc/install.html index 6f5091d39..f30964629 100644 --- a/doc/install.html +++ b/doc/install.html @@ -350,6 +350,22 @@ /usr/local/vitro/home + + + Languages (in addition to American English) that will be built into your + Vitro site. The languages must be found in the + languages directory of the Vitro distribution. + See + the VIVO Wiki for more information. + + + + + languages.addToBuild + + + es_MX + From afa5e8697aae74217538d4a1d65043e82d5b57f9 Mon Sep 17 00:00:00 2001 From: j2blake Date: Mon, 9 Sep 2013 14:23:42 -0400 Subject: [PATCH 4/4] VIVO-262 Document the language support configuration --- webapp/config/example.build.properties | 65 ++++++++++++++------------ 1 file changed, 36 insertions(+), 29 deletions(-) diff --git a/webapp/config/example.build.properties b/webapp/config/example.build.properties index cd1a293ff..ed1b16b39 100644 --- a/webapp/config/example.build.properties +++ b/webapp/config/example.build.properties @@ -1,29 +1,36 @@ -# ----------------------------------------------------------------------------- -# -# Vitro build properties -# -# This file is provided as example.build.properties. -# -# Save a copy of this file as build.properties, and edit the properties as -# needed for your installation. -# -# ----------------------------------------------------------------------------- - -# -# The base install directory for your Tomcat server. The Vitro application -# will be deployed in the /webapps directory below this base. -# -tomcat.home = /usr/local/tomcat - -# -# The name of the Vitro application. This will be used as the name of the -# subdirectory within your Tomcat server's /webapps directory. It also appears -# in the URL for the application. For example, http://my.vitro.server/vitro -# -webapp.name = vitro - -# -# The location where the Vitro application will store the data that it creates. -# This includes uploaded files (usually images) and the search index. -# -vitro.home = /usr/local/vitro/home +# ----------------------------------------------------------------------------- +# +# Vitro build properties +# +# This file is provided as example.build.properties. +# +# Save a copy of this file as build.properties, and edit the properties as +# needed for your installation. +# +# ----------------------------------------------------------------------------- + +# +# The base install directory for your Tomcat server. The Vitro application +# will be deployed in the /webapps directory below this base. +# +tomcat.home = /usr/local/tomcat + +# +# The name of the Vitro application. This will be used as the name of the +# subdirectory within your Tomcat server's /webapps directory. It also appears +# in the URL for the application. For example, http://my.vitro.server/vitro +# +webapp.name = vitro + +# +# The location where the Vitro application will store the data that it creates. +# This includes uploaded files (usually images) and the search index. +# +vitro.home = /usr/local/vitro/home + +# +# Additional languages to be built into your VIVO site. The locales specified +# here must appear as sub-directories of [vivo]/languages in the distribution. +# Find more information on the VIVO Wiki (https://wiki.duraspace.org/display/VIVO). +# +#languages.addToBuild =