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

changes to solr build.xml

Browse source
This commit is contained in:
briancaruso 2011-04-01 18:55:46 +00:00
parent d070c84453
commit 81c48b9fdd
2 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
solr/build.xml
View file

@ -13,8 +13,6 @@
<property name="solr.example.dir" location="${solr.build.dir}/exampleSolr" /> <property name="solr.example.dir" location="${solr.build.dir}/exampleSolr" />
<property name="solr.context.config.example" location="${solr.build.dir}/exampleSolrContext.xml"/> <property name="solr.context.config.example" location="${solr.build.dir}/exampleSolrContext.xml"/>
<property name="solr.war" location="${solr.build.dir}/apache-solr-1.4.1.war"/> <property name="solr.war" location="${solr.build.dir}/apache-solr-1.4.1.war"/>
<property name="deploy.properties.file" location="???"/>
<!-- ================================= <!-- =================================
target: describe target: describe
@ -56,7 +54,7 @@ deploy - Deploy solr service for use by vitro.
</copy> </copy>
<!-- Place context configuration XML in tomcat config directory. --> <!-- Place context configuration XML in tomcat config directory. -->
<copy tofile="${tomcat.home}/conf/Catalina/localhost"> <copy todir="${tomcat.home}/conf/Catalina/localhost">
<fileset file="${solr.context.config}"/> <fileset file="${solr.context.config}"/>
</copy> </copy>
@ -67,8 +65,11 @@ deploy - Deploy solr service for use by vitro.
target: properties target: properties
- - - - - - - - - - - - - - - - - --> - - - - - - - - - - - - - - - - - -->
<target name="properties"> <target name="properties">
<property name="deploy.properties.file" location="deploy.properties" /> <!--<property name="deploy.properties.file" location="deploy.properties" /> -->
<fail message="You must create a &quot;${deploy.properties.file}&quot; file."> <fail unless="deploy.properties.file"
message="The ant property deploy.properties.file must be defined to indicate the vitro deploy to create a solr service for." />
<fail message="There is no accessable deploy.properties file at &quot;${deploy.properties.file}&quot;.">
<condition> <condition>
<not> <not>
<available file="${deploy.properties.file}" /> <available file="${deploy.properties.file}" />

10
solr/exampleSolrContext.xml
View file

@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<Context docBase="${solr.docbase}" <Context docBase="${solr.docbase}"
debug="0" crossContext="true"> crossContext="true" override="true">
<Environment <Environment
name="solr/home"
type="java.lang.String" type="java.lang.String"
name="solr/home"
value="${solr.home}" override="true"/> value="${solr.home}" override="true"/>
<!-- Disable persist sessions on shut down.-->
<Manager pathname="" />
</Context> </Context>