Commit Graph

996 Commits

Author SHA1 Message Date
Jan Vonka
e03e26f6ba Merged 5.2.N-LAST-T-MOD (5.2.1) to 5.2.N (5.2.1)
134685 aforascu: REPO-1580 / MNT-17113 - Preview not updated after new versions, AOS and manual upload
       - added Junit test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@134716 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2017-01-23 14:04:23 +00:00
Constantin Popa
1233beb56e Merged WEBAPP-API (5.2.1) to 5.2.N (5.2.1)
134647 cpopa: APPSREPO-105 : Add an API to download multiple file/folders as a zip
      - Shy attempt to fix the TestCustomModelExport.testCreateDownload test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@134672 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2017-01-20 12:56:40 +00:00
Alex Mukha
88f99d6e9a Merged DEV to 5.2.N (5.2.1)
133903 sglover: MNT-17247 "Disabled user can log into Alfresco Share using external authentication" take user disabled status in to account for external authentication subsystem + tests
   133907 sglover: MNT-17247 "Disabled user can log into Alfresco Share using external authentication" don't propagate user disabled exception
   133930 sglover: MNT-17247 "Disabled user can log into Alfresco Share using external authentication" move test class and add to a test suite
   134295 amukha: MNT-17247: Disabled user can log into Alfresco Share using external authentication
      - Added a test to simulate creation of missing person during external auth log in.
   134315 amukha: MNT-17247: Disabled user can log into Alfresco Share using external authentication
      - Added a fallback to supprt the logging in by non provisioned users.
   134354 amukha: MNT-17247: Disabled user can log into Alfresco Share using external authentication
      - Added a test with deauthorized user. Refactored existing test to start context once.
   134359 jvonka: REPO-1227: External authentication - prevent disabled user from authenticating
      - add log warning (with masked username, similar to brute force attack) if authentication bypassed when setting user details
   134372 amukha: MNT-17247: Disabled user can log into Alfresco Share using external authentication
      - Updated core and data model (contain new logging)
   134390 amukha: MNT-17247: Disabled user can log into Alfresco Share using external authentication
      - isEnabled flag for users is returned correctly
      - Added tests


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@134396 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2017-01-17 13:57:05 +00:00
Constantin Popa
97baf5757a Merged 5.1.N (5.1.3) to 5.2.N (5.2.1)
134007 cpopa: Merged 5.0.N (5.0.5) to 5.1.N (5.1.3)
      134006 cpopa: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.5)
         134005 cpopa: MNT-17011 : Site Blog Post's tag filter always limits to 10 results and offers no paging to go through all results if larger than 10
            - ensure the tag filter returns correct information so as to allow the user to page though all the results


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@134008 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-12-22 14:37:45 +00:00
Ramona Neamtu
5d546877f2 SHA-1966: Deleting a link causes huge memory and cache usage and eventually OOM error
- Replaced XPATH search for links to a canned query
   - Removed the XPATH search for existing nodes with the same name =>catch exception

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@133960 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-12-21 10:04:36 +00:00
Ancuta Morarasu
dd08919347 REPO-1682 / MNT-15447: getCurrentVersion(node) throws ConcurrencyFailureException after creating multiple versions of a node
- Changes after review (broader check on the type of node + formatting).

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@133902 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-12-19 18:37:05 +00:00
Ancuta Morarasu
9794eb72dc REPO-1682 / MNT-15447: getCurrentVersion(node) throws ConcurrencyFailureException after creating multiple versions of a node
- Throw IllegalArgumentException when not a 'live' noderef is used for retrieving the current version.
   - Added Junit test.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@133884 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-12-19 12:05:24 +00:00
