You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2014/12/02 15:35:19 UTC
svn commit: r1642880 - in /lucene/dev/branches/branch_5x: ./ solr/
solr/build.xml solr/webapp/ solr/webapp/build.xml
Author: markrmiller
Date: Tue Dec 2 14:35:19 2014
New Revision: 1642880
URL: http://svn.apache.org/r1642880
Log:
SOLR-4792: Remove WAR file from dist directory.
Modified:
lucene/dev/branches/branch_5x/ (props changed)
lucene/dev/branches/branch_5x/solr/ (props changed)
lucene/dev/branches/branch_5x/solr/build.xml (contents, props changed)
lucene/dev/branches/branch_5x/solr/webapp/ (props changed)
lucene/dev/branches/branch_5x/solr/webapp/build.xml
Modified: lucene/dev/branches/branch_5x/solr/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/build.xml?rev=1642880&r1=1642879&r2=1642880&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/build.xml (original)
+++ lucene/dev/branches/branch_5x/solr/build.xml Tue Dec 2 14:35:19 2014
@@ -40,9 +40,7 @@
<!-- ========================================================================= -->
<target name="example" description="Creates a runnable example configuration."
- depends="dist-contrib,dist-war">
- <copy file="${dist}/${fullnamever}.war"
- tofile="${server.dir}/webapps/${ant.project.name}.war"/>
+ depends="dist-contrib,build-war">
<jar destfile="${example}/exampledocs/post.jar"
basedir="${dest}/solr-core/classes/java"
includes="org/apache/solr/util/SimplePostTool*.class">
@@ -336,7 +334,7 @@
<target name="dist"
description="Creates the Solr distribution files."
- depends="dist-solrj, dist-core, dist-test-framework, dist-contrib, dist-war" />
+ depends="dist-solrj, dist-core, dist-test-framework, dist-contrib, build-war" />
<target name="dist-test-framework" depends="init-dist"
description="Creates the Solr test-framework JAR.">
@@ -350,7 +348,7 @@
<contrib-crawl target="dist" failonerror="true" />
</target>
- <target name="dist-war"
+ <target name="build-war"
description="Creates the Solr WAR Distribution file.">
<ant dir="webapp" target="dist" inheritall="false">
<propertyset refid="uptodate.and.compiled.properties"/>
Modified: lucene/dev/branches/branch_5x/solr/webapp/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/webapp/build.xml?rev=1642880&r1=1642879&r2=1642880&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/webapp/build.xml (original)
+++ lucene/dev/branches/branch_5x/solr/webapp/build.xml Tue Dec 2 14:35:19 2014
@@ -46,7 +46,7 @@
<build-manifest title="Apache Solr Search Server"
implementation.title="org.apache.solr"/>
<ant dir="${common-solr.dir}" inheritall="false" target="contribs-add-to-war"/>
- <war destfile="${dist}/solr-${version}${solr.war.suffix}.war"
+ <war destfile="${server.dir}/webapps/solr.war"
webxml="web/WEB-INF/web.xml"
manifest="${manifest.file}">
<lib dir="${common-solr.dir}/core/lib" excludes="${exclude.from.war},${common.classpath.excludes}"/>