You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by si...@apache.org on 2010/10/20 14:44:39 UTC
svn commit: r1025539 [6/10] - in /lucene/dev/branches/docvalues: ./ lucene/
lucene/contrib/
lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/
lucene/contrib/highlighter/src/test/
lucene/contrib/instantiated/src/test/org/apache...
Modified: lucene/dev/branches/docvalues/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestTemplateTransformer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestTemplateTransformer.java?rev=1025539&r1=1025538&r2=1025539&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestTemplateTransformer.java (original)
+++ lucene/dev/branches/docvalues/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestTemplateTransformer.java Wed Oct 20 12:44:28 2010
@@ -16,8 +16,6 @@
*/
package org.apache.solr.handler.dataimport;
-import org.apache.solr.SolrTestCaseJ4;
-import org.junit.Assert;
import org.junit.Test;
import java.util.ArrayList;
@@ -33,28 +31,28 @@ import java.util.Arrays;
* @version $Id$
* @since solr 1.3
*/
-public class TestTemplateTransformer extends SolrTestCaseJ4 {
+public class TestTemplateTransformer extends AbstractDataImportHandlerTestCase {
@Test
@SuppressWarnings("unchecked")
public void testTransformRow() {
List fields = new ArrayList();
- fields.add(AbstractDataImportHandlerTestCase.createMap("column", "firstName"));
- fields.add(AbstractDataImportHandlerTestCase.createMap("column", "lastName"));
- fields.add(AbstractDataImportHandlerTestCase.createMap("column", "middleName"));
- fields.add(AbstractDataImportHandlerTestCase.createMap("column", "name",
+ fields.add(createMap("column", "firstName"));
+ fields.add(createMap("column", "lastName"));
+ fields.add(createMap("column", "middleName"));
+ fields.add(createMap("column", "name",
TemplateTransformer.TEMPLATE,
"${e.lastName}, ${e.firstName} ${e.middleName}"));
- fields.add(AbstractDataImportHandlerTestCase.createMap("column", "emails",
+ fields.add(createMap("column", "emails",
TemplateTransformer.TEMPLATE,
"${e.mail}"));
// test reuse of template output in another template
- fields.add(AbstractDataImportHandlerTestCase.createMap("column", "mrname",
+ fields.add(createMap("column", "mrname",
TemplateTransformer.TEMPLATE,"Mr ${e.name}"));
List<String> mails = Arrays.asList(new String[]{"a@b.com", "c@d.com"});
- Map row = AbstractDataImportHandlerTestCase.createMap(
+ Map row = createMap(
"firstName", "Shalin",
"middleName", "Shekhar",
"lastName", "Mangar",
@@ -62,15 +60,14 @@ public class TestTemplateTransformer ext
VariableResolverImpl resolver = new VariableResolverImpl();
resolver.addNamespace("e", row);
- Map<String, String> entityAttrs = AbstractDataImportHandlerTestCase.createMap(
- "name", "e");
+ Map<String, String> entityAttrs = createMap("name", "e");
- Context context = AbstractDataImportHandlerTestCase.getContext(null, resolver,
+ Context context = getContext(null, resolver,
null, Context.FULL_DUMP, fields, entityAttrs);
new TemplateTransformer().transformRow(row, context);
- Assert.assertEquals("Mangar, Shalin Shekhar", row.get("name"));
- Assert.assertEquals("Mr Mangar, Shalin Shekhar", row.get("mrname"));
- Assert.assertEquals(mails,row.get("emails"));
+ assertEquals("Mangar, Shalin Shekhar", row.get("name"));
+ assertEquals("Mr Mangar, Shalin Shekhar", row.get("mrname"));
+ assertEquals(mails,row.get("emails"));
}
}
Modified: lucene/dev/branches/docvalues/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestThreaded.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestThreaded.java?rev=1025539&r1=1025538&r2=1025539&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestThreaded.java (original)
+++ lucene/dev/branches/docvalues/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestThreaded.java Wed Oct 20 12:44:28 2010
@@ -16,6 +16,7 @@
*/
package org.apache.solr.handler.dataimport;
+import org.junit.BeforeClass;
import org.junit.Test;
import java.util.List;
@@ -24,6 +25,11 @@ import java.util.Map;
public class TestThreaded extends AbstractDataImportHandlerTestCase {
+ @BeforeClass
+ public static void beforeClass() throws Exception {
+ initCore("dataimport-solrconfig.xml", "dataimport-schema.xml");
+ }
+
@Test
@SuppressWarnings("unchecked")
public void testCompositePk_FullImport() throws Exception {
@@ -44,23 +50,14 @@ public class TestThreaded extends Abstra
MockDataSource.setIterator("select * from y where y.A=3", childRow.iterator());
MockDataSource.setIterator("select * from y where y.A=4", childRow.iterator());
- super.runFullImport(dataConfig);
+ runFullImport(dataConfig);
assertQ(req("id:1"), "//*[@numFound='1']");
assertQ(req("*:*"), "//*[@numFound='4']");
assertQ(req("desc:hello"), "//*[@numFound='4']");
}
- @Override
- public String getSchemaFile() {
- return "dataimport-schema.xml";
- }
-
- @Override
- public String getSolrConfigFile() {
- return "dataimport-solrconfig.xml";
- }
- private static String dataConfig = "<dataConfig>\n"
+ private static String dataConfig = "<dataConfig>\n"
+"<dataSource type=\"MockDataSource\"/>\n"
+ " <document>\n"
+ " <entity name=\"x\" threads=\"2\" query=\"select * from x\" deletedPkQuery=\"select id from x where last_modified > NOW AND deleted='true'\" deltaQuery=\"select id from x where last_modified > NOW\">\n"
Modified: lucene/dev/branches/docvalues/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestURLDataSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestURLDataSource.java?rev=1025539&r1=1025538&r2=1025539&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestURLDataSource.java (original)
+++ lucene/dev/branches/docvalues/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestURLDataSource.java Wed Oct 20 12:44:28 2010
@@ -22,12 +22,9 @@ import java.util.List;
import java.util.Map;
import java.util.Properties;
-import junit.framework.Assert;
-
-import org.apache.solr.SolrTestCaseJ4;
import org.junit.Test;
-public class TestURLDataSource extends SolrTestCaseJ4 {
+public class TestURLDataSource extends AbstractDataImportHandlerTestCase {
private List<Map<String, String>> fields = new ArrayList<Map<String, String>>();
private URLDataSource dataSource = new URLDataSource();
private VariableResolverImpl variableResolver = new VariableResolverImpl();
@@ -43,6 +40,6 @@ public class TestURLDataSource extends S
initProps.setProperty(URLDataSource.BASE_URL, "${dataimporter.request.baseurl}");
dataSource.init(context, initProps);
- Assert.assertEquals(url, dataSource.getBaseUrl());
+ assertEquals(url, dataSource.getBaseUrl());
}
}
Modified: lucene/dev/branches/docvalues/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestVariableResolver.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestVariableResolver.java?rev=1025539&r1=1025538&r2=1025539&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestVariableResolver.java (original)
+++ lucene/dev/branches/docvalues/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestVariableResolver.java Wed Oct 20 12:44:28 2010
@@ -16,9 +16,7 @@
*/
package org.apache.solr.handler.dataimport;
-import org.junit.Assert;
import org.junit.Test;
-import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.util.DateMathParser;
import java.text.SimpleDateFormat;
@@ -32,7 +30,7 @@ import java.util.*;
* @version $Id$
* @since solr 1.3
*/
-public class TestVariableResolver extends SolrTestCaseJ4 {
+public class TestVariableResolver extends AbstractDataImportHandlerTestCase {
@Test
public void testSimpleNamespace() {
@@ -40,7 +38,7 @@ public class TestVariableResolver extend
Map<String, Object> ns = new HashMap<String, Object>();
ns.put("world", "WORLD");
vri.addNamespace("hello", ns);
- Assert.assertEquals("WORLD", vri.resolve("hello.world"));
+ assertEquals("WORLD", vri.resolve("hello.world"));
}
@Test
@@ -54,9 +52,8 @@ public class TestVariableResolver extend
VariableResolverImpl vri = new VariableResolverImpl(m);
Object val = vri.resolve(TestVariableResolver.class.getName());
// System.out.println("val = " + val);
- Assert.assertEquals("hello", val);
- Assert.assertEquals("world",vri.resolve("hello"));
-
+ assertEquals("hello", val);
+ assertEquals("world",vri.resolve("hello"));
}
@Test
@@ -68,7 +65,7 @@ public class TestVariableResolver extend
ns = new HashMap<String, Object>();
ns.put("world1", "WORLD1");
vri.addNamespace("hello.my", ns);
- Assert.assertEquals("WORLD1", vri.resolve("hello.my.world1"));
+ assertEquals("WORLD1", vri.resolve("hello.my.world1"));
}
@Test
@@ -80,7 +77,7 @@ public class TestVariableResolver extend
ns = new HashMap<String, Object>();
ns.put("world1", "WORLD1");
vri.addNamespace("hello.my.new", ns);
- Assert.assertEquals("WORLD1", vri.resolve("hello.my.new.world1"));
+ assertEquals("WORLD1", vri.resolve("hello.my.new.world1"));
}
@Test
@@ -95,7 +92,7 @@ public class TestVariableResolver extend
Date d = new Date();
ns.put("dt", d);
vri.addNamespace("A", ns);
- Assert.assertEquals(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(d),
+ assertEquals(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(d),
vri.replaceTokens("${dataimporter.functions.formatDate(A.dt,'yyyy-MM-dd HH:mm:ss')}"));
} finally {
Context.CURRENT_CONTEXT.remove();
@@ -117,7 +114,7 @@ public class TestVariableResolver extend
DateMathParser dmp = new DateMathParser(TimeZone.getDefault(), Locale.getDefault());
String s = vri.replaceTokens("${dataimporter.functions.formatDate('NOW/DAY','yyyy-MM-dd HH:mm')}");
- Assert.assertEquals(new SimpleDateFormat("yyyy-MM-dd HH:mm").format(dmp.parseMath("/DAY")), s);
+ assertEquals(new SimpleDateFormat("yyyy-MM-dd HH:mm").format(dmp.parseMath("/DAY")), s);
} finally {
Context.CURRENT_CONTEXT.remove();
}
@@ -129,7 +126,7 @@ public class TestVariableResolver extend
Map<String, Object> ns = new HashMap<String, Object>();
ns.put("world", "WORLD");
vri.addNamespace(null, ns);
- Assert.assertEquals("WORLD", vri.resolve("world"));
+ assertEquals("WORLD", vri.resolve("world"));
}
@Test
@@ -138,7 +135,7 @@ public class TestVariableResolver extend
Map<String, Object> ns = new HashMap<String, Object>();
ns.put("world", "WORLD");
vri.addNamespace(null, ns);
- Assert.assertEquals("WORLD", vri.resolve("world"));
+ assertEquals("WORLD", vri.resolve("world"));
}
@Test
@@ -162,9 +159,9 @@ public class TestVariableResolver extend
.getFunctionsNamespace(l,null));
String s = resolver
.replaceTokens("${dataimporter.functions.formatDate('NOW/DAY','yyyy-MM-dd HH:mm')}");
- Assert.assertEquals(new SimpleDateFormat("yyyy-MM-dd HH:mm")
+ assertEquals(new SimpleDateFormat("yyyy-MM-dd HH:mm")
.format(dmp.parseMath("/DAY")), s);
- Assert.assertEquals("Hello World", resolver
+ assertEquals("Hello World", resolver
.replaceTokens("${dataimporter.functions.test('TEST')}"));
} finally {
Context.CURRENT_CONTEXT.remove();
Modified: lucene/dev/branches/docvalues/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestXPathEntityProcessor.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestXPathEntityProcessor.java?rev=1025539&r1=1025538&r2=1025539&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestXPathEntityProcessor.java (original)
+++ lucene/dev/branches/docvalues/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestXPathEntityProcessor.java Wed Oct 20 12:44:28 2010
@@ -16,10 +16,6 @@
*/
package org.apache.solr.handler.dataimport;
-import static org.apache.solr.handler.dataimport.AbstractDataImportHandlerTestCase.createMap;
-
-import org.apache.solr.SolrTestCaseJ4;
-import org.junit.Assert;
import org.junit.Test;
import java.io.File;
@@ -39,26 +35,25 @@ import java.util.concurrent.TimeUnit;
* @version $Id$
* @since solr 1.3
*/
-public class TestXPathEntityProcessor extends SolrTestCaseJ4 {
+public class TestXPathEntityProcessor extends AbstractDataImportHandlerTestCase {
boolean simulateSlowReader;
boolean simulateSlowResultProcessor;
int rowsToRead = -1;
@Test
public void withFieldsAndXpath() throws Exception {
- long time = System.currentTimeMillis();
- File tmpdir = new File("." + time);
+ File tmpdir = File.createTempFile("test", "tmp", TEMP_DIR);
+ tmpdir.delete();
tmpdir.mkdir();
tmpdir.deleteOnExit();
- TestFileListEntityProcessor.createFile(tmpdir, "x.xsl", xsl.getBytes(),
- false);
+ createFile(tmpdir, "x.xsl", xsl.getBytes(), false);
Map entityAttrs = createMap("name", "e", "url", "cd.xml",
XPathEntityProcessor.FOR_EACH, "/catalog/cd");
List fields = new ArrayList();
fields.add(createMap("column", "title", "xpath", "/catalog/cd/title"));
fields.add(createMap("column", "artist", "xpath", "/catalog/cd/artist"));
fields.add(createMap("column", "year", "xpath", "/catalog/cd/year"));
- Context c = AbstractDataImportHandlerTestCase.getContext(null,
+ Context c = getContext(null,
new VariableResolverImpl(), getDataSource(cdData), Context.FULL_DUMP, fields, entityAttrs);
XPathEntityProcessor xPathEntityProcessor = new XPathEntityProcessor();
xPathEntityProcessor.init(c);
@@ -69,10 +64,10 @@ public class TestXPathEntityProcessor ex
break;
result.add(row);
}
- Assert.assertEquals(3, result.size());
- Assert.assertEquals("Empire Burlesque", result.get(0).get("title"));
- Assert.assertEquals("Bonnie Tyler", result.get(1).get("artist"));
- Assert.assertEquals("1982", result.get(2).get("year"));
+ assertEquals(3, result.size());
+ assertEquals("Empire Burlesque", result.get(0).get("title"));
+ assertEquals("Bonnie Tyler", result.get(1).get("artist"));
+ assertEquals("1982", result.get(2).get("year"));
}
@Test
@@ -81,7 +76,7 @@ public class TestXPathEntityProcessor ex
XPathEntityProcessor.FOR_EACH, "/root");
List fields = new ArrayList();
fields.add(createMap("column", "a", "xpath", "/root/a", DataImporter.MULTI_VALUED, "true"));
- Context c = AbstractDataImportHandlerTestCase.getContext(null,
+ Context c = getContext(null,
new VariableResolverImpl(), getDataSource(testXml), Context.FULL_DUMP, fields, entityAttrs);
XPathEntityProcessor xPathEntityProcessor = new XPathEntityProcessor();
xPathEntityProcessor.init(c);
@@ -92,7 +87,7 @@ public class TestXPathEntityProcessor ex
break;
result.add(row);
}
- Assert.assertEquals(2, ((List)result.get(0).get("a")).size());
+ assertEquals(2, ((List)result.get(0).get("a")).size());
}
@Test
@@ -101,7 +96,7 @@ public class TestXPathEntityProcessor ex
XPathEntityProcessor.FOR_EACH, "/root");
List fields = new ArrayList();
fields.add(createMap("column", "a", "xpath", "/root/a" ,"flatten","true"));
- Context c = AbstractDataImportHandlerTestCase.getContext(null,
+ Context c = getContext(null,
new VariableResolverImpl(), getDataSource(testXmlFlatten), Context.FULL_DUMP, fields, entityAttrs);
XPathEntityProcessor xPathEntityProcessor = new XPathEntityProcessor();
xPathEntityProcessor.init(c);
@@ -112,7 +107,7 @@ public class TestXPathEntityProcessor ex
break;
result = row;
}
- Assert.assertEquals("1B2", result.get("a"));
+ assertEquals("1B2", result.get("a"));
}
@Test
@@ -126,7 +121,7 @@ public class TestXPathEntityProcessor ex
fields.add(createMap("column", "title", "xpath", "/catalog/cd/title"));
fields.add(createMap("column", "artist", "xpath", "/catalog/cd/artist"));
fields.add(createMap("column", "year", "xpath", "/catalog/cd/year"));
- Context c = AbstractDataImportHandlerTestCase.getContext(null,
+ Context c = getContext(null,
new VariableResolverImpl(), getDataSource(cdData), Context.FULL_DUMP, fields, entityAttrs);
XPathEntityProcessor xPathEntityProcessor = new XPathEntityProcessor() {
private int count;
@@ -180,14 +175,14 @@ public class TestXPathEntityProcessor ex
// confirm that publisher thread stops.
xPathEntityProcessor.publisherThread.join(1000);
- Assert.assertEquals("Expected thread to stop", false, xPathEntityProcessor.publisherThread.isAlive());
+ assertEquals("Expected thread to stop", false, xPathEntityProcessor.publisherThread.isAlive());
- Assert.assertEquals(rowsToRead < 0 ? 3 : rowsToRead, result.size());
+ assertEquals(rowsToRead < 0 ? 3 : rowsToRead, result.size());
if (rowsToRead < 0) {
- Assert.assertEquals("Empire Burlesque", result.get(0).get("title"));
- Assert.assertEquals("Bonnie Tyler", result.get(1).get("artist"));
- Assert.assertEquals("1982", result.get(2).get("year"));
+ assertEquals("Empire Burlesque", result.get(0).get("title"));
+ assertEquals("Bonnie Tyler", result.get(1).get("artist"));
+ assertEquals("1982", result.get(2).get("year"));
}
}
@@ -212,8 +207,8 @@ public class TestXPathEntityProcessor ex
@Test
public void withDefaultSolrAndXsl() throws Exception {
- long time = System.currentTimeMillis();
- File tmpdir = new File("." + time);
+ File tmpdir = File.createTempFile("test", "tmp", TEMP_DIR);
+ tmpdir.delete();
tmpdir.mkdir();
tmpdir.deleteOnExit();
TestFileListEntityProcessor.createFile(tmpdir, "x.xsl", xsl.getBytes(),
@@ -221,7 +216,7 @@ public class TestXPathEntityProcessor ex
Map entityAttrs = createMap("name", "e",
XPathEntityProcessor.USE_SOLR_ADD_SCHEMA, "true", "xsl", ""
+ new File(tmpdir, "x.xsl").getAbsolutePath(), "url", "cd.xml");
- Context c = AbstractDataImportHandlerTestCase.getContext(null,
+ Context c = getContext(null,
new VariableResolverImpl(), getDataSource(cdData), Context.FULL_DUMP, null, entityAttrs);
XPathEntityProcessor xPathEntityProcessor = new XPathEntityProcessor();
xPathEntityProcessor.init(c);
@@ -232,10 +227,10 @@ public class TestXPathEntityProcessor ex
break;
result.add(row);
}
- Assert.assertEquals(3, result.size());
- Assert.assertEquals("Empire Burlesque", result.get(0).get("title"));
- Assert.assertEquals("Bonnie Tyler", result.get(1).get("artist"));
- Assert.assertEquals("1982", result.get(2).get("year"));
+ assertEquals(3, result.size());
+ assertEquals("Empire Burlesque", result.get(0).get("title"));
+ assertEquals("Bonnie Tyler", result.get(1).get("artist"));
+ assertEquals("1982", result.get(2).get("year"));
}
private DataSource<Reader> getDataSource(final String xml) {
Modified: lucene/dev/branches/docvalues/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestXPathRecordReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestXPathRecordReader.java?rev=1025539&r1=1025538&r2=1025539&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestXPathRecordReader.java (original)
+++ lucene/dev/branches/docvalues/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestXPathRecordReader.java Wed Oct 20 12:44:28 2010
@@ -16,8 +16,6 @@
*/
package org.apache.solr.handler.dataimport;
-import org.apache.solr.SolrTestCaseJ4;
-import org.junit.Assert;
import org.junit.Test;
import java.io.StringReader;
@@ -31,9 +29,9 @@ import java.util.Map;
* @version $Id$
* @since solr 1.3
*/
-public class TestXPathRecordReader extends SolrTestCaseJ4 {
+public class TestXPathRecordReader extends AbstractDataImportHandlerTestCase {
@Test
- public void basic() {
+ public void testBasic() {
String xml="<root>\n"
+ " <b><c>Hello C1</c>\n"
+ " <c>Hello C1</c>\n"
@@ -44,13 +42,13 @@ public class TestXPathRecordReader exten
XPathRecordReader rr = new XPathRecordReader("/root/b");
rr.addField("c", "/root/b/c", true);
List<Map<String, Object>> l = rr.getAllRecords(new StringReader(xml));
- Assert.assertEquals(2, l.size());
- Assert.assertEquals(2, ((List) l.get(0).get("c")).size());
- Assert.assertEquals(1, ((List) l.get(1).get("c")).size());
+ assertEquals(2, l.size());
+ assertEquals(2, ((List) l.get(0).get("c")).size());
+ assertEquals(1, ((List) l.get(1).get("c")).size());
}
@Test
- public void attributes() {
+ public void testAttributes() {
String xml="<root>\n"
+ " <b a=\"x0\" b=\"y0\" />\n"
+ " <b a=\"x1\" b=\"y1\" />\n"
@@ -60,17 +58,17 @@ public class TestXPathRecordReader exten
rr.addField("a", "/root/b/@a", false);
rr.addField("b", "/root/b/@b", false);
List<Map<String, Object>> l = rr.getAllRecords(new StringReader(xml));
- Assert.assertEquals(3, l.size());
- Assert.assertEquals("x0", l.get(0).get("a"));
- Assert.assertEquals("x1", l.get(1).get("a"));
- Assert.assertEquals("x2", l.get(2).get("a"));
- Assert.assertEquals("y0", l.get(0).get("b"));
- Assert.assertEquals("y1", l.get(1).get("b"));
- Assert.assertEquals("y2", l.get(2).get("b"));
+ assertEquals(3, l.size());
+ assertEquals("x0", l.get(0).get("a"));
+ assertEquals("x1", l.get(1).get("a"));
+ assertEquals("x2", l.get(2).get("a"));
+ assertEquals("y0", l.get(0).get("b"));
+ assertEquals("y1", l.get(1).get("b"));
+ assertEquals("y2", l.get(2).get("b"));
}
@Test
- public void attrInRoot(){
+ public void testAttrInRoot(){
String xml="<r>\n" +
"<merchantProduct id=\"814636051\" mid=\"189973\">\n" +
" <in_stock type=\"stock-4\" />\n" +
@@ -91,20 +89,20 @@ public class TestXPathRecordReader exten
rr.addField("conditionType", "/r/merchantProduct/condition/@type", false);
List<Map<String, Object>> l = rr.getAllRecords(new StringReader(xml));
Map<String, Object> m = l.get(0);
- Assert.assertEquals("814636051", m.get("id"));
- Assert.assertEquals("189973", m.get("mid"));
- Assert.assertEquals("301.46", m.get("price"));
- Assert.assertEquals("cond-0", m.get("conditionType"));
+ assertEquals("814636051", m.get("id"));
+ assertEquals("189973", m.get("mid"));
+ assertEquals("301.46", m.get("price"));
+ assertEquals("cond-0", m.get("conditionType"));
m = l.get(1);
- Assert.assertEquals("814636052", m.get("id"));
- Assert.assertEquals("189974", m.get("mid"));
- Assert.assertEquals("302.46", m.get("price"));
- Assert.assertEquals("cond-1", m.get("conditionType"));
+ assertEquals("814636052", m.get("id"));
+ assertEquals("189974", m.get("mid"));
+ assertEquals("302.46", m.get("price"));
+ assertEquals("cond-1", m.get("conditionType"));
}
@Test
- public void attributes2Level() {
+ public void testAttributes2Level() {
String xml="<root>\n"
+ "<a>\n <b a=\"x0\" b=\"y0\" />\n"
+ " <b a=\"x1\" b=\"y1\" />\n"
@@ -115,13 +113,13 @@ public class TestXPathRecordReader exten
rr.addField("a", "/root/a/b/@a", false);
rr.addField("b", "/root/a/b/@b", false);
List<Map<String, Object>> l = rr.getAllRecords(new StringReader(xml));
- Assert.assertEquals(3, l.size());
- Assert.assertEquals("x0", l.get(0).get("a"));
- Assert.assertEquals("y1", l.get(1).get("b"));
+ assertEquals(3, l.size());
+ assertEquals("x0", l.get(0).get("a"));
+ assertEquals("y1", l.get(1).get("b"));
}
@Test
- public void attributes2LevelHetero() {
+ public void testAttributes2LevelHetero() {
String xml="<root>\n"
+ "<a>\n <b a=\"x0\" b=\"y0\" />\n"
+ " <b a=\"x1\" b=\"y1\" />\n"
@@ -148,12 +146,12 @@ public class TestXPathRecordReader exten
}
});
- Assert.assertEquals(1, a.size());
- Assert.assertEquals(1, x.size());
+ assertEquals(1, a.size());
+ assertEquals(1, x.size());
}
@Test
- public void attributes2LevelMissingAttrVal() {
+ public void testAttributes2LevelMissingAttrVal() {
String xml="<root>\n"
+ "<a>\n <b a=\"x0\" b=\"y0\" />\n"
+ " <b a=\"x1\" b=\"y1\" />\n"
@@ -166,13 +164,13 @@ public class TestXPathRecordReader exten
rr.addField("a", "/root/a/b/@a", true);
rr.addField("b", "/root/a/b/@b", true);
List<Map<String, Object>> l = rr.getAllRecords(new StringReader(xml));
- Assert.assertEquals(2, l.size());
- Assert.assertNull(((List) l.get(1).get("a")).get(1));
- Assert.assertNull(((List) l.get(1).get("b")).get(0));
+ assertEquals(2, l.size());
+ assertNull(((List) l.get(1).get("a")).get(1));
+ assertNull(((List) l.get(1).get("b")).get(0));
}
@Test
- public void elems2LevelMissing() {
+ public void testElems2LevelMissing() {
String xml="<root>\n"
+ "\t<a>\n"
+ "\t <b>\n\t <x>x0</x>\n"
@@ -191,13 +189,13 @@ public class TestXPathRecordReader exten
rr.addField("a", "/root/a/b/x", true);
rr.addField("b", "/root/a/b/y", true);
List<Map<String, Object>> l = rr.getAllRecords(new StringReader(xml));
- Assert.assertEquals(2, l.size());
- Assert.assertNull(((List) l.get(1).get("a")).get(1));
- Assert.assertNull(((List) l.get(1).get("b")).get(0));
+ assertEquals(2, l.size());
+ assertNull(((List) l.get(1).get("a")).get(1));
+ assertNull(((List) l.get(1).get("b")).get(0));
}
@Test
- public void mixedContent() {
+ public void testMixedContent() {
String xml = "<xhtml:p xmlns:xhtml=\"http://xhtml.com/\" >This text is \n" +
" <xhtml:b>bold</xhtml:b> and this text is \n" +
" <xhtml:u>underlined</xhtml:u>!\n" +
@@ -209,18 +207,18 @@ public class TestXPathRecordReader exten
List<Map<String, Object>> l = rr.getAllRecords(new StringReader(xml));
Map<String, Object> row = l.get(0);
- Assert.assertEquals("bold", ((List) row.get("b")).get(0));
- Assert.assertEquals("underlined", ((List) row.get("u")).get(0));
+ assertEquals("bold", ((List) row.get("b")).get(0));
+ assertEquals("underlined", ((List) row.get("u")).get(0));
String p = (String) ((List) row.get("p")).get(0);
- Assert.assertTrue(p.contains("This text is"));
- Assert.assertTrue(p.contains("and this text is"));
- Assert.assertTrue(p.contains("!"));
+ assertTrue(p.contains("This text is"));
+ assertTrue(p.contains("and this text is"));
+ assertTrue(p.contains("!"));
// Should not contain content from child elements
- Assert.assertFalse(p.contains("bold"));
+ assertFalse(p.contains("bold"));
}
@Test
- public void mixedContentFlattened() {
+ public void testMixedContentFlattened() {
String xml = "<xhtml:p xmlns:xhtml=\"http://xhtml.com/\" >This text is \n" +
" <xhtml:b>bold</xhtml:b> and this text is \n" +
" <xhtml:u>underlined</xhtml:u>!\n" +
@@ -229,13 +227,13 @@ public class TestXPathRecordReader exten
rr.addField("p", "/p", false, XPathRecordReader.FLATTEN);
List<Map<String, Object>> l = rr.getAllRecords(new StringReader(xml));
Map<String, Object> row = l.get(0);
- Assert.assertEquals("This text is \n" +
+ assertEquals("This text is \n" +
" bold and this text is \n" +
" underlined!", ((String)row.get("p")).trim() );
}
@Test
- public void elems2LevelWithAttrib() {
+ public void testElems2LevelWithAttrib() {
String xml = "<root>\n\t<a>\n\t <b k=\"x\">\n"
+ "\t <x>x0</x>\n"
+ "\t <y>y0</y>\n"
@@ -257,14 +255,14 @@ public class TestXPathRecordReader exten
rr.addField("x", "/root/a/b[@k]/x", true);
rr.addField("y", "/root/a/b[@k]/y", true);
List<Map<String, Object>> l = rr.getAllRecords(new StringReader(xml));
- Assert.assertEquals(2, l.size());
- Assert.assertEquals(2, ((List) l.get(0).get("x")).size());
- Assert.assertEquals(2, ((List) l.get(0).get("y")).size());
- Assert.assertEquals(0, l.get(1).size());
+ assertEquals(2, l.size());
+ assertEquals(2, ((List) l.get(0).get("x")).size());
+ assertEquals(2, ((List) l.get(0).get("y")).size());
+ assertEquals(0, l.get(1).size());
}
@Test
- public void elems2LevelWithAttribMultiple() {
+ public void testElems2LevelWithAttribMultiple() {
String xml="<root>\n"
+ "\t<a>\n\t <b k=\"x\" m=\"n\" >\n"
+ "\t <x>x0</x>\n"
@@ -287,14 +285,14 @@ public class TestXPathRecordReader exten
rr.addField("x", "/root/a/b[@k][@m='n']/x", true);
rr.addField("y", "/root/a/b[@k][@m='n']/y", true);
List<Map<String, Object>> l = rr.getAllRecords(new StringReader(xml));
- Assert.assertEquals(2, l.size());
- Assert.assertEquals(1, ((List) l.get(0).get("x")).size());
- Assert.assertEquals(1, ((List) l.get(0).get("y")).size());
- Assert.assertEquals(0, l.get(1).size());
+ assertEquals(2, l.size());
+ assertEquals(1, ((List) l.get(0).get("x")).size());
+ assertEquals(1, ((List) l.get(0).get("y")).size());
+ assertEquals(0, l.get(1).size());
}
@Test
- public void elems2LevelWithAttribVal() {
+ public void testElems2LevelWithAttribVal() {
String xml="<root>\n\t<a>\n <b k=\"x\">\n"
+ "\t <x>x0</x>\n"
+ "\t <y>y0</y>\n"
@@ -311,44 +309,43 @@ public class TestXPathRecordReader exten
rr.addField("x", "/root/a/b[@k='x']/x", true);
rr.addField("y", "/root/a/b[@k='x']/y", true);
List<Map<String, Object>> l = rr.getAllRecords(new StringReader(xml));
- Assert.assertEquals(2, l.size());
- Assert.assertEquals(1, ((List) l.get(0).get("x")).size());
- Assert.assertEquals(1, ((List) l.get(0).get("y")).size());
- Assert.assertEquals(0, l.get(1).size());
+ assertEquals(2, l.size());
+ assertEquals(1, ((List) l.get(0).get("x")).size());
+ assertEquals(1, ((List) l.get(0).get("y")).size());
+ assertEquals(0, l.get(1).size());
}
@Test
- public void attribValWithSlash() {
+ public void testAttribValWithSlash() {
String xml = "<root><b>\n" +
" <a x=\"a/b\" h=\"hello-A\"/> \n" +
"</b></root>";
XPathRecordReader rr = new XPathRecordReader("/root/b");
rr.addField("x", "/root/b/a[@x='a/b']/@h", false);
List<Map<String, Object>> l = rr.getAllRecords(new StringReader(xml));
- Assert.assertEquals(1, l.size());
+ assertEquals(1, l.size());
Map<String, Object> m = l.get(0);
- Assert.assertEquals("hello-A", m.get("x"));
+ assertEquals("hello-A", m.get("x"));
}
@Test
- public void unsupported_Xpaths() {
+ public void testUnsupported_Xpaths() {
String xml = "<root><b><a x=\"a/b\" h=\"hello-A\"/> </b></root>";
XPathRecordReader rr=null;
try {
rr = new XPathRecordReader("//b");
- Assert.fail("A RuntimeException was expected: //b forEach cannot begin with '//'.");
+ fail("A RuntimeException was expected: //b forEach cannot begin with '//'.");
}
catch (RuntimeException ex) { }
try {
rr.addField("bold" ,"b", false);
- Assert.fail("A RuntimeException was expected: 'b' xpaths must begin with '/'.");
+ fail("A RuntimeException was expected: 'b' xpaths must begin with '/'.");
}
catch (RuntimeException ex) { }
-
}
@Test
- public void any_decendent_from_root() {
+ public void testAny_decendent_from_root() {
XPathRecordReader rr = new XPathRecordReader("/anyd/contenido");
rr.addField("descdend", "//boo", true);
rr.addField("inr_descd","//boo/i", false);
@@ -373,22 +370,22 @@ public class TestXPathRecordReader exten
+ "</anyd>";
List<Map<String, Object>> l = rr.getAllRecords(new StringReader(xml));
- Assert.assertEquals(1, l.size());
+ assertEquals(1, l.size());
Map<String, Object> m = l.get(0);
- Assert.assertEquals("This one is inside a forEach", m.get("cont").toString().trim());
- Assert.assertEquals("10097" ,m.get("id"));
- Assert.assertEquals("My flattened title",m.get("title").toString().trim());
- Assert.assertEquals("My summary" ,m.get("resume").toString().trim());
- Assert.assertEquals("My text" ,m.get("text").toString().trim());
- Assert.assertEquals("not ignored as its",(String) ((List) m.get("descdend")).get(0) );
- Assert.assertEquals("antler" ,(String) ((List) m.get("descdend")).get(1) );
- Assert.assertEquals("Within the body of",(String) ((List) m.get("descdend")).get(2) );
- Assert.assertEquals("inner as well" ,(String) ((List) m.get("descdend")).get(3) );
- Assert.assertEquals("sub clauses" ,m.get("inr_descd").toString().trim());
+ assertEquals("This one is inside a forEach", m.get("cont").toString().trim());
+ assertEquals("10097" ,m.get("id"));
+ assertEquals("My flattened title",m.get("title").toString().trim());
+ assertEquals("My summary" ,m.get("resume").toString().trim());
+ assertEquals("My text" ,m.get("text").toString().trim());
+ assertEquals("not ignored as its",(String) ((List) m.get("descdend")).get(0) );
+ assertEquals("antler" ,(String) ((List) m.get("descdend")).get(1) );
+ assertEquals("Within the body of",(String) ((List) m.get("descdend")).get(2) );
+ assertEquals("inner as well" ,(String) ((List) m.get("descdend")).get(3) );
+ assertEquals("sub clauses" ,m.get("inr_descd").toString().trim());
}
@Test
- public void any_decendent_of_a_child1() {
+ public void testAny_decendent_of_a_child1() {
XPathRecordReader rr = new XPathRecordReader("/anycd");
rr.addField("descdend", "/anycd//boo", true);
@@ -407,19 +404,19 @@ public class TestXPathRecordReader exten
+ "</anycd>";
List<Map<String, Object>> l = rr.getAllRecords(new StringReader(xml));
- Assert.assertEquals(1, l.size());
+ assertEquals(1, l.size());
Map<String, Object> m = l.get(0);
- Assert.assertEquals("top level" ,(String) ((List) m.get("descdend")).get(0) );
- Assert.assertEquals("this element" ,(String) ((List) m.get("descdend")).get(1) );
- Assert.assertEquals("not ignored as its",(String) ((List) m.get("descdend")).get(2) );
- Assert.assertEquals("antler" ,(String) ((List) m.get("descdend")).get(3) );
- Assert.assertEquals("title" ,(String) ((List) m.get("descdend")).get(4) );
- Assert.assertEquals("Within the body of",(String) ((List) m.get("descdend")).get(5) );
- Assert.assertEquals("inner as well" ,(String) ((List) m.get("descdend")).get(6) );
+ assertEquals("top level" ,(String) ((List) m.get("descdend")).get(0) );
+ assertEquals("this element" ,(String) ((List) m.get("descdend")).get(1) );
+ assertEquals("not ignored as its",(String) ((List) m.get("descdend")).get(2) );
+ assertEquals("antler" ,(String) ((List) m.get("descdend")).get(3) );
+ assertEquals("title" ,(String) ((List) m.get("descdend")).get(4) );
+ assertEquals("Within the body of",(String) ((List) m.get("descdend")).get(5) );
+ assertEquals("inner as well" ,(String) ((List) m.get("descdend")).get(6) );
}
@Test
- public void any_decendent_of_a_child2() {
+ public void testAny_decendent_of_a_child2() {
XPathRecordReader rr = new XPathRecordReader("/anycd");
rr.addField("descdend", "/anycd/contenido//boo", true);
@@ -438,17 +435,17 @@ public class TestXPathRecordReader exten
+ "</anycd>";
List<Map<String, Object>> l = rr.getAllRecords(new StringReader(xml));
- Assert.assertEquals(1, l.size());
+ assertEquals(1, l.size());
Map<String, Object> m = l.get(0);
- Assert.assertEquals("not ignored as its",((List) m.get("descdend")).get(0) );
- Assert.assertEquals("antler" ,((List) m.get("descdend")).get(1) );
- Assert.assertEquals("title" ,((List) m.get("descdend")).get(2) );
- Assert.assertEquals("Within the body of",((List) m.get("descdend")).get(3) );
- Assert.assertEquals("inner as well" ,((List) m.get("descdend")).get(4) );
+ assertEquals("not ignored as its",((List) m.get("descdend")).get(0) );
+ assertEquals("antler" ,((List) m.get("descdend")).get(1) );
+ assertEquals("title" ,((List) m.get("descdend")).get(2) );
+ assertEquals("Within the body of",((List) m.get("descdend")).get(3) );
+ assertEquals("inner as well" ,((List) m.get("descdend")).get(4) );
}
@Test
- public void another() {
+ public void testAnother() {
String xml="<root>\n"
+ " <contenido id=\"10097\" idioma=\"cat\">\n"
+ " <antetitulo></antetitulo>\n"
@@ -464,17 +461,17 @@ public class TestXPathRecordReader exten
rr.addField("text", "/root/contenido/texto", false);
List<Map<String, Object>> l = rr.getAllRecords(new StringReader(xml));
- Assert.assertEquals(1, l.size());
+ assertEquals(1, l.size());
Map<String, Object> m = l.get(0);
- Assert.assertEquals("10097", m.get("id"));
- Assert.assertEquals("This is my title", m.get("title").toString().trim());
- Assert.assertEquals("This is my summary", m.get("resume").toString().trim());
- Assert.assertEquals("This is the body of my text", m.get("text").toString()
+ assertEquals("10097", m.get("id"));
+ assertEquals("This is my title", m.get("title").toString().trim());
+ assertEquals("This is my summary", m.get("resume").toString().trim());
+ assertEquals("This is the body of my text", m.get("text").toString()
.trim());
}
@Test
- public void sameForEachAndXpath(){
+ public void testSameForEachAndXpath(){
String xml="<root>\n" +
" <cat>\n" +
" <name>hello</name>\n" +
@@ -484,11 +481,11 @@ public class TestXPathRecordReader exten
XPathRecordReader rr = new XPathRecordReader("/root/cat/name");
rr.addField("catName", "/root/cat/name",false);
List<Map<String, Object>> l = rr.getAllRecords(new StringReader(xml));
- Assert.assertEquals("hello",l.get(0).get("catName"));
+ assertEquals("hello",l.get(0).get("catName"));
}
@Test
- public void putNullTest(){
+ public void testPutNullTest(){
String xml = "<root>\n" +
" <i>\n" +
" <x>\n" +
@@ -521,29 +518,29 @@ public class TestXPathRecordReader exten
List<String> b = (List<String>) map.get("b");
List<String> c = (List<String>) map.get("c");
- Assert.assertEquals("A.1.1",a.get(0));
- Assert.assertEquals("B.1.1",b.get(0));
- Assert.assertNull(c.get(0));
-
- Assert.assertNull(a.get(1));
- Assert.assertEquals("B.1.2",b.get(1));
- Assert.assertEquals("C.1.2",c.get(1));
+ assertEquals("A.1.1",a.get(0));
+ assertEquals("B.1.1",b.get(0));
+ assertNull(c.get(0));
+
+ assertNull(a.get(1));
+ assertEquals("B.1.2",b.get(1));
+ assertEquals("C.1.2",c.get(1));
map = l.get(1);
a = (List<String>) map.get("a");
b = (List<String>) map.get("b");
c = (List<String>) map.get("c");
- Assert.assertEquals("A.2.1",a.get(0));
- Assert.assertNull(b.get(0));
- Assert.assertEquals("C.2.1",c.get(0));
-
- Assert.assertNull(a.get(1));
- Assert.assertEquals("B.2.2",b.get(1));
- Assert.assertEquals("C.2.2",c.get(1));
+ assertEquals("A.2.1",a.get(0));
+ assertNull(b.get(0));
+ assertEquals("C.2.1",c.get(0));
+
+ assertNull(a.get(1));
+ assertEquals("B.2.2",b.get(1));
+ assertEquals("C.2.2",c.get(1));
}
- @Test
+ @Test
public void testError(){
String malformedXml = "<root>\n" +
" <node>\n" +
@@ -564,7 +561,7 @@ public class TestXPathRecordReader exten
rr.addField("desc", "/root/node/desc", true);
try {
rr.getAllRecords(new StringReader(malformedXml));
- Assert.fail("A RuntimeException was expected: the input XML is invalid.");
+ fail("A RuntimeException was expected: the input XML is invalid.");
} catch (Exception e) { }
}
}
Modified: lucene/dev/branches/docvalues/solr/contrib/extraction/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/solr/contrib/extraction/build.xml?rev=1025539&r1=1025538&r2=1025539&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/solr/contrib/extraction/build.xml (original)
+++ lucene/dev/branches/docvalues/solr/contrib/extraction/build.xml Wed Oct 20 12:44:28 2010
@@ -117,7 +117,7 @@
<sysproperty key="tests.multiplier" value="${tests.multiplier}"/>
<sysproperty key="tests.iter" value="${tests.iter}"/>
<sysproperty key="tests.seed" value="${tests.seed}"/>
- <sysproperty key="jetty.insecurerandom" value="1"/>
+ <sysproperty key="jetty.testMode" value="1"/>
<sysproperty key="tempDir" file="${tempDir}"/>
<sysproperty key="testmethod" value="${testmethod}"/>
<jvmarg line="${args}"/>
Modified: lucene/dev/branches/docvalues/solr/contrib/extraction/src/test/java/org/apache/solr/handler/ExtractingRequestHandlerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/solr/contrib/extraction/src/test/java/org/apache/solr/handler/ExtractingRequestHandlerTest.java?rev=1025539&r1=1025538&r2=1025539&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/solr/contrib/extraction/src/test/java/org/apache/solr/handler/ExtractingRequestHandlerTest.java (original)
+++ lucene/dev/branches/docvalues/solr/contrib/extraction/src/test/java/org/apache/solr/handler/ExtractingRequestHandlerTest.java Wed Oct 20 12:44:28 2010
@@ -26,6 +26,7 @@ import org.apache.solr.common.SolrExcept
import org.apache.solr.handler.extraction.ExtractingParams;
import org.apache.solr.handler.extraction.ExtractingRequestHandler;
import org.apache.solr.handler.extraction.ExtractingDocumentLoader;
+
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -34,6 +35,7 @@ import static org.junit.Assert.*;
import java.util.List;
import java.util.ArrayList;
+import java.util.Locale;
import java.io.File;
@@ -56,6 +58,9 @@ public class ExtractingRequestHandlerTes
@Test
public void testExtraction() throws Exception {
+ // broken for turkish: https://issues.apache.org/jira/browse/SOLR-2088
+ String defLang = Locale.getDefault().getLanguage();
+ assumeFalse("Known bugs under Turkish locale: https://issues.apache.org/jira/browse/SOLR-2088", defLang.equals("tr") || defLang.equals("az"));
ExtractingRequestHandler handler = (ExtractingRequestHandler) h.getCore().getRequestHandler("/update/extract");
assertTrue("handler is null and it shouldn't be", handler != null);
loadLocal("solr-word.pdf", "fmap.created", "extractedDate", "fmap.producer", "extractedProducer",
@@ -355,13 +360,16 @@ public class ExtractingRequestHandlerTes
SolrQueryResponse loadLocal(String filename, String... args) throws Exception {
LocalSolrQueryRequest req = (LocalSolrQueryRequest) req(args);
-
- // TODO: stop using locally defined streams once stream.file and
- // stream.body work everywhere
- List<ContentStream> cs = new ArrayList<ContentStream>();
- cs.add(new ContentStreamBase.FileStream(new File(filename)));
- req.setContentStreams(cs);
- return h.queryAndResponse("/update/extract", req);
+ try {
+ // TODO: stop using locally defined streams once stream.file and
+ // stream.body work everywhere
+ List<ContentStream> cs = new ArrayList<ContentStream>();
+ cs.add(new ContentStreamBase.FileStream(new File(filename)));
+ req.setContentStreams(cs);
+ return h.queryAndResponse("/update/extract", req);
+ } finally {
+ req.close();
+ }
}
Modified: lucene/dev/branches/docvalues/solr/example/solr/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/solr/example/solr/conf/solrconfig.xml?rev=1025539&r1=1025538&r2=1025539&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/solr/example/solr/conf/solrconfig.xml (original)
+++ lucene/dev/branches/docvalues/solr/example/solr/conf/solrconfig.xml Wed Oct 20 12:44:28 2010
@@ -498,9 +498,6 @@
<str name="version">2.1</str>
-->
</lst>
- <arr name="last-components">
- <str>pivot</str> <!-- not included by default -->
- </arr>
</requestHandler>
<!--
@@ -527,7 +524,23 @@
<str name="facet">on</str>
<str name="facet.field">cat</str>
<str name="facet.field">manu_exact</str>
+ <str name="facet.query">ipod</str>
+ <str name="facet.query">GB</str>
<str name="facet.mincount">1</str>
+ <str name="facet.pivot">cat,inStock</str>
+ <str name="facet.range">price</str>
+ <int name="facet.range.start">0</int>
+ <int name="facet.range.end">600</int>
+ <int name="facet.range.gap">50</int>
+ <str name="facet.range.other">after</str>
+ <str name="facet.date">manufacturedate_dt</str>
+ <str name="facet.date.start">NOW/YEAR-10YEARS</str>
+ <str name="facet.date.end">NOW</str>
+ <str name="facet.mincount">1</str>
+ <str name="facet.date.gap">+1YEAR</str>
+ <str name="facet.date.other">before</str>
+ <str name="facet.date.other">after</str>
+
<!-- Highlighting defaults -->
<str name="hl">on</str>
@@ -668,7 +681,6 @@
<searchComponent name="query" class="org.apache.solr.handler.component.QueryComponent" />
<searchComponent name="facet" class="org.apache.solr.handler.component.FacetComponent" />
- <searchComponent name="pivot" class="org.apache.solr.handler.component.PivotFacetComponent" />
<searchComponent name="mlt" class="org.apache.solr.handler.component.MoreLikeThisComponent" />
<searchComponent name="highlight" class="org.apache.solr.handler.component.HighlightComponent" />
<searchComponent name="stats" class="org.apache.solr.handler.component.StatsComponent" />
Modified: lucene/dev/branches/docvalues/solr/example/solr/conf/velocity/VM_global_library.vm
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/solr/example/solr/conf/velocity/VM_global_library.vm?rev=1025539&r1=1025538&r2=1025539&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/solr/example/solr/conf/velocity/VM_global_library.vm (original)
+++ lucene/dev/branches/docvalues/solr/example/solr/conf/velocity/VM_global_library.vm Wed Oct 20 12:44:28 2010
@@ -17,9 +17,16 @@
#macro(url_for_filters $p)#url_for_home?#q#if($list.size($p) > 0)&#fqs($p)#end#debug#end
+#macro(url_for_nested_facet_query $field)#url_for_home#lens&fq=$esc.url($field)#end
+
## TODO: convert to use {!raw f=$field}$value (with escaping of course)
#macro(url_for_facet_filter $field $value)#url_for_home#lens&fq=$esc.url($field):%22$esc.url($value)%22#end
+#macro(url_for_facet_date_filter $field $value)#url_for_home#lens&fq=$esc.url($field):$esc.url($value)#end
+
+#macro(url_for_facet_range_filter $field $value)#url_for_home#lens&fq=$esc.url($field):$esc.url($value)#end
+
+
#macro(link_to_previous_page $text)
#if($page.current_page_number > 1)
#set($prev_start = $page.start - $page.results_per_page)
@@ -44,3 +51,108 @@
#end
#end
#end
+
+#macro(display_facet_query $field, $display, $fieldName)
+ #if($field.size() > 0)
+ <span class="facet-field">$display</span>
+ <ul>
+ #foreach ($facet in $field)
+ #if ($facet.value > 0)
+ #set($facetURL = "#url_for_nested_facet_query($facet.key)")
+ #if ($facetURL != '')
+ <li><a href="$facetURL">$facet.key</a> ($facet.value)</li>
+ #end
+ #end
+ #end
+ </ul>
+ #end
+#end
+
+#macro(display_facet_date $field, $display, $fieldName, $gap)
+ <span class="facet-field">$display</span>
+ <ul>
+ #foreach ($facet in $field)
+ #set($theDate = $date.toDate("yyyy-MM-dd'T'HH:mm:ss'Z'", $facet.key))
+ #set($value = '["' + $facet.key + '" TO "' + $facet.key + $gap + '"]')
+
+ #set($facetURL = "#url_for_facet_date_filter($fieldName, $value)")
+ #if ($facetURL != '')
+ #if ($facet.key != "gap" && $facet.key != "start" && $facet.key != "end" && $facet.key != "before" && $facet.key != "after")
+
+ <li><a href="$facetURL">$date.format('MMM yyyy', $theDate)</a> ($facet.value)</li>
+ #end
+ #if ($facet.key == "before" && $facet.value > 0)
+ <li><a href="$facetURL">Before</a> ($facet.value)</li>
+ #end
+ #if ($facet.key == "after" && $facet.value > 0)
+ <li><a href="$facetURL">After</a> ($facet.value)</li>
+ #end
+ #end
+ #end
+ </ul>
+#end
+
+
+
+#macro(display_facet_range $field, $display, $fieldName, $start, $end, $gap, $before, $after)
+ <span class="facet-field">$display</span>
+ <ul>
+ #if($before && $before != "")
+ #set($value = '[* TO "' + $start + '"]')
+ #set($facetURL = "#url_for_facet_range_filter($fieldName, $value)")
+ <li><a href="$facetURL">Less than $start</a> ($before)</li>
+ #end
+ #foreach ($facet in $field)
+ #set($rangeEnd = $math.add($facet.key, $gap))
+ #set($value = "[" + $facet.key + " TO $rangeEnd]")
+ #set($facetURL = "#url_for_facet_filter($fieldName, $value)")
+ #if ($facetURL != '')
+ <li><a href="$facetURL">$facet.key</a> ($facet.value)</li>
+ #end
+ #end
+ #if($end && $end != "")
+ #set($value = "[" + $end + " TO *]")
+ #set($facetURL = "#url_for_facet_range_filter($fieldName, $value)")
+ <li><a href="$facetURL">More than $math.toNumber($end)</a> ($after)</li>
+ #end
+ </ul>
+#end
+
+## <lst name="facet_pivot">
+## <arr name="cat,inStock">
+## <lst>
+## <str name="field">cat</str>
+## <str name="value">electronics</str>
+## <int name="count">17</int>
+## <arr name="pivot">
+## <lst>
+## <str name="field">inStock</str>
+## <str name="value">true</str>
+## <int name="count">13</int>
+## </lst>
+## <lst>
+## <str name="field">inStock</str>
+## <str name="value">false</str>
+## <int name="count">4</int>
+## </lst>
+## </arr>
+## </lst>
+
+## $pivots is a list of facet_pivot
+#macro(display_facet_pivot $pivots, $display)
+ #if($pivots.size() > 0)
+ <span class="facet-field">$display</span>
+ <ul>
+ #foreach ($pivot in $pivots)
+ #foreach ($entry in $pivot.value)
+ <a href="#url_for_facet_filter($entry.field, $entry.value)">$entry.field::$entry.value</a> ($entry.count)
+ <ul>
+ #foreach($nest in $entry.pivot)
+ <a href="#url_for_facet_filter($entry.field, $entry.value)&fq=$esc.url($nest.field):%22$esc.url($nest.value)%22">$nest.field::$nest.value</a> ($nest.count)
+ #end
+ </ul>
+ #end
+ #end
+ </ul>
+ #end
+#end
\ No newline at end of file
Modified: lucene/dev/branches/docvalues/solr/example/solr/conf/velocity/facets.vm
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/solr/example/solr/conf/velocity/facets.vm?rev=1025539&r1=1025538&r2=1025539&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/solr/example/solr/conf/velocity/facets.vm (original)
+++ lucene/dev/branches/docvalues/solr/example/solr/conf/velocity/facets.vm Wed Oct 20 12:44:28 2010
@@ -10,3 +10,10 @@
</ul>
#end
#end
+#parse('facet_queries.vm')
+#parse('facet_ranges.vm')
+#parse('facet_dates.vm')
+#parse('facet_pivot.vm')
+
+
+
Modified: lucene/dev/branches/docvalues/solr/example/solr/conf/velocity/hit.vm
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/solr/example/solr/conf/velocity/hit.vm?rev=1025539&r1=1025538&r2=1025539&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/solr/example/solr/conf/velocity/hit.vm (original)
+++ lucene/dev/branches/docvalues/solr/example/solr/conf/velocity/hit.vm Wed Oct 20 12:44:28 2010
@@ -8,9 +8,10 @@
#end
#end
<div class="result-document">
- <p><b>#field('name')</b> $!number.currency($doc.getFieldValue('price'))</p>
-
- <p>#field('features')</p>
+ <p><b>#field('name')</b></p>
+ <p>Price: $!number.currency($doc.getFieldValue('price'))</p>
+ <p>Features: #field('features')</p>
+ <p>In Stock: #field('inStock')</p>
#if($params.getBool("debugQuery",false))
<a href="#" onclick='jQuery(this).siblings("pre").toggle(); return false;'>toggle explain</a>
Propchange: lucene/dev/branches/docvalues/solr/lib/commons-httpclient-3.1.jar
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 20 12:44:28 2010
@@ -1,3 +1,4 @@
/lucene/dev/branches/branch_3x/solr/lib/commons-httpclient-3.1.jar:949730,961612,979161,980654,982195,987811,988512
/lucene/dev/branches/preflexfixes/solr/lib/commons-httpclient-3.1.jar:967125-979432
+/lucene/dev/trunk/solr/lib/commons-httpclient-3.1.jar:1021635-1024556,1025532-1025536
/lucene/solr/trunk/lib/commons-httpclient-3.1.jar:922950-923910,923912-925091
Propchange: lucene/dev/branches/docvalues/solr/lib/jcl-over-slf4j-1.5.5.jar
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 20 12:44:28 2010
@@ -1,3 +1,4 @@
/lucene/dev/branches/branch_3x/solr/lib/jcl-over-slf4j-1.5.5.jar:949730,961612,979161,980654,982195,987811,988512
/lucene/dev/branches/preflexfixes/solr/lib/jcl-over-slf4j-1.5.5.jar:967125-979432
+/lucene/dev/trunk/solr/lib/jcl-over-slf4j-1.5.5.jar:1021635-1024556,1025532-1025536
/lucene/solr/trunk/lib/jcl-over-slf4j-1.5.5.jar:922950-923910,923912-925091
Propchange: lucene/dev/branches/docvalues/solr/src/common/org/apache/solr/common/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 20 12:44:28 2010
@@ -1,3 +1,4 @@
/lucene/dev/branches/branch_3x/solr/src/common/org/apache/solr/common:949730,961612,979161,980654,982195,987811,988512
/lucene/dev/branches/preflexfixes/solr/src/common/org/apache/solr/common:967125-979432
+/lucene/dev/trunk/solr/src/common/org/apache/solr/common:1021635-1024556,1025532-1025536
/lucene/solr/trunk/src/common/org/apache/solr/common:922950-923910,923912-925091
Modified: lucene/dev/branches/docvalues/solr/src/common/org/apache/solr/common/params/CoreAdminParams.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/solr/src/common/org/apache/solr/common/params/CoreAdminParams.java?rev=1025539&r1=1025538&r2=1025539&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/solr/src/common/org/apache/solr/common/params/CoreAdminParams.java (original)
+++ lucene/dev/branches/docvalues/solr/src/common/org/apache/solr/common/params/CoreAdminParams.java Wed Oct 20 12:44:28 2010
@@ -59,6 +59,12 @@ public interface CoreAdminParams
* The directories are specified by multiple indexDir parameters. */
public final static String INDEX_DIR = "indexDir";
+ /** The collection name in solr cloud */
+ public final static String COLLECTION = "collection";
+
+ /** The shard id in solr cloud */
+ public final static String SHARD = "shard";
+
public enum CoreAdminAction {
STATUS,
LOAD,
Propchange: lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/ArabicLetterTokenizerFactory.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/ArabicNormalizationFilterFactory.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/ArabicStemFilterFactory.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/BufferedTokenStream.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/BulgarianStemFilterFactory.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/ClassicFilterFactory.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/ClassicTokenizerFactory.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/CzechStemFilterFactory.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/DelimitedPayloadTokenFilterFactory.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/DoubleMetaphoneFilterFactory.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/EdgeNGramFilterFactory.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/EdgeNGramTokenizerFactory.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/EnglishMinimalStemFilterFactory.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/EnglishPossessiveFilterFactory.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/FinnishLightStemFilterFactory.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/FrenchLightStemFilterFactory.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/FrenchMinimalStemFilterFactory.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/GermanLightStemFilterFactory.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/GermanMinimalStemFilterFactory.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/GreekStemFilterFactory.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/HindiNormalizationFilterFactory.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/HindiStemFilterFactory.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/HungarianLightStemFilterFactory.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/HyphenatedWordsFilterFactory.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/HyphenationCompoundWordTokenFilterFactory.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/ISOLatin1AccentFilterFactory.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Oct 20 12:44:28 2010
@@ -1 +1 @@
-Id
+Date Author Id Revision HeadURL
Propchange: lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/IndicNormalizationFilterFactory.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/IndicTokenizerFactory.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/IndonesianStemFilterFactory.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/ItalianLightStemFilterFactory.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/KeywordMarkerFilterFactory.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/KeywordTokenizerFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/KeywordTokenizerFactory.java?rev=1025539&r1=1025538&r2=1025539&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/KeywordTokenizerFactory.java (original)
+++ lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/KeywordTokenizerFactory.java Wed Oct 20 12:44:28 2010
@@ -22,7 +22,7 @@ import org.apache.lucene.analysis.core.K
import java.io.Reader;
/**
- * @version $Id: LowerCaseTokenizerFactory.java 382610 2006-03-03 01:43:03Z yonik $
+ * @version $Id$
*/
public class KeywordTokenizerFactory extends BaseTokenizerFactory {
public KeywordTokenizer create(Reader input) {
Propchange: lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/KeywordTokenizerFactory.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/LimitTokenCountFilterFactory.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/NGramFilterFactory.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/NGramTokenizerFactory.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/PatternReplaceFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/PatternReplaceFilterFactory.java?rev=1025539&r1=1025538&r2=1025539&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/PatternReplaceFilterFactory.java (original)
+++ lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/PatternReplaceFilterFactory.java Wed Oct 20 12:44:28 2010
@@ -24,7 +24,7 @@ import java.util.regex.Pattern;
import java.util.regex.PatternSyntaxException;
/**
- * @version $Id:$
+ * @version $Id$
* @see PatternReplaceFilter
*/
public class PatternReplaceFilterFactory extends BaseTokenFilterFactory {
Propchange: lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/PatternReplaceFilterFactory.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/PatternTokenizerFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/PatternTokenizerFactory.java?rev=1025539&r1=1025538&r2=1025539&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/PatternTokenizerFactory.java (original)
+++ lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/PatternTokenizerFactory.java Wed Oct 20 12:44:28 2010
@@ -58,7 +58,7 @@ import org.apache.solr.common.SolrExcept
*
* @see PatternTokenizer
* @since solr1.2
- * @version $Id:$
+ * @version $Id$
*/
public class PatternTokenizerFactory extends BaseTokenizerFactory
{
Propchange: lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/PatternTokenizerFactory.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/PortugueseLightStemFilterFactory.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/PortugueseMinimalStemFilterFactory.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/RemoveDuplicatesTokenFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/RemoveDuplicatesTokenFilterFactory.java?rev=1025539&r1=1025538&r2=1025539&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/RemoveDuplicatesTokenFilterFactory.java (original)
+++ lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/RemoveDuplicatesTokenFilterFactory.java Wed Oct 20 12:44:28 2010
@@ -21,7 +21,7 @@ import org.apache.lucene.analysis.TokenS
import org.apache.lucene.analysis.miscellaneous.RemoveDuplicatesTokenFilter;
/**
- * @version $Id:$
+ * @version $Id$
*/
public class RemoveDuplicatesTokenFilterFactory extends BaseTokenFilterFactory {
public RemoveDuplicatesTokenFilter create(TokenStream input) {
Propchange: lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/RemoveDuplicatesTokenFilterFactory.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/ReversedWildcardFilter.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/ReversedWildcardFilterFactory.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/RussianLightStemFilterFactory.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/SpanishLightStemFilterFactory.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/StemmerOverrideFilterFactory.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/SwedishLightStemFilterFactory.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/TrimFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/TrimFilterFactory.java?rev=1025539&r1=1025538&r2=1025539&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/TrimFilterFactory.java (original)
+++ lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/TrimFilterFactory.java Wed Oct 20 12:44:28 2010
@@ -24,7 +24,7 @@ import org.apache.lucene.analysis.miscel
import org.apache.solr.common.SolrException;
/**
- * @version $Id:$
+ * @version $Id$
* @see TrimFilter
*/
public class TrimFilterFactory extends BaseTokenFilterFactory {
Propchange: lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/TrimFilterFactory.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/TurkishLowerCaseFilterFactory.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/WikipediaTokenizerFactory.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL