439 Commits

Author SHA1 Message Date
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
Will Abson
c717551907 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
79326: Merged EOL to HEAD-BUG-FIX (5.0/Cloud)
      79090: ACE-2013 EOL JCR, JCR-RMI, etc in 5.0
         - Removed references to http://www.jcp.org/jcr (left in web-scripts-application-context.xml
           and multiple versions of opencmis-gnamefilter-context.xml)
      78990: ACE-2013 EOL JCR, JCR-RMI, etc in 5.0
         - Removing references to "jcr-xpath" - Biggest changes were to: DocumentNavigator, NodeServiceXPath and NodeSearcher
         - SearcherComponentTest has a lot of tests removed that appeared to be JCR specific
         - There are still a lot of namespace references in XML files to http://www.jcp.org/jcr/1.0 etc.
         - Left a few  references to "JSR 170" and JCR in java classes as they looked like they might be common with other bits.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82708 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 15:21:53 +00:00
Erik Winlof
3f5242db68 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
78519: Merged EOL (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      78398: ACE-81 Upgrade MyBatis to 3.2.7
         - myBatis 3.2.7 upgrade onto Spring 3.2 upgrade. Merged in appropriate sections from BRANCHES/DEV/DEREK/ALF-19099 and fixed
         - myBatis namespace config issue. Full maven build with unit tests works, repo and share start and the basics seem to be working.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82583 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 12:25:40 +00:00
Erik Winlof
e94f8f8351 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
78429: Merged EOL (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      75801: ACE-2149: EOL AVM / WCM
       - Thorough sweep of 'avm' and 'wcm' references
       - Picked up on many 'deployment' and related classes and configuration
       - Repo starts


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82558 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 12:13:50 +00:00
Erik Winlof
0baa0f74f4 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
78403: Merged EOL (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      75700: ACE-2149: EOL AVM / WCM
       - Remove most of the AVM and WCM beans, scripts, classes, patches, etc
       - The Explorer client is very broken for compilation
         - TODO: Remove all WCM-related functionality, which I thought would be best left to a UI dev
                 I've murdered many of the classes and beans but there's more to do
       - The repository compiles
         TODO: Get it running again
       - TODO: Check if we can wipe the 'deployment' project as well


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82540 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 12:01:49 +00:00
Erik Winlof
f01f727e5e Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
78392: Merged EOL (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      75693: ACE-2149 Remove AVM/WCM - first round, based on the following Sparta commits
         08f1ff556cf3e8eb370e433b69b634026c848af1: SlimRepo: comment-out AVM schema bootstrap and wcm-services-context
            - plus associated bootstrap/startup fallout
            - note: disabling/removing WCM/AVM will be a work-in-progress due to tight code coupling :-(
         cdb78eeae53522cc2d78feb94be49d11648fa582; SlimRepo: comment-out AVM schema bootstrap and wcm-services-context
             - follow-on to fix "regenerate_renditions" fallout error (in Alfresco Explorer web client)
         33337ad4239df91b9a8dc7a00be43e55ffef5bef: SlimRepo: remove WCM/AVM - round 1 (wip)
            - removal of some of the AVM code and tests (including core impl such as AVMServiceImpl, AVMRepository, AVMSyncServiceImpl, underlying DAOs etc)
            - fix Spring config (major impact) and any obvious compile-time fallout
            - ensured repo starts and ran (some of the) repo unit tests
            - also check basic Explorer access
         47e50847bbbbdda5fd64a27c212dfbdd625cbfdb: Jenkins build/test repo - minor: disable/remove repo tests
            - disabled unused tests, removed remaining AVM* tests


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82537 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 11:57:51 +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
96f5e5815d Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
63338: Merged BRANCHES/DEV/KEVINR to HEAD-BUG-FIX
      63337: Fix bug in SolrJSONResultSet where 'lastIndexedTx' is not always reported in JSON returned from SOLR but it is assumed to be mandatory.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64283 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-14 16:11:01 +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
0fddaf3141 Merged HEAD-BUG-FIX (Cloud33/4.3) to HEAD (Cloud33/4.3)
62925: Merged PLATFORM1 (Cloud33) to HEAD-BUG-FIX (Cloud33/4.3)
      62531: ACE-482: ChildAssocRefResultSet.hasMore() returns false, previously threw UnsupportedOperationException.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62979 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-20 14:41:11 +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
50f699b961 Merged HEAD-BUG-FIX (Cloud33/4.3) to HEAD (Cloud33/4.3)
62916: Merged PLATFORM1 (Cloud33) to HEAD-BUG-FIX (Cloud33/4.3)
      62406: ACE-479  Provide Search Adapter - more tidy up - remove commented code, update copyright, tweak some adaptor variable names


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62970 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-20 14:34:04 +00:00
Alan Davis
e245353b4a Merged HEAD-BUG-FIX (Cloud33/4.3) to HEAD (Cloud33/4.3)
62915: Merged PLATFORM1 (Cloud33) to HEAD-BUG-FIX (Cloud33/4.3)
      62288: ACE-479  Provide Search Adapter - general tidy up including addressing the review comments


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62969 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-20 14:33:04 +00:00
Alan Davis
30b1d43c90 Merged HEAD-BUG-FIX (Cloud33/4.3) to HEAD (Cloud33/4.3)
62901: Merged PLATFORM1 (Cloud33) to HEAD-BUG-FIX (Cloud33/4.3)
      61252: ACE-479  Provide Search Adapter
       - Reintegrated BRANCHES/DEV/PLATFORM1 from BRANCHES/DEV/PLATFORM1-AHIND


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62955 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-20 14:21:16 +00:00
Alan Davis
c66a25e95d Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
61048: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      60930: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.2)
         60804: MNT-9595: Merged DEV to V4.1-BUG-FIX (4.1.8)
            57553: MNT-9595: Tag manager cannot find tags past the value of solr.query.maximumResultsFromUnlimitedQuery
               - Tag queries are unlimited. Make paginator in ConsoleTagManagement to fetch data by portions for tags actually displayed.
            57586: MNT-9595: Tag manager cannot find tags past the value of solr.query.maximumResultsFromUnlimitedQuery
               -  Do filter by tag name on SOLR side.
            60643: MNT-9595: Tag manager cannot find tags past the value of solr.query.maximumResultsFromUnlimitedQuery
               -  Prepend wildcard to the filter to match the old contains behaviour. Add unit tests for the tag and category filtering.
            60765: MNT-9595: Tag manager cannot find tags past the value of solr.query.maximumResultsFromUnlimitedQuery
               -  Add test for wildcard matches support.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62380 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 14:48:36 +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
7aa1c5131b Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
60177: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      60156: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.2)
         60155: MNT-10399 AutomaticBuilds: Alfresco doesn't shut down because of FullTextSearchIndexerImpl 
            - TABs to spaces


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62296 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 12:48:11 +00:00
Alan Davis
a1c7917881 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
60122: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      60121: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.2)
         60118: Merged DEV (V4.1-BUG-FIX-2013_11_14) to V4.1-BUG-FIX (4.1.8)
            60117: Merged DEV (V4.2.1-2014_01_09) to DEV (V4.1-BUG-FIX-2013_11_14)
               60116: MNT-10399: AutomaticBuilds: Alfresco doesn't shut down because of FullTextSearchIndexerImpl 
                  - Try to spot dead daemon threads holding the lock on subsystem shutdown


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62267 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 10:24:55 +00:00
Alan Davis
1cc0bf5a5d Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
58270: Fixed the failing test by moving MetadataQueryTest_model.xml to test-resources


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61954 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 23:08:43 +00:00
Alan Davis
bd8b00f623 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
57572: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      57536: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
         57528: Merged V4.1.7 (4.1.7) to V4.1-BUG-FIX (4.1.8)
            57524: Reverse Merged out of 4.1.7, as it is the cause of MNT-9873 - a new approach is needed (paging or limits on the UI side). Moving both issues to 4.1.N.
               56842: Fix for     MNT-9595    Tag manager cannot find tags past the value of solr.query.maximumResultsFromUnlimitedQuery 
               - tag queries are unlimited


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61848 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 21:08:14 +00:00
Alan Davis
f22b1b3fef Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
57509: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      57384: Fix for     MNT-9868     Transformation server + Lucene specific: Dead lock on startup of the second node 
      - selectNodes does not depend on the search sub-system


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61839 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 21:00:56 +00:00