Revision 8827
Added by ben leinfelder over 10 years ago
metacat-common/src/test/java/edu/ucsb/nceas/metacat/common/SolrServerFactoryTest.java | ||
---|---|---|
4 | 4 |
|
5 | 5 |
import java.io.FileNotFoundException; |
6 | 6 |
import java.io.IOException; |
7 |
import java.util.List; |
|
8 | 7 |
|
9 | 8 |
import org.apache.commons.configuration.ConfigurationException; |
10 | 9 |
import org.apache.solr.client.solrj.SolrServer; |
11 | 10 |
import org.junit.Before; |
12 | 11 |
import org.junit.Test; |
13 | 12 |
|
14 |
import edu.ucsb.nceas.metacat.common.query.EnabledQueryEngines; |
|
15 |
|
|
16 | 13 |
public class SolrServerFactoryTest extends MetacatCommonTestBase { |
17 | 14 |
/** |
18 | 15 |
* The setup method |
metacat-common/src/main/java/edu/ucsb/nceas/metacat/common/query/EmbeddedSolrQueryService.java | ||
---|---|---|
21 | 21 |
import java.io.IOException; |
22 | 22 |
import java.io.InputStream; |
23 | 23 |
import java.io.StringWriter; |
24 |
import java.util.ArrayList; |
|
25 | 24 |
import java.util.List; |
26 | 25 |
import java.util.Map; |
27 | 26 |
import java.util.Set; |
... | ... | |
35 | 34 |
import org.apache.solr.common.util.XML; |
36 | 35 |
import org.apache.solr.core.CoreContainer; |
37 | 36 |
import org.apache.solr.core.SolrCore; |
38 |
import org.apache.solr.schema.IndexSchema; |
|
39 | 37 |
import org.apache.solr.schema.SchemaField; |
40 | 38 |
import org.dataone.service.exceptions.NotFound; |
41 |
import org.dataone.service.exceptions.NotImplemented; |
|
42 | 39 |
import org.dataone.service.exceptions.UnsupportedType; |
43 | 40 |
import org.dataone.service.types.v1.Subject; |
44 | 41 |
import org.xml.sax.SAXException; |
45 | 42 |
|
46 |
import edu.ucsb.nceas.metacat.common.query.SolrQueryResponseTransformer; |
|
47 | 43 |
|
48 |
|
|
49 | 44 |
/** |
50 | 45 |
*The query service of the embedded solr server. |
51 | 46 |
* @author tao |
metacat-common/src/main/java/edu/ucsb/nceas/metacat/common/query/HttpSolrQueryService.java | ||
---|---|---|
22 | 22 |
import java.io.InputStream; |
23 | 23 |
import java.net.MalformedURLException; |
24 | 24 |
import java.net.URL; |
25 |
import java.util.ArrayList; |
|
26 |
import java.util.HashMap; |
|
27 | 25 |
import java.util.List; |
28 | 26 |
import java.util.Map; |
29 | 27 |
import java.util.Set; |
30 |
import java.util.Vector; |
|
31 | 28 |
|
32 | 29 |
import javax.xml.parsers.DocumentBuilder; |
33 | 30 |
import javax.xml.parsers.DocumentBuilderFactory; |
34 | 31 |
import javax.xml.parsers.ParserConfigurationException; |
35 | 32 |
import javax.xml.xpath.XPathConstants; |
36 |
import javax.xml.xpath.XPathExpressionException; |
|
37 | 33 |
import javax.xml.xpath.XPathFactory; |
38 | 34 |
|
39 | 35 |
import org.apache.commons.codec.net.URLCodec; |
... | ... | |
41 | 37 |
import org.apache.commons.logging.LogFactory; |
42 | 38 |
import org.apache.solr.client.solrj.impl.CommonsHttpSolrServer; |
43 | 39 |
import org.apache.solr.client.solrj.util.ClientUtils; |
44 |
|
|
45 | 40 |
import org.apache.solr.common.params.SolrParams; |
46 | 41 |
import org.apache.solr.core.SolrConfig; |
47 |
import org.apache.solr.schema.FieldType; |
|
48 | 42 |
import org.apache.solr.schema.IndexSchema; |
49 | 43 |
import org.apache.solr.schema.SchemaField; |
50 |
import org.apache.solr.schema.TextField; |
|
51 | 44 |
import org.dataone.configuration.Settings; |
52 | 45 |
import org.dataone.service.exceptions.NotFound; |
53 |
import org.dataone.service.exceptions.NotImplemented; |
|
54 | 46 |
import org.dataone.service.types.v1.Subject; |
55 |
import org.w3c.dom.Attr; |
|
56 | 47 |
import org.w3c.dom.Document; |
57 |
import org.w3c.dom.Element; |
|
58 | 48 |
import org.w3c.dom.Node; |
59 | 49 |
import org.w3c.dom.NodeList; |
60 |
import org.xml.sax.Attributes; |
|
61 | 50 |
import org.xml.sax.InputSource; |
62 | 51 |
import org.xml.sax.SAXException; |
63 | 52 |
|
metacat-common/src/main/java/edu/ucsb/nceas/metacat/common/query/SolrQueryResponseTransformer.java | ||
---|---|---|
18 | 18 |
*/ |
19 | 19 |
package edu.ucsb.nceas.metacat.common.query; |
20 | 20 |
|
21 |
import java.io.ByteArrayInputStream; |
|
22 | 21 |
import java.io.IOException; |
23 | 22 |
import java.io.InputStream; |
24 | 23 |
import java.io.StringWriter; |
metacat-common/src/main/java/edu/ucsb/nceas/metacat/common/query/SolrQueryServiceController.java | ||
---|---|---|
21 | 21 |
import java.io.IOException; |
22 | 22 |
import java.io.InputStream; |
23 | 23 |
import java.net.MalformedURLException; |
24 |
import java.util.List; |
|
25 | 24 |
import java.util.Map; |
26 | 25 |
import java.util.Set; |
27 | 26 |
|
metacat-common/src/main/java/edu/ucsb/nceas/metacat/common/index/IndexTask.java | ||
---|---|---|
4 | 4 |
import java.util.List; |
5 | 5 |
import java.util.Map; |
6 | 6 |
|
7 |
import org.dataone.service.types.v1.SystemMetadata;
|
|
7 |
import org.dataone.service.types.v2.SystemMetadata;
|
|
8 | 8 |
|
9 | 9 |
public class IndexTask implements Serializable { |
10 | 10 |
|
Also available in: Unified diff
update to use v2 types for indexing