Martin Muller
1292beeb9a MNT-13097 content reverted as well to head version if you delete last version of node
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@133813 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-12-16 10:49:25 +00:00
Martin Muller
b264e2c4ec MNT-13097 content reverted as well to head version if you delete last version of node
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@133764 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-12-15 16:39:38 +00:00
Martin Muller
3c8f669b98 MNT-13097 content reverted as well to head version if you delete last version of node
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@133732 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-12-15 13:29:14 +00:00
Alan Davis
877fdb05e8 MNT-15359,MNT-14437,ALF-21479,MNT-16609: Remove dependency on filename for office transformations
<< Root cause for these 4 issues was a fix made in 4.2.4 MNT-11279. That fix was trying to
      use the file name field value in a document when transformed to PDF. In addition to the
      3  problems found, using file names supplied by users is a potential security issue.
      We have not found a way to exploit the use of the original file name, but that should
      not stop us from closing off the possibility. Fix is being merged to the dot N branches
      of 5.2, 5.1, 5.0 and 4.2 so the fix will be in the next service pack for each branch.
      The original MNT-16609 fix is also being reverted as the original code included the source
      extension in the temporary file name. >>> 
      Reverse merged 5.2.N (5.2.1)
         129407 skopf: MNT-16609 - Alfresco OOTB install doesn't show preview for .EML files on Windows
         94626 adavis: Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
            89429: ACE-2649: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
               89386: Merged DEV to 4.2-BUG-FIX (4.2.4)
                  85587: MNT-11279: Docx Preview: FileName in the document header not previewing correctly
                     - Keep original name during convertion.
                     - Add unit test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@133715 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-12-15 11:14:17 +00:00
Martin Muller
f4e2424af7 MNT-13097 content reverted as well to head version if you delete last version of node
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@133689 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-12-14 16:41:07 +00:00
Alan Davis
c03a2cc411 MNT-17017 Remove folder name from title when folders are unzipped from the Unzip to action
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@133662 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-12-14 13:37:27 +00:00
Jan Vonka
1d5917dbe9 REPPO-1688: Implement a failing test to demonstrate the issue when a site restore can fail due to locks (and custom behaviours)
- follow-on for MNT-14671 (noticed as part of investigation for MNT-17093, CLD-28 and ACE-5465)
- note: the test is currently not active (pending agreement to introduce and implement the proposed fix)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@133520 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-12-08 18:34:34 +00:00
Alex Mukha
16e7095d93 REPO-1687: ACE-5662: The AuthenticationServiceImpl.ProtectedUser is not suitable for clustered cache
- Changed the implementation to use Serializable objects in cache.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@133415 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-12-06 20:23:04 +00:00
Derek Hulley
3c8205b03f Fix code formatting for code in 'org.alfresco.repo.action' packages
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@133311 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-12-01 14:31:04 +00:00
Alex Mukha
2cce1b76d5 REPO-1489: Slowdown of brute force attack on passwords
- Added a fix to when the Warn is shown (next login after protection is enabled)
   - extended tests to cover protection enabled flag.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@133276 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-11-29 13:02:59 +00:00
Jamal Kaabi-Mofrad
5fcc679ac7 Merged WEBAPP-API (5.2.1) to 5.2.N (5.2.1)
133213 jkaabimofrad: APPSREPO-61: Based on code review, made the expiry action executor to be private. Also, fixed a silly typo!


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@133223 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-11-28 16:54:37 +00:00
Jamal Kaabi-Mofrad
698587d616 Merged WEBAPP-API (5.2.1) to 5.2.N (5.2.1)
133185 jkaabimofrad: APPSREPO-61: As part of code review, renamed the quick share expiry date period flag.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@133222 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-11-28 16:54:32 +00:00
Jamal Kaabi-Mofrad
090b7bbe41 Merged WEBAPP-API (5.2.1) to 5.2.N (5.2.1)
133145 jkaabimofrad: APPSREPO-54: Added support to the quick-share V1 API to allow setting an optional expiry date when creating a shared link.
              - Also, fixed the overloaded shareContent method which was missed during code clean-up.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@133219 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-11-28 16:54:07 +00:00
