89 Commits

Author SHA1 Message Date
Neil McErlean
9e9357088b Refactoring 'special facet id' handling as the injection of special values has broken the build. ACE-2639.
Sadly I'm going back to hard-coded special values.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85798 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-26 14:13:45 +00:00
Neil McErlean
e52aede98f Additional handling for "special" facet IDs (SITE, TAG etc). Part of ACE-2639.
This check-in ensures that those facet IDs are not prefixed with the '@' char like all other facet IDs.
The list is currently injected from solr-facets-context.xml, which required a slight refactoring of spring beans to make SolrFacetHelper a bean.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85711 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-25 11:29:05 +00:00
Mark Rogers
5142297ac0 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
85082: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      84493: ACE-2637: Initial implementation of spell-check feature.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85397 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-20 10:51:27 +00:00
Mark Rogers
5a504fce07 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
85028: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      84196: Addition of what I'm calling 'synthetic' facetable properties to SolrFacetService and REST API as part of ACE-2639.
      A synthetic property is something that is technically *NOT* a property, but which can be treated as such for the purposes
      of SOLR facetting/filtering.
      Currently we only support two synthetic properties: size and mimetype, which are defined within any Alfresco property of
      type d:content. This includes, but is not limited to, the cm:content property in all cm:content types in Alfresco.
      (Be careful with your cm:content. That name is heavily overloaded.)
      This checkin only supports what we need for 5.0. It is expressly not designed for resuse/extension in a general way.
      However, I have tried to push the less stable parts of this work into the implementation of the service and REST API
      and limit what's in the service interface to the more stable parts of the work.
      Also note that I had to add some l10n/i18n key-values for these synthetic properties. I've called the mimetype 'MIME type'
      in the l10n'd text as I have translations for that in all languages.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85343 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-20 10:24:57 +00:00
Mark Rogers
238448f7b5 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
85023: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      84171: ACE-1692: system property security.anyDenyDenies is respected by AbstractQParser (when SolrQueryHTTPClient sends authority filter in json)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85338 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-20 10:22:30 +00:00
Mark Rogers
7a1d7666f5 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
84958: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      83712: ACE-2612: Added option to lower case Suggester term (addressing the review comments). Also refactored the Suggester service to take 'SuggesterParameters' as a method parameter.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85273 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-20 09:27:37 +00:00
Mark Rogers
e0b69f6ca7 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
84954: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      83702: ACE-2639. Added javadoc stating that inherited properties are included in results for a single type/aspect, which they are.
      Added content class qname (type/aspect) to the JSON rsp as it's very helpful.
      Improved FacetablePropertyData's compareTo impl to properly sort on model,type,prop.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85271 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-20 09:26:40 +00:00
Mark Rogers
bbbbfc1dbe Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
84950: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      83670: Moved the FacetablePropertyData inner class from SolrFacetService (Java API layer) into FacetablePropertiesGet (REST API layer) as that is a better place for it. ACE-2639.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85267 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-20 09:24:45 +00:00
Mark Rogers
1d5aa5d15c Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
84948: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      83656: Addition of standard paging to FacetableProperties result sets. Part of ACE-2639.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85265 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-20 09:23:46 +00:00
Mark Rogers
dd26455cf4 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
84926: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      83488: ACE-2639. Added a natural ordering (alphabetical) to FacetablePropertyData to ensure predictable result ordering.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85243 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-20 09:13:04 +00:00
Mark Rogers
2798ba02dd Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
84922: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      83457: Refactoring the facetable properties.get response and some of the service API. Part of ACE-2639.
      This checkin changes the JSON structure slightly (array, not map), adds a displayName.
      The localised title and displayName are still in the server locale. I'll fix that to client locale next. Also need to add paging.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85239 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-20 09:11:04 +00:00
Mark Rogers
f9dee792a5 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
84919: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      83447: ACE-2612: Initial implementation of the Suggester service to support the auto-suggest web script.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85237 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-20 09:09:54 +00:00
Mark Rogers
48dbf73041 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
84917: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      83444: ACE-2639. Added property title (where available) to JSON rsp.
      As the title can only be retrieved using a getTitle(MessageLookup) call, I had to get the titles from the Java layer, rather than a straight get call in the FTL. Makes the API a bit messier. I may get to tidy it as part of ongoing work on ACE-2639.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85235 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-20 09:08:52 +00:00
Mark Rogers
2731b9a7bb Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
84902: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      83412: Preliminary implementation of ACE-2639.
      This check-in allows any user to hit the repo at http://localhost:8080/alfresco/service/api/facet/facetable-properties
      or at http://localhost:8080/alfresco/service/api/facet/classes/cm:thumbnail/facetable-properties and get details on facetable properties for all properties in the system or all properties on the specified type/aspect, respectively.
      I'm checking this in in order to start to get some feedback on what the global list contains and how we might restrict it. The JSON response is very basic currently and it will be enhanced also.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85222 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-20 09:02:07 +00:00
