Commit Graph

11 Commits

Author SHA1 Message Date
Raluca Munteanu
2b43a84ea7 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
Tatyana Valkevych
185b2b1db9 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
1a26e575ea Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
105660: Merged DEV to HEAD-BUG-FIX
       91143: POC - mimetype drill in - grouping -> raw mimetype
           - content size dynamic grouping and drill in
           - some bug fixes to running histogram generation
       Fixes for  ACE-3853  SOLR 4 - allow configurable mimetype faceting etc that matches reporting and analytics


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@105708 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-06-08 09:23:04 +00:00
Alan Davis
ed9936b022 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
Alan Davis
b4e2e7d22a Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
93087: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      93059: Fix for     MNT-12821   Duplicate org.alfresco.solr.tracker.Tracker interface stops Solr working
      - split out common interface.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94935 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 12:10:35 +00:00
Andrew Hind
a3d54f5f51 Fix for ACE-3593 Duplicate org.alfresco.solr.tracker.Tracker interface stops Solr working
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@90801 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-11-20 13:42:20 +00:00
Andrew Hind
eac1e38415 Fix for ACE-3392 Solr 4- java.lang.ArithmeticException: / by zero during Tracking
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@89741 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-11-03 10:03:02 +00:00
Andrew Hind
6b56142928 Fix for Bug ACE-3373 Approx transaction indexing time remaining: being incorrect.
- node and acl estimates now use elapsed time
- added estimated time to finish for content index based on elapsed time
- time now include query, tracking loop, index commit and index warming amortized per unit of work (node, acl or content)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@89643 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-10-31 14:47:57 +00:00
Mark Rogers
798cab080c Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
85044: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      84314: ACE-1037: SOLR 4 - Information server implementation - the rest
         - report and checking index


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85359 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-20 10:32:41 +00:00
Mark Rogers
be9680eb71 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
77016: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      71478: ACE-1705: SOLR 4 - Core admin handler and start core tracking
         - Thinned down Tracker API. Made methods private where possible


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77855 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-23 12:15:01 +00:00
Mark Rogers
45aff692fb Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
76927: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      67096: Merged BRANCHES/DEV/aowian/plat1_solr4 to BRANCHES/DEV/PLATFORM1
      BRANCHES/DEV/PLATFORM1:
         65032: ACE-916: Carve out tracking from SOLR 1.4
              - Initial checkin. Does not compile
         65034: ACE-916: Carve out tracking from SOLR 1.4
              - Another checkin. Does not compile
         65036: ACE-916: Carve out tracking from SOLR 1.4
              - Another checkin. Does not compile
              - Added InformationServer interface
         65393: ACE-916: Carve out tracking from SOLR 1.4
              - Another checkin. Does not compile
         65963: ACE-916: Carve out tracking from SOLR 1.4
              - Changed references of toDocument method to LegacySolrInformationServer
         65988: ACE-916: Carve out tracking from SOLR 1.4
              - Created individual classes and got CoreTracker and LegacySolrInformationServer to compile
         66090: ACE-916: Carve out tracking from SOLR 1.4
              - Getting closer to no red
         66091: ACE-916: Carve out tracking from SOLR 1.4
              - Getting closer to no red
         66092: ACE-916: Carve out tracking from SOLR 1.4
              - Getting closer to no red
         66847: ACE-916: Carve out tracking from SOLR 1.4
              - Updated eclipse .project files to include SONAR nature
              - Updated solr4 pom to use different port
              - Added adapter for solr data object in SOLR Client, therefore introducing dependency on legacy jars while keeping the main client code version agnostic
              - TODO: Finish making Tracker API work in client project, and explore moving trackers into client project
         66863: ACE-916: Carve out tracking from SOLR 1.4
              - Moved Tracker, TrackerStats, etc into Client project, and abstracted some data objects.
              - TODO: Deal with AlfrescoSolrDataModel
         66926: ACE-916: Carve out tracking from SOLR 1.4
              - Removed some classes that had already been moved
              - TODO: Deal with AlfrescoSolrDataModel
         66957: ACE-916: Carve out tracking from SOLR 1.4
              - Moved adapters into legacy solr project and removed client project's dependency on legacy jars.
              - TODO: Deal with AlfrescoSolrDataModel
         66959: ACE-916: Carve out tracking from SOLR 1.4
              - Moved AlfrescoSolrDataModel to InformationServer and exposed needed APIs
              - Finally, the red is gone, and the code compiles.
         67027: ACE-916: Carve out tracking from SOLR 1.4
              - Removed unused import
         67028: ACE-916: Carve out tracking from SOLR 1.4
              - Merged PLATFORM1 to aowian/plat1_solr4
         67029: ACE-916: Carve out tracking from SOLR 1.4
              - Merged PLATFORM1 to aowian/plat1_solr4
         67076: ACE-916: Carve out tracking from SOLR 1.4
              - Reverse merged from aowian/plat1_solr4 to aowian/plat1_solr4 at -67028
         67090: ACE-916: Carve out tracking from SOLR 1.4
              - Merged PLATFORM1 at 67076 to aowian/plat1_solr4
         67093: ACE-916: Carve out tracking from SOLR 1.4
              - Merged PLATFORM1 at 67085 to aowian/plat1_solr4


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77771 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-23 10:50:14 +00:00