Commit Graph

189 Commits

Author SHA1 Message Date
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
Mark Rogers
e9776b1c19 Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
122231 mrogers: UTF-382 - Added the skeleton of the End to End update test.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@123986 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 11:33:31 +00:00
Mark Rogers
206255a931 Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
122191 mrogers: Try again


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@123985 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 11:32:58 +00:00
Mark Rogers
484eabbb20 Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
122189 mrogers: For now we have a hard coded url and its just changed.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@123984 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 11:32:29 +00:00
Mark Rogers
9431b09af8 Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
122186 mrogers: UTF-380 Now should update both source and target instances of alfresco.   (They are both the same but that should allow us to progress with building the rest of build.)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@123983 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 11:32:10 +00:00
Mark Rogers
94e7c52915 Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
122179 mrogers: UTF-380 Try again.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@123982 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 11:31:44 +00:00
Mark Rogers
ddc76b5db7 Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
122172 mrogers: UTF-380 Temp build fix


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@123981 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 11:31:20 +00:00
Mark Rogers
8a49ca2e61 Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
122162 mrogers: UTF-380 - Add install steps


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@123980 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 11:30:53 +00:00
Mark Rogers
6a363e63ca Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
122157 mrogers: UTF-380 - Work in progress.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@123979 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 11:29:05 +00:00
Mark Rogers
6a2a088c0f Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
122137 mrogers: Fix merge error.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@123977 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 11:26:28 +00:00
Mark Rogers
9703d9e09b Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) (RECORD ONLY) :
- 122095,122124


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@123976 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 11:26:18 +00:00
Mark Rogers
42b71c69aa Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
122086 mrogers: UTF-379 - add new test project.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@123975 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 11:26:16 +00:00
Mark Rogers
ec2484e7ff Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) (RECORD ONLY) :
- 121992,122038


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@123974 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 11:25:01 +00:00
Mark Rogers
2cac504731 Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
121858 nsmintanca: Merged 5.0.N (5.0.4) to WOLF-6 (WOLF.0.0)
      121838 mward: UTF-370: fixed and added back apply_updates.sh executable bit tests.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@123973 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 11:24:58 +00:00
Mark Rogers
456ab125ae Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) (RECORD ONLY) :
- 121857


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@123972 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 11:24:40 +00:00
Mark Rogers
e4492724fc Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
121760 nsmintanca: Merged 5.0.N (5.0.4) to WOLF-6 (WOLF.0.0)
      121725 mrogers: UTF-370 - Disable permissions unit test.


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


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@123970 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 11:24:30 +00:00
Mark Rogers
31137f6ebe Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
121758 nsmintanca: Merged 5.0.N (5.0.4) to WOLF-6 (WOLF.0.0)
      121690 mrogers: UTF-370 - Replace TgZFormatIntegrationTest with ZipFormatIntegrationTest


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


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@123968 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 11:24:22 +00:00
Mark Rogers
e0b5123bca Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
121669 mrogers: Merged 5.0.N (5.0.4) to WOLF-6 (WOLF.0.0)
      121667 mrogers: UTF-370 - Get rid of the .tgz archive


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@123967 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 11:24:20 +00:00
Mark Rogers
60831e816b Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
121668 mrogers: Merged 5.0.N (5.0.4) to WOLF-6 (WOLF.0.0)
      121665 mrogers: Remove un-used update assembly


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@123966 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 11:24:10 +00:00
Mark Rogers
927d1af23b Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) (RECORD ONLY) :
- 121638


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@123965 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 11:24:00 +00:00
Mark Rogers
e38c75463e Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
121560 mrogers: Merged 5.0.N (5.0.4) to WOLF-6 (WOLF.0.0)
      121460 mrogers: UTF-375 - added awe.war and also simplified update build to use the wqs distribution package


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@123964 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 11:23:58 +00:00
Mark Rogers
26f52eb814 Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) (RECORD ONLY) :
- 121490


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@123963 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 11:23:30 +00:00
Mark Rogers
75725653a1 Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
121487 abalmus: Merged 5.0.N (5.0.4) to WOLF-6 (WOLF.0.0)
      121456 mrogers: UTF-373 - Add _vti_bin.war to 5.0 update package


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@123962 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 11:23:27 +00:00
Mark Rogers
f639702e15 Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) (RECORD ONLY) :
- 121407,121449,121486


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@123961 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 11:23:21 +00:00
Mark Rogers
1cb422eadf Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
121406 rmunteanu: Merged 5.0.N (5.0.4) to WOLF-6 (WOLF.0.0)
      121352 mrogers: Correcting upgrade assistant script


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@123960 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 11:23:16 +00:00
Mark Rogers
f3ee061922 Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) (RECORD ONLY) :
- 121308,121405


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@123959 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 11:23:07 +00:00
Mark Rogers
b0d2aef605 Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
121307 amorarasu: Merged 5.0.N (5.0.4) to WOLF-6 (WOLF.0.0)
      121251 mrogers: UTF-365 - Adding Update Script to the 5.0 update package


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@123958 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 11:23:04 +00:00
Mark Rogers
30762e80ea Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) (RECORD ONLY) :
- 121306


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@123957 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 11:22:46 +00:00
Mark Rogers
f0f654ab6e Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
121294 mward: UTF-348: include filtered package.properties in package.


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


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@123955 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 11:22:04 +00:00
Mark Rogers
2e0ad70290 Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
121209 mward: UTF-348: Tie the update tool version to the encompasing package


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@123954 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 11:22:02 +00:00
Mark Rogers
d5a45a7c6e Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) (RECORD ONLY) :
- 121126,121131,121138


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@123953 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 11:21:37 +00:00
Mark Rogers
9e267709fe Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
121089 mrogers: UTF-368 - Add the share specific README to the update package


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