Commit Graph

26 Commits

Author SHA1 Message Date
Andrei Rebegea
86baca768e Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
128045 arebegea: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      127999 rneamtu: Merged DEV to 5.0.N (5.0.4)
         127518 rneamtu: MNT-15457 : Can not define site filter via solr-facets-config-custom.properties file
            - Set qname for SITE special facetable property


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@128093 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-09 15:00:06 +00:00
Raluca Munteanu
27333f1d39 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
125606 rmunteanu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
      125515 slanglois: MNT-16155 Update source headers - add new Copyrights for Java and JSP source files + automatic check in the build


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125788 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-26 13:45:01 +00:00
Raluca Munteanu
9a889c69ea Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
125603 rmunteanu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
      125484 slanglois: MNT-16155 Update source headers - remove old Copyrights from Java and JSP dource files


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125781 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-26 12:48:49 +00:00
Alan Davis
1ca60fc47a Merged 5.1.N (5.1.1) to HEAD (5.1)
121627 rmunteanu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
      121496 arebegea: MNT-14409 : Unable to configure search filter for TAG/SITE via extension
         - Modified the SolrFacetConfig QName resolver to use the FacetQNameUtils that was also used when added a filter from Share
         - Had to move the FacetQNameUtils and the test class FacetQNameUtilsTest to repository project
         - Added the FacetQNameUtilsTest test to the AllUnitTestsSuite


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123645 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 21:42:09 +00:00
Tatyana Valkevych
22d2935235 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
107541: Merged 5.0.N (5.0.3) to HEAD-BUG-FIX (5.1/Cloud) (PARTIAL MERGE)
      107413: Merged DEV to 5.0.N (5.0.3)
         106858 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Cleaning of Javadoc,
   107565: MNT-13545 Fix compilation after merge of Javadoc


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@107633 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-07-02 16:13:03 +00:00
Alan Davis
6ae2064bfe Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
99981: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud) (PARTIAL MERGE)
      99482: Merged DEV to 5.0.N (5.0.1)
         99198 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc typo in project alfresco-jlan
         99413 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project alfresco-jlan
         99205 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project core
         99415 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project data-model
         99227 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project file-transfer-receiver
         99416 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project legacy-lucene
         99417 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project qa-share
         99418 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project remote-api
         99427 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc in project Repository, letters S..Z
         99433 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc in project Repository, letters A..R
         99421 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project share-po
         99247 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc typo in project slingshot
         99248 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project slingshot
         99424 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project solr
         99426 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project solr4
         99253 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project solr-client
         99259 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project web-client
         99260 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project web-framework-commons


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@100501 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-27 23:00:01 +00:00
Neil McErlean
ae9e0e3b23 This is a tentative fix for ACE-3671. It's being checked in in order to push one build through bamboo.
The fix was to remove the bootstrap patch for the solrFacetsRootFolder created within Data Dictionary.
We are lucky with this feature in that any time this folder is accessed, it either happens:
1. within a write transaction and so we can lazy-create the folder
2. within a read transaction where the data being returned by the SolrFacetService can be easily simulated.

So we now lazily create the folder when it is first used - reusing the importer bootstrap/view data that the patch had used.
AFAICT, this will create the folder (in the default tenant) during startup and also when any search admin tries to create a new SOLR filter within a non-default tenant.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@92799 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-12-29 21:23:13 +00:00
Neil McErlean
5d1fc74367 Further fix for ACE-2932 to allow the UI to post pseudo-qname strings like "Site" or "Tag".
Without this fix, strings with no leading "{}" are rejected as not being recognised as QNames.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@86035 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-30 15:21:08 +00:00
Neil McErlean
e2dded6a18 Fix for issue blocking ACE-2932. This checkin means that the SolrFacetConfigAdmin{Post,Put} webscripts will accept both long and short-form qname strings.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85991 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-30 11:42:55 +00:00
Neil McErlean
d93f56c5ca ACE-2639. Adding Site and Tag based facets to the REST API.
These are handled as 'special cases' where the facetID (a QName) is stored without a namespace e.g. {}Site


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85580 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-24 08:34:11 +00:00
Mark Rogers
59f8bd1364 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
85067: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      84399: Addition of 'special' facetable properties. These aren't Alfresco properties at all, but are just entities that SOLR understands and can facet on. Part of ACE-2639. Examples currently are TAG and Site.
      Note that these are sorted at the top of the facetable properties list and so should always appear in a first result page.
      As part of this, I've refactored the FTL-specific parts of FacetablePropertiesGet to try and extract out the messy bits into a single class, FacetablePropertyFtl.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85382 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-20 10:43:57 +00:00
Mark Rogers
e8cc740c42 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
85042: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      84307: Fixes to ACE-2639. The long-form QName for synthetic properties should be like {http:\/\/www.alfresco.org\/model\/content\/1.0}content.size


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85357 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-20 10:31:41 +00:00
Mark Rogers
e44a69e401 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
85031: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      84201: Trivial change as part of ACE-2639. Added some javadoc and some code comments.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85346 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-20 10:26:21 +00:00
Mark Rogers
06f1a662c4 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
ec01efb150 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
84975: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      83854: Removing a System.out call.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85290 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-20 09:59:36 +00:00
Mark Rogers
7968213a8d Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
84974: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      83853: As part of ACE-2639, this adds an optional locale query parameter to the facetableproperties.get webscript.
      We may revisit the use of a URL query parameter to get the requester's locale and consider e.g. an accept-languages HTTP header, but for now, ?locale=fr, will receive french titles and descriptions for property definitions. ?locale=rubbish or "" will result in the use of the server's default locale.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85289 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-20 09:59:08 +00:00
Mark Rogers
6d28d27188 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
e2382dbb42 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
40eec10e44 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
0f32ea24ae Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
84944: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      83563: Added support into faceted-search web scripts to convert short-form QName into fully qualified QName.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85261 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-20 09:21:49 +00:00
Mark Rogers
69f25229d2 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
84938: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      83536: Added support for a namespace query parameter (nsp) as part of ACE-2639.
      Improved the .desc.xml documentation.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85255 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-20 09:18:56 +00:00
Mark Rogers
b605e62834 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
84937: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      83533: ACE-2640: Added filterId validation to the remote-api's faceted search configuration.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85254 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-20 09:18:27 +00:00
Mark Rogers
22e9af3abc 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
9abe30d450 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
be04629fec 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
Will Abson
72f0e836a4 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
80736: Merged WAT1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      78923: ACE-2370: Changed facet config web-scripts URL from /api/solr/facet-config TO /api/facet/facet-config to fix the facets retrieval when Solr SSL is enabled.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@83034 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 16:46:01 +00:00