Author: yonik
Date: Sat Jul 4 16:22:40 2009
New Revision: 791147
URL: http://svn.apache.org/viewvc?rev=791147&view=rev
Log:
move clustering server out of example, use clustering libs w/o making a copy
Added:
lucene/solr/trunk/contrib/clustering/conf/
- copied from r791136, lucene/solr/trunk/example/clustering/solr/conf/
Removed:
lucene/solr/trunk/example/clustering/solr/conf/
Modified:
lucene/solr/trunk/contrib/clustering/README.txt
lucene/solr/trunk/contrib/clustering/build.xml
Modified: lucene/solr/trunk/contrib/clustering/README.txt
URL:
http://svn.apache.org/viewvc/lucene/solr/trunk/contrib/clustering/README.txt?rev=791147&r1=791146&r2=791147&view=diff
==============================================================================
--- lucene/solr/trunk/contrib/clustering/README.txt (original)
+++ lucene/solr/trunk/contrib/clustering/README.txt Sat Jul 4 16:22:40 2009
@@ -4,5 +4,5 @@
See http://wiki.apache.org/solr/ClusteringComponent for how to get started.
Also, note, some of the Carrot2 libraries cannot be distributed in binary form
because they are LGPL. Thus, you will have
- to download those components. See the build.xml file located in this
directory for the location of the libraries.
- The libraries you will need are: nni.jar, Colt and PNJ.
\ No newline at end of file
+to download those components. See the build.xml file located in this
directory for the location of the libraries.
+The libraries you will need are: nni.jar, Colt and PNJ.
Modified: lucene/solr/trunk/contrib/clustering/build.xml
URL:
http://svn.apache.org/viewvc/lucene/solr/trunk/contrib/clustering/build.xml?rev=791147&r1=791146&r2=791147&view=diff
==============================================================================
--- lucene/solr/trunk/contrib/clustering/build.xml (original)
+++ lucene/solr/trunk/contrib/clustering/build.xml Sat Jul 4 16:22:40 2009
@@ -29,7 +29,6 @@
<path id="common.classpath">
<fileset dir="lib"/>
- <fileset dir="lib/downloads"/>
<pathelement location="${solr-path}/build/solr" />
<pathelement location="${solr-path}/build/solrj" />
<fileset dir="${solr-path}/lib" includes="*.jar"/>
@@ -47,7 +46,10 @@
</target>
<target name="clean-downloads">
- <delete dir="lib/downloads"/>
+ <delete file="lib/colt-1.2.0.jar"/>
+ <delete file="lib/pcj-1.2.jar"/>
+ <delete file="lib/nni-1.0.0.jar"/>
+ <delete file="lib/simple-xml-1.7.3.jar"/>
</target>
<target name="init">
@@ -59,30 +61,30 @@
</target>
<target name="check-files" depends="proxy.setup">
- <available file="lib/downloads/colt-1.2.0.jar" property="colt.exists"/>
- <available file="lib/downloads/pcj-1.2.jar" property="pcj.exists"/>
- <available file="lib/downloads/nni-1.0.0.jar" property="nni.exists"/>
- <available file="lib/downloads/simple-xml-1.7.3.jar"
property="simplexml.exists"/>
+ <available file="lib/colt-1.2.0.jar" property="colt.exists"/>
+ <available file="lib/pcj-1.2.jar" property="pcj.exists"/>
+ <available file="lib/nni-1.0.0.jar" property="nni.exists"/>
+ <available file="lib/simple-xml-1.7.3.jar" property="simplexml.exists"/>
</target>
<!--
http://mirrors.ibiblio.org/pub/mirrors/maven2/org/simpleframework/simple-xml/1.7.3/simple-xml-1.7.3.jar
-->
<target name="get-colt" depends="check-files" unless="colt.exists">
<!-- Get the LGPL deps and put them in a separate dir -->
- <get src="http://repo1.maven.org/maven2/colt/colt/1.2.0/colt-1.2.0.jar";
dest="lib/downloads/colt-1.2.0.jar"/>
+ <get src="http://repo1.maven.org/maven2/colt/colt/1.2.0/colt-1.2.0.jar";
dest="lib/colt-1.2.0.jar"/>
</target>
<target name="get-nni" depends="check-files" unless="nni.exists">
<!-- Get the LGPL deps and put them in a separate dir -->
- <get
src="http://download.carrot2.org/maven2/org/carrot2/nni/1.0.0/nni-1.0.0.jar";
dest="lib/downloads/nni-1.0.0.jar"/>
+ <get
src="http://download.carrot2.org/maven2/org/carrot2/nni/1.0.0/nni-1.0.0.jar";
dest="lib/nni-1.0.0.jar"/>
</target>
<!-- Compile time dep. only -->
<target name="get-simple-xml" depends="check-files"
unless="simplexml.exists">
<!-- Get the LGPL deps and put them in a separate dir -->
- <get
src="http://mirrors.ibiblio.org/pub/mirrors/maven2/org/simpleframework/simple-xml/1.7.3/simple-xml-1.7.3.jar";
dest="lib/downloads/simple-xml-1.7.3.jar"/>
+ <get
src="http://mirrors.ibiblio.org/pub/mirrors/maven2/org/simpleframework/simple-xml/1.7.3/simple-xml-1.7.3.jar";
dest="lib/simple-xml-1.7.3.jar"/>
</target>
<target name="get-pcj" depends="check-files" unless="pcj.exists">
<!-- Get the LGPL deps and put them in a separate dir -->
- <get src="http://repo1.maven.org/maven2/pcj/pcj/1.2/pcj-1.2.jar";
dest="lib/downloads/pcj-1.2.jar"/>
+ <get src="http://repo1.maven.org/maven2/pcj/pcj/1.2/pcj-1.2.jar";
dest="lib/pcj-1.2.jar"/>
</target>
<target name="get-libraries" depends="init, get-colt, get-pcj, get-nni,
get-simple-xml"/>
@@ -112,14 +114,6 @@
<fileset dir="lib">
<include name="*.jar"/>
</fileset>
- <fileset dir="lib/downloads">
- <include name="*.jar"/>
- </fileset>
- </copy>
- <copy todir="${example}/clustering/solr/lib">
- <fileset dir="lib/downloads">
- <include name="*.jar"/>
- </fileset>
</copy>
</target>
