lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From uschind...@apache.org
Subject svn commit: r1390246 - in /lucene/dev/branches/lucene_solr_4_0: ./ solr/ solr/build.xml
Date Wed, 26 Sep 2012 01:03:13 GMT
Author: uschindler
Date: Wed Sep 26 01:03:12 2012
New Revision: 1390246

URL: http://svn.apache.org/viewvc?rev=1390246&view=rev
Log:
Merged revision(s) 1390245 from lucene/dev/branches/branch_4x:
Remove useless task, as we have no analyzer factories anymore in Solr.

Modified:
    lucene/dev/branches/lucene_solr_4_0/   (props changed)
    lucene/dev/branches/lucene_solr_4_0/solr/   (props changed)
    lucene/dev/branches/lucene_solr_4_0/solr/build.xml   (contents, props changed)

Modified: lucene/dev/branches/lucene_solr_4_0/solr/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_0/solr/build.xml?rev=1390246&r1=1390245&r2=1390246&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_0/solr/build.xml (original)
+++ lucene/dev/branches/lucene_solr_4_0/solr/build.xml Wed Sep 26 01:03:12 2012
@@ -566,99 +566,7 @@
   <!-- ========================================================================= -->
   <!-- ========================= COMMITTERS' HELPERS =========================== -->
   <!-- ========================================================================= -->
- 
-  <target name="stub-factories" depends="dist-core,lucene-jars-to-solr"
-          description="Generates stub factories as needed">
- 
-    <path id="stub.jars">
-      <!-- this needs to be a list of all jars that might contain
-            classes we want to build factories for
-         -->
-      <fileset dir="${lucene-libs}">
-        <include name="*.jar"/>
-      </fileset>
-      <fileset dir="${dist}">
-        <include name="*.jar"/>
-        <exclude name="*solrj*.jar"/>
-      </fileset>
-    </path>
-    <pathconvert property="jar.list" pathsep=" " refid="stub.jars" />
-    <path id="missing.factories.classpath">
-      <pathelement path="${common.dir}/contrib/queries/lib/jakarta-regexp-1.4.jar"/>
-      <path refid="test.classpath"/>
-    </path>
-    <property name="stub.list" value="${dest}/need-stub-factories.txt" />
-    <java fork="false"
-          classname="org.apache.solr.util.SuggestMissingFactories"
-          logError="true"
-          failonerror="true"
-          classpathref="missing.factories.classpath"
-          output="${stub.list}">
-      <arg line="${jar.list}" />
-    </java>
-    <fail unless="stub.src.path">...
- 
-      This task requires that the property 'stub.src.path' be set.
- 
-      It must contain a "path" listing directories containing source
-      files that this task should use when looking for classes that
-      need factories created, the format is platform specific --
-      typically it is  colon seperated in Unix, semi-colon seperated
-      on windows, ie:
- 
-      ant stub-factories -Dstub.src.path="core/src:../lucene/contrib:../lucene/core/src/java:../lucene/analysis"
- 
-      FYI: The file ${stub.list} contains a list of classes
-      that seem to need stub factories. (if java files can be found to
-      use as guides for creating them).
-    </fail>
- 
-    <pathconvert pathsep=" " property="stub.src.dirs">
-      <path>
-        <pathelement path="${stub.src.path}"/>
-      </path>
-    </pathconvert>
-    <exec executable="perl"
-          dir="core/src/java/org/apache/solr/analysis/"
-          failonerror="true">
-      <arg value="${common-solr.dir}/dev-tools/stub-analysis-factory-maker.pl"/>
-      <redirector input="${stub.list}">
-        <!-- place to put special case classes we want to ignore -->
-        <inputfilterchain>
-          <linecontainsregexp negate="true">
-            <!-- only for internal Solr highlighting purposes -->
-            <regexp pattern="TokenOrderingFilter"/>
-          </linecontainsregexp>
-          <linecontainsregexp negate="true">
-            <!-- no way to leverage this in Solr -->
-            <regexp pattern="CachingTokenFilter"/>
-          </linecontainsregexp>
-          <linecontainsregexp negate="true">
-            <!-- no way to leverage this in Solr -->
-            <regexp pattern="HyphenationCompoundWordTokenFilter"/>
-          </linecontainsregexp>
-          <linecontainsregexp negate="true">
-            <!-- no way to leverage these in Solr (yet) -->
-            <regexp pattern="Sink|Tee"/>
-          </linecontainsregexp>
-          <linecontainsregexp negate="true">
-            <!-- Solr already has a different impl for this -->
-            <regexp pattern="SynonymTokenFilter"/>
-          </linecontainsregexp>
-          <linecontainsregexp negate="true">
-            <!-- solr and lucene both have one? ? ? ? -->
-            <regexp pattern="LengthFilter"/>
-          </linecontainsregexp>
-          <linecontainsregexp negate="true">
-            <!-- solr provides it's own SnowballPorterFilter variant -->
-            <regexp pattern="SnowballFilter"/>
-          </linecontainsregexp>
-        </inputfilterchain>
-      </redirector>
-      <arg line="${stub.src.dirs}"/>
-    </exec>
-  </target>
- 
+  
   <property name="analysis-common.res.dir"  value="../lucene/analysis/common/src/resources/org/apache/lucene/analysis"/>
   <property name="analysis-kuromoji.res.dir"  value="../lucene/analysis/kuromoji/src/resources/org/apache/lucene/analysis"/>
   <property name="analysis.conf.dest" value="${example}/solr/conf/lang"/>



Mime
View raw message