SOLR-6926: remove ant example, now it is ant server

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1651535 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Timothy Potter 2015-01-13 23:31:20 +00:00
parent eb5db72e69
commit bc475b8c42
12 changed files with 24 additions and 21 deletions

View File

@ -699,6 +699,9 @@ Other Changes
* SOLR-6943: HdfsDirectoryFactory should fall back to system props for most of it's config
if it is not found in solrconfig.xml. (Mark Miller, Mike Drob)
* SOLR-6926: "ant example" makes no sense anymore - should be "ant server"
(Ramkumar Aiyengar, Timothy Potter)
================== 4.10.3 ==================
Bug Fixes

View File

@ -156,7 +156,7 @@ Instructions for Building Apache Solr from Source
for building, testing, and packaging Solr.
NOTE:
To see Solr in action, you may want to use the "ant example" command to build
To see Solr in action, you may want to use the "ant server" command to build
and package Solr into the server/webapps directory. See also server/README.txt.

View File

@ -20,8 +20,8 @@
<target name="usage" description="Prints out instructions">
<echo message="Welcome to the Solr project!" />
<echo message="Use 'ant example' to create a runnable example configuration." />
<echo message="Use 'ant run-example' to create and run the example." />
<echo message="Use 'ant server' to create the Solr server." />
<echo message="Use 'bin/solr' to run the Solr after it is created." />
<echo message="And for developers:"/>
<echo message="Use 'ant clean' to clean compiled files." />
<echo message="Use 'ant compile' to compile the source code." />
@ -38,9 +38,9 @@
<!-- ========================================================================= -->
<!-- ============================== USER TASKS =============================== -->
<!-- ========================================================================= -->
<target name="example" description="Creates a runnable example configuration."
depends="dist-contrib,build-war">
<target name="server" depends="dist-contrib,server-war"
description="Creates a Solr server">
<jar destfile="${example}/exampledocs/post.jar"
basedir="${dest}/solr-core/classes/java"
includes="org/apache/solr/util/SimplePostTool*.class">
@ -51,10 +51,10 @@
<delete includeemptydirs="true">
<fileset dir="${server.dir}/solr-webapp" includes="**/*"/>
</delete>
<echo>See ${example}/README.txt for how to run the Solr example configuration.</echo>
<echo>See ${common-solr.dir}/README.txt for how to run the Solr server.</echo>
</target>
<target name="run-example" depends="example"
<target name="run-example" depends="server"
description="Run Solr interactively, via Jetty. -Dexample.debug=true to enable JVM debugger">
<property name="example.debug.suspend" value="n"/>
<property name="example.jetty.port" value="8983"/>
@ -337,7 +337,7 @@
<target name="dist"
description="Creates the Solr distribution files."
depends="dist-solrj, dist-core, dist-test-framework, dist-contrib, build-war" />
depends="dist-solrj, dist-core, dist-test-framework, dist-contrib" />
<target name="dist-test-framework" depends="init-dist"
description="Creates the Solr test-framework JAR.">
@ -351,9 +351,9 @@
<contrib-crawl target="dist" failonerror="true" />
</target>
<target name="build-war"
<target name="server-war"
description="Creates the Solr WAR Distribution file.">
<ant dir="webapp" target="dist" inheritall="false">
<ant dir="webapp" target="server-war" inheritall="false">
<propertyset refid="uptodate.and.compiled.properties"/>
</ant>
</target>
@ -450,7 +450,7 @@
<param name="called.from.create-package" value="true"/>
<target name="init-dist"/>
<target name="dist"/>
<target name="example"/>
<target name="server"/>
<target name="documentation"/>
</antcall>
<mkdir dir="${dest}/${fullnamever}"/>

View File

@ -16,7 +16,7 @@ rm -r -f server/solr/zoo_data
rm -r -f server/solr/data
rm -f server/server.log
ant example dist
ant server dist
cp -r -f server server2
cp -r -f server server3

View File

@ -10,7 +10,7 @@ rm -r -f example/solr/zoo_data
rm -r -f example/solr/collection1/data
rm -f example/example.log
ant example dist
ant server dist
cp -r -f example example2

View File

@ -12,7 +12,7 @@ rm -r -f example/solr/zoo_data
rm -r -f example/solr/collection1/data
rm -f example/example.log
ant example dist
ant server dist
cp -r -f example example2
cp -r -f example example3

View File

@ -12,7 +12,7 @@ rm -r -f example/solr/zoo_data
rm -r -f example/solr/collection1/data
rm -f example/example.log
ant example dist
ant server dist
cp -r -f example example2
cp -r -f example example3

View File

@ -11,7 +11,7 @@ rebuild() {
rm -r -f build
rm -r -f server/solr/zoo_data
rm -f server/server.log
ant example dist
ant server dist
}
setports() {

View File

@ -18,7 +18,7 @@ rm -r -f server/solr/zoo_data
rm -r -f server/solr/collection1/data
rm -f server/server.log
ant example dist
ant server dist
cp -r -f server server2
cp -r -f server server3

View File

@ -18,7 +18,7 @@ rm -r -f server/solr/zoo_data
rm -r -f server/solr/collection1/data
rm -f server/server.log
ant example dist
ant server dist
cp -r -f server server2
cp -r -f server server3

View File

@ -36,7 +36,7 @@ rm -r -f server/solr/zoo_data
rm -f server/server.log
ant -f ../build.xml clean
ant example dist
ant server dist
rm -r server/solr-webapp/*
unzip server/webapps/solr.war -d server/solr-webapp/webapp

View File

@ -40,7 +40,7 @@
<target name="compile-core"/>
<target name="compile-test"/>
<target name="dist"
<target name="server-war"
description="Creates the Solr WAR Distribution file."
depends="test, init-dist, dist-core, dist-solrj, lucene-jars-to-solr">
<build-manifest title="Apache Solr Search Server"