inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
507 Commits 330 Branches 2,178 Tags
01d183c8c87d469677be50883c016ec94e74f06c
Commit Graph

507 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mark Rogers
67c9641b7c Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) 
123256 mrogers: rollback 123243


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@124037 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-03-15 12:12:00 +00:00
Mark Rogers
b50def799b Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) 
123243 mrogers: Merged trunk (2015.0) to WOLF-6 (WOLF.0.0)
      122874 slanglois: ACE-5135 ACE-5131 Pre-apply share-services AMP in alfresco.war packaged in EAR


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@124036 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-03-15 12:11:48 +00:00
Mark Rogers
bcde49e0e5 Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) 
123239 mrogers: Build against Platform 5.1.1-SNAPSHOT since that contains our MMT fixes.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@124035 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-03-15 12:10:26 +00:00
Mark Rogers
dd4bb97984 Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) 
123233 mrogers: Run the test against alfresco-one-update-package not alfresco-enterprise-update-package


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@124034 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-03-15 12:09:58 +00:00
Mark Rogers
6044ec98f7 Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) 
123231 mrogers: Rename the alfresco-enterprise-update-package to the alfresco-one-update-package


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@124033 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-03-15 12:09:49 +00:00
Mark Rogers
e50ef1c01f Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) 
123230 mrogers: Rollback previous changes.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@124032 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-03-15 12:09:23 +00:00
Mark Rogers
a608785d40 Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) 
123184 mrogers: More work on pom files


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@124031 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-03-15 12:04:02 +00:00
Mark Rogers
906bf94144 Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) 
123183 mrogers: Update pom files to a) reflect the fact that the "enterprise" artifact name has been changed to "one", b) update to what is on 5.1


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@124030 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-03-15 12:01:57 +00:00
Mark Rogers
18aa18c391 Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) (RECORD ONLY) : 
- 123159


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@124029 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-03-15 12:01:28 +00:00
Mark Rogers
aa94cd99e9 Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) 
123121 mrogers: when comparing the two trees, ignore the sol1 war file in alf_data


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@124028 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-03-15 12:01:26 +00:00
Mark Rogers
5eb4079339 Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) (RECORD ONLY) : 
- 123096


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@124027 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-03-15 12:01:19 +00:00
Mark Rogers
bcd54a9313 Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) 
123084 mrogers: Add more ignorePaths


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@124026 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-03-15 12:01:17 +00:00
Mark Rogers
c9b1a93e62 Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) 
123080 mrogers: Fix for file names within ZipFormatter ... had // in the path.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@124025 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-03-15 12:01:11 +00:00
Mark Rogers
cc1a0a660f Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) 
123059 mrogers: UTF-378 - Try toRealPath on file comparison utility.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@124024 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-03-15 11:57:54 +00:00
Mark Rogers
f764b0a7aa Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) (RECORD ONLY) : 
- 123042


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@124023 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-03-15 11:57:23 +00:00
Mark Rogers
9811e8e842 Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) 
123029 mrogers: UTF-378 - A few additions to the ignore patterns + change for zip format to use absolute paths.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@124022 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-03-15 11:57:20 +00:00
Mark Rogers
6e8a4018a8 Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) 
123015 mrogers: UTF-378 - Now produce the zip file of the update test differences.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@124021 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-03-15 11:57:10 +00:00
Mark Rogers
c93bdd696f Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) 
122949 mrogers: UTF-378 - Added some code to ignore module.install date within module.properties


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@124020 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-03-15 11:57:03 +00:00
Mark Rogers
df3acfd11a Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) 
122922 mward: UTF-378: added some diff ignore patterns.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@124019 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-03-15 11:56:56 +00:00
Mark Rogers
616e03b1d5 Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) 
122881 mrogers: Update googledocs to 3.0.3 to keep in line with release


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@124018 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-03-15 11:56:46 +00:00
Mark Rogers
029bc75d4b Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) (RECORD ONLY) : 
- 122880


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@124017 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-03-15 11:55:57 +00:00
Mark Rogers
5a22fd095c Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) 
122860 mward: UTF-378: improved test to ensure multiple occurrences of replacement text are all replaced.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@124016 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-03-15 11:55:55 +00:00
Mark Rogers
09520372e4 Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) 
122856 mward: UTF-384: swapped the 'fresh' and 'updated' in the comparison method call so that the report appears with them in the correct columns.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@124015 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-03-15 11:55:33 +00:00
Mark Rogers
4b35b09bed Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) 
122846 mrogers: BDE-539 - Remove kludge.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@124014 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-03-15 11:55:26 +00:00
Mark Rogers
053034758a Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) 
122824 jphuynh: BDE-539: Use latest 5.1-SNAPSHOT build as base version for now. (Latest as in previous successful build excluding the current one.)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@124013 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-03-15 11:55:07 +00:00
Mark Rogers
af27e4f182 Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) 
122800 mrogers: kludge tests to get something to run.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@124012 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-03-15 11:55:01 +00:00
Mark Rogers
1cabf38177 Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) 
122797 mrogers: Corrected test to run on windows.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@124011 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-03-15 11:54:37 +00:00
Mark Rogers
7d25c3c46d Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) 
122785 mward: UTF-378: fixed path pattern matching on Windows.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@124010 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-03-15 11:54:31 +00:00
Mark Rogers
21972513c4 Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) 
122774 jphuynh: BDE-539: alfrescosharepoint is not a selectable component.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@124009 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-03-15 11:54:20 +00:00
Mark Rogers
04cfba44c1 Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) 
122767 jphuynh: BDE-539: this.installer.args!


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@124008 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-03-15 11:53:58 +00:00
Mark Rogers
e9a8284958 Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) 
122766 jphuynh: BDE-539: AOS Module Only exist on 5.1. Added changes in installer.args to reflect that.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@124007 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-03-15 11:53:48 +00:00
Mark Rogers
487b623933 Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) 
122764 mward: UTF-378: added missing test data


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@124006 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-03-15 11:52:11 +00:00
Mark Rogers
a3de76ef9e Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) 
122763 mward: UTF-378: improve result set formatting.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@124005 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-03-15 11:52:01 +00:00
Mark Rogers
33b9cbf011 Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) 
122756 jphuynh: BDE-539: Fixed typo.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@124004 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-03-15 11:51:52 +00:00
Mark Rogers
7d8f2da5b5 Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) 
122755 mward: UTF-378: Fix unit tests


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@124003 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-03-15 11:51:27 +00:00
Mark Rogers
86664bbe02 Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) 
122753 jphuynh: BDE-539: Changed wget to ant get.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@124002 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-03-15 11:51:17 +00:00
Mark Rogers
c4d708e392 Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) 
122752 mward: UTF-378: Delete temp files when no longer needed


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@124001 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-03-15 11:50:57 +00:00
Mark Rogers
d2a2b48ee9 Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) 
122751 mward: UTF-384: wired in comparison tool and HTML formatter to the build.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@124000 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-03-15 11:50:47 +00:00
Mark Rogers
17c2f95a00 Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) 
122745 mward: UTF-383: added support for deep differencing in amp files.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@123999 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-03-15 11:50:42 +00:00
Mark Rogers
536e7d884d Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) 
122731 mward: UTF-383: added support for ignoring differences in files where it is just the absolute tree root.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@123998 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-03-15 11:50:33 +00:00
Mark Rogers
dbb45ae1b4 Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) 
122730 jphuynh: BDE-539: Fixed path and added base version extension check.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@123997 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-03-15 11:50:27 +00:00
Mark Rogers
4c4ee311c1 Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) 
122721 jphuynh: BDE-539: Amended the installer download part.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@123995 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-03-15 11:48:09 +00:00
Mark Rogers
dcc5304f9f Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) 
122698 mward: UTF-378: bring back all the default java behaviour by removing the pom packaging specification.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@123994 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-03-15 11:47:37 +00:00
Mark Rogers
caddeb90a6 Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) 
122694 mward: UTF-378: moved the big end-to-end to happen during integration testing.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@123993 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-03-15 11:44:59 +00:00
Mark Rogers
10970e2f72 Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) 
122681 mward: Added some sensible svn ignore patterns.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@123992 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-03-15 11:44:23 +00:00
Mark Rogers
ca1409b55b Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) 
122680 mward: UTF-383: moved diff tool from update-tool to full-installer code base.
   Had erroneously added the code to the wrong project.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@123991 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-03-15 11:44:11 +00:00
Mark Rogers
ef4b24d2a6 Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) 
122672 mward: Changed language level to 1.7 so that IDEs may pick up the correct configuration.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@123990 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-03-15 11:38:17 +00:00
Mark Rogers
6843c4b5b2 Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) (RECORD ONLY) : 
- 122662


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@123989 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-03-15 11:37:51 +00:00
Mark Rogers
b67305d17c Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) 
122643 mrogers: UTF-371 - Add AOS to the update package.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@123988 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-03-15 11:37:49 +00:00
Mark Rogers
1c19cfd471 Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) (RECORD ONLY) : 
- 122613,122620


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@123987 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-03-15 11:33:33 +00:00