Mark Rogers
0dac120b1c Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
84822: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      82523: Fix for     ACE-1044  SOLR 4 - Back up and recovery
      - added baseUrl configuration
      - improved admin


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85181 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-20 08:42:16 +00:00
Will Abson
72af9229de ACE-2433: Adapt repository script to allow SOLR 4
- Change solr query endpoint to that passed in to the method and remove redundant 'qt' parameter (consistent with other query methods)
 - Parsing of stats response no longer expects a specific stats item, it just parses the first stats field object as there should only ever be one

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@83720 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-09 15:27:32 +00:00
Erik Winlof
e71d0e65f8 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
81437: Fixing a little bug identified by findbugs. An exception was created and dropped without being thrown.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@83164 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-04 06:18:34 +00:00
Will Abson
bc794cda30 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
80709: Merged WAT1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      78667: ACE-1582: Made the facet config service and the relevant web scripts to accept single/multiple value(s) update (to support inline edits).


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@83007 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 16:41:45 +00:00
Will Abson
930f2a2edf Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
80698: Merged WAT1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      78457: ACE-1582: - Fixed facet's custom properties.
                - Made the GET facets web-script to be accessed by all authenticated users rather than just the Search-Admin/Network-Admin users. 
                - Fixed FacetRestApiTests and added more tests.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82996 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 16:30:54 +00:00
Will Abson
a740ca67cb Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
80669: Merged WAT1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      78166: ACE-1582: Enhancements to the facet service to persist only the modified value(s) rather than the whole facet's properties. Also fixed facets cache and facets reordering NPE.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82966 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 16:18:39 +00:00
Will Abson
5d5409019e Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
80656: Merged WAT1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      77535: Adding first JUnit test of facet config rest api. Part of ACE-1582.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82950 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 16:16:41 +00:00
Will Abson
3a8e6c7309 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
80643: Merged WAT1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      76831: Enhancement to the /api/solr/facet-config REST endpoint to support facet reordering.
      If you add a query parameter like so: /api/solr/facet-config/{filterID}?relativePos={relativePos?}
      then the specified filterID will be moved by the specified relative position.
      '3' means move it 3 places down the list. '-1' means move it one place up the list.
      Note that currently you cannot provide a HTTP request body (JSON) at the same time as the relativePos param,
      in other words you cannot update the facet metadata and reposition in in one REST call. It is either or.
      We may enhance the webscript to support simultaneous edits of metadata and position at a future date.
      Also added automatic management of facet position on facet create and delete. New facets are put at the
      end of the list - this can easily be changed if it is not what's wanted.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82937 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 16:14:31 +00:00
Will Abson
76e5df2cb7 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
80628: Merged WAT1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      76618: Initial commit of Java service changes for facet reordering. Part of ACE-1582.
      Facet persistence has not been changed, but a property has been added to the folder
      which contains the facet nodes. This property 'facetOrder' holds a sequence of strings
      which are the ordered facet IDs.
      Facets are now returned from the SolrFacetService in a sorted order, where this explicit
      'facetOrder' is the primary source for sort order.
      The sorting algorithm falls back to using indexes if no order is available.
      It then falls back to using alphabetic sorting if no index is available.
      These last two scenarios are likely to be corner cases.
      Still to do: some enhancements to the Java service, webscripts as REST API endpoints.
                   the REST API will provide for reordering of existing facets.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82922 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 16:12:05 +00:00
Will Abson
f0423115fa Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
80523: Merged WAT1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      75184: ACE-1582: Fixed Cloud build failures. Also, added CloudSolrFacetService overlay to override the isSearchAdmin method.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82820 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 15:53:43 +00:00
Will Abson
26880952a0 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
80520: Merged WAT1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      74961: ACE-1582: Added index control and custom data support for the facet configs.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82817 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 15:53:15 +00:00
Will Abson
b0d07f4c04 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
80509: Merged WAT1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      74144: ACE-1582: added:
           - more facet props to the Model and the related JSON response
           - GET one facet API
           - Sorting by facet index


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82806 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 15:51:24 +00:00
Will Abson
9daa0727d5 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
80504: Merged WAT1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      73946: ACE-1582: First cut of Solr faceted-search configuration.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82802 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 15:50:43 +00:00
Will Abson
33334fef52 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
80110: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      79475: Merged DEV to V4.2-BUG-FIX (4.2.4)
         79324: MNT-11023 Admin Console:Search service. After enable noindex not possible to change search service.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82713 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 15:22:43 +00:00