Jamal Kaabi-Mofrad
7e67a40024 Merged WEBAPP-API (5.2.1) to 5.2.N (5.2.1)
133087 jkaabimofrad: APPSREPO-61: Minor clean up (removed the schedule interval, left from testing different scenarios)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@133218 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-11-28 16:53:58 +00:00
Jamal Kaabi-Mofrad
9faaad1d45 Merged WEBAPP-API (5.2.1) to 5.2.N (5.2.1)
133081 jkaabimofrad: APPSREPO-61: First cut of automatic time expiry enhancement to the quick-sharing functionality.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@133216 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-11-28 16:53:39 +00:00
Alex Mukha
972a52c4f0 REPO-1489: Slowdown of brute force attack on passwords
- Extended tests.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@133158 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-11-26 15:21:07 +00:00
Alex Mukha
75286950f1 REPO-1489: Slowdown of brute force attack on passwords
- Added the implementation based on REPO-1539.
   - Added JUnit tests.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@133149 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-11-25 21:20:31 +00:00
Derek Hulley
5682ef0c34 Undo fix for REPO-1022: MNT-16271. Tests working locally but race conditions are possible.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@133098 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-11-24 21:05:13 +00:00
Derek Hulley
b6358642e4 REPO-1022: MNT-16271 SiteGroups of existing sites are deleted if site of the same name exists in the Trashcan.
- It is not possible to create a site if a same-named site has not been deleted and purged
 - Before this change came in, there were cases where sites had been created while same-named sites existed in the trashcan
 - Purging those sites was detrimental to the live sites
 - Added the workaround and associated test as suggested by Andrea on MNT-16271


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@133079 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-11-24 13:13:22 +00:00
Derek Hulley
b4f68c0630 Removed for class after review of MNT-16991root\projects\repository\source\test-java\org\alfresco\repo\security\authority\AuthorityServiceTest.java
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@132713 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-11-11 13:52:26 +00:00
Alex Mukha
17f9b1cf00 REPO-1525: PdfBoxMetadataExtracterTest failures on all DBs (including main PostgreSQL build)
- Committed whitespaces to satisfy license checker...


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@132695 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-11-10 22:28:24 +00:00
Alex Mukha
52d8d9cf59 REPO-1525: PdfBoxMetadataExtracterTest failures on all DBs (including main PostgreSQL build)
- Moved the concurrent test to a separate class - ConcurrencyPdfBoxMetadataExtracterTest
   - It is now utilizing an overridden extractor with a configurable timeout.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@132690 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-11-10 18:46:46 +00:00
