litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge commit 'afa5e8697a' into dev-isf

Browse source
This commit is contained in:
brianjlowe 2013-09-10 09:08:14 -04:00
commit 2d3295fa2b
4 changed files with 55 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

16
doc/install.html
View file

@ -350,6 +350,22 @@
/usr/local/vitro/home /usr/local/vitro/home
</td> </td>
</tr> </tr>
<tr>
<td colspan="2">
Languages (in addition to American English) that will be built into your
Vitro site. The languages must be found in the
<code>languages</code> directory of the Vitro distribution.
See <a href="https://wiki.duraspace.org/display/VIVO/Building+a+multi-language+VIVO+instance">
the VIVO Wiki</a> for more information.
</td>
</tr>
<tr class="odd_row">
<td>
languages.addToBuild
</td>
<td>
es_MX
</td>
</tr> </tr>
</tbody> </tbody>
</table> </table>

2
webapp/build.xml
View file

@ -170,7 +170,7 @@
echo(e, "Adding language: " + languages[i]) echo(e, "Adding language: " + languages[i])
} }
} else { } else {
ps.appendExcludes(["**/*"]) ps.setExcludes(["**/*"])
} }
]]> </script> ]]> </script>
</target> </target>

65
webapp/config/example.build.properties
View file

@ -1,29 +1,36 @@
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
# #
# Vitro build properties # Vitro build properties
# #
# This file is provided as example.build.properties. # This file is provided as example.build.properties.
# #
# Save a copy of this file as build.properties, and edit the properties as # Save a copy of this file as build.properties, and edit the properties as
# needed for your installation. # needed for your installation.
# #
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
# #
# The base install directory for your Tomcat server. The Vitro application # The base install directory for your Tomcat server. The Vitro application
# will be deployed in the /webapps directory below this base. # will be deployed in the /webapps directory below this base.
# #
tomcat.home = /usr/local/tomcat tomcat.home = /usr/local/tomcat
# #
# The name of the Vitro application. This will be used as the name of the # 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 # subdirectory within your Tomcat server's /webapps directory. It also appears
# in the URL for the application. For example, http://my.vitro.server/vitro # in the URL for the application. For example, http://my.vitro.server/vitro
# #
webapp.name = vitro webapp.name = vitro
# #
# The location where the Vitro application will store the data that it creates. # The location where the Vitro application will store the data that it creates.
# This includes uploaded files (usually images) and the search index. # This includes uploaded files (usually images) and the search index.
# #
vitro.home = /usr/local/vitro/home 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 =

2
webapp/test/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyStatementDaoJenaTest.java
View file

@ -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; package edu.cornell.mannlib.vitro.webapp.dao.jena;
import static org.junit.Assert.*; import static org.junit.Assert.*;