You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by bv...@apache.org on 2012/08/16 15:04:01 UTC
svn commit: r1373815 - in /camel/trunk:
components/camel-lucene/src/main/java/org/apache/camel/component/lucene/
components/camel-lucene/src/test/java/org/apache/camel/component/lucene/
components/camel-lucene/src/test/java/org/apache/camel/processor/l...
Author: bvahdat
Date: Thu Aug 16 13:04:00 2012
New Revision: 1373815
URL: http://svn.apache.org/viewvc?rev=1373815&view=rev
Log:
Update to Lucene 3.6.1
Modified:
camel/trunk/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneConfiguration.java
camel/trunk/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneIndexer.java
camel/trunk/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneSearcher.java
camel/trunk/components/camel-lucene/src/test/java/org/apache/camel/component/lucene/LuceneIndexAndQueryProducerTest.java
camel/trunk/components/camel-lucene/src/test/java/org/apache/camel/processor/lucene/LuceneQueryProcessorTest.java
camel/trunk/parent/pom.xml
Modified: camel/trunk/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneConfiguration.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneConfiguration.java?rev=1373815&r1=1373814&r2=1373815&view=diff
==============================================================================
--- camel/trunk/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneConfiguration.java (original)
+++ camel/trunk/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneConfiguration.java Thu Aug 16 13:04:00 2012
@@ -35,7 +35,7 @@ public class LuceneConfiguration {
private File indexDirectory;
private Analyzer analyzer;
private int maxHits;
- private Version luceneVersion = Version.LUCENE_35;
+ private Version luceneVersion = Version.LUCENE_36;
public LuceneConfiguration() {
}
Modified: camel/trunk/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneIndexer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneIndexer.java?rev=1373815&r1=1373814&r2=1373815&view=diff
==============================================================================
--- camel/trunk/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneIndexer.java (original)
+++ camel/trunk/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneIndexer.java Thu Aug 16 13:04:00 2012
@@ -145,12 +145,12 @@ public class LuceneIndexer {
private void openIndexWriter() throws IOException {
IndexWriterConfig indexWriterConfig;
if (!indexCreated) {
- indexWriterConfig = new IndexWriterConfig(Version.LUCENE_35, getAnalyzer()).setOpenMode(OpenMode.CREATE);
+ indexWriterConfig = new IndexWriterConfig(Version.LUCENE_36, getAnalyzer()).setOpenMode(OpenMode.CREATE);
indexWriter = new IndexWriter(niofsDirectory, indexWriterConfig);
indexCreated = true;
return;
}
- indexWriterConfig = new IndexWriterConfig(Version.LUCENE_35, getAnalyzer()).setOpenMode(OpenMode.APPEND);
+ indexWriterConfig = new IndexWriterConfig(Version.LUCENE_36, getAnalyzer()).setOpenMode(OpenMode.APPEND);
indexWriter = new IndexWriter(niofsDirectory, indexWriterConfig);
}
Modified: camel/trunk/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneSearcher.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneSearcher.java?rev=1373815&r1=1373814&r2=1373815&view=diff
==============================================================================
--- camel/trunk/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneSearcher.java (original)
+++ camel/trunk/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneSearcher.java Thu Aug 16 13:04:00 2012
@@ -55,7 +55,7 @@ public class LuceneSearcher {
}
public Hits search(String searchPhrase, int maxNumberOfHits) throws Exception {
- return search(searchPhrase, maxNumberOfHits, Version.LUCENE_35);
+ return search(searchPhrase, maxNumberOfHits, Version.LUCENE_36);
}
public Hits search(String searchPhrase, int maxNumberOfHits, Version luenceVersion) throws Exception {
Modified: camel/trunk/components/camel-lucene/src/test/java/org/apache/camel/component/lucene/LuceneIndexAndQueryProducerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-lucene/src/test/java/org/apache/camel/component/lucene/LuceneIndexAndQueryProducerTest.java?rev=1373815&r1=1373814&r2=1373815&view=diff
==============================================================================
--- camel/trunk/components/camel-lucene/src/test/java/org/apache/camel/component/lucene/LuceneIndexAndQueryProducerTest.java (original)
+++ camel/trunk/components/camel-lucene/src/test/java/org/apache/camel/component/lucene/LuceneIndexAndQueryProducerTest.java Thu Aug 16 13:04:00 2012
@@ -53,11 +53,11 @@ public class LuceneIndexAndQueryProducer
JndiRegistry registry = new JndiRegistry(createJndiContext());
registry.bind("std", new File("target/stdindexDir"));
registry.bind("load_dir", new File("src/test/resources/sources"));
- registry.bind("stdAnalyzer", new StandardAnalyzer(Version.LUCENE_35));
+ registry.bind("stdAnalyzer", new StandardAnalyzer(Version.LUCENE_36));
registry.bind("simple", new File("target/simpleindexDir"));
- registry.bind("simpleAnalyzer", new SimpleAnalyzer(Version.LUCENE_35));
+ registry.bind("simpleAnalyzer", new SimpleAnalyzer(Version.LUCENE_36));
registry.bind("whitespace", new File("target/whitespaceindexDir"));
- registry.bind("whitespaceAnalyzer", new WhitespaceAnalyzer(Version.LUCENE_35));
+ registry.bind("whitespaceAnalyzer", new WhitespaceAnalyzer(Version.LUCENE_36));
return registry;
}
Modified: camel/trunk/components/camel-lucene/src/test/java/org/apache/camel/processor/lucene/LuceneQueryProcessorTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-lucene/src/test/java/org/apache/camel/processor/lucene/LuceneQueryProcessorTest.java?rev=1373815&r1=1373814&r2=1373815&view=diff
==============================================================================
--- camel/trunk/components/camel-lucene/src/test/java/org/apache/camel/processor/lucene/LuceneQueryProcessorTest.java (original)
+++ camel/trunk/components/camel-lucene/src/test/java/org/apache/camel/processor/lucene/LuceneQueryProcessorTest.java Thu Aug 16 13:04:00 2012
@@ -53,7 +53,7 @@ public class LuceneQueryProcessorTest ex
@Test
public void testPhraseSearcher() throws Exception {
- final StandardAnalyzer analyzer = new StandardAnalyzer(Version.LUCENE_35);
+ final StandardAnalyzer analyzer = new StandardAnalyzer(Version.LUCENE_36);
MockEndpoint mockSearchEndpoint = getMockEndpoint("mock:searchResult");
context.stop();
@@ -97,7 +97,7 @@ public class LuceneQueryProcessorTest ex
@Test
public void testWildcardSearcher() throws Exception {
- final SimpleAnalyzer analyzer = new SimpleAnalyzer(Version.LUCENE_35);
+ final SimpleAnalyzer analyzer = new SimpleAnalyzer(Version.LUCENE_36);
MockEndpoint mockSearchEndpoint = getMockEndpoint("mock:searchResult");
context.stop();
Modified: camel/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1373815&r1=1373814&r2=1373815&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Thu Aug 16 13:04:00 2012
@@ -135,7 +135,7 @@
<krati-version>0.4.5</krati-version>
<leveldbjni-version>1.2</leveldbjni-version>
<log4j-version>1.2.17</log4j-version>
- <lucene-version>3.6.0</lucene-version>
+ <lucene-version>3.6.1</lucene-version>
<mina-version>1.1.7</mina-version>
<mina2-version>2.0.4</mina2-version>
<mockito-version>1.9.0</mockito-version>