You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2014/09/24 18:12:05 UTC
svn commit: r1627355 - in /lucene/dev/branches/branch_5x: ./ lucene/
lucene/build.xml lucene/site/ lucene/site/xsl/index.xsl
Author: uschindler
Date: Wed Sep 24 16:12:05 2014
New Revision: 1627355
URL: http://svn.apache.org/r1627355
Log:
Merged revision(s) 1627353 from lucene/dev/trunk:
Fix encoding issue with source file, remove groovy script and do the defaultCodec transformation natively in ANT, hack lowercasing in XSL
Modified:
lucene/dev/branches/branch_5x/ (props changed)
lucene/dev/branches/branch_5x/lucene/ (props changed)
lucene/dev/branches/branch_5x/lucene/build.xml (contents, props changed)
lucene/dev/branches/branch_5x/lucene/site/ (props changed)
lucene/dev/branches/branch_5x/lucene/site/xsl/index.xsl
Modified: lucene/dev/branches/branch_5x/lucene/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/build.xml?rev=1627355&r1=1627354&r2=1627355&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/build.xml (original)
+++ lucene/dev/branches/branch_5x/lucene/build.xml Wed Sep 24 16:12:05 2014
@@ -198,16 +198,10 @@
<fileset dir="." includes="**/build.xml" excludes="build.xml,analysis/*,build/**,tools/**,site/**"/>
</makeurl>
<property name="Codec.java" location="core/src/java/org/apache/lucene/codecs/Codec.java"/>
- <loadfile srcfile="${Codec.java}" property="defaultCodecPackage">
+ <loadfile srcfile="${Codec.java}" property="defaultCodec" encoding="UTF-8">
<filterchain>
- <tokenfilter>
- <filetokenizer/>
- <scriptfilter language="groovy" classpathref="groovy.classpath"><![CDATA[
- // private static Codec defaultCodec = Codec . forName ( "LuceneXXX" ) ;
- def defaultCodecMatcher = self.getToken() =~ /defaultCodec\s*=\s*Codec\s*\.\s*forName\s*\(\s*"([^"]+)"\s*\)\s*;/
- self.setToken(defaultCodecMatcher[0][1].toLowerCase(Locale.ROOT));
- ]]></scriptfilter>
- </tokenfilter>
+ <!-- private static Codec defaultCodec = Codec . forName ( "LuceneXXX" ) ; -->
+ <containsregex pattern="^.*defaultCodec\s*=\s*Codec\s*\.\s*forName\s*\(\s*"([^"]+)"\s*\)\s*;.*$" replace="\1"/>
</filterchain>
</loadfile>
@@ -223,7 +217,7 @@
<outputproperty name="indent" value="yes"/>
<param name="buildfiles" expression="${process-webpages.buildfiles}"/>
<param name="version" expression="${version}"/>
- <param name="defaultCodecPackage" expression="${defaultCodecPackage}"/>
+ <param name="defaultCodec" expression="${defaultCodec}"/>
</xslt>
<pegdown todir="${javadoc.dir}">
@@ -232,7 +226,7 @@
</pegdown>
<copy todir="${javadoc.dir}">
- <fileset dir="site/html" includes="**/*"/>
+ <fileset dir="site/html"/>
</copy>
</target>
Modified: lucene/dev/branches/branch_5x/lucene/site/xsl/index.xsl
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/site/xsl/index.xsl?rev=1627355&r1=1627354&r2=1627355&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/site/xsl/index.xsl (original)
+++ lucene/dev/branches/branch_5x/lucene/site/xsl/index.xsl Wed Sep 24 16:12:05 2014
@@ -22,7 +22,10 @@
>
<xsl:param name="buildfiles"/>
<xsl:param name="version"/>
- <xsl:param name="defaultCodecPackage"/>
+ <xsl:param name="defaultCodec"/>
+
+ <!-- ANT cannot lowercase a property, so we hack this here: -->
+ <xsl:variable name="defaultCodecPackage" select="translate($defaultCodec,'ABCDEFGHIJKLMNOPQRSTUVWXYZ','abcdefghijklmnopqrstuvwxyz')"/>
<!--
NOTE: This template matches the root element of any given input XML document!
Re: svn commit: r1627355 - in /lucene/dev/branches/branch_5x: ./
lucene/ lucene/build.xml lucene/site/ lucene/site/xsl/index.xsl
Posted by Ryan Ernst <ry...@iernst.net>.
This change somehow caused a newline in the middle of the latest codec
link, which broke checkJavadocLinks.py. I don't know how to fix the xsl,
but html allows whitespace in the middle of links and browsers just remove
it (tested), so I fixed checkJavadocLinks.py to remove inner whitespace.
On Wed, Sep 24, 2014 at 9:12 AM, <us...@apache.org> wrote:
> Author: uschindler
> Date: Wed Sep 24 16:12:05 2014
> New Revision: 1627355
>
> URL: http://svn.apache.org/r1627355
> Log:
> Merged revision(s) 1627353 from lucene/dev/trunk:
> Fix encoding issue with source file, remove groovy script and do the
> defaultCodec transformation natively in ANT, hack lowercasing in XSL
>
> Modified:
> lucene/dev/branches/branch_5x/ (props changed)
> lucene/dev/branches/branch_5x/lucene/ (props changed)
> lucene/dev/branches/branch_5x/lucene/build.xml (contents, props
> changed)
> lucene/dev/branches/branch_5x/lucene/site/ (props changed)
> lucene/dev/branches/branch_5x/lucene/site/xsl/index.xsl
>
> Modified: lucene/dev/branches/branch_5x/lucene/build.xml
> URL:
> http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/build.xml?rev=1627355&r1=1627354&r2=1627355&view=diff
>
> ==============================================================================
> --- lucene/dev/branches/branch_5x/lucene/build.xml (original)
> +++ lucene/dev/branches/branch_5x/lucene/build.xml Wed Sep 24 16:12:05 2014
> @@ -198,16 +198,10 @@
> <fileset dir="." includes="**/build.xml"
> excludes="build.xml,analysis/*,build/**,tools/**,site/**"/>
> </makeurl>
> <property name="Codec.java"
> location="core/src/java/org/apache/lucene/codecs/Codec.java"/>
> - <loadfile srcfile="${Codec.java}" property="defaultCodecPackage">
> + <loadfile srcfile="${Codec.java}" property="defaultCodec"
> encoding="UTF-8">
> <filterchain>
> - <tokenfilter>
> - <filetokenizer/>
> - <scriptfilter language="groovy"
> classpathref="groovy.classpath"><![CDATA[
> - // private static Codec defaultCodec =
> Codec . forName ( "LuceneXXX" ) ;
> - def defaultCodecMatcher = self.getToken() =~
> /defaultCodec\s*=\s*Codec\s*\.\s*forName\s*\(\s*"([^"]+)"\s*\)\s*;/
> -
> self.setToken(defaultCodecMatcher[0][1].toLowerCase(Locale.ROOT));
> - ]]></scriptfilter>
> - </tokenfilter>
> + <!-- private static Codec defaultCodec = Codec .
> forName ( "LuceneXXX" ) ; -->
> + <containsregex
> pattern="^.*defaultCodec\s*=\s*Codec\s*\.\s*forName\s*\(\s*"([^"]+)"\s*\)\s*;.*$"
> replace="\1"/>
> </filterchain>
> </loadfile>
>
> @@ -223,7 +217,7 @@
> <outputproperty name="indent" value="yes"/>
> <param name="buildfiles"
> expression="${process-webpages.buildfiles}"/>
> <param name="version" expression="${version}"/>
> - <param name="defaultCodecPackage"
> expression="${defaultCodecPackage}"/>
> + <param name="defaultCodec" expression="${defaultCodec}"/>
> </xslt>
>
> <pegdown todir="${javadoc.dir}">
> @@ -232,7 +226,7 @@
> </pegdown>
>
> <copy todir="${javadoc.dir}">
> - <fileset dir="site/html" includes="**/*"/>
> + <fileset dir="site/html"/>
> </copy>
> </target>
>
>
> Modified: lucene/dev/branches/branch_5x/lucene/site/xsl/index.xsl
> URL:
> http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/site/xsl/index.xsl?rev=1627355&r1=1627354&r2=1627355&view=diff
>
> ==============================================================================
> --- lucene/dev/branches/branch_5x/lucene/site/xsl/index.xsl (original)
> +++ lucene/dev/branches/branch_5x/lucene/site/xsl/index.xsl Wed Sep 24
> 16:12:05 2014
> @@ -22,7 +22,10 @@
> >
> <xsl:param name="buildfiles"/>
> <xsl:param name="version"/>
> - <xsl:param name="defaultCodecPackage"/>
> + <xsl:param name="defaultCodec"/>
> +
> + <!-- ANT cannot lowercase a property, so we hack this here: -->
> + <xsl:variable name="defaultCodecPackage"
> select="translate($defaultCodec,'ABCDEFGHIJKLMNOPQRSTUVWXYZ','abcdefghijklmnopqrstuvwxyz')"/>
>
> <!--
> NOTE: This template matches the root element of any given input XML
> document!
>
>
>