Changeset 4480
- Timestamp:
- 02/07/14 16:19:02 (10 years ago)
- Location:
- vlo/branches/vlo-3.0
- Files:
-
- 23 added
- 4 edited
- 10 copied
- 8 moved
Legend:
- Unmodified
- Added
- Removed
-
vlo/branches/vlo-3.0/pom.xml
r4459 r4480 1 1 <?xml version="1.0" encoding="UTF-8"?> 2 3 <project xmlns="http://maven.apache.org/POM/4.0.0" 4 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 5 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 6 http://maven.apache.org/xsd/maven-4.0.0.xsd" 7 > 2 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 8 3 9 4 <modelVersion>4.0.0</modelVersion> … … 28 23 <module>vlo-web-app</module> 29 24 <module>vlo-importer</module> 25 <module>vlo-commons</module> 30 26 </modules> 31 27 … … 58 54 <version>2.3</version> 59 55 <configuration> 56 <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot> 60 57 <descriptors> 61 58 <descriptor>src/main/assembly/installPackageBuilder.xml</descriptor> -
vlo/branches/vlo-3.0/src/main/assembly/installPackageBuilder.xml
r4269 r4480 29 29 </fileSet> 30 30 <fileSet> 31 <directory>vlo _solr</directory>31 <directory>vlo-solr</directory> 32 32 <includes> 33 33 <include>README.TXT</include> … … 39 39 <!-- jar file --> 40 40 <fileSet> 41 <directory>vlo _importer/target</directory>41 <directory>vlo-importer/target</directory> 42 42 <includes> 43 43 <include>*.jar</include> … … 47 47 <!-- run script --> 48 48 <fileSet> 49 <directory>vlo _importer/src/main/bin</directory>49 <directory>vlo-importer/src/main/bin</directory> 50 50 <includes> 51 51 <include>*.sh</include> … … 56 56 <!-- config files --> 57 57 <fileSet> 58 <directory>vlo _importer/src/main/resources</directory>58 <directory>vlo-commons/src/main/resources</directory> 59 59 <includes> 60 60 <include>*.properties</include> … … 68 68 <!-- war file --> 69 69 <fileSet> 70 <directory>vlo _web_app/target</directory>70 <directory>vlo-web-app/target</directory> 71 71 <includes> 72 72 <include>*.war</include> … … 76 76 <!-- config --> 77 77 <fileSet> 78 <directory>vlo _importer/src/main/resources</directory>78 <directory>vlo-commons/src/main/resources</directory> 79 79 <includes> 80 80 <include>VloConfig.xml</include> … … 86 86 <!-- war file --> 87 87 <fileSet> 88 <directory>vlo _solr/target</directory>88 <directory>vlo-solr/target</directory> 89 89 <includes> 90 90 <include>*.war</include> … … 95 95 <!-- solr configuration files --> 96 96 <fileSet> 97 <directory>vlo_solr/target/vlo_solr-3.6.0-vlo_solr_conf</directory> 97 <!-- TODO: Get this dynamically from version property --> 98 <directory>vlo-solr/target/vlo-solr-3.0-SNAPSHOT</directory> 98 99 <includes> 99 100 <include>**/*</include> … … 102 103 </fileSet> 103 104 <fileSet> 104 <directory>vlo_solr/target/vlo_solr-3.6.0-vlo_solr_conf</directory> 105 <!-- TODO: Get this dynamically from version property --> 106 <directory>vlo-solr/target/vlo-solr-3.0-SNAPSHOT</directory> 105 107 <includes> 106 108 <include>vlo_solr.xml</include> -
vlo/branches/vlo-3.0/vlo-importer/pom.xml
r4326 r4480 129 129 <dependencies> 130 130 <dependency> 131 <groupId>${project.groupId}</groupId> 132 <artifactId>vlo-commons</artifactId> 133 <version>${project.version}</version> 134 </dependency> 135 <dependency> 131 136 <groupId>net.handle</groupId> 132 137 <artifactId>handle-client</artifactId> … … 189 194 </dependency> 190 195 <dependency> 191 <groupId>org.simpleframework</groupId>192 <artifactId>simple-xml</artifactId>193 <version>2.4.1</version>194 </dependency>195 <dependency>196 196 <groupId>commons-cli</groupId> 197 197 <artifactId>commons-cli</artifactId> -
vlo/branches/vlo-3.0/vlo-web-app/pom.xml
r4326 r4480 44 44 <version>${jetty.version}</version> 45 45 <scope>provided</scope> 46 </dependency> 47 <dependency> 48 <groupId>org.apache.solr</groupId> 49 <artifactId>solr-solrj</artifactId> 50 <version>${solr.version}</version> 51 <type>jar</type> 52 </dependency> 53 <dependency> 54 <groupId>${project.groupId}</groupId> 55 <artifactId>vlo-commons</artifactId> 56 <version>3.0-SNAPSHOT</version> 46 57 </dependency> 47 58 </dependencies> -
vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/service/impl/AutoCompleteDao.java
r4459 r4480 1 package eu.clarin.cmdi.vlo. dao;1 package eu.clarin.cmdi.vlo.service.impl; 2 2 3 3 import java.util.ArrayList; -
vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/service/impl/SearchResultsDao.java
r4459 r4480 1 package eu.clarin.cmdi.vlo. dao;1 package eu.clarin.cmdi.vlo.service.impl; 2 2 3 3 import eu.clarin.cmdi.vlo.FacetConstants; -
vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/service/impl/SolrDao.java
r4459 r4480 1 package eu.clarin.cmdi.vlo. dao;1 package eu.clarin.cmdi.vlo.service.impl; 2 2 3 3 import eu.clarin.cmdi.vlo.config.VloConfig; … … 8 8 import org.apache.solr.client.solrj.SolrQuery; 9 9 import org.apache.solr.client.solrj.SolrServerException; 10 import org.apache.solr.client.solrj.impl. CommonsHttpSolrServer;10 import org.apache.solr.client.solrj.impl.HttpSolrServer; 11 11 import org.apache.solr.client.solrj.response.QueryResponse; 12 12 import org.apache.solr.client.solrj.util.ClientUtils; … … 19 19 20 20 private final static Logger LOG = LoggerFactory.getLogger(SolrDao.class); 21 private final CommonsHttpSolrServer solrServer;21 private final HttpSolrServer solrServer; 22 22 23 23 public SolrDao() { 24 24 String solrUrl; 25 25 solrUrl = VloConfig.getSolrUrl(); 26 try { 27 solrServer = new CommonsHttpSolrServer(solrUrl); 28 } catch (MalformedURLException e) { 29 throw new RuntimeException("URL: " + solrUrl, e); 30 } 26 solrServer = new HttpSolrServer(solrUrl); 31 27 } 32 28 33 protected CommonsHttpSolrServer getSolrserver() {29 protected HttpSolrServer getSolrserver() { 34 30 return solrServer; 35 31 }
Note: See TracChangeset
for help on using the changeset viewer.