Commit Graph
103 Commits
Author SHA1 Message Date
Gethin James e25d837fa3 SEARCH-56: data.dir.root now configurable externally 2016-06-16 10:52:21 +02:00
Gethin James 56b140eb4a SEARCH-9: Adding the alfresco solr host settings 2016-06-15 17:04:02 +02:00
Gethin James af34af4818 Merge branch 'feature/SEARCH-9_create_build_artifacts' into 'master'
Feature/search 9 create build artifacts

We are building jars artifacts in alfresco-solr/target which are then used in the packaging/target distribution.  How does it look?

See merge request !3
2016-06-15 14:37:33 +01:00
Joel 1c7ca11c20 SEARCH-42: Added large block of FTS assertions 2016-06-14 16:35:57 -04:00
Gethin James e55adca562 SEARCH-18: Changing the artifact version to 6.0-SNAPSHOT 2016-06-14 17:21:42 +02:00
Gethin James 019772da16 SEARCH-9: Tweeking docker-compose 2016-06-14 17:21:11 +02:00
Gethin James 196480f7a0 SEARCH-9: Configuring directories for content / models / index 2016-06-14 14:47:04 +02:00
Joel d32e7c75fc SEARCH-42: Added more tests checking the data load 2016-06-13 16:42:41 -04:00
Gethin James e1ad071280 SEARCH-18: Added sources and tests jars 2016-06-13 17:47:17 +02:00
Gethin James cdcbe3ef6e SEARCH-9: Removing unused webapp dir 2016-06-13 17:46:14 +02:00
Gethin James 1116665e2a SEARCH-9: Clearer docker-compose file 2016-06-13 17:41:37 +02:00
Michael Suzuki 5e9deb97c0 SEARCH-20, updated to use alfresco's new super pom that supports java 8 2016-06-13 15:27:48 +01:00
Michael Suzuki bbd9d4a811 Added solr.log to list of ingoreable files 2016-06-13 15:26:00 +01:00
Joel Bernstein 177d35ec4e Merge branch 'feature/SEARCH-56_externalize_solr_host_properties' into 'master'
Feature/search 56 externalize solr host properties

solr.host, solr.port, solr.baseUrl are the properties a client (eg. Alfresco) can use to talk to Solr. These are the external values, not local values e.g. they could point to a proxy.
We should allow these to be passed in via configuration.

See merge request !1
2016-06-13 14:34:21 +01:00
Joel 2a8e15d40c SEARCH-42: Loads an initial data set and runs a partial set of tests checking the data load 2016-06-13 08:17:53 -04:00
Gethin James fbbe3b5aa8 SEARCH-9: Cleaning up the branch name for the docker image 2016-06-13 13:01:57 +02:00
Gethin James caab114117 SEARCH-56: Now using a valid share.properties that matches the default configuration 2016-06-13 12:24:07 +02:00
Gethin James 2814557cd4 SEARCH-9: Updated the docker test for the new distribution structure 2016-06-10 17:04:40 +02:00
Gethin James 9e9504a374 Merge branch 'master' into feature/SEARCH-56_externalize_solr_host_properties
solr/src/main/resources/solr/instance/templates/without_suggest/conf/solrcore.properties
2016-06-10 16:52:22 +02:00
Gethin James 98d250543d As discussed with Andy, removed unused config 2016-06-10 16:28:27 +02:00
Gethin James 1880902a75 Merge branch 'removeJetty' into 'master'
Remove jetty and other libraries that are already bundled in solr zip

See merge request !2
2016-06-10 15:13:13 +01:00
Gethin James eb5428fa66 SEARCH-56: Changed to use "proxy" rather than "solr" host 2016-06-10 15:48:27 +02:00
Gethin James c23f0fa593 SEARCH-56: Clearer alfresco.version default value 2016-06-10 15:48:07 +02:00
Michael Suzuki ec865c9e6f Merge branch 'removeJetty' of https://gitlab.alfresco.com/search_discovery/solr into removeJetty 2016-06-10 13:34:47 +01:00
Michael Suzuki 83f024e25b Added list of of libs to exclude instead of using scope to filter out the unwanted libs 2016-06-10 13:34:23 +01:00
Michael Suzuki 94b866d2dc rebase merging fix 2016-06-10 13:32:12 +01:00
Michael Suzuki b87681cced Remove unwanted jar such as jetty 2016-06-10 13:31:01 +01:00
Michael Suzuki cf3f6bae35 Remove contents of org solr folder as it is a surplus 2016-06-10 13:31:01 +01:00
Michael Suzuki ac6109afa2 Added list of of libs to exclude instead of using scope to filter out the unwanted libs 2016-06-10 13:31:01 +01:00
Michael Suzuki 5b1a74d111 Amend pom to exclude libs that are not needed such as jetty 2016-06-10 13:31:01 +01:00
Michael Suzuki aa20697cdc Remove unwanted jar such as jetty 2016-06-10 13:31:01 +01:00
Michael Suzuki 70c089f227 Merge branch 'removeJetty' of https://gitlab.alfresco.com/search_discovery/solr into removeJetty 2016-06-10 13:01:43 +01:00
Michael Suzuki dd554d630b Remove contents of org solr folder as it is a surplus 2016-06-10 13:01:32 +01:00
Michael Suzuki 9f851d3485 Added list of of libs to exclude instead of using scope to filter out the unwanted libs 2016-06-10 13:01:32 +01:00
Michael Suzuki 981f32fc19 Amend pom to exclude libs that are not needed such as jetty 2016-06-10 13:01:32 +01:00
Michael Suzuki 27cc6a36d4 Remove unwanted jar such as jetty 2016-06-10 13:01:32 +01:00
Michael Suzuki b578b01fac Remove contents of org solr folder as it is a surplus 2016-06-10 11:28:41 +01:00
Michael Suzuki 32cb67cd69 Added list of of libs to exclude instead of using scope to filter out the unwanted libs 2016-06-10 10:45:21 +01:00
Gethin James aa5d66c04f Using a script from source control to build/run the docker image 2016-06-10 10:55:12 +02:00
Michael Suzuki 21fa9d9727 Amend pom to exclude libs that are not needed such as jetty 2016-06-09 21:56:56 +01:00
Gethin James 6928769405 Added a docker-compose file for easy running. 2016-06-09 17:05:34 +02:00
Michael Suzuki d84385b411 Reverted wait time back to 80000 2016-06-09 15:25:48 +01:00
Gethin James b20685ce99 SEARCH-56: setup() no longer needed for the test 2016-06-09 16:02:47 +02:00
Gethin James 032ab52790 SEARCH-56: Changed to use "proxy" rather than "solr" host 2016-06-09 16:02:08 +02:00
Michael Suzuki ba34795ef6 Remove unwanted jar such as jetty 2016-06-09 14:51:27 +01:00
Gethin James d320d2086e SEARCH-56: Switching to use external properties for the Model Home 2016-06-09 14:40:44 +02:00
Gethin James f0aeb356ac Moving around the test resources 2016-06-09 14:39:31 +02:00
Gethin James 209b57242d SEARCH-56: Adding test files and error logging 2016-06-09 12:45:41 +02:00
Michael Suzuki d892237879 Tidy up duplication and removed System.out.prints 2016-06-09 10:59:01 +01:00
Gethin James a6964bd908 SEARCH-56: Moved solrhome to a top level directory 2016-06-09 11:26:24 +02:00