Merge commit 'afa5e8697a' into dev-isf

doc/install.html

@@ -350,6 +350,22 @@
                             /usr/local/vitro/home
                         </td>
                     </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>
                 </tbody>
             </table>

webapp/build.xml

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

webapp/config/example.build.properties

@@ -27,3 +27,10 @@ webapp.name = vitro
 # 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 = 

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.*;