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
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
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
Gethin James
aa5d66c04f
Using a script from source control to build/run the docker image
2016-06-10 10:55:12 +02: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
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
Gethin James
6945265d9a
SEARCH-56: Altering CoreDescriptorDecorator to allow for limited property substitution
2016-06-09 10:54:46 +02:00
Gethin James
978efd7c50
SEARCH-56: SolrContentStore now uses just a static initializer
2016-06-09 10:54:46 +02:00
Gethin James
c1c20bf356
SEARCH-56: Switching to use external properties for solr.host,port,baseurl
2016-06-09 10:54:46 +02:00
Gethin James
58a6d0acd3
SEARCH-56: Added a ConfigUtil class for locating properties
2016-06-09 10:54:46 +02:00
Gethin James
bdd8c60b84
Fixing the alfresco.version number.
2016-06-09 10:48:26 +02:00
Gethin James
062e7d28fe
Restrict the libs jar to: compile, provided, and system dependencies
2016-06-09 10:34:03 +02:00
Gethin James
68bbad375d
Fixing the packaging to use a solr-libs.jar
2016-06-09 10:21:59 +02:00
Michael Suzuki
fd8bb0b643
Amend assembly to work with new structure
2016-06-08 21:13:53 +01:00
Michael Suzuki
e30bfe6398
Amend to not use shade as it would return all libs as flat files and instead place all dependency in a lib folder
2016-06-08 20:43:27 +01:00
Michael Suzuki
ca7190a4cd
Merge branch 'master' of https://gitlab.alfresco.com/search_discovery/solr
2016-06-08 14:50:23 +01:00
Michael Suzuki
10949630c9
Fix packaging to work with alfresco-solr in jar format
2016-06-08 14:50:09 +01:00
Gethin James
4aeabf0cc8
SEARCH-9: Changed the docker envs because bamboo uses an old docker version
2016-06-08 15:34:05 +02:00
Michael Suzuki
0f69dbaf35
organise imports
2016-06-08 11:21:57 +01:00
Michael Suzuki
dd6889f985
Fix to use locally built alfresco-solr instead of using the artifact released in nexus
2016-06-08 09:48:44 +01:00
Michael Suzuki
980187ff01
Fix to locate jar instead of war file
2016-06-08 07:27:29 +01:00
Michael Suzuki
a0d1933f7c
Merge branch 'master' of https://gitlab.alfresco.com/search_discovery/solr
2016-06-07 14:35:30 +01:00
Michael Suzuki
32f42e0f4d
Removed unused libs and changed packaging to a jar as the packaging project is now responsible for making it into a war file
2016-06-07 14:35:25 +01:00
Gethin James
f3c93d2dbb
Fixing the packaging after the build artifact was renamed
2016-06-07 13:24:10 +02:00
Michael Suzuki
bf2d4c98f3
Updated artifact naming to alfresco-solr instead of specifying a solr version
2016-06-06 15:43:17 +01:00
Michael Suzuki
a029dc845c
Removed jetty dependencies and tidy up pom indentation
2016-06-06 15:21:34 +01:00
Gethin James
26939dc561
SEARCH-9: Renamed the packaging project to -distribution
2016-06-06 16:11:47 +02:00
Michael Suzuki
ce87cad096
Removed settings and plugins relating to ssl setup
2016-06-03 17:37:30 +01:00
Michael Suzuki
Joel Bernstein
Gethin James