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

Merge branch 'develop' of https://github.com/vivo-project/Vitro into develop

Browse source
This commit is contained in:
hudajkhan 2013-01-17 11:55:12 -05:00
commit 1ba6204815
34 changed files with 1625 additions and 658 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
solr/apache-solr-3.1.0.war
View file

Binary file not shown.

BIN
solr/apache-solr-3.6.2.war Normal file
View file

Binary file not shown.

7
solr/template.context.xml
View file

@ -1,11 +1,4 @@
<Context crossContext="true" override="true">
<!-- For security, restrict access to clients on this machine
for IPv4 requests, localhost is 127.0.0.1
for IPv6 requests, localhost is 0:0:0:0:0:0:0:1 -->
<Valve className="org.apache.catalina.valves.RemoteAddrValve"
allow="${vitro.local.solr.ipaddress.mask}"/>
<Environment
type="java.lang.String"
name="solr/home"