Merge 9383 from 1.4 maint branch

This commit is contained in:
j2blake 2011-12-13 17:01:26 +00:00
parent 81f44481aa
commit 51a2eee34b

View file

@ -281,6 +281,7 @@ deploy - Deploy the application directly into the Tomcat webapps directory.
<srcfiles dir="${appbase.dir}/config/solr/" /> <srcfiles dir="${appbase.dir}/config/solr/" />
</uptodate> </uptodate>
<filesmatch file1="${solr.context.temp.file}" file2="${solr.context.file}" /> <filesmatch file1="${solr.context.temp.file}" file2="${solr.context.file}" />
<filesmatch file1="${solr.context.temp.file}" file2="${tomcat.home}/webapps/${solr.context.name}/META-INF/context.xml" />
</and> </and>
</condition> </condition>
</target> </target>