Stefan Kopf
c9f08144b0 REPO-1535 - HotFix: MNT-16991: Mixed case user name issue for public workflow REST API
MNT-16991 - Mixed case user name issue for public workflow REST API
- AuthorityDAOImpl: Normalize username before reading from or writing to the cache
- AuthorityServiceTest: Added test case using mixed case user names

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@132619 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-11-10 11:30:45 +00:00
Ramona Neamtu
dbe2c44536 SHA-1892 : Error appears when Consumer or Contributor is trying to create a link on a document
- After creating the link for a node, add the marker aspect (LINKED) to the original node as System user. 
   - Added test for case 
   - Added a new test for DocumentLinkServiceImplTest for updated fucntionality

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@132612 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-11-10 09:39:15 +00:00
Jamal Kaabi-Mofrad
b49bb8f36c Merged WEBAPP-API (5.2.1) to 5.2.N (5.2.1)
132578 jkaabimofrad: APPSREPO-59: Modified the model validator to ignore the TYPE_NAMESPACE when there is a DIFF_DELETED type.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@132589 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-11-09 10:45:19 +00:00
Stefan Kopf
2a37b4e180 REPO-1110 - Apply patch provided in ALF-21632 (FreeMarker performance improvement)
ALF-21632 - FreeMarker API node.childByNamePath can be very slow
- Added test cases

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@132561 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-11-08 13:29:33 +00:00
Alex Mukha
c6f82e5489 REPO-1525: PdfBoxMetadataExtracterTest failures on Oracle, MSSQL Server, DB2
- Another Java8 to Java7 compliation fallback.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@132557 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-11-08 13:14:27 +00:00
Alex Mukha
2b129ae1b6 REPO-1525: PdfBoxMetadataExtracterTest failures on Oracle, MSSQL Server, DB2
- Removed Java8 includes, those are not necessary and break compilation on Java7


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@132552 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-11-08 12:49:06 +00:00
Alex Mukha
815cc0ed95 REPO-1525: PdfBoxMetadataExtracterTest failures on Oracle, MSSQL Server, DB2
- Another attempt to stabilize the test.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@132501 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-11-08 10:03:45 +00:00
Alex Mukha
ff553f3376 REPO-1525: PdfBoxMetadataExtracterTest failures on Oracle, MSSQL Server, DB2
- An attempt to fix the test (refactored the checks and timeouts)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@132496 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-11-07 18:45:24 +00:00
Alexandra Leahu
ad5e18ffb4 REPO-1529: Ignore tests that fail recurrently on certain DBs for now
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@132426 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-11-04 16:20:22 +00:00
Derek Hulley
b083325e0a Fix compilation after r132100
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@132109 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-11-02 16:59:34 +00:00
Alexandra Leahu
6c41a4f779 REPO-1219: Allow file content URLs to be generated by a provider
- merged implementation from ACE-5093
   - marked the FileContentUrlProvider as public
   - added the default implementation bean, and injected it in the TenantRoutingFileContentStore 

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@132105 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-11-02 15:43:31 +00:00
Andrei Rebegea
1e97c7c275 ALF-18332 : WorkflowObjectFactory.createTransition doesn't use the description property
- Fixed default description key for transition + added testcase
   - merged from DEV/HEAD_WROKFLOW to 5.2.N

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@131924 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-11-01 09:07:52 +00:00
Ramona Neamtu
fee7ef2ad4 SHA-1629 : Creating a link to file in a different location
- Added support for multiple files in doclink.post webscript
   - Added unit test for api/node/doclink api
   - Added marker aspect app:linked for nodes that have links attached

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@131857 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-10-28 12:09:59 +00:00
Ramona Neamtu
354f66df4c Reverse merged 5.2.N (5.2.1)
131742 rneamtu: SHA-1629 : Creating a link to file in a different location
            - Added support for multiple files in doclink.post webscript


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@131775 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-10-26 09:39:37 +00:00
Ramona Neamtu
2d7b780763 131742 rneamtu: SHA-1629 : Creating a link to file in a different location
- Added support for multiple files in doclink.post webscript


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@131742 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-10-25 14:39:25 +00:00
Andreea Dragoi
c95cbaccd9 MNT-16709 : Metadata extraction on 200MB PDF file causes large heap utilization
- added concurrent extraction limit
   - added max document size limit

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@131709 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-10-24 12:13:50 +00:00
Gethin James
3c7a0a0e2e SEARCH-107: Extend search public API for multi-select facets
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@131528 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-10-19 07:58:16 +00:00
Kevin Roast
829474d7e4 Merged DEV/WEBAPP-API (5.2.0) to 5.2.N (5.2.N)
131265 kroast: Merged 130934 from HEAD - SHA-1698

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@131488 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-10-17 15:47:06 +00:00
Gethin James
99a47b92e7 SEARCH-106: Fix highlighting typo
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@131308 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-10-11 10:59:54 +00:00
Gethin James
460db685d7 SEARCH-194: Adding hightlighting to the Solr Http request
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@131291 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-10-11 07:12:19 +00:00
Alex Mukha
33ee24817c Merged DEV to 5.2.N (5.2.1)
131050 skopf: REPO-483 - The repository does not contain any code or data related to JBPM / ACE-1659 - Remove JBPM and Hibernate
   131057 skopf: REPO-483 - The repository does not contain any code or data related to JBPM / ACE-1659 - Remove JBPM and Hibernate / fix test CMISTest.testModelAvailability
   131064 skopf: REPO-483 - The repository does not contain any code or data related to JBPM / ACE-1659 - Remove JBPM and Hibernate
      - added patch to remove JBPM database tables
   131169 skopf: REPO-483 - The repository does not contain any code or data related to JBPM / ACE-1659 - Remove JBPM and Hibernate
      - replaced generic DB script with database specific scripts
   131171 skopf: REPO-483 - The repository does not contain any code or data related to JBPM / ACE-1659 - Remove JBPM and Hibernate
      - Fix DB2 patch
   131213 skopf: REPO-483 - The repository does not contain any code or data related to JBPM / ACE-1659 - Remove JBPM and Hibernate
      - Fix JBPM table removal patch

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@131286 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-10-10 17:34:57 +00:00