Mark Rogers
a89276be19 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
75551: Reverse Merge HEAD-BUG-FIX (5.0/Cloud)
      74584: Reverse merged HEAD-BUG-FIX (5.0/Cloud)
         << Requires more work on the EOL branch >>
         74416: Merged EOL to HEAD-BUG-FIX (5.0/Cloud)
            74309: ACE-2010 EOL Legacy CMIS Inputs (2) in 5.0
               - Start replacing references to the original CMIS code with Alfresco and chemistry Open CMIS classes 
            74342: ACE-2010 EOL Legacy CMIS Inputs (2) in 5.0
               - Switch ServiceRegistry over to using Open CMIS classes 
            74406: ACE-2010 EOL Legacy CMIS Inputs (2) in 5.0
               << Compiles and starts Share without error >>
               - Removed Original CMIS classes from the repository, remote-api and thor
               - Moved the CMIS.DictionaryBootstrap bean into opencmis-context.xml before removing cmis-api-context.xml
               - Some code was left under:
                   root\projects\remote-api\source\java\org\alfresco\repo\cmis
                   ...........................................................\client
                   ...........................................................\ws
                   ...........................................................\rest
                   ................................test-java\org\alfresco\repo\cmis
                   ................................................................\ws
                   ................................................................\rest
                 Will have to see if it should be be removed too, or if it is common with OpenCMIS
            74407: ACE-2010 EOL Legally CMIS Inputs (2) in 5.0
               - Removed left over code under:
                   root\projects\remote-api\source\java\org\alfresco\repo\cmis
                   ................................test-java\org\alfresco\repo\cmis
               - Removed an authentication URL test in QuickShareRestApiTest which was failing in
                 the same way as the tests above.
               - Removed CXFAuthenticationSystemTest which appears to be using the original CMIS
         74465: Merged EOL (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
            74464: ACE-2010 EOL Legacey CMIS Inputs (2) in 5.0
               - New failure in QuickShareRestApiTest
               - CXFAuthenticationSystemTest (deleted) was still referenced in MiscSystemTestSuite


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77489 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-22 12:58:48 +00:00
Will Abson
9aaca71a50 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
75011: Merged WAT2 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      70370: Cleaned up the solr stats code, added security check and tenants


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@75339 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-01 15:00:02 +00:00
Will Abson
ceeee50b22 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
75005: Merged WAT2 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      70182: WIP, allows date ranges for solr stats queries


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@75334 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-01 14:59:19 +00:00
Will Abson
1962cab130 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
75000: Merged WAT2 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      69908: Initial version of Solr Stats service and webscript


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@75329 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-01 14:58:38 +00:00
David Draper
5d73fd5185 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
70698: Merged WAT1 (4.3/Cloud) to HEAD-BUG-FIX (4.3/Cloud)
      69833: ACE-1581: Updated the facet display handlers to handle "<field-facet>__.u" rather than "<field-facet>__"


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70929 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-05-19 12:53:47 +00:00
David Draper
cf0542eb10 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
70692: Merged WAT1 (4.3/Cloud) to HEAD-BUG-FIX (4.3/Cloud)
      69799: ACE-1605: Fixed Created and Modified date filters.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70923 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-05-19 12:52:21 +00:00
David Draper
13c1057ba7 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
70682: Merged WAT1 (4.3/Cloud) to HEAD-BUG-FIX (4.3/Cloud)
      69736: ACE-1615: Fixed the search result to return empty arrays for field facets, when no facet queries are available.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70914 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-05-19 12:49:53 +00:00
David Draper
98e88f9d65 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
70681: Merged WAT1 (4.3/Cloud) to HEAD-BUG-FIX (4.3/Cloud)
      69090: Updated the java doc in SolrFacetHelper class as well as removed the un-necessary LinkedHashMap.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70913 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-05-19 12:49:39 +00:00
David Draper
ad28258976 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
70680: Merged WAT1 (4.3/Cloud) to HEAD-BUG-FIX (4.3/Cloud)
      69081: ACE-1265: Fixed the selected Date/Size range filtering
      	- Added insertion index for the facet label, to help the Date/Size sorting labels in the UI.
      	- A minor optimization in SolrFacetHelper.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70911 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-05-19 12:49:26 +00:00
David Draper
c22799ddfa Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
70676: Merged WAT1 (4.3/Cloud) to HEAD-BUG-FIX (4.3/Cloud)
      68560: ACE-1265: removed the setter method in the SolrFacetHelper, to close any window of vulnerability.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70907 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-05-19 12:48:27 +00:00
David Draper
4d920b21e9 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
70675: Merged WAT1 (4.3/Cloud) to HEAD-BUG-FIX (4.3/Cloud)
      68557: ACE-1265: added Created date, Modified date, and Content size bucketing. Also, refactored the facet display label implementation.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70906 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-05-19 12:48:13 +00:00
Mark Rogers
752c4fb038 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
68139: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      67630: Merged DEV to V4.2-BUG-FIX (4.2.3)
         67523 : MNT-11104 : Admin Console:Search service. Setting wrong SSL port makes search admin console unavailable
            - Catch IAE to prevent 500 status returning


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@68423 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-30 16:14:49 +00:00
Alan Davis
48bc4bc879 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
65593: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (4.3/Cloud)
      65443: MNT-10826: When SOLR encounters an error during a search, it returns empty result set rather than an error message
      Error from the SOLR side needs to be captured and sent over in the results. It should be thrown on the repository side.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@66247 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-02 21:50:30 +00:00
Alan Davis
4707e6cd48 Merged HEAD-BUG-FIX (Cloud33/4.3) to HEAD (Cloud33/4.3)
62939: Merged PLATFORM1 (Cloud33) to HEAD-BUG-FIX (Cloud33/4.3)
      62289: Merged BRANCHES/DEV/mward/plat1_hybrid_search to BRANCHES/DEV/PLATFORM1:
         61145: ACE-482: very simple start to Hybrid DB/SOLR search.
         61236: ACE-482: added last indexed transaction ID to search results.
         61254: ACE-482: added repo-side support for "lastIndexedTx" from SOLR results
         61508: ACE-482: DbOrIndexSwitchingQueryLanguage uses sinceTxId search param to perform DB search for unindexed content.
         61523: ACE-482: Improved unit tests for DbOrIndexSwitchingQueryLanguage
         61656: ACE-482: Retrieves a changed nodes list, and removes these from index results before adding DB search results.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62993 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-20 15:05:11 +00:00
Alan Davis
9dca412a8c Merged HEAD-BUG-FIX (Cloud33/4.3) to HEAD (Cloud33/4.3)
62931: Merged PLATFORM1 (Cloud33) to HEAD-BUG-FIX (Cloud33/4.3)
      62696: ACE-480  Split Data-Model into Lucene Independent and Legacy Lucene Project


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62986 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-20 14:59:18 +00:00
Alan Davis
3e55fd9ca1 Merged HEAD-BUG-FIX (Cloud33/4.3) to HEAD (Cloud33/4.3)
62930: Merged PLATFORM1 (Cloud33) to HEAD-BUG-FIX (Cloud33/4.3)
      62626: Build fix


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62985 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-20 14:45:36 +00:00
Alan Davis
149492e25c Merged HEAD-BUG-FIX (Cloud33/4.3) to HEAD (Cloud33/4.3)
62928: Merged PLATFORM1 (Cloud33) to HEAD-BUG-FIX (Cloud33/4.3)
      62580: ACE-482: now logs timings for search types other than hybrid.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62983 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-20 14:43:50 +00:00
Alan Davis
b0954de8b3 Merged HEAD-BUG-FIX (Cloud33/4.3) to HEAD (Cloud33/4.3)
62927: Merged PLATFORM1 (Cloud33) to HEAD-BUG-FIX (Cloud33/4.3)
      62573: ACE-482: now logs timings for hybrid search at debug level.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62982 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-20 14:42:56 +00:00
Alan Davis
8bb9d2507d Merged HEAD-BUG-FIX (Cloud33/4.3) to HEAD (Cloud33/4.3)
62924: Merged PLATFORM1 (Cloud33) to HEAD-BUG-FIX (Cloud33/4.3)
      62527: ACE-482: improved logging for hybrid search - returns numbers of results for each part of process.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62978 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-20 14:40:18 +00:00
Alan Davis
1a7fd86ee2 Merged HEAD-BUG-FIX (Cloud33/4.3) to HEAD (Cloud33/4.3)
62920: Merged PLATFORM1 (Cloud33) to HEAD-BUG-FIX (Cloud33/4.3)
      << This was a bad merge with conflicts to do with the impl/solr directory not existing >>
      62511: ACE-482: Hybrid search can be disabled/enabled and is disabled by default.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62975 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-20 14:37:41 +00:00
Alan Davis
7d59e9392c Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
60937: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      60816: MNT-10323: QueryModelException: Descen dant/IN_TREE() is unsupported by opening WCMQS
      Logging level has been changed from INFO to DEBUG for the queries that cannot be executed against the DB


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62372 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 14:43:54 +00:00
Alan Davis
a6b0e25dcf Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
57484: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      57302: Merged V4.1-BUG-FIX (4.1.7) to V4.2-BUG-FIX (4.2.1)
         57294: Merged DEV to V4.1-BUG-FIX (4.1.7)
            57293: MNT-8557: Escaping space in JS search query sort column ID
               Added explicit space replacing in SOLR url query and reverse replacing to get property definition.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61826 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 20:49:58 +00:00