You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@lucene.apache.org by Uwe Schindler <uw...@thetaphi.de> on 2009/11/25 19:05:54 UTC
RE: svn commit: r884216 - in /lucene/java/branches/flex_1458: ./ contrib/ contrib/highlighter/src/test/ src/java/org/apache/lucene/analysis/ src/java/org/apache/lucene/util/ src/test/org/apache/lucene/analysis/ src/test/org/apache/lucene/document/ src/tes
Hallo Mark,
I merged this one revision from trunk to flex, to make the updated backwards
branch pass again (I merged all changes since start of 3.0 branch to trunk
and flex BW branch, to be in sync to the 3.0 release. If you want to merge
the rest of the changes, do not wonder.
I am now finished with heavy committing!
Uwe
-----
Uwe Schindler
H.-H.-Meier-Allee 63, D-28213 Bremen
http://www.thetaphi.de
eMail: uwe@thetaphi.de
> -----Original Message-----
> From: uschindler@apache.org [mailto:uschindler@apache.org]
> Sent: Wednesday, November 25, 2009 6:44 PM
> To: java-commits@lucene.apache.org
> Subject: svn commit: r884216 - in /lucene/java/branches/flex_1458: ./
> contrib/ contrib/highlighter/src/test/
> src/java/org/apache/lucene/analysis/ src/java/org/apache/lucene/util/
> src/test/org/apache/lucene/analysis/ src/test/org/apache/lucene/document/
> src/test...
>
> Author: uschindler
> Date: Wed Nov 25 17:43:55 2009
> New Revision: 884216
>
> URL: http://svn.apache.org/viewvc?rev=884216&view=rev
> Log:
> Merge this also to flex to make new BW tests pass
>
> Modified:
> lucene/java/branches/flex_1458/ (props changed)
> lucene/java/branches/flex_1458/CHANGES.txt
> lucene/java/branches/flex_1458/contrib/ (props changed)
> lucene/java/branches/flex_1458/contrib/CHANGES.txt (props changed)
> lucene/java/branches/flex_1458/contrib/highlighter/src/test/ (props
> changed)
>
> lucene/java/branches/flex_1458/src/java/org/apache/lucene/analysis/package
> .html
>
> lucene/java/branches/flex_1458/src/java/org/apache/lucene/util/AttributeSo
> urce.java
>
> lucene/java/branches/flex_1458/src/test/org/apache/lucene/analysis/TestISO
> Latin1AccentFilter.java (props changed)
>
> lucene/java/branches/flex_1458/src/test/org/apache/lucene/document/TestDat
> eTools.java (props changed)
>
> lucene/java/branches/flex_1458/src/test/org/apache/lucene/document/TestNum
> berTools.java (props changed)
>
> lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/TestBackwa
> rdsCompatibility.java (props changed)
>
> lucene/java/branches/flex_1458/src/test/org/apache/lucene/util/TestAttribu
> teSource.java
>
> Propchange: lucene/java/branches/flex_1458/
> --------------------------------------------------------------------------
> ----
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Wed Nov 25 17:43:55 2009
> @@ -2,4 +2,4 @@
> /lucene/java/branches/lucene_2_9:817269-818600,829134,829881,831036
> /lucene/java/branches/lucene_2_9_back_compat_tests:818601-821336
> /lucene/java/branches/lucene_3_0:880793
> -/lucene/java/trunk:824912-825292,827043-833960,880727-882265
> +/lucene/java/trunk:824912-825292,827043-833960,880727-882265,883074
>
> Modified: lucene/java/branches/flex_1458/CHANGES.txt
> URL:
> http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/CHANGES.txt?re
> v=884216&r1=884215&r2=884216&view=diff
> ==========================================================================
> ====
> --- lucene/java/branches/flex_1458/CHANGES.txt (original)
> +++ lucene/java/branches/flex_1458/CHANGES.txt Wed Nov 25 17:43:55 2009
> @@ -151,6 +151,9 @@
> * LUCENE-2013: SpanRegexQuery does not work with QueryScorer.
> (Benjamin Keil via Mark Miller)
>
> +* LUCENE-2088: addAttribute() should only accept interfaces that
> + extend Attribute. (Shai Erera, Uwe Schindler)
> +
> New features
>
> * LUCENE-1933: Provide a convenience AttributeFactory that creates a
>
> Propchange: lucene/java/branches/flex_1458/contrib/
> --------------------------------------------------------------------------
> ----
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Wed Nov 25 17:43:55 2009
> @@ -2,4 +2,4 @@
> /lucene/java/branches/lucene_2_9/contrib:817269-
> 818600,825998,829134,829816,829881,831036
> /lucene/java/branches/lucene_2_9_back_compat_tests/contrib:818601-821336
> /lucene/java/branches/lucene_3_0/contrib:880793
> -/lucene/java/trunk/contrib:824912-825292,827043-833960,880727-882265
> +/lucene/java/trunk/contrib:824912-825292,827043-833960,880727-
> 882265,883074
>
> Propchange: lucene/java/branches/flex_1458/contrib/CHANGES.txt
> --------------------------------------------------------------------------
> ----
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Wed Nov 25 17:43:55 2009
> @@ -2,4 +2,4 @@
> /lucene/java/branches/lucene_2_9/contrib/CHANGES.txt:817269-
> 818600,825998,826775,829134,829816,829881,831036
>
> /lucene/java/branches/lucene_2_9_back_compat_tests/contrib/CHANGES.txt:818
> 601-821336
> /lucene/java/branches/lucene_3_0/contrib/CHANGES.txt:880793
> -/lucene/java/trunk/contrib/CHANGES.txt:829439-833960,880727-882265
> +/lucene/java/trunk/contrib/CHANGES.txt:829439-833960,880727-882265,883074
>
> Propchange: lucene/java/branches/flex_1458/contrib/highlighter/src/test/
> --------------------------------------------------------------------------
> ----
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Wed Nov 25 17:43:55 2009
> @@ -2,4 +2,4 @@
> /lucene/java/branches/lucene_2_9/contrib/highlighter/src/test:817269-
> 818600,825998,826775,829134,829816,829881,831036
>
> /lucene/java/branches/lucene_2_9_back_compat_tests/contrib/highlighter/src
> /test:818601-821336
> /lucene/java/branches/lucene_3_0/contrib/highlighter/src/test:880793
> -/lucene/java/trunk/contrib/highlighter/src/test:829439-833960,880727-
> 882265
> +/lucene/java/trunk/contrib/highlighter/src/test:829439-833960,880727-
> 882265,883074
>
> Modified:
> lucene/java/branches/flex_1458/src/java/org/apache/lucene/analysis/package
> .html
> URL:
> http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/java/org/a
> pache/lucene/analysis/package.html?rev=884216&r1=884215&r2=884216&view=dif
> f
> ==========================================================================
> ====
> ---
> lucene/java/branches/flex_1458/src/java/org/apache/lucene/analysis/package
> .html (original)
> +++
> lucene/java/branches/flex_1458/src/java/org/apache/lucene/analysis/package
> .html Wed Nov 25 17:43:55 2009
> @@ -140,7 +140,6 @@
> TokenStream ts = analyzer.tokenStream("myfield",new
> StringReader("some text goes here"));
> while (ts.incrementToken()) {
> System.out.println("token: "+ts));
> - t = ts.next();
> }
> </PRE>
> </p>
>
> Modified:
> lucene/java/branches/flex_1458/src/java/org/apache/lucene/util/AttributeSo
> urce.java
> URL:
> http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/java/org/a
> pache/lucene/util/AttributeSource.java?rev=884216&r1=884215&r2=884216&view
> =diff
> ==========================================================================
> ====
> ---
> lucene/java/branches/flex_1458/src/java/org/apache/lucene/util/AttributeSo
> urce.java (original)
> +++
> lucene/java/branches/flex_1458/src/java/org/apache/lucene/util/AttributeSo
> urce.java Wed Nov 25 17:43:55 2009
> @@ -224,6 +224,12 @@
> public <A extends Attribute> A addAttribute(Class<A> attClass) {
> AttributeImpl attImpl = attributes.get(attClass);
> if (attImpl == null) {
> + if (!(attClass.isInterface() &&
> Attribute.class.isAssignableFrom(attClass))) {
> + throw new IllegalArgumentException(
> + "addAttribute() only accepts an interface that extends
> Attribute, but " +
> + attClass.getName() + " does not fulfil this contract."
> + );
> + }
> addAttributeImpl(attImpl =
> this.factory.createAttributeInstance(attClass));
> }
> return attClass.cast(attImpl);
>
> Propchange:
> lucene/java/branches/flex_1458/src/test/org/apache/lucene/analysis/TestISO
> Latin1AccentFilter.java
> --------------------------------------------------------------------------
> ----
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Wed Nov 25 17:43:55 2009
> @@ -1,4 +1,4 @@
>
> /lucene/java/branches/lucene_2_4/src/test/org/apache/lucene/analysis/TestI
> SOLatin1AccentFilter.java:748824
>
> /lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/analysis/TestI
> SOLatin1AccentFilter.java:829134,829881,831036
>
> /lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/analysis/TestI
> SOLatin1AccentFilter.java:880793
> -
> /lucene/java/trunk/src/test/org/apache/lucene/analysis/TestISOLatin1Accent
> Filter.java:824912-825292,826213-833960,880727-882265
> +/lucene/java/trunk/src/test/org/apache/lucene/analysis/TestISOLatin1Accen
> tFilter.java:824912-825292,826213-833960,880727-882265,883074
>
> Propchange:
> lucene/java/branches/flex_1458/src/test/org/apache/lucene/document/TestDat
> eTools.java
> --------------------------------------------------------------------------
> ----
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Wed Nov 25 17:43:55 2009
> @@ -1,4 +1,4 @@
>
> /lucene/java/branches/lucene_2_4/src/test/org/apache/lucene/document/TestD
> ateTools.java:748824
>
> /lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/document/TestD
> ateTools.java:829134,829881,831036
>
> /lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/document/TestD
> ateTools.java:880793
> -
> /lucene/java/trunk/src/test/org/apache/lucene/document/TestDateTools.java:
> 824912-825292,826213-833960,880727-882265
> +/lucene/java/trunk/src/test/org/apache/lucene/document/TestDateTools.java
> :824912-825292,826213-833960,880727-882265,883074
>
> Propchange:
> lucene/java/branches/flex_1458/src/test/org/apache/lucene/document/TestNum
> berTools.java
> --------------------------------------------------------------------------
> ----
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Wed Nov 25 17:43:55 2009
> @@ -1,4 +1,4 @@
>
> /lucene/java/branches/lucene_2_4/src/test/org/apache/lucene/document/TestN
> umberTools.java:748824
>
> /lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/document/TestN
> umberTools.java:829134,829881,831036
>
> /lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/document/TestN
> umberTools.java:880793
> -
> /lucene/java/trunk/src/test/org/apache/lucene/document/TestNumberTools.jav
> a:824912-825292,826213-833960,880727-882265
> +/lucene/java/trunk/src/test/org/apache/lucene/document/TestNumberTools.ja
> va:824912-825292,826213-833960,880727-882265,883074
>
> Propchange:
> lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/TestBackwa
> rdsCompatibility.java
> --------------------------------------------------------------------------
> ----
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Wed Nov 25 17:43:55 2009
> @@ -1,4 +1,4 @@
>
> /lucene/java/branches/lucene_2_4/src/test/org/apache/lucene/index/TestBack
> wardsCompatibility.java:748824
>
> /lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/index/TestBack
> wardsCompatibility.java:829134,829881,831036
>
> /lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/index/TestBack
> wardsCompatibility.java:880793
> -
> /lucene/java/trunk/src/test/org/apache/lucene/index/TestBackwardsCompatibi
> lity.java:824912-825292,826213-833960,880727-882265
> +/lucene/java/trunk/src/test/org/apache/lucene/index/TestBackwardsCompatib
> ility.java:824912-825292,826213-833960,880727-882265,883074
>
> Modified:
> lucene/java/branches/flex_1458/src/test/org/apache/lucene/util/TestAttribu
> teSource.java
> URL:
> http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/test/org/a
> pache/lucene/util/TestAttributeSource.java?rev=884216&r1=884215&r2=884216&
> view=diff
> ==========================================================================
> ====
> ---
> lucene/java/branches/flex_1458/src/test/org/apache/lucene/util/TestAttribu
> teSource.java (original)
> +++
> lucene/java/branches/flex_1458/src/test/org/apache/lucene/util/TestAttribu
> teSource.java Wed Nov 25 17:43:55 2009
> @@ -141,4 +141,18 @@
> assertTrue("TypeAttribute is not implemented by TypeAttributeImpl",
> src.addAttribute(TypeAttribute.class) instanceof
> TypeAttributeImpl);
> }
> +
> + public void testInvalidArguments() throws Exception {
> + try {
> + AttributeSource src = new AttributeSource();
> + src.addAttribute(Token.class);
> + fail("Should throw IllegalArgumentException");
> + } catch (IllegalArgumentException iae) {}
> +
> + try {
> + AttributeSource src = new
> AttributeSource(Token.TOKEN_ATTRIBUTE_FACTORY);
> + src.addAttribute(Token.class);
> + fail("Should throw IllegalArgumentException");
> + } catch (IllegalArgumentException iae) {}
> + }
> }
>
---------------------------------------------------------------------
To unsubscribe, e-mail: java-dev-unsubscribe@lucene.apache.org
For additional commands, e-mail: java-dev-help@lucene.apache.org