lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mikemcc...@apache.org
Subject svn commit: r1700800 [8/24] - in /lucene/dev/branches/lucene6699: ./ dev-tools/ dev-tools/eclipse/ dev-tools/idea/.idea/ dev-tools/scripts/ lucene/ lucene/analysis/ lucene/analysis/common/ lucene/analysis/common/src/java/org/apache/lucene/analysis/ar/ ...
Date Wed, 02 Sep 2015 13:06:22 GMT
Modified: lucene/dev/branches/lucene6699/solr/contrib/analytics/src/test-files/analytics/requestXMLFiles/functions.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6699/solr/contrib/analytics/src/test-files/analytics/requestXMLFiles/functions.xml?rev=1700800&r1=1700799&r2=1700800&view=diff
==============================================================================
--- lucene/dev/branches/lucene6699/solr/contrib/analytics/src/test-files/analytics/requestXMLFiles/functions.xml (original)
+++ lucene/dev/branches/lucene6699/solr/contrib/analytics/src/test-files/analytics/requestXMLFiles/functions.xml Wed Sep  2 13:06:13 2015
@@ -1,246 +1,246 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <analyticsRequestEnvelope stats="true" olap="true">
- 	<analyticsRequest>
- 		<name>Add Request</name>
- 		
- 		<statistic>
- 			<expression>sum(add(int(int_id),float(float_fd)))</expression>
- 			<name>sum</name>
- 		</statistic>
- 		<statistic>
- 			<expression>sum(double(add_if_dd))</expression>
- 			<name>sum calced</name>
- 		</statistic>
- 		
- 		<statistic>
- 			<expression>mean(add(long(long_ld),double(double_dd),float(float_fd)))</expression>
- 			<name>mean</name>
- 		</statistic>
- 		<statistic>
- 			<expression>mean(double(add_ldf_dd))</expression>
- 			<name>mean calced</name>
- 		</statistic>
- 	</analyticsRequest>
- 	
- 	<analyticsRequest>
- 		<name>Multiply Request</name>
- 		
- 		<statistic>
- 			<expression>sum(mult(int(int_id),float(float_fd)))</expression>
- 			<name>sum</name>
- 		</statistic>
- 		<statistic>
- 			<expression>sum(double(mult_if_dd))</expression>
- 			<name>sum calced</name>
- 		</statistic>
- 		
- 		<statistic>
- 			<expression>mean(mult(long(long_ld),double(double_dd),float(float_fd)))</expression>
- 			<name>mean</name>
- 		</statistic>
- 		<statistic>
- 			<expression>mean(double(mult_ldf_dd))</expression>
- 			<name>mean calced</name>
- 		</statistic>
- 	</analyticsRequest>
- 	
- 	<analyticsRequest>
- 		<name>Divide Request</name>
- 		
- 		<statistic>
- 			<expression>sum(div(int(int_id),float(float_fd)))</expression>
- 			<name>sum</name>
- 		</statistic>
- 		<statistic>
- 			<expression>sum(double(div_if_dd))</expression>
- 			<name>sum calced</name>
- 		</statistic>
- 		
- 		<statistic>
- 			<expression>mean(div(long(long_ld),double(double_dd)))</expression>
- 			<name>mean</name>
- 		</statistic>
- 		
- 		<statistic>
- 			<expression>mean(double(div_ld_dd))</expression>
- 			<name>mean calced</name>
- 		</statistic>
- 	</analyticsRequest>
- 	
- 	<analyticsRequest>
- 		<name>Power Request</name>
- 		
- 		<statistic>
- 			<expression>sum(pow(int(int_id),float(float_fd))</expression>
- 			<name>sum</name>
- 		</statistic>
- 		<statistic>
- 			<expression>sum(double(pow_if_dd))</expression>
- 			<name>sum calced</name>
- 		</statistic>
- 		
- 		<statistic>
- 			<expression>mean(pow(long(long_ld),double(double_dd)))</expression>
- 			<name>mean</name>
- 		</statistic>
- 		
- 		<statistic>
- 			<expression>mean(double(pow_ld_dd))</expression>
- 			<name>mean calced</name>
- 		</statistic>
- 	</analyticsRequest>
- 	
- 	<analyticsRequest>
- 		<name>Negate Request</name>
- 		
- 		<statistic>
- 			<expression>sum(neg(int(int_id)))</expression>
- 			<name>sum</name>
- 		</statistic>
- 		<statistic>
- 			<expression>sum(double(neg_i_dd))</expression>
- 			<name>sum calced</name>
- 		</statistic>
- 		
- 		<statistic>
- 			<expression>mean(neg(long(long_ld)))</expression>
- 			<name>mean</name>
- 		</statistic>
- 		<statistic>
- 			<expression>mean(double(neg_l_dd))</expression>
- 			<name>mean calced</name>
- 		</statistic>
- 	</analyticsRequest>
- 	
- 	<analyticsRequest>
- 		<name>Const Num Request</name>
- 		
- 		<statistic>
- 			<expression>sum(const_num(8))</expression>
- 			<name>sum</name>
- 		</statistic>
- 		<statistic>
- 			<expression>sum(double(const_8_dd))</expression>
- 			<name>sum calced</name>
- 		</statistic>
- 		
- 		<statistic>
- 			<expression>mean(const_num(10))</expression>
- 			<name>mean</name>
- 		</statistic>
- 		<statistic>
- 			<expression>mean(double(const_10_dd))</expression>
- 			<name>mean calced</name>
- 		</statistic>
- 	</analyticsRequest>
- 	
- 	<analyticsRequest>
- 		<name>Date Math Request</name>
- 		
- 		<statistic>
- 			<expression>median(date_math(date(date_dtd),const_str(+2YEARS)))</expression>
- 			<name>median</name>
- 		</statistic>
- 		<statistic>
- 			<expression>median(date(dm_2y_dtd))</expression>
- 			<name>median calced</name>
- 		</statistic>
- 		
- 		<statistic>
- 			<expression>max(date_math(date(date_dtd),const_str(+2MONTHS)))</expression>
- 			<name>max</name>
- 		</statistic>
- 		<statistic>
- 			<expression>max(date(dm_2m_dtd))</expression>
- 			<name>max calced</name>
- 		</statistic>
- 	</analyticsRequest>
- 	
- 	<analyticsRequest>
- 		<name>Constant Date Request</name>
- 		
- 		<statistic>
- 			<expression>median(const_date(1800-06-30T23:59:59Z))</expression>
- 			<name>median</name>
- 		</statistic>
- 		<statistic>
- 			<expression>median(date(const_00_dtd))</expression>
- 			<name>median calced</name>
- 		</statistic>
- 		
- 		<statistic>
- 			<expression>max(const_date(1804-06-30T23:59:59Z))</expression>
- 			<name>max</name>
- 		</statistic>
- 		<statistic>
- 			<expression>max(date(const_04_dtd))</expression>
- 			<name>max calced</name>
- 		</statistic>
- 	</analyticsRequest>
- 	
- 	<analyticsRequest>
- 		<name>Constant String Request</name>
- 		
- 		<statistic>
- 			<expression>min(const_str(this is the first))</expression>
- 			<name>min</name>
- 		</statistic>
- 		<statistic>
- 			<expression>min(str(const_first_sd))</expression>
- 			<name>min calced</name>
- 		</statistic>
- 		
- 		<statistic>
- 			<expression>max(const_str(this is the second))</expression>
- 			<name>max</name>
- 		</statistic>
- 		<statistic>
- 			<expression>max(str(const_second_sd))</expression>
- 			<name>max calced</name>
- 		</statistic>
- 	</analyticsRequest>
- 	
- 	<analyticsRequest>
- 		<name>Concatenate Request</name>
- 		
- 		<statistic>
- 			<expression>min(concat(const_str(this is the first),str(string_sd)))</expression>
- 			<name>min</name>
- 		</statistic>
- 		<statistic>
- 			<expression>min(str(concat_first_sd))</expression>
- 			<name>min calced</name>
- 		</statistic>
- 		
- 		<statistic>
- 			<expression>max(concat(const_str(this is the second),str(string_sd)))</expression>
- 			<name>max</name>
- 		</statistic>
- 		<statistic>
- 			<expression>max(str(concat_second_sd))</expression>
- 			<name>max calced</name>
- 		</statistic>
- 	</analyticsRequest>
- 	
- 	<analyticsRequest>
- 		<name>Reverse Request</name>
- 		
- 		<statistic>
- 			<expression>min(rev(str(string_sd)))</expression>
- 			<name>min</name>
- 		</statistic>
- 		<statistic>
- 			<expression>min(str(rev_sd))</expression>
- 			<name>min calced</name>
- 		</statistic>
- 		
- 		<statistic>
- 			<expression>max(rev(str(string_sd)))</expression>
- 			<name>max</name>
- 		</statistic>
- 		<statistic>
- 			<expression>max(str(rev_sd))</expression>
- 			<name>max calced</name>
- 		</statistic>
- 	</analyticsRequest>
+   <analyticsRequest>
+     <name>Add Request</name>
+     
+     <statistic>
+       <expression>sum(add(int(int_id),float(float_fd)))</expression>
+       <name>sum</name>
+     </statistic>
+     <statistic>
+       <expression>sum(double(add_if_dd))</expression>
+       <name>sum calced</name>
+     </statistic>
+     
+     <statistic>
+       <expression>mean(add(long(long_ld),double(double_dd),float(float_fd)))</expression>
+       <name>mean</name>
+     </statistic>
+     <statistic>
+       <expression>mean(double(add_ldf_dd))</expression>
+       <name>mean calced</name>
+     </statistic>
+   </analyticsRequest>
+   
+   <analyticsRequest>
+     <name>Multiply Request</name>
+     
+     <statistic>
+       <expression>sum(mult(int(int_id),float(float_fd)))</expression>
+       <name>sum</name>
+     </statistic>
+     <statistic>
+       <expression>sum(double(mult_if_dd))</expression>
+       <name>sum calced</name>
+     </statistic>
+     
+     <statistic>
+       <expression>mean(mult(long(long_ld),double(double_dd),float(float_fd)))</expression>
+       <name>mean</name>
+     </statistic>
+     <statistic>
+       <expression>mean(double(mult_ldf_dd))</expression>
+       <name>mean calced</name>
+     </statistic>
+   </analyticsRequest>
+   
+   <analyticsRequest>
+     <name>Divide Request</name>
+     
+     <statistic>
+       <expression>sum(div(int(int_id),float(float_fd)))</expression>
+       <name>sum</name>
+     </statistic>
+     <statistic>
+       <expression>sum(double(div_if_dd))</expression>
+       <name>sum calced</name>
+     </statistic>
+     
+     <statistic>
+       <expression>mean(div(long(long_ld),double(double_dd)))</expression>
+       <name>mean</name>
+     </statistic>
+     
+     <statistic>
+       <expression>mean(double(div_ld_dd))</expression>
+       <name>mean calced</name>
+     </statistic>
+   </analyticsRequest>
+   
+   <analyticsRequest>
+     <name>Power Request</name>
+     
+     <statistic>
+       <expression>sum(pow(int(int_id),float(float_fd))</expression>
+       <name>sum</name>
+     </statistic>
+     <statistic>
+       <expression>sum(double(pow_if_dd))</expression>
+       <name>sum calced</name>
+     </statistic>
+     
+     <statistic>
+       <expression>mean(pow(long(long_ld),double(double_dd)))</expression>
+       <name>mean</name>
+     </statistic>
+     
+     <statistic>
+       <expression>mean(double(pow_ld_dd))</expression>
+       <name>mean calced</name>
+     </statistic>
+   </analyticsRequest>
+   
+   <analyticsRequest>
+     <name>Negate Request</name>
+     
+     <statistic>
+       <expression>sum(neg(int(int_id)))</expression>
+       <name>sum</name>
+     </statistic>
+     <statistic>
+       <expression>sum(double(neg_i_dd))</expression>
+       <name>sum calced</name>
+     </statistic>
+     
+     <statistic>
+       <expression>mean(neg(long(long_ld)))</expression>
+       <name>mean</name>
+     </statistic>
+     <statistic>
+       <expression>mean(double(neg_l_dd))</expression>
+       <name>mean calced</name>
+     </statistic>
+   </analyticsRequest>
+   
+   <analyticsRequest>
+     <name>Const Num Request</name>
+     
+     <statistic>
+       <expression>sum(const_num(8))</expression>
+       <name>sum</name>
+     </statistic>
+     <statistic>
+       <expression>sum(double(const_8_dd))</expression>
+       <name>sum calced</name>
+     </statistic>
+     
+     <statistic>
+       <expression>mean(const_num(10))</expression>
+       <name>mean</name>
+     </statistic>
+     <statistic>
+       <expression>mean(double(const_10_dd))</expression>
+       <name>mean calced</name>
+     </statistic>
+   </analyticsRequest>
+   
+   <analyticsRequest>
+     <name>Date Math Request</name>
+     
+     <statistic>
+       <expression>median(date_math(date(date_dtd),const_str(+2YEARS)))</expression>
+       <name>median</name>
+     </statistic>
+     <statistic>
+       <expression>median(date(dm_2y_dtd))</expression>
+       <name>median calced</name>
+     </statistic>
+     
+     <statistic>
+       <expression>max(date_math(date(date_dtd),const_str(+2MONTHS)))</expression>
+       <name>max</name>
+     </statistic>
+     <statistic>
+       <expression>max(date(dm_2m_dtd))</expression>
+       <name>max calced</name>
+     </statistic>
+   </analyticsRequest>
+   
+   <analyticsRequest>
+     <name>Constant Date Request</name>
+     
+     <statistic>
+       <expression>median(const_date(1800-06-30T23:59:59Z))</expression>
+       <name>median</name>
+     </statistic>
+     <statistic>
+       <expression>median(date(const_00_dtd))</expression>
+       <name>median calced</name>
+     </statistic>
+     
+     <statistic>
+       <expression>max(const_date(1804-06-30T23:59:59Z))</expression>
+       <name>max</name>
+     </statistic>
+     <statistic>
+       <expression>max(date(const_04_dtd))</expression>
+       <name>max calced</name>
+     </statistic>
+   </analyticsRequest>
+   
+   <analyticsRequest>
+     <name>Constant String Request</name>
+     
+     <statistic>
+       <expression>min(const_str(this is the first))</expression>
+       <name>min</name>
+     </statistic>
+     <statistic>
+       <expression>min(str(const_first_sd))</expression>
+       <name>min calced</name>
+     </statistic>
+     
+     <statistic>
+       <expression>max(const_str(this is the second))</expression>
+       <name>max</name>
+     </statistic>
+     <statistic>
+       <expression>max(str(const_second_sd))</expression>
+       <name>max calced</name>
+     </statistic>
+   </analyticsRequest>
+   
+   <analyticsRequest>
+     <name>Concatenate Request</name>
+     
+     <statistic>
+       <expression>min(concat(const_str(this is the first),str(string_sd)))</expression>
+       <name>min</name>
+     </statistic>
+     <statistic>
+       <expression>min(str(concat_first_sd))</expression>
+       <name>min calced</name>
+     </statistic>
+     
+     <statistic>
+       <expression>max(concat(const_str(this is the second),str(string_sd)))</expression>
+       <name>max</name>
+     </statistic>
+     <statistic>
+       <expression>max(str(concat_second_sd))</expression>
+       <name>max calced</name>
+     </statistic>
+   </analyticsRequest>
+   
+   <analyticsRequest>
+     <name>Reverse Request</name>
+     
+     <statistic>
+       <expression>min(rev(str(string_sd)))</expression>
+       <name>min</name>
+     </statistic>
+     <statistic>
+       <expression>min(str(rev_sd))</expression>
+       <name>min calced</name>
+     </statistic>
+     
+     <statistic>
+       <expression>max(rev(str(string_sd)))</expression>
+       <name>max</name>
+     </statistic>
+     <statistic>
+       <expression>max(str(rev_sd))</expression>
+       <name>max calced</name>
+     </statistic>
+   </analyticsRequest>
 </analyticsRequestEnvelope> 

Modified: lucene/dev/branches/lucene6699/solr/contrib/analytics/src/test-files/analytics/requestXMLFiles/noFacets.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6699/solr/contrib/analytics/src/test-files/analytics/requestXMLFiles/noFacets.xml?rev=1700800&r1=1700799&r2=1700800&view=diff
==============================================================================
--- lucene/dev/branches/lucene6699/solr/contrib/analytics/src/test-files/analytics/requestXMLFiles/noFacets.xml (original)
+++ lucene/dev/branches/lucene6699/solr/contrib/analytics/src/test-files/analytics/requestXMLFiles/noFacets.xml Wed Sep  2 13:06:13 2015
@@ -1,310 +1,310 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <analyticsRequestEnvelope stats="true" olap="true">
- 	<analyticsRequest>
- 		<name>Sum Request</name>
- 		
- 		<statistic>
- 			<expression>sum(int(int_id))</expression>
- 			<name>int_id</name>
- 		</statistic>
- 		<statistic>
- 			<expression>sum(long(long_ld))</expression>
- 			<name>long_ld</name>
- 		</statistic>
- 		<statistic>
- 			<expression>sum(float(float_fd))</expression>
- 			<name>float_fd</name>
- 		</statistic>
- 		<statistic>
- 			<expression>sum(double(double_dd))</expression>
- 			<name>double_dd</name>
- 		</statistic>
- 	</analyticsRequest>
- 	
- 	<analyticsRequest>
- 		<name>SumOfSquares Request</name>
- 		
- 		<statistic>
- 			<expression>sumofsquares(int(int_id))</expression>
- 			<name>int_id</name>
- 		</statistic>
- 		<statistic>
- 			<expression>sumofsquares(long(long_ld))</expression>
- 			<name>long_ld</name>
- 		</statistic>
- 		<statistic>
- 			<expression>sumofsquares(float(float_fd))</expression>
- 			<name>float_fd</name>
- 		</statistic>
- 		<statistic>
- 			<expression>sumofsquares(double(double_dd))</expression>
- 			<name>double_dd</name>
- 		</statistic>
- 	</analyticsRequest>
- 	
- 	<analyticsRequest>
- 		<name>Mean Request</name>
- 		
- 		<statistic>
- 			<expression>mean(int(int_id))</expression>
- 			<name>int_id</name>
- 		</statistic>
- 		<statistic>
- 			<expression>mean(long(long_ld))</expression>
- 			<name>long_ld</name>
- 		</statistic>
- 		<statistic>
- 			<expression>mean(float(float_fd))</expression>
- 			<name>float_fd</name>
- 		</statistic>
- 		<statistic>
- 			<expression>mean(double(double_dd))</expression>
- 			<name>double_dd</name>
- 		</statistic>
- 	</analyticsRequest>
- 	
- 	<analyticsRequest>
- 		<name>Stddev Request</name>
- 		
- 		<statistic>
- 			<expression>stddev(int(int_id))</expression>
- 			<name>int_id</name>
- 		</statistic>
- 		<statistic>
- 			<expression>stddev(long(long_ld))</expression>
- 			<name>long_ld</name>
- 		</statistic>
- 		<statistic>
- 			<expression>stddev(float(float_fd))</expression>
- 			<name>float_fd</name>
- 		</statistic>
- 		<statistic>
- 			<expression>stddev(double(double_dd))</expression>
- 			<name>double_dd</name>
- 		</statistic>
- 	</analyticsRequest>
- 	
- 	<analyticsRequest>
- 		<name>Median Request</name>
- 		
- 		<statistic>
- 			<expression>median(int(int_id))</expression>
- 			<name>int_id</name>
- 		</statistic>
- 		<statistic>
- 			<expression>median(long(long_ld))</expression>
- 			<name>long_ld</name>
- 		</statistic>
- 		<statistic>
- 			<expression>median(float(float_fd))</expression>
- 			<name>float_fd</name>
- 		</statistic>
- 		<statistic>
- 			<expression>median(double(double_dd))</expression>
- 			<name>double_dd</name>
- 		</statistic>
- 	</analyticsRequest>
- 	
- 	<analyticsRequest>
- 		<name>Perc 20 Request</name>
- 		
- 		<statistic>
- 			<expression>perc(20,int(int_id))</expression>
- 			<name>int_id</name>
- 		</statistic>
- 		<statistic>
- 			<expression>perc(20,long(long_ld))</expression>
- 			<name>long_ld</name>
- 		</statistic>
- 		<statistic>
- 			<expression>perc(20,float(float_fd))</expression>
- 			<name>float_fd</name>
- 		</statistic>
- 		<statistic>
- 			<expression>perc(20,double(double_dd))</expression>
- 			<name>double_dd</name>
- 		</statistic>
- 		<statistic>
- 			<expression>perc(20,date(date_dtd))</expression>
- 			<name>date_dtd</name>
- 		</statistic>
- 		<statistic>
- 			<expression>perc(20,str(string_sd))</expression>
- 			<name>string_sd</name>
- 		</statistic>
- 	</analyticsRequest>
- 	
- 	<analyticsRequest>
- 		<name>Perc 60 Request</name>
- 		
- 		<statistic>
- 			<expression>perc(60,int(int_id))</expression>
- 			<name>int_id</name>
- 		</statistic>
- 		<statistic>
- 			<expression>perc(60,long(long_ld))</expression>
- 			<name>long_ld</name>
- 		</statistic>
- 		<statistic>
- 			<expression>perc(60,float(float_fd))</expression>
- 			<name>float_fd</name>
- 		</statistic>
- 		<statistic>
- 			<expression>perc(60,double(double_dd))</expression>
- 			<name>double_dd</name>
- 		</statistic>
- 		<statistic>
- 			<expression>perc(60,date(date_dtd))</expression>
- 			<name>date_dtd</name>
- 		</statistic>
- 		<statistic>
- 			<expression>perc(60,str(string_sd))</expression>
- 			<name>string_sd</name>
- 		</statistic>
- 	</analyticsRequest>
- 	
- 	<analyticsRequest>
- 		<name>Min Request</name>
- 		
- 		<statistic>
- 			<expression>min(int(int_id))</expression>
- 			<name>int_id</name>
- 		</statistic>
- 		<statistic>
- 			<expression>min(long(long_ld))</expression>
- 			<name>long_ld</name>
- 		</statistic>
- 		<statistic>
- 			<expression>min(float(float_fd))</expression>
- 			<name>float_fd</name>
- 		</statistic>
- 		<statistic>
- 			<expression>min(double(double_dd))</expression>
- 			<name>double_dd</name>
- 		</statistic>
- 		<statistic>
- 			<expression>min(date(date_dtd))</expression>
- 			<name>date_dtd</name>
- 		</statistic>
- 		<statistic>
- 			<expression>min(str(string_sd))</expression>
- 			<name>string_sd</name>
- 		</statistic>
- 	</analyticsRequest>
- 	
- 	<analyticsRequest>
- 		<name>Max Request</name>
- 		
- 		<statistic>
- 			<expression>max(int(int_id))</expression>
- 			<name>int_id</name>
- 		</statistic>
- 		<statistic>
- 			<expression>max(long(long_ld))</expression>
- 			<name>long_ld</name>
- 		</statistic>
- 		<statistic>
- 			<expression>max(float(float_fd))</expression>
- 			<name>float_fd</name>
- 		</statistic>
- 		<statistic>
- 			<expression>max(double(double_dd))</expression>
- 			<name>double_dd</name>
- 		</statistic>
- 		<statistic>
- 			<expression>max(date(date_dtd))</expression>
- 			<name>date_dtd</name>
- 		</statistic>
- 		<statistic>
- 			<expression>max(str(string_sd))</expression>
- 			<name>string_sd</name>
- 		</statistic>
- 	</analyticsRequest>
- 	
- 	<analyticsRequest>
- 		<name>Unique Request</name>
- 		
- 		<statistic>
- 			<expression>unique(int(int_id))</expression>
- 			<name>int_id</name>
- 		</statistic>
- 		<statistic>
- 			<expression>unique(long(long_ld))</expression>
- 			<name>long_ld</name>
- 		</statistic>
- 		<statistic>
- 			<expression>unique(float(float_fd))</expression>
- 			<name>float_fd</name>
- 		</statistic>
- 		<statistic>
- 			<expression>unique(double(double_dd))</expression>
- 			<name>double_dd</name>
- 		</statistic>
- 		<statistic>
- 			<expression>unique(date(date_dtd))</expression>
- 			<name>date_dtd</name>
- 		</statistic>
- 		<statistic>
- 			<expression>unique(str(string_sd))</expression>
- 			<name>string_sd</name>
- 		</statistic>
- 	</analyticsRequest>
- 	
- 	<analyticsRequest>
- 		<name>Count Request</name>
- 		
- 		<statistic>
- 			<expression>count(int(int_id))</expression>
- 			<name>int_id</name>
- 		</statistic>
- 		<statistic>
- 			<expression>count(long(long_ld))</expression>
- 			<name>long_ld</name>
- 		</statistic>
- 		<statistic>
- 			<expression>count(float(float_fd))</expression>
- 			<name>float_fd</name>
- 		</statistic>
- 		<statistic>
- 			<expression>count(double(double_dd))</expression>
- 			<name>double_dd</name>
- 		</statistic>
- 		<statistic>
- 			<expression>count(date(date_dtd))</expression>
- 			<name>date_dtd</name>
- 		</statistic>
- 		<statistic>
- 			<expression>count(str(string_sd))</expression>
- 			<name>string_sd</name>
- 		</statistic>
- 	</analyticsRequest>
- 	
- 	<analyticsRequest>
- 		<name>Missing Request</name>
- 		 		
- 		<statistic>
- 			<expression>missing(int{int_id})</expression>
- 			<name>int_id</name>
- 		</statistic>
- 		<statistic>
- 			<expression>missing(long{long_ld})</expression>
- 			<name>long_ld</name>
- 		</statistic>
- 		<statistic>
- 			<expression>missing(float{float_fd})</expression>
- 			<name>float_fd</name>
- 		</statistic>
- 		<statistic>
- 			<expression>missing(double{double_dd})</expression>
- 			<name>double_dd</name>
- 		</statistic>
- 		<statistic>
- 			<expression>missing(date{date_dtd})</expression>
- 			<name>date_dtd</name>
- 		</statistic>
- 		<statistic>
- 			<expression>missing(str{string_sd})</expression>
- 			<name>string_sd</name>
- 		</statistic>
- 	</analyticsRequest>
+   <analyticsRequest>
+     <name>Sum Request</name>
+     
+     <statistic>
+       <expression>sum(int(int_id))</expression>
+       <name>int_id</name>
+     </statistic>
+     <statistic>
+       <expression>sum(long(long_ld))</expression>
+       <name>long_ld</name>
+     </statistic>
+     <statistic>
+       <expression>sum(float(float_fd))</expression>
+       <name>float_fd</name>
+     </statistic>
+     <statistic>
+       <expression>sum(double(double_dd))</expression>
+       <name>double_dd</name>
+     </statistic>
+   </analyticsRequest>
+   
+   <analyticsRequest>
+     <name>SumOfSquares Request</name>
+     
+     <statistic>
+       <expression>sumofsquares(int(int_id))</expression>
+       <name>int_id</name>
+     </statistic>
+     <statistic>
+       <expression>sumofsquares(long(long_ld))</expression>
+       <name>long_ld</name>
+     </statistic>
+     <statistic>
+       <expression>sumofsquares(float(float_fd))</expression>
+       <name>float_fd</name>
+     </statistic>
+     <statistic>
+       <expression>sumofsquares(double(double_dd))</expression>
+       <name>double_dd</name>
+     </statistic>
+   </analyticsRequest>
+   
+   <analyticsRequest>
+     <name>Mean Request</name>
+     
+     <statistic>
+       <expression>mean(int(int_id))</expression>
+       <name>int_id</name>
+     </statistic>
+     <statistic>
+       <expression>mean(long(long_ld))</expression>
+       <name>long_ld</name>
+     </statistic>
+     <statistic>
+       <expression>mean(float(float_fd))</expression>
+       <name>float_fd</name>
+     </statistic>
+     <statistic>
+       <expression>mean(double(double_dd))</expression>
+       <name>double_dd</name>
+     </statistic>
+   </analyticsRequest>
+   
+   <analyticsRequest>
+     <name>Stddev Request</name>
+     
+     <statistic>
+       <expression>stddev(int(int_id))</expression>
+       <name>int_id</name>
+     </statistic>
+     <statistic>
+       <expression>stddev(long(long_ld))</expression>
+       <name>long_ld</name>
+     </statistic>
+     <statistic>
+       <expression>stddev(float(float_fd))</expression>
+       <name>float_fd</name>
+     </statistic>
+     <statistic>
+       <expression>stddev(double(double_dd))</expression>
+       <name>double_dd</name>
+     </statistic>
+   </analyticsRequest>
+   
+   <analyticsRequest>
+     <name>Median Request</name>
+     
+     <statistic>
+       <expression>median(int(int_id))</expression>
+       <name>int_id</name>
+     </statistic>
+     <statistic>
+       <expression>median(long(long_ld))</expression>
+       <name>long_ld</name>
+     </statistic>
+     <statistic>
+       <expression>median(float(float_fd))</expression>
+       <name>float_fd</name>
+     </statistic>
+     <statistic>
+       <expression>median(double(double_dd))</expression>
+       <name>double_dd</name>
+     </statistic>
+   </analyticsRequest>
+   
+   <analyticsRequest>
+     <name>Perc 20 Request</name>
+     
+     <statistic>
+       <expression>perc(20,int(int_id))</expression>
+       <name>int_id</name>
+     </statistic>
+     <statistic>
+       <expression>perc(20,long(long_ld))</expression>
+       <name>long_ld</name>
+     </statistic>
+     <statistic>
+       <expression>perc(20,float(float_fd))</expression>
+       <name>float_fd</name>
+     </statistic>
+     <statistic>
+       <expression>perc(20,double(double_dd))</expression>
+       <name>double_dd</name>
+     </statistic>
+     <statistic>
+       <expression>perc(20,date(date_dtd))</expression>
+       <name>date_dtd</name>
+     </statistic>
+     <statistic>
+       <expression>perc(20,str(string_sd))</expression>
+       <name>string_sd</name>
+     </statistic>
+   </analyticsRequest>
+   
+   <analyticsRequest>
+     <name>Perc 60 Request</name>
+     
+     <statistic>
+       <expression>perc(60,int(int_id))</expression>
+       <name>int_id</name>
+     </statistic>
+     <statistic>
+       <expression>perc(60,long(long_ld))</expression>
+       <name>long_ld</name>
+     </statistic>
+     <statistic>
+       <expression>perc(60,float(float_fd))</expression>
+       <name>float_fd</name>
+     </statistic>
+     <statistic>
+       <expression>perc(60,double(double_dd))</expression>
+       <name>double_dd</name>
+     </statistic>
+     <statistic>
+       <expression>perc(60,date(date_dtd))</expression>
+       <name>date_dtd</name>
+     </statistic>
+     <statistic>
+       <expression>perc(60,str(string_sd))</expression>
+       <name>string_sd</name>
+     </statistic>
+   </analyticsRequest>
+   
+   <analyticsRequest>
+     <name>Min Request</name>
+     
+     <statistic>
+       <expression>min(int(int_id))</expression>
+       <name>int_id</name>
+     </statistic>
+     <statistic>
+       <expression>min(long(long_ld))</expression>
+       <name>long_ld</name>
+     </statistic>
+     <statistic>
+       <expression>min(float(float_fd))</expression>
+       <name>float_fd</name>
+     </statistic>
+     <statistic>
+       <expression>min(double(double_dd))</expression>
+       <name>double_dd</name>
+     </statistic>
+     <statistic>
+       <expression>min(date(date_dtd))</expression>
+       <name>date_dtd</name>
+     </statistic>
+     <statistic>
+       <expression>min(str(string_sd))</expression>
+       <name>string_sd</name>
+     </statistic>
+   </analyticsRequest>
+   
+   <analyticsRequest>
+     <name>Max Request</name>
+     
+     <statistic>
+       <expression>max(int(int_id))</expression>
+       <name>int_id</name>
+     </statistic>
+     <statistic>
+       <expression>max(long(long_ld))</expression>
+       <name>long_ld</name>
+     </statistic>
+     <statistic>
+       <expression>max(float(float_fd))</expression>
+       <name>float_fd</name>
+     </statistic>
+     <statistic>
+       <expression>max(double(double_dd))</expression>
+       <name>double_dd</name>
+     </statistic>
+     <statistic>
+       <expression>max(date(date_dtd))</expression>
+       <name>date_dtd</name>
+     </statistic>
+     <statistic>
+       <expression>max(str(string_sd))</expression>
+       <name>string_sd</name>
+     </statistic>
+   </analyticsRequest>
+   
+   <analyticsRequest>
+     <name>Unique Request</name>
+     
+     <statistic>
+       <expression>unique(int(int_id))</expression>
+       <name>int_id</name>
+     </statistic>
+     <statistic>
+       <expression>unique(long(long_ld))</expression>
+       <name>long_ld</name>
+     </statistic>
+     <statistic>
+       <expression>unique(float(float_fd))</expression>
+       <name>float_fd</name>
+     </statistic>
+     <statistic>
+       <expression>unique(double(double_dd))</expression>
+       <name>double_dd</name>
+     </statistic>
+     <statistic>
+       <expression>unique(date(date_dtd))</expression>
+       <name>date_dtd</name>
+     </statistic>
+     <statistic>
+       <expression>unique(str(string_sd))</expression>
+       <name>string_sd</name>
+     </statistic>
+   </analyticsRequest>
+   
+   <analyticsRequest>
+     <name>Count Request</name>
+     
+     <statistic>
+       <expression>count(int(int_id))</expression>
+       <name>int_id</name>
+     </statistic>
+     <statistic>
+       <expression>count(long(long_ld))</expression>
+       <name>long_ld</name>
+     </statistic>
+     <statistic>
+       <expression>count(float(float_fd))</expression>
+       <name>float_fd</name>
+     </statistic>
+     <statistic>
+       <expression>count(double(double_dd))</expression>
+       <name>double_dd</name>
+     </statistic>
+     <statistic>
+       <expression>count(date(date_dtd))</expression>
+       <name>date_dtd</name>
+     </statistic>
+     <statistic>
+       <expression>count(str(string_sd))</expression>
+       <name>string_sd</name>
+     </statistic>
+   </analyticsRequest>
+   
+   <analyticsRequest>
+     <name>Missing Request</name>
+          
+     <statistic>
+       <expression>missing(int{int_id})</expression>
+       <name>int_id</name>
+     </statistic>
+     <statistic>
+       <expression>missing(long{long_ld})</expression>
+       <name>long_ld</name>
+     </statistic>
+     <statistic>
+       <expression>missing(float{float_fd})</expression>
+       <name>float_fd</name>
+     </statistic>
+     <statistic>
+       <expression>missing(double{double_dd})</expression>
+       <name>double_dd</name>
+     </statistic>
+     <statistic>
+       <expression>missing(date{date_dtd})</expression>
+       <name>date_dtd</name>
+     </statistic>
+     <statistic>
+       <expression>missing(str{string_sd})</expression>
+       <name>string_sd</name>
+     </statistic>
+   </analyticsRequest>
 </analyticsRequestEnvelope> 

Modified: lucene/dev/branches/lucene6699/solr/contrib/analytics/src/test-files/analytics/requestXMLFiles/queryFacets.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6699/solr/contrib/analytics/src/test-files/analytics/requestXMLFiles/queryFacets.xml?rev=1700800&r1=1700799&r2=1700800&view=diff
==============================================================================
--- lucene/dev/branches/lucene6699/solr/contrib/analytics/src/test-files/analytics/requestXMLFiles/queryFacets.xml (original)
+++ lucene/dev/branches/lucene6699/solr/contrib/analytics/src/test-files/analytics/requestXMLFiles/queryFacets.xml Wed Sep  2 13:06:13 2015
@@ -1,94 +1,94 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <analyticsRequestEnvelope stats="true" olap="true">
- 	<analyticsRequest>
- 		<name>int request</name>
- 		
- 		<statistic>
- 			<expression>sum(int(int_id))</expression>
- 			<name>sum</name>
- 		</statistic>
- 		
- 		<statistic>
- 			<expression>mean(int(int_id))</expression>
- 			<name>mean</name>
- 		</statistic>
- 		
- 		<statistic>
- 			<expression>median(int(int_id))</expression>
- 			<name>median</name>
- 		</statistic>
- 		
- 		<statistic>
- 			<expression>perc(8,int(int_id))</expression>
- 			<name>perc_8</name>
- 		</statistic>
- 		
- 		<queryFacet>
- 			<name>float1</name>
- 			<query>float_fd:[* TO 50]</query>
- 		</queryFacet>
- 		<queryFacet>
- 			<name>float2</name>
- 			<query>float_fd:[* TO 30]</query>
- 		</queryFacet>
- 	</analyticsRequest>
- 	<analyticsRequest>
- 		<name>long request</name>
- 		
- 		<statistic>
- 			<expression>sum(long(long_ld))</expression>
- 			<name>sum</name>
- 		</statistic>
- 		
- 		<statistic>
- 			<expression>mean(long(long_ld))</expression>
- 			<name>mean</name>
- 		</statistic>
- 		
- 		<statistic>
- 			<expression>median(long(long_ld))</expression>
- 			<name>median</name>
- 		</statistic>
- 		
- 		<statistic>
- 			<expression>perc(8,long(long_ld))</expression>
- 			<name>perc_8</name>
- 		</statistic>
- 		
- 		<queryFacet>
- 			<name>string</name>
- 			<query>string_sd:abc1</query>
- 			<query>string_sd:abc2</query>
- 		</queryFacet>
- 	</analyticsRequest>
- 	<analyticsRequest>
- 		<name>float request</name>
- 		
- 		<statistic>
- 			<expression>sum(float(float_fd))</expression>
- 			<name>sum</name>
- 		</statistic>
- 		
- 		<statistic>
- 			<expression>mean(float(float_fd))</expression>
- 			<name>mean</name>
- 		</statistic>
- 		
- 		<statistic>
- 			<expression>median(float(float_fd))</expression>
- 			<name>median</name>
- 		</statistic>
- 		
- 		<statistic>
- 			<expression>perc(8,float(float_fd))</expression>
- 			<name>perc_8</name>
- 		</statistic>
- 		
- 		<queryFacet>
- 			<name>long and double</name>
- 			<query>long_ld:[20 TO *]</query>
- 			<query>long_ld:[30 TO *]</query>
- 			<query>double_dd:[* TO 50]</query>
- 		</queryFacet>
- 	</analyticsRequest>
+   <analyticsRequest>
+     <name>int request</name>
+     
+     <statistic>
+       <expression>sum(int(int_id))</expression>
+       <name>sum</name>
+     </statistic>
+     
+     <statistic>
+       <expression>mean(int(int_id))</expression>
+       <name>mean</name>
+     </statistic>
+     
+     <statistic>
+       <expression>median(int(int_id))</expression>
+       <name>median</name>
+     </statistic>
+     
+     <statistic>
+       <expression>perc(8,int(int_id))</expression>
+       <name>perc_8</name>
+     </statistic>
+     
+     <queryFacet>
+       <name>float1</name>
+       <query>float_fd:[* TO 50]</query>
+     </queryFacet>
+     <queryFacet>
+       <name>float2</name>
+       <query>float_fd:[* TO 30]</query>
+     </queryFacet>
+   </analyticsRequest>
+   <analyticsRequest>
+     <name>long request</name>
+     
+     <statistic>
+       <expression>sum(long(long_ld))</expression>
+       <name>sum</name>
+     </statistic>
+     
+     <statistic>
+       <expression>mean(long(long_ld))</expression>
+       <name>mean</name>
+     </statistic>
+     
+     <statistic>
+       <expression>median(long(long_ld))</expression>
+       <name>median</name>
+     </statistic>
+     
+     <statistic>
+       <expression>perc(8,long(long_ld))</expression>
+       <name>perc_8</name>
+     </statistic>
+     
+     <queryFacet>
+       <name>string</name>
+       <query>string_sd:abc1</query>
+       <query>string_sd:abc2</query>
+     </queryFacet>
+   </analyticsRequest>
+   <analyticsRequest>
+     <name>float request</name>
+     
+     <statistic>
+       <expression>sum(float(float_fd))</expression>
+       <name>sum</name>
+     </statistic>
+     
+     <statistic>
+       <expression>mean(float(float_fd))</expression>
+       <name>mean</name>
+     </statistic>
+     
+     <statistic>
+       <expression>median(float(float_fd))</expression>
+       <name>median</name>
+     </statistic>
+     
+     <statistic>
+       <expression>perc(8,float(float_fd))</expression>
+       <name>perc_8</name>
+     </statistic>
+     
+     <queryFacet>
+       <name>long and double</name>
+       <query>long_ld:[20 TO *]</query>
+       <query>long_ld:[30 TO *]</query>
+       <query>double_dd:[* TO 50]</query>
+     </queryFacet>
+   </analyticsRequest>
 </analyticsRequestEnvelope>

Modified: lucene/dev/branches/lucene6699/solr/contrib/analytics/src/test-files/analytics/requestXMLFiles/rangeFacets.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6699/solr/contrib/analytics/src/test-files/analytics/requestXMLFiles/rangeFacets.xml?rev=1700800&r1=1700799&r2=1700800&view=diff
==============================================================================
--- lucene/dev/branches/lucene6699/solr/contrib/analytics/src/test-files/analytics/requestXMLFiles/rangeFacets.xml (original)
+++ lucene/dev/branches/lucene6699/solr/contrib/analytics/src/test-files/analytics/requestXMLFiles/rangeFacets.xml Wed Sep  2 13:06:13 2015
@@ -1,319 +1,319 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <analyticsRequestEnvelope stats="true" olap="true">
- 	<analyticsRequest>
- 		<name>regular int</name>
- 		
- 		<statistic>
- 			<expression>mean(int(int_id))</expression>
- 			<name>mean</name>
- 		</statistic>
- 		<statistic>
- 			<expression>sum(int(int_id))</expression>
- 			<name>sum</name>
- 		</statistic>
- 		<statistic>
- 			<expression>median(int(int_id))</expression>
- 			<name>median</name>
- 		</statistic>
- 		<statistic>
- 			<expression>count(int(int_id))</expression>
- 			<name>count</name>
- 		</statistic>
- 		<statistic>
- 			<expression>sumofsquares(int(int_id))</expression>
- 			<name>sumOfSquares</name>
- 		</statistic>
- 		
- 		<rangeFacet hardend="false">
- 			<field>long_ld</field>
- 			<start>5</start>
- 			<end>30</end>
- 			<gap>5</gap>
- 			<includeBoundary>lower</includeBoundary>
- 			<otherRange>all</otherRange>
- 		</rangeFacet>
- 		<rangeFacet hardend="false">
- 			<field>double_dd</field>
- 			<start>3</start>
- 			<end>39</end>
- 			<gap>7</gap>
- 			<includeBoundary>upper</includeBoundary>
- 			<includeBoundary>outer</includeBoundary>
- 			<otherRange>all</otherRange>
- 		</rangeFacet>
- 		<rangeFacet hardend="false">
- 			<field>date_dtd</field>
- 			<start>1007-01-01T23:59:59Z</start>
- 			<end>1044-01-01T23:59:59Z</end>
- 			<gap>+7YEARS</gap>
- 			<includeBoundary>lower</includeBoundary>
- 			<includeBoundary>edge</includeBoundary>
- 			<includeBoundary>outer</includeBoundary>
- 			<otherRange>all</otherRange>
- 		</rangeFacet>
- 	</analyticsRequest>
- 	<analyticsRequest>
- 		<name>regular float</name>
- 		
- 		<statistic>
- 			<expression>mean(float(float_fd))</expression>
- 			<name>mean</name>
- 		</statistic>
- 		<statistic>
- 			<expression>sum(float(float_fd))</expression>
- 			<name>sum</name>
- 		</statistic>
- 		<statistic>
- 			<expression>median(float(float_fd))</expression>
- 			<name>median</name>
- 		</statistic>
- 		<statistic>
- 			<expression>count(float(float_fd))</expression>
- 			<name>count</name>
- 		</statistic>
- 		<statistic>
- 			<expression>sumofsquares(float(float_fd))</expression>
- 			<name>sumOfSquares</name>
- 		</statistic>
- 		
- 		<rangeFacet hardend="false">
- 			<field>long_ld</field>
- 			<start>0</start>
- 			<end>29</end>
- 			<gap>4</gap>
- 			<includeBoundary>all</includeBoundary>
- 			<otherRange>all</otherRange>
- 		</rangeFacet>
- 		<rangeFacet hardend="false">
- 			<field>double_dd</field>
- 			<start>4</start>
- 			<end>47</end>
- 			<gap>11</gap>
- 			<includeBoundary>edge</includeBoundary>
- 			<otherRange>all</otherRange>
- 		</rangeFacet>
- 		<rangeFacet hardend="false">
- 			<field>date_dtd</field>
- 			<start>1004-01-01T23:59:59Z</start>
- 			<end>1046-01-01T23:59:59Z</end>
- 			<gap>+5YEARS</gap>
- 			<includeBoundary>upper</includeBoundary>
- 			<includeBoundary>edge</includeBoundary>
- 			<otherRange>all</otherRange>
- 		</rangeFacet>
- 	</analyticsRequest>
- 	<analyticsRequest>
- 		<name>hardend int</name>
- 		
- 		<statistic>
- 			<expression>mean(int(int_id))</expression>
- 			<name>mean</name>
- 		</statistic>
- 		<statistic>
- 			<expression>sum(int(int_id))</expression>
- 			<name>sum</name>
- 		</statistic>
- 		<statistic>
- 			<expression>median(int(int_id))</expression>
- 			<name>median</name>
- 		</statistic>
- 		<statistic>
- 			<expression>count(int(int_id))</expression>
- 			<name>count</name>
- 		</statistic>
- 		<statistic>
- 			<expression>sumofsquares(int(int_id))</expression>
- 			<name>sumOfSquares</name>
- 		</statistic>
- 		
- 		<rangeFacet hardend="true">
- 			<field>long_ld</field>
- 			<start>5</start>
- 			<end>30</end>
- 			<gap>5</gap>
- 			<includeBoundary>lower</includeBoundary>
- 			<otherRange>all</otherRange>
- 		</rangeFacet>
- 		<rangeFacet hardend="true">
- 			<field>double_dd</field>
- 			<start>3</start>
- 			<end>39</end>
- 			<gap>7</gap>
- 			<includeBoundary>upper</includeBoundary>
- 			<includeBoundary>outer</includeBoundary>
- 			<otherRange>all</otherRange>
- 		</rangeFacet>
- 		<rangeFacet hardend="true">
- 			<field>date_dtd</field>
- 			<start>1007-01-01T23:59:59Z</start>
- 			<end>1044-01-01T23:59:59Z</end>
- 			<gap>+7YEARS</gap>
- 			<includeBoundary>lower</includeBoundary>
- 			<includeBoundary>edge</includeBoundary>
- 			<includeBoundary>outer</includeBoundary>
- 			<otherRange>all</otherRange>
- 		</rangeFacet>
- 	</analyticsRequest>
- 	<analyticsRequest>
- 		<name>hardend float</name>
- 		
- 		<statistic>
- 			<expression>mean(float(float_fd))</expression>
- 			<name>mean</name>
- 		</statistic>
- 		<statistic>
- 			<expression>sum(float(float_fd))</expression>
- 			<name>sum</name>
- 		</statistic>
- 		<statistic>
- 			<expression>median(float(float_fd))</expression>
- 			<name>median</name>
- 		</statistic>
- 		<statistic>
- 			<expression>count(float(float_fd))</expression>
- 			<name>count</name>
- 		</statistic>
- 		<statistic>
- 			<expression>sumofsquares(float(float_fd))</expression>
- 			<name>sumOfSquares</name>
- 		</statistic>
- 		
- 		<rangeFacet hardend="true">
- 			<field>long_ld</field>
- 			<start>0</start>
- 			<end>29</end>
- 			<gap>4</gap>
- 			<includeBoundary>all</includeBoundary>
- 			<otherRange>all</otherRange>
- 		</rangeFacet>
- 		<rangeFacet hardend="true">
- 			<field>double_dd</field>
- 			<start>4</start>
- 			<end>47</end>
- 			<gap>11</gap>
- 			<includeBoundary>edge</includeBoundary>
- 			<otherRange>all</otherRange>
- 		</rangeFacet>
- 		<rangeFacet hardend="true">
- 			<field>date_dtd</field>
- 			<start>1004-01-01T23:59:59Z</start>
- 			<end>1046-01-01T23:59:59Z</end>
- 			<gap>+5YEARS</gap>
- 			<includeBoundary>upper</includeBoundary>
- 			<includeBoundary>edge</includeBoundary>
- 			<otherRange>all</otherRange>
- 		</rangeFacet>
- 	</analyticsRequest>
- 	<analyticsRequest>
- 		<name>multigap int</name>
- 		
- 		<statistic>
- 			<expression>mean(int(int_id))</expression>
- 			<name>mean</name>
- 		</statistic>
- 		<statistic>
- 			<expression>sum(int(int_id))</expression>
- 			<name>sum</name>
- 		</statistic>
- 		<statistic>
- 			<expression>median(int(int_id))</expression>
- 			<name>median</name>
- 		</statistic>
- 		<statistic>
- 			<expression>count(int(int_id))</expression>
- 			<name>count</name>
- 		</statistic>
- 		<statistic>
- 			<expression>sumofsquares(int(int_id))</expression>
- 			<name>sumOfSquares</name>
- 		</statistic>
- 		
- 		<rangeFacet hardend="false">
- 			<field>long_ld</field>
- 			<start>5</start>
- 			<end>30</end>
- 			<gap>4</gap>
- 			<gap>2</gap>
- 			<gap>6</gap>
- 			<gap>3</gap>
- 			<includeBoundary>lower</includeBoundary>
- 			<otherRange>all</otherRange>
- 		</rangeFacet>
- 		<rangeFacet hardend="false">
- 			<field>double_dd</field>
- 			<start>3</start>
- 			<end>39</end>
- 			<gap>3</gap>
- 			<gap>1</gap>
- 			<gap>7</gap>
- 			<includeBoundary>upper</includeBoundary>
- 			<includeBoundary>outer</includeBoundary>
- 			<otherRange>all</otherRange>
- 		</rangeFacet>
- 		<rangeFacet hardend="false">
- 			<field>date_dtd</field>
- 			<start>1007-01-01T23:59:59Z</start>
- 			<end>1044-01-01T23:59:59Z</end>
- 			<gap>+2YEARS</gap>
- 			<gap>+7YEARS</gap>
- 			<includeBoundary>lower</includeBoundary>
- 			<includeBoundary>edge</includeBoundary>
- 			<includeBoundary>outer</includeBoundary>
- 			<otherRange>all</otherRange>
- 		</rangeFacet>
- 	</analyticsRequest>
- 	<analyticsRequest>
- 		<name>multigap float</name>
- 		
- 		<statistic>
- 			<expression>mean(float(float_fd))</expression>
- 			<name>mean</name>
- 		</statistic>
- 		<statistic>
- 			<expression>sum(float(float_fd))</expression>
- 			<name>sum</name>
- 		</statistic>
- 		<statistic>
- 			<expression>median(float(float_fd))</expression>
- 			<name>median</name>
- 		</statistic>
- 		<statistic>
- 			<expression>count(float(float_fd))</expression>
- 			<name>count</name>
- 		</statistic>
- 		<statistic>
- 			<expression>sumofsquares(float(float_fd))</expression>
- 			<name>sumOfSquares</name>
- 		</statistic>
- 		
- 		<rangeFacet hardend="false">
- 			<field>long_ld</field>
- 			<start>0</start>
- 			<end>29</end>
- 			<gap>1</gap>
- 			<gap>4</gap>
- 			<includeBoundary>all</includeBoundary>
- 			<otherRange>all</otherRange>
- 		</rangeFacet>
- 		<rangeFacet hardend="false">
- 			<field>double_dd</field>
- 			<start>4</start>
- 			<end>47</end>
- 			<gap>2</gap>
- 			<gap>3</gap>
- 			<gap>11</gap>
- 			<includeBoundary>edge</includeBoundary>
- 			<otherRange>all</otherRange>
- 		</rangeFacet>
- 		<rangeFacet hardend="false">
- 			<field>date_dtd</field>
- 			<start>1004-01-01T23:59:59Z</start>
- 			<end>1046-01-01T23:59:59Z</end>
- 			<gap>+4YEARS</gap>
- 			<gap>+5YEARS</gap>
- 			<includeBoundary>upper</includeBoundary>
- 			<includeBoundary>edge</includeBoundary>
- 			<otherRange>all</otherRange>
- 		</rangeFacet>
- 	</analyticsRequest>
+   <analyticsRequest>
+     <name>regular int</name>
+     
+     <statistic>
+       <expression>mean(int(int_id))</expression>
+       <name>mean</name>
+     </statistic>
+     <statistic>
+       <expression>sum(int(int_id))</expression>
+       <name>sum</name>
+     </statistic>
+     <statistic>
+       <expression>median(int(int_id))</expression>
+       <name>median</name>
+     </statistic>
+     <statistic>
+       <expression>count(int(int_id))</expression>
+       <name>count</name>
+     </statistic>
+     <statistic>
+       <expression>sumofsquares(int(int_id))</expression>
+       <name>sumOfSquares</name>
+     </statistic>
+     
+     <rangeFacet hardend="false">
+       <field>long_ld</field>
+       <start>5</start>
+       <end>30</end>
+       <gap>5</gap>
+       <includeBoundary>lower</includeBoundary>
+       <otherRange>all</otherRange>
+     </rangeFacet>
+     <rangeFacet hardend="false">
+       <field>double_dd</field>
+       <start>3</start>
+       <end>39</end>
+       <gap>7</gap>
+       <includeBoundary>upper</includeBoundary>
+       <includeBoundary>outer</includeBoundary>
+       <otherRange>all</otherRange>
+     </rangeFacet>
+     <rangeFacet hardend="false">
+       <field>date_dtd</field>
+       <start>1007-01-01T23:59:59Z</start>
+       <end>1044-01-01T23:59:59Z</end>
+       <gap>+7YEARS</gap>
+       <includeBoundary>lower</includeBoundary>
+       <includeBoundary>edge</includeBoundary>
+       <includeBoundary>outer</includeBoundary>
+       <otherRange>all</otherRange>
+     </rangeFacet>
+   </analyticsRequest>
+   <analyticsRequest>
+     <name>regular float</name>
+     
+     <statistic>
+       <expression>mean(float(float_fd))</expression>
+       <name>mean</name>
+     </statistic>
+     <statistic>
+       <expression>sum(float(float_fd))</expression>
+       <name>sum</name>
+     </statistic>
+     <statistic>
+       <expression>median(float(float_fd))</expression>
+       <name>median</name>
+     </statistic>
+     <statistic>
+       <expression>count(float(float_fd))</expression>
+       <name>count</name>
+     </statistic>
+     <statistic>
+       <expression>sumofsquares(float(float_fd))</expression>
+       <name>sumOfSquares</name>
+     </statistic>
+     
+     <rangeFacet hardend="false">
+       <field>long_ld</field>
+       <start>0</start>
+       <end>29</end>
+       <gap>4</gap>
+       <includeBoundary>all</includeBoundary>
+       <otherRange>all</otherRange>
+     </rangeFacet>
+     <rangeFacet hardend="false">
+       <field>double_dd</field>
+       <start>4</start>
+       <end>47</end>
+       <gap>11</gap>
+       <includeBoundary>edge</includeBoundary>
+       <otherRange>all</otherRange>
+     </rangeFacet>
+     <rangeFacet hardend="false">
+       <field>date_dtd</field>
+       <start>1004-01-01T23:59:59Z</start>
+       <end>1046-01-01T23:59:59Z</end>
+       <gap>+5YEARS</gap>
+       <includeBoundary>upper</includeBoundary>
+       <includeBoundary>edge</includeBoundary>
+       <otherRange>all</otherRange>
+     </rangeFacet>
+   </analyticsRequest>
+   <analyticsRequest>
+     <name>hardend int</name>
+     
+     <statistic>
+       <expression>mean(int(int_id))</expression>
+       <name>mean</name>
+     </statistic>
+     <statistic>
+       <expression>sum(int(int_id))</expression>
+       <name>sum</name>
+     </statistic>
+     <statistic>
+       <expression>median(int(int_id))</expression>
+       <name>median</name>
+     </statistic>
+     <statistic>
+       <expression>count(int(int_id))</expression>
+       <name>count</name>
+     </statistic>
+     <statistic>
+       <expression>sumofsquares(int(int_id))</expression>
+       <name>sumOfSquares</name>
+     </statistic>
+     
+     <rangeFacet hardend="true">
+       <field>long_ld</field>
+       <start>5</start>
+       <end>30</end>
+       <gap>5</gap>
+       <includeBoundary>lower</includeBoundary>
+       <otherRange>all</otherRange>
+     </rangeFacet>
+     <rangeFacet hardend="true">
+       <field>double_dd</field>
+       <start>3</start>
+       <end>39</end>
+       <gap>7</gap>
+       <includeBoundary>upper</includeBoundary>
+       <includeBoundary>outer</includeBoundary>
+       <otherRange>all</otherRange>
+     </rangeFacet>
+     <rangeFacet hardend="true">
+       <field>date_dtd</field>
+       <start>1007-01-01T23:59:59Z</start>
+       <end>1044-01-01T23:59:59Z</end>
+       <gap>+7YEARS</gap>
+       <includeBoundary>lower</includeBoundary>
+       <includeBoundary>edge</includeBoundary>
+       <includeBoundary>outer</includeBoundary>
+       <otherRange>all</otherRange>
+     </rangeFacet>
+   </analyticsRequest>
+   <analyticsRequest>
+     <name>hardend float</name>
+     
+     <statistic>
+       <expression>mean(float(float_fd))</expression>
+       <name>mean</name>
+     </statistic>
+     <statistic>
+       <expression>sum(float(float_fd))</expression>
+       <name>sum</name>
+     </statistic>
+     <statistic>
+       <expression>median(float(float_fd))</expression>
+       <name>median</name>
+     </statistic>
+     <statistic>
+       <expression>count(float(float_fd))</expression>
+       <name>count</name>
+     </statistic>
+     <statistic>
+       <expression>sumofsquares(float(float_fd))</expression>
+       <name>sumOfSquares</name>
+     </statistic>
+     
+     <rangeFacet hardend="true">
+       <field>long_ld</field>
+       <start>0</start>
+       <end>29</end>
+       <gap>4</gap>
+       <includeBoundary>all</includeBoundary>
+       <otherRange>all</otherRange>
+     </rangeFacet>
+     <rangeFacet hardend="true">
+       <field>double_dd</field>
+       <start>4</start>
+       <end>47</end>
+       <gap>11</gap>
+       <includeBoundary>edge</includeBoundary>
+       <otherRange>all</otherRange>
+     </rangeFacet>
+     <rangeFacet hardend="true">
+       <field>date_dtd</field>
+       <start>1004-01-01T23:59:59Z</start>
+       <end>1046-01-01T23:59:59Z</end>
+       <gap>+5YEARS</gap>
+       <includeBoundary>upper</includeBoundary>
+       <includeBoundary>edge</includeBoundary>
+       <otherRange>all</otherRange>
+     </rangeFacet>
+   </analyticsRequest>
+   <analyticsRequest>
+     <name>multigap int</name>
+     
+     <statistic>
+       <expression>mean(int(int_id))</expression>
+       <name>mean</name>
+     </statistic>
+     <statistic>
+       <expression>sum(int(int_id))</expression>
+       <name>sum</name>
+     </statistic>
+     <statistic>
+       <expression>median(int(int_id))</expression>
+       <name>median</name>
+     </statistic>
+     <statistic>
+       <expression>count(int(int_id))</expression>
+       <name>count</name>
+     </statistic>
+     <statistic>
+       <expression>sumofsquares(int(int_id))</expression>
+       <name>sumOfSquares</name>
+     </statistic>
+     
+     <rangeFacet hardend="false">
+       <field>long_ld</field>
+       <start>5</start>
+       <end>30</end>
+       <gap>4</gap>
+       <gap>2</gap>
+       <gap>6</gap>
+       <gap>3</gap>
+       <includeBoundary>lower</includeBoundary>
+       <otherRange>all</otherRange>
+     </rangeFacet>
+     <rangeFacet hardend="false">
+       <field>double_dd</field>
+       <start>3</start>
+       <end>39</end>
+       <gap>3</gap>
+       <gap>1</gap>
+       <gap>7</gap>
+       <includeBoundary>upper</includeBoundary>
+       <includeBoundary>outer</includeBoundary>
+       <otherRange>all</otherRange>
+     </rangeFacet>
+     <rangeFacet hardend="false">
+       <field>date_dtd</field>
+       <start>1007-01-01T23:59:59Z</start>
+       <end>1044-01-01T23:59:59Z</end>
+       <gap>+2YEARS</gap>
+       <gap>+7YEARS</gap>
+       <includeBoundary>lower</includeBoundary>
+       <includeBoundary>edge</includeBoundary>
+       <includeBoundary>outer</includeBoundary>
+       <otherRange>all</otherRange>
+     </rangeFacet>
+   </analyticsRequest>
+   <analyticsRequest>
+     <name>multigap float</name>
+     
+     <statistic>
+       <expression>mean(float(float_fd))</expression>
+       <name>mean</name>
+     </statistic>
+     <statistic>
+       <expression>sum(float(float_fd))</expression>
+       <name>sum</name>
+     </statistic>
+     <statistic>
+       <expression>median(float(float_fd))</expression>
+       <name>median</name>
+     </statistic>
+     <statistic>
+       <expression>count(float(float_fd))</expression>
+       <name>count</name>
+     </statistic>
+     <statistic>
+       <expression>sumofsquares(float(float_fd))</expression>
+       <name>sumOfSquares</name>
+     </statistic>
+     
+     <rangeFacet hardend="false">
+       <field>long_ld</field>
+       <start>0</start>
+       <end>29</end>
+       <gap>1</gap>
+       <gap>4</gap>
+       <includeBoundary>all</includeBoundary>
+       <otherRange>all</otherRange>
+     </rangeFacet>
+     <rangeFacet hardend="false">
+       <field>double_dd</field>
+       <start>4</start>
+       <end>47</end>
+       <gap>2</gap>
+       <gap>3</gap>
+       <gap>11</gap>
+       <includeBoundary>edge</includeBoundary>
+       <otherRange>all</otherRange>
+     </rangeFacet>
+     <rangeFacet hardend="false">
+       <field>date_dtd</field>
+       <start>1004-01-01T23:59:59Z</start>
+       <end>1046-01-01T23:59:59Z</end>
+       <gap>+4YEARS</gap>
+       <gap>+5YEARS</gap>
+       <includeBoundary>upper</includeBoundary>
+       <includeBoundary>edge</includeBoundary>
+       <otherRange>all</otherRange>
+     </rangeFacet>
+   </analyticsRequest>
 </analyticsRequestEnvelope>

Modified: lucene/dev/branches/lucene6699/solr/contrib/clustering/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6699/solr/contrib/clustering/ivy.xml?rev=1700800&r1=1700799&r2=1700800&view=diff
==============================================================================
--- lucene/dev/branches/lucene6699/solr/contrib/clustering/ivy.xml (original)
+++ lucene/dev/branches/lucene6699/solr/contrib/clustering/ivy.xml Wed Sep  2 13:06:13 2015
@@ -24,25 +24,22 @@
   </configurations>
   <dependencies>
     <dependency org="org.carrot2" name="carrot2-mini" rev="${/org.carrot2/carrot2-mini}" conf="compile"/>
-
-    <dependency org="com.carrotsearch" name="hppc" rev="${/com.carrotsearch/hppc}" conf="compile"/>
+    <dependency org="org.carrot2.shaded" name="carrot2-guava" rev="${/org.carrot2.shaded/carrot2-guava}" conf="compile"/>
     <dependency org="org.carrot2.attributes" name="attributes-binder" rev="${/org.carrot2.attributes/attributes-binder}" conf="compile"/>
+
     <dependency org="org.simpleframework" name="simple-xml" rev="${/org.simpleframework/simple-xml}" conf="compile"/>
 
-    <dependency org="org.apache.mahout" name="mahout-math" rev="${/org.apache.mahout/mahout-math}" conf="compile"/>
+    <dependency org="org.apache.mahout" name="mahout-math"        rev="${/org.apache.mahout/mahout-math}"        conf="compile"/>
     <dependency org="org.apache.mahout" name="mahout-collections" rev="${/org.apache.mahout/mahout-collections}" conf="compile"/>
 
-    <dependency org="org.codehaus.jackson" name="jackson-core-asl" rev="${/org.codehaus.jackson/jackson-core-asl}" conf="compile"/>
-    <dependency org="org.codehaus.jackson" name="jackson-mapper-asl" rev="${/org.codehaus.jackson/jackson-mapper-asl}" conf="compile"/>
-
-    <!--
-    Included as part of Solr's environment.
-
-    com.google.guava:guava:jar:14.0.1:compile
-    commons-lang:commons-lang:jar:2.6:compile
-     -->
-
+    <dependency org="com.fasterxml.jackson.core" name="jackson-annotations"  rev="${/com.fasterxml.jackson.core/jackson-annotations}"   conf="compile"/>
+    <dependency org="com.fasterxml.jackson.core" name="jackson-databind"     rev="${/com.fasterxml.jackson.core/jackson-databind}"      conf="compile"/>
+    
     <dependency org="org.slf4j" name="jcl-over-slf4j" rev="${/org.slf4j/jcl-over-slf4j}" conf="test"/>
+    
+    <!--
+    NOTE: There are dependencies that are part of core Solr server (jackson-core, HPPC, etc.).
+    -->
 
     <exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/>
   </dependencies>

Modified: lucene/dev/branches/lucene6699/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/ClusteringComponent.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6699/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/ClusteringComponent.java?rev=1700800&r1=1700799&r2=1700800&view=diff
==============================================================================
--- lucene/dev/branches/lucene6699/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/ClusteringComponent.java (original)
+++ lucene/dev/branches/lucene6699/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/ClusteringComponent.java Wed Sep  2 13:06:13 2015
@@ -22,12 +22,13 @@ import java.util.Collections;
 import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.Map;
-import java.util.Map.Entry;
 import java.util.Set;
 
 import org.apache.commons.lang.StringUtils;
 import org.apache.solr.common.SolrDocument;
 import org.apache.solr.common.SolrDocumentList;
+import org.apache.solr.common.SolrException;
+import org.apache.solr.common.SolrException.ErrorCode;
 import org.apache.solr.common.params.CommonParams;
 import org.apache.solr.common.params.SolrParams;
 import org.apache.solr.common.util.NamedList;
@@ -107,7 +108,9 @@ public class ClusteringComponent extends
       for (Map.Entry<String,Object> entry : initParams) {
         if ("engine".equals(entry.getKey())) {
           NamedList<Object> engineInitParams = (NamedList<Object>) entry.getValue();
-          
+          Boolean optional = engineInitParams.getBooleanArg("optional");
+          optional = (optional == null ? Boolean.FALSE : optional);
+
           String engineClassName = StringUtils.defaultIfBlank( 
               (String) engineInitParams.get("classname"),
               CarrotClusteringEngine.class.getName()); 
@@ -115,6 +118,16 @@ public class ClusteringComponent extends
           // Instantiate the clustering engine and split to appropriate map. 
           final ClusteringEngine engine = loader.newInstance(engineClassName, ClusteringEngine.class);
           final String name = StringUtils.defaultIfBlank(engine.init(engineInitParams, core), "");
+
+          if (!engine.isAvailable()) {
+            if (optional) {
+              log.info("Optional clustering engine not available: " + name);
+            } else {
+              throw new SolrException(ErrorCode.SERVER_ERROR, 
+                  "A required clustering engine failed to initialize, check the logs: " + name);
+            }
+          }
+          
           final ClusteringEngine previousEntry;
           if (engine instanceof SearchClusteringEngine) {
             previousEntry = searchClusteringEngines.put(name, (SearchClusteringEngine) engine);
@@ -152,11 +165,13 @@ public class ClusteringComponent extends
     if (!params.getBool(COMPONENT_NAME, false)) {
       return;
     }
-    String name = getClusteringEngineName(rb);
+
+    final String name = getClusteringEngineName(rb);
     boolean useResults = params.getBool(ClusteringParams.USE_SEARCH_RESULTS, false);
     if (useResults == true) {
-      SearchClusteringEngine engine = getSearchClusteringEngine(rb);
+      SearchClusteringEngine engine = searchClusteringEngines.get(name);
       if (engine != null) {
+        checkAvailable(name, engine);
         DocListAndSet results = rb.getResults();
         Map<SolrDocument,Integer> docIds = Maps.newHashMapWithExpectedSize(results.docList.size());
         SolrDocumentList solrDocList = SolrPluginUtils.docListToSolrDocumentList(
@@ -164,13 +179,15 @@ public class ClusteringComponent extends
         Object clusters = engine.cluster(rb.getQuery(), solrDocList, docIds, rb.req);
         rb.rsp.add("clusters", clusters);
       } else {
-        log.warn("No engine for: " + name);
+        log.warn("No engine named: " + name);
       }
     }
+
     boolean useCollection = params.getBool(ClusteringParams.USE_COLLECTION, false);
     if (useCollection == true) {
       DocumentClusteringEngine engine = documentClusteringEngines.get(name);
       if (engine != null) {
+        checkAvailable(name, engine);
         boolean useDocSet = params.getBool(ClusteringParams.USE_DOC_SET, false);
         NamedList<?> nl = null;
 
@@ -182,15 +199,18 @@ public class ClusteringComponent extends
         }
         rb.rsp.add("clusters", nl);
       } else {
-        log.warn("No engine for " + name);
+        log.warn("No engine named: " + name);
       }
     }
   }
 
-  private SearchClusteringEngine getSearchClusteringEngine(ResponseBuilder rb){
-    return searchClusteringEngines.get(getClusteringEngineName(rb));
+  private void checkAvailable(String name, ClusteringEngine engine) {
+    if (!engine.isAvailable()) {
+      throw new SolrException(ErrorCode.SERVER_ERROR, 
+          "Clustering engine declared, but not available, check the logs: " + name);
+    }
   }
-  
+
   private String getClusteringEngineName(ResponseBuilder rb){
     return rb.req.getParams().get(ClusteringParams.ENGINE_NAME, ClusteringEngine.DEFAULT_ENGINE_NAME);
   }
@@ -204,24 +224,37 @@ public class ClusteringComponent extends
     sreq.params.remove(COMPONENT_NAME);
     if( ( sreq.purpose & ShardRequest.PURPOSE_GET_FIELDS ) != 0 ){
       String fl = sreq.params.get(CommonParams.FL,"*");
-      // if fl=* then we don't need check
-      if( fl.indexOf( '*' ) >= 0 ) return;
-      Set<String> fields = getSearchClusteringEngine(rb).getFieldsToLoad(rb.req);
-      if( fields == null || fields.size() == 0 ) return;
-      StringBuilder sb = new StringBuilder();
-      String[] flparams = fl.split( "[,\\s]+" );
-      Set<String> flParamSet = new HashSet<>(flparams.length);
-      for( String flparam : flparams ){
-        // no need trim() because of split() by \s+
-        flParamSet.add(flparam);
+      // if fl=* then we don't need to check.
+      if (fl.indexOf('*') >= 0) { 
+        return;
       }
-      for( String aFieldToLoad : fields ){
-        if( !flParamSet.contains( aFieldToLoad ) ){
-          sb.append( ',' ).append( aFieldToLoad );
+
+      String name = getClusteringEngineName(rb);
+      SearchClusteringEngine engine = searchClusteringEngines.get(name);
+      if (engine != null) {
+        checkAvailable(name, engine);
+        Set<String> fields = engine.getFieldsToLoad(rb.req);
+        if (fields == null || fields.size() == 0) { 
+          return;
         }
-      }
-      if( sb.length() > 0 ){
-        sreq.params.set( CommonParams.FL, fl + sb.toString() );
+  
+        StringBuilder sb = new StringBuilder();
+        String[] flparams = fl.split( "[,\\s]+" );
+        Set<String> flParamSet = new HashSet<>(flparams.length);
+        for (String flparam : flparams) {
+          // no need trim() because of split() by \s+
+          flParamSet.add(flparam);
+        }
+        for (String aFieldToLoad : fields) {
+          if (!flParamSet.contains(aFieldToLoad )) {
+            sb.append(',').append(aFieldToLoad);
+          }
+        }
+        if (sb.length() > 0) {
+          sreq.params.set(CommonParams.FL, fl + sb.toString());
+        }
+      } else {
+        log.warn("No engine named: " + name);
       }
     }
   }
@@ -229,13 +262,17 @@ public class ClusteringComponent extends
   @Override
   public void finishStage(ResponseBuilder rb) {
     SolrParams params = rb.req.getParams();
-    if (!params.getBool(COMPONENT_NAME, false) || !params.getBool(ClusteringParams.USE_SEARCH_RESULTS, false)) {
+    if (!params.getBool(COMPONENT_NAME, false) || 
+        !params.getBool(ClusteringParams.USE_SEARCH_RESULTS, false)) {
       return;
     }
+
     if (rb.stage == ResponseBuilder.STAGE_GET_FIELDS) {
-      SearchClusteringEngine engine = getSearchClusteringEngine(rb);
+      String name = getClusteringEngineName(rb);
+      SearchClusteringEngine engine = searchClusteringEngines.get(name);
       if (engine != null) {
-        SolrDocumentList solrDocList = (SolrDocumentList)rb.rsp.getValues().get("response");
+        checkAvailable(name, engine);
+        SolrDocumentList solrDocList = (SolrDocumentList) rb.rsp.getValues().get("response");
         // TODO: Currently, docIds is set to null in distributed environment.
         // This causes CarrotParams.PRODUCE_SUMMARY doesn't work.
         // To work CarrotParams.PRODUCE_SUMMARY under distributed mode, we can choose either one of:
@@ -247,8 +284,7 @@ public class ClusteringComponent extends
         Object clusters = engine.cluster(rb.getQuery(), solrDocList, docIds, rb.req);
         rb.rsp.add("clusters", clusters);
       } else {
-        String name = getClusteringEngineName(rb);
-        log.warn("No engine for: " + name);
+        log.warn("No engine named: " + name);
       }
     }
   }
@@ -271,16 +307,27 @@ public class ClusteringComponent extends
    */
   private static <T extends ClusteringEngine> void setupDefaultEngine(String type, LinkedHashMap<String,T> map) {
     // If there's already a default algorithm, leave it as is.
-    if (map.containsKey(ClusteringEngine.DEFAULT_ENGINE_NAME)) {
-      return;
+    String engineName = ClusteringEngine.DEFAULT_ENGINE_NAME;
+    T defaultEngine = map.get(engineName);
+
+    if (defaultEngine == null ||
+        !defaultEngine.isAvailable()) {
+      // If there's no default algorithm, and there are any algorithms available, 
+      // the first definition becomes the default algorithm.
+      for (Map.Entry<String, T> e : map.entrySet()) {
+        if (e.getValue().isAvailable()) {
+          engineName = e.getKey();
+          defaultEngine = e.getValue();
+          map.put(ClusteringEngine.DEFAULT_ENGINE_NAME, defaultEngine);
+          break;
+        }
+      }
     }
-  
-    // If there's no default algorithm, and there are any algorithms available, 
-    // the first definition becomes the default algorithm.
-    if (!map.isEmpty()) {
-      Entry<String,T> first = map.entrySet().iterator().next();
-      map.put(ClusteringEngine.DEFAULT_ENGINE_NAME, first.getValue());
-      log.info("Default engine for " + type + ": " + first.getKey());
+
+    if (defaultEngine != null) {
+      log.info("Default engine for " + type + ": " + engineName + " [" + defaultEngine.getClass().getSimpleName() + "]");
+    } else {
+      log.warn("No default engine for " + type + ".");
     }
   }
 }

Modified: lucene/dev/branches/lucene6699/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/ClusteringEngine.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6699/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/ClusteringEngine.java?rev=1700800&r1=1700799&r2=1700800&view=diff
==============================================================================
--- lucene/dev/branches/lucene6699/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/ClusteringEngine.java (original)
+++ lucene/dev/branches/lucene6699/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/ClusteringEngine.java Wed Sep  2 13:06:13 2015
@@ -22,7 +22,7 @@ import org.apache.solr.core.SolrCore;
  * A base class for {@link SearchClusteringEngine} and {@link DocumentClusteringEngine}.
  * @lucene.experimental
  */
-public class ClusteringEngine {
+public abstract class ClusteringEngine {
   public static final String ENGINE_NAME = "name";
   public static final String DEFAULT_ENGINE_NAME = "default";
 
@@ -36,4 +36,6 @@ public class ClusteringEngine {
   public String getName() {
     return name;
   }
+
+  public abstract boolean isAvailable();
 }

Modified: lucene/dev/branches/lucene6699/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/CarrotClusteringEngine.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6699/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/CarrotClusteringEngine.java?rev=1700800&r1=1700799&r2=1700800&view=diff
==============================================================================
--- lucene/dev/branches/lucene6699/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/CarrotClusteringEngine.java (original)
+++ lucene/dev/branches/lucene6699/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/CarrotClusteringEngine.java Wed Sep  2 13:06:13 2015
@@ -115,6 +115,11 @@ public class CarrotClusteringEngine exte
   private SolrCore core;
 
   @Override
+  public boolean isAvailable() {
+    return clusteringAlgorithmClass != null;
+  }
+  
+  @Override
   @SuppressWarnings("rawtypes")
   public String init(NamedList config, final SolrCore core) {
     this.core = core;
@@ -136,6 +141,17 @@ public class CarrotClusteringEngine exte
     DefaultLexicalDataFactoryDescriptor.attributeBuilder(initAttributes)
       .resourceLookup(resourceLookup);
 
+    // Make sure the requested Carrot2 clustering algorithm class is available
+    String carrotAlgorithmClassName = initParams.get(CarrotParams.ALGORITHM);
+    try {
+      this.clusteringAlgorithmClass = core.getResourceLoader().findClass(
+          carrotAlgorithmClassName, IClusteringAlgorithm.class);
+    } catch (SolrException s) {
+      if (!(s.getCause() instanceof ClassNotFoundException)) {
+        throw s;
+      } 
+    }
+
     // Load Carrot2-Workbench exported attribute XMLs based on the 'name' attribute
     // of this component. This by-name convention lookup is used to simplify configuring algorithms.
     String componentName = initParams.get(ClusteringEngine.ENGINE_NAME);
@@ -208,11 +224,6 @@ public class CarrotClusteringEngine exte
     }
     this.idFieldName = uniqueField.getName();
 
-    // Make sure the requested Carrot2 clustering algorithm class is available
-    String carrotAlgorithmClassName = initParams.get(CarrotParams.ALGORITHM);
-    this.clusteringAlgorithmClass = core.getResourceLoader().findClass(
-        carrotAlgorithmClassName, IClusteringAlgorithm.class);
-
     return result;
   }
 

Modified: lucene/dev/branches/lucene6699/solr/contrib/clustering/src/test-files/clustering/solr/collection1/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6699/solr/contrib/clustering/src/test-files/clustering/solr/collection1/conf/solrconfig.xml?rev=1700800&r1=1700799&r2=1700800&view=diff
==============================================================================
--- lucene/dev/branches/lucene6699/solr/contrib/clustering/src/test-files/clustering/solr/collection1/conf/solrconfig.xml (original)
+++ lucene/dev/branches/lucene6699/solr/contrib/clustering/src/test-files/clustering/solr/collection1/conf/solrconfig.xml Wed Sep  2 13:06:13 2015
@@ -31,17 +31,17 @@
     <useCompoundFile>${useCompoundFile:false}</useCompoundFile>
   </indexConfig>
   
-  <!--	Enables JMX if and only if an existing MBeanServer is found, use 
-  		this if you want to configure JMX through JVM parameters. Remove
-  		this to disable exposing Solr configuration and statistics to JMX.
-  		
-		If you want to connect to a particular server, specify the agentId
-		e.g. <jmx agentId="myAgent" />
-		
-		If you want to start a new MBeanServer, specify the serviceUrl
-		e.g <jmx serviceurl="service:jmx:rmi:///jndi/rmi://localhost:9999/solr" />
-		
-		For more details see http://wiki.apache.org/solr/SolrJmx
+  <!--  Enables JMX if and only if an existing MBeanServer is found, use 
+      this if you want to configure JMX through JVM parameters. Remove
+      this to disable exposing Solr configuration and statistics to JMX.
+      
+    If you want to connect to a particular server, specify the agentId
+    e.g. <jmx agentId="myAgent" />
+    
+    If you want to start a new MBeanServer, specify the serviceUrl
+    e.g <jmx serviceurl="service:jmx:rmi:///jndi/rmi://localhost:9999/solr" />
+    
+    For more details see http://wiki.apache.org/solr/SolrJmx
   -->
   <jmx />
 
@@ -390,6 +390,11 @@
 
   <searchComponent class="org.apache.solr.handler.clustering.ClusteringComponent" name="clustering-name-decl-order">
     <lst name="engine">
+      <bool name="optional">true</bool>
+      <str name="name">unavailable</str>
+      <str name="carrot.algorithm">org.carrot2.clustering.lingo.UnavailableAlgorithm</str>
+    </lst>
+    <lst name="engine">
       <str name="name">lingo</str>
       <str name="carrot.algorithm">org.carrot2.clustering.lingo.LingoClusteringAlgorithm</str>
     </lst>

Modified: lucene/dev/branches/lucene6699/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/MockDocumentClusteringEngine.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6699/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/MockDocumentClusteringEngine.java?rev=1700800&r1=1700799&r2=1700800&view=diff
==============================================================================
--- lucene/dev/branches/lucene6699/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/MockDocumentClusteringEngine.java (original)
+++ lucene/dev/branches/lucene6699/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/MockDocumentClusteringEngine.java Wed Sep  2 13:06:13 2015
@@ -34,4 +34,9 @@ public class MockDocumentClusteringEngin
   public NamedList<?> cluster(SolrParams solrParams) {
     return new NamedList<>();
   }
+  
+  @Override
+  public boolean isAvailable() {
+    return true;
+  }
 }

Modified: lucene/dev/branches/lucene6699/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/carrot2/CarrotClusteringEngineTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6699/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/carrot2/CarrotClusteringEngineTest.java?rev=1700800&r1=1700799&r2=1700800&view=diff
==============================================================================
--- lucene/dev/branches/lucene6699/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/carrot2/CarrotClusteringEngineTest.java (original)
+++ lucene/dev/branches/lucene6699/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/carrot2/CarrotClusteringEngineTest.java Wed Sep  2 13:06:13 2015
@@ -376,7 +376,7 @@ public class CarrotClusteringEngineTest
     params.add(CarrotParams.SNIPPET_FIELD_NAME, "snippet");
 
     final List<String> labels = getLabels(checkEngine(
-        getClusteringEngine("custom-duplicating-tokenizer"), 1, 16, new TermQuery(new Term("title",
+        getClusteringEngine("custom-duplicating-tokenizer"), 1, 15, new TermQuery(new Term("title",
             "field")), params).get(0));
     
     // The custom test tokenizer duplicates each token's text
@@ -414,7 +414,7 @@ public class CarrotClusteringEngineTest
     ClusteringComponent comp = (ClusteringComponent) h.getCore().getSearchComponent("clustering-name-decl-order");
     Map<String,SearchClusteringEngine> engines = getSearchClusteringEngines(comp);
     assertEquals(
-        Lists.newArrayList("lingo", "stc", "mock", "default"),
+        Lists.newArrayList("unavailable", "lingo", "stc", "mock", "default"),
         Lists.newArrayList(engines.keySet()));
     assertEquals(
         LingoClusteringAlgorithm.class,

Modified: lucene/dev/branches/lucene6699/solr/contrib/dataimporthandler-extras/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6699/solr/contrib/dataimporthandler-extras/build.xml?rev=1700800&r1=1700799&r2=1700800&view=diff
==============================================================================
--- lucene/dev/branches/lucene6699/solr/contrib/dataimporthandler-extras/build.xml (original)
+++ lucene/dev/branches/lucene6699/solr/contrib/dataimporthandler-extras/build.xml Wed Sep  2 13:06:13 2015
@@ -30,7 +30,7 @@
                          classpath.property="solr-dataimporthandler.jar"/>
 
   <target name="compile-solr-dataimporthandler" unless="solr-dataimporthandler.uptodate">
-  	<ant dir="${common-solr.dir}/contrib/dataimporthandler" target="compile-core" inheritAll="false">
+    <ant dir="${common-solr.dir}/contrib/dataimporthandler" target="compile-core" inheritAll="false">
       <propertyset refid="uptodate.and.compiled.properties"/>
     </ant>
   </target>
@@ -40,7 +40,7 @@
        we should probably fix this, the same issue exists in modules
    -->
   <target name="compile-solr-dataimporthandler-tests">
-  	<ant dir="${common-solr.dir}/contrib/dataimporthandler" target="compile-test" inheritAll="false">
+    <ant dir="${common-solr.dir}/contrib/dataimporthandler" target="compile-test" inheritAll="false">
       <propertyset refid="uptodate.and.compiled.properties"/>
     </ant>
   </target>

Modified: lucene/dev/branches/lucene6699/solr/contrib/dataimporthandler/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6699/solr/contrib/dataimporthandler/build.xml?rev=1700800&r1=1700799&r2=1700800&view=diff
==============================================================================
--- lucene/dev/branches/lucene6699/solr/contrib/dataimporthandler/build.xml (original)
+++ lucene/dev/branches/lucene6699/solr/contrib/dataimporthandler/build.xml Wed Sep  2 13:06:13 2015
@@ -18,7 +18,7 @@
  -->
 
 <project name="solr-dataimporthandler" default="default">
-	
+  
   <description>
     Data Import Handler
   </description>

Modified: lucene/dev/branches/lucene6699/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/FieldReaderDataSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6699/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/FieldReaderDataSource.java?rev=1700800&r1=1700799&r2=1700800&view=diff
==============================================================================
--- lucene/dev/branches/lucene6699/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/FieldReaderDataSource.java (original)
+++ lucene/dev/branches/lucene6699/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/FieldReaderDataSource.java Wed Sep  2 13:06:13 2015
@@ -36,7 +36,7 @@ import java.util.Properties;
  * <p>
  * &lt;datasource name="f1" type="FieldReaderDataSource" /&gt;
  * <p>
- * The enity which uses this datasource must keep the url value as the variable name url="field-name"
+ * The entity which uses this datasource must keep the url value as the variable name url="field-name"
  * <p>
  * The fieldname must be resolvable from {@link VariableResolver}
  * <p>

Modified: lucene/dev/branches/lucene6699/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/FieldStreamDataSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6699/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/FieldStreamDataSource.java?rev=1700800&r1=1700799&r2=1700800&view=diff
==============================================================================
--- lucene/dev/branches/lucene6699/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/FieldStreamDataSource.java (original)
+++ lucene/dev/branches/lucene6699/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/FieldStreamDataSource.java Wed Sep  2 13:06:13 2015
@@ -32,7 +32,7 @@ import static org.apache.solr.handler.da
 /**
  * This can be useful for users who have a DB field containing BLOBs which may be Rich documents
  * <p>
- * The datasouce may be configured as follows
+ * The datasource may be configured as follows
  * <p>
  * &lt;dataSource name="f1" type="FieldStreamDataSource" /&gt;
  * <p>

Modified: lucene/dev/branches/lucene6699/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/data-config-end-to-end.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6699/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/data-config-end-to-end.xml?rev=1700800&r1=1700799&r2=1700800&view=diff
==============================================================================
--- lucene/dev/branches/lucene6699/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/data-config-end-to-end.xml (original)
+++ lucene/dev/branches/lucene6699/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/data-config-end-to-end.xml Wed Sep  2 13:06:13 2015
@@ -25,13 +25,13 @@
         
         query="SELECT CODE, COUNTRY_NAME FROM COUNTRIES"
       >
-      	<field column="CODE" name="DO_NOT_INDEX" />
+        <field column="CODE" name="DO_NOT_INDEX" />
       </entity>
          
       <entity 
         name="Sports"
         processor="SqlEntityProcessor"
-        dataSource="hsqldb"             	
+        dataSource="hsqldb"               
         query="SELECT PERSON_ID, SPORT_NAME FROM PEOPLE_SPORTS WHERE PERSON_ID=${People.ID}"
       />
 

Modified: lucene/dev/branches/lucene6699/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/data-config-with-datasource.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6699/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/data-config-with-datasource.xml?rev=1700800&r1=1700799&r2=1700800&view=diff
==============================================================================
--- lucene/dev/branches/lucene6699/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/data-config-with-datasource.xml (original)
+++ lucene/dev/branches/lucene6699/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/data-config-with-datasource.xml Wed Sep  2 13:06:13 2015
@@ -1,9 +1,9 @@
 <dataConfig>
-	<dataSource type="MockDataSource" />
-	<document>
-		<entity name="x" query="select * from x">
-			<field column="id" />
-			<field column="desc" />
-		</entity>
-	</document>
+  <dataSource type="MockDataSource" />
+  <document>
+    <entity name="x" query="select * from x">
+      <field column="id" />
+      <field column="desc" />
+    </entity>
+  </document>
 </dataConfig>

Modified: lucene/dev/branches/lucene6699/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/data-config-with-transformer.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6699/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/data-config-with-transformer.xml?rev=1700800&r1=1700799&r2=1700800&view=diff
==============================================================================
--- lucene/dev/branches/lucene6699/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/data-config-with-transformer.xml (original)
+++ lucene/dev/branches/lucene6699/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/data-config-with-transformer.xml Wed Sep  2 13:06:13 2015
@@ -1,10 +1,10 @@
 <dataConfig>
-	<dataSource  type="MockDataSource" />
-	<dataSource name="mockDs" type="TestDocBuilder2$MockDataSource2" />
-	<document>
-		<entity name="x" query="select * from x" transformer="TestDocBuilder2$MockTransformer">
-			<field column="id" />
-			<field column="desc" />
-		</entity>
-	</document>
+  <dataSource  type="MockDataSource" />
+  <dataSource name="mockDs" type="TestDocBuilder2$MockDataSource2" />
+  <document>
+    <entity name="x" query="select * from x" transformer="TestDocBuilder2$MockTransformer">
+      <field column="id" />
+      <field column="desc" />
+    </entity>
+  </document>
 </dataConfig>

Modified: lucene/dev/branches/lucene6699/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/dataimport-solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6699/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/dataimport-solrconfig.xml?rev=1700800&r1=1700799&r2=1700800&view=diff
==============================================================================
--- lucene/dev/branches/lucene6699/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/dataimport-solrconfig.xml (original)
+++ lucene/dev/branches/lucene6699/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/dataimport-solrconfig.xml Wed Sep  2 13:06:13 2015
@@ -240,7 +240,7 @@
   </requestHandler>
   
   <requestHandler name="/dataimport" class="org.apache.solr.handler.dataimport.DataImportHandler">
-  	<lst name="defaults">
+    <lst name="defaults">
       <str name="dots.in.hsqldb.driver">org.hsqldb.jdbcDriver</str>
     </lst>
   </requestHandler>

Modified: lucene/dev/branches/lucene6699/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/single-entity-data-config.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6699/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/single-entity-data-config.xml?rev=1700800&r1=1700799&r2=1700800&view=diff
==============================================================================
--- lucene/dev/branches/lucene6699/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/single-entity-data-config.xml (original)
+++ lucene/dev/branches/lucene6699/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/single-entity-data-config.xml Wed Sep  2 13:06:13 2015
@@ -1,9 +1,9 @@
 <dataConfig>
   <dataSource type="MockDataSource"/>
-	<document>
-		<entity name="x" query="select * from x">
-			<field column="id" />
-			<field column="desc" />
-		</entity>
-	</document>
+  <document>
+    <entity name="x" query="select * from x">
+      <field column="id" />
+      <field column="desc" />
+    </entity>
+  </document>
 </dataConfig>

Modified: lucene/dev/branches/lucene6699/solr/contrib/extraction/src/test-files/extraction/solr/collection1/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6699/solr/contrib/extraction/src/test-files/extraction/solr/collection1/conf/solrconfig.xml?rev=1700800&r1=1700799&r2=1700800&view=diff
==============================================================================
--- lucene/dev/branches/lucene6699/solr/contrib/extraction/src/test-files/extraction/solr/collection1/conf/solrconfig.xml (original)
+++ lucene/dev/branches/lucene6699/solr/contrib/extraction/src/test-files/extraction/solr/collection1/conf/solrconfig.xml Wed Sep  2 13:06:13 2015
@@ -159,7 +159,7 @@
      is not specified in the request.
   -->
   <requestHandler name="standard" class="solr.StandardRequestHandler">
-  	<bool name="httpCaching">true</bool>
+    <bool name="httpCaching">true</bool>
   </requestHandler>
   <requestHandler name="dismax" class="solr.SearchHandler" >
     <lst name="defaults">

Modified: lucene/dev/branches/lucene6699/solr/contrib/langid/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6699/solr/contrib/langid/build.xml?rev=1700800&r1=1700799&r2=1700800&view=diff
==============================================================================
--- lucene/dev/branches/lucene6699/solr/contrib/langid/build.xml (original)
+++ lucene/dev/branches/lucene6699/solr/contrib/langid/build.xml Wed Sep  2 13:06:13 2015
@@ -23,9 +23,9 @@
     Language Identifier contrib for extracting language from a document being indexed
   </description>
 
-	<import file="../contrib-build.xml"/>
+  <import file="../contrib-build.xml"/>
 
-	<path id="classpath">
+  <path id="classpath">
     <fileset dir="../extraction/lib" excludes="${common.classpath.excludes}"/>
     <fileset dir="lib" excludes="${common.classpath.excludes}"/>
     <path refid="solr.base.classpath"/>   



Mime
View raw message