You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by th...@apache.org on 2015/01/14 00:41:32 UTC
svn commit: r1651537 - in /lucene/dev/branches/branch_5x: ./ solr/
solr/cloud-dev/ solr/webapp/
Author: thelabdude
Date: Tue Jan 13 23:41:32 2015
New Revision: 1651537
URL: http://svn.apache.org/r1651537
Log:
SOLR-6926: remove ant example, now it is ant server
Modified:
lucene/dev/branches/branch_5x/ (props changed)
lucene/dev/branches/branch_5x/solr/ (props changed)
lucene/dev/branches/branch_5x/solr/CHANGES.txt (contents, props changed)
lucene/dev/branches/branch_5x/solr/README.txt (contents, props changed)
lucene/dev/branches/branch_5x/solr/build.xml (contents, props changed)
lucene/dev/branches/branch_5x/solr/cloud-dev/ (props changed)
lucene/dev/branches/branch_5x/solr/cloud-dev/cli-test-solrcloud-start.sh
lucene/dev/branches/branch_5x/solr/cloud-dev/example1.sh
lucene/dev/branches/branch_5x/solr/cloud-dev/example2.sh
lucene/dev/branches/branch_5x/solr/cloud-dev/example3.sh
lucene/dev/branches/branch_5x/solr/cloud-dev/functions.sh
lucene/dev/branches/branch_5x/solr/cloud-dev/solrcloud-extzk-start.sh
lucene/dev/branches/branch_5x/solr/cloud-dev/solrcloud-multi-start.sh
lucene/dev/branches/branch_5x/solr/cloud-dev/solrcloud-start.sh
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/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/CHANGES.txt?rev=1651537&r1=1651536&r2=1651537&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_5x/solr/CHANGES.txt Tue Jan 13 23:41:32 2015
@@ -649,6 +649,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
Modified: lucene/dev/branches/branch_5x/solr/README.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/README.txt?rev=1651537&r1=1651536&r2=1651537&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/README.txt (original)
+++ lucene/dev/branches/branch_5x/solr/README.txt Tue Jan 13 23:41:32 2015
@@ -155,7 +155,7 @@ Instructions for Building Apache Solr fr
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.
Modified: lucene/dev/branches/branch_5x/solr/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/build.xml?rev=1651537&r1=1651536&r2=1651537&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/build.xml (original)
+++ lucene/dev/branches/branch_5x/solr/build.xml Tue Jan 13 23:41:32 2015
@@ -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.solr.home" location="example/solr"/>
<property name="example.debug.suspend" value="n"/>
@@ -340,7 +340,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.">
@@ -354,9 +354,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>
@@ -453,7 +453,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}"/>
Modified: lucene/dev/branches/branch_5x/solr/cloud-dev/cli-test-solrcloud-start.sh
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/cloud-dev/cli-test-solrcloud-start.sh?rev=1651537&r1=1651536&r2=1651537&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/cloud-dev/cli-test-solrcloud-start.sh (original)
+++ lucene/dev/branches/branch_5x/solr/cloud-dev/cli-test-solrcloud-start.sh Tue Jan 13 23:41:32 2015
@@ -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
Modified: lucene/dev/branches/branch_5x/solr/cloud-dev/example1.sh
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/cloud-dev/example1.sh?rev=1651537&r1=1651536&r2=1651537&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/cloud-dev/example1.sh (original)
+++ lucene/dev/branches/branch_5x/solr/cloud-dev/example1.sh Tue Jan 13 23:41:32 2015
@@ -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
Modified: lucene/dev/branches/branch_5x/solr/cloud-dev/example2.sh
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/cloud-dev/example2.sh?rev=1651537&r1=1651536&r2=1651537&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/cloud-dev/example2.sh (original)
+++ lucene/dev/branches/branch_5x/solr/cloud-dev/example2.sh Tue Jan 13 23:41:32 2015
@@ -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
Modified: lucene/dev/branches/branch_5x/solr/cloud-dev/example3.sh
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/cloud-dev/example3.sh?rev=1651537&r1=1651536&r2=1651537&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/cloud-dev/example3.sh (original)
+++ lucene/dev/branches/branch_5x/solr/cloud-dev/example3.sh Tue Jan 13 23:41:32 2015
@@ -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
Modified: lucene/dev/branches/branch_5x/solr/cloud-dev/functions.sh
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/cloud-dev/functions.sh?rev=1651537&r1=1651536&r2=1651537&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/cloud-dev/functions.sh (original)
+++ lucene/dev/branches/branch_5x/solr/cloud-dev/functions.sh Tue Jan 13 23:41:32 2015
@@ -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() {
Modified: lucene/dev/branches/branch_5x/solr/cloud-dev/solrcloud-extzk-start.sh
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/cloud-dev/solrcloud-extzk-start.sh?rev=1651537&r1=1651536&r2=1651537&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/cloud-dev/solrcloud-extzk-start.sh (original)
+++ lucene/dev/branches/branch_5x/solr/cloud-dev/solrcloud-extzk-start.sh Tue Jan 13 23:41:32 2015
@@ -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
Modified: lucene/dev/branches/branch_5x/solr/cloud-dev/solrcloud-multi-start.sh
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/cloud-dev/solrcloud-multi-start.sh?rev=1651537&r1=1651536&r2=1651537&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/cloud-dev/solrcloud-multi-start.sh (original)
+++ lucene/dev/branches/branch_5x/solr/cloud-dev/solrcloud-multi-start.sh Tue Jan 13 23:41:32 2015
@@ -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
Modified: lucene/dev/branches/branch_5x/solr/cloud-dev/solrcloud-start.sh
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/cloud-dev/solrcloud-start.sh?rev=1651537&r1=1651536&r2=1651537&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/cloud-dev/solrcloud-start.sh (original)
+++ lucene/dev/branches/branch_5x/solr/cloud-dev/solrcloud-start.sh Tue Jan 13 23:41:32 2015
@@ -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
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=1651537&r1=1651536&r2=1651537&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/webapp/build.xml (original)
+++ lucene/dev/branches/branch_5x/solr/webapp/build.xml Tue Jan 13 23:41:32 2015
@@ -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"