From 2973bda755f58b0fd2679d16e59b8e159387dae6 Mon Sep 17 00:00:00 2001 From: Gethin James Date: Wed, 8 Feb 2012 16:17:49 +0000 Subject: [PATCH] FIXED : ALF-12540: AMP - file-mapping.properties: white space at end of line is significant git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@33781 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../module/tool/ModuleManagementTool.java | 3 +++ .../module/tool/ModuleManagementToolTest.java | 21 ++++++++++++++++++ source/test-resources/module/test_v3.amp | Bin 0 -> 5243 bytes 3 files changed, 24 insertions(+) create mode 100644 source/test-resources/module/test_v3.amp diff --git a/source/java/org/alfresco/repo/module/tool/ModuleManagementTool.java b/source/java/org/alfresco/repo/module/tool/ModuleManagementTool.java index 3936de9cb5..728ad01c4b 100644 --- a/source/java/org/alfresco/repo/module/tool/ModuleManagementTool.java +++ b/source/java/org/alfresco/repo/module/tool/ModuleManagementTool.java @@ -313,6 +313,9 @@ public class ModuleManagementTool throw new AlfrescoRuntimeException("File mapping targets must start with '/' but was '" + mappingTarget + "'"); } + mappingSource = mappingSource.trim(); //trim whitespace + mappingTarget = mappingTarget.trim(); //trim whitespace + // Run throught the files one by one figuring out what we are going to do during the copy copyToWar(ampFileLocation, warFileLocation, mappingSource, mappingTarget, installedFiles, preview); diff --git a/source/java/org/alfresco/repo/module/tool/ModuleManagementToolTest.java b/source/java/org/alfresco/repo/module/tool/ModuleManagementToolTest.java index 9e8127a362..70751c2ca4 100644 --- a/source/java/org/alfresco/repo/module/tool/ModuleManagementToolTest.java +++ b/source/java/org/alfresco/repo/module/tool/ModuleManagementToolTest.java @@ -269,6 +269,27 @@ public class ModuleManagementToolTest extends TestCase } } + public void testWhiteSpaceInCustomMapping() + throws Exception + { + manager.setVerbose(true); + + String warLocation = getFileLocation(".war", "module/test.war"); + String ampLocation = getFileLocation(".amp", "module/test_v3.amp"); + + // Initial install of module + this.manager.installModule(ampLocation, warLocation, false, false, true); + + List files = new ArrayList(10); + files.add("/WEB-INF/classes/alfresco/module/test/module.properties"); + files.add("/WEB-INF/classes/alfresco/module/test/modifications.install"); + files.add("/WEB-INF/lib/test.jar"); + files.add("/WEB-INF/classes/alfresco/module/test/module-context.xml"); + files.add("/images/test.jpg"); + files.add("/css/test.css"); + files.add("/extra.txt"); + checkForFileExistance(warLocation, files); + } public void testList() throws Exception diff --git a/source/test-resources/module/test_v3.amp b/source/test-resources/module/test_v3.amp new file mode 100644 index 0000000000000000000000000000000000000000..dd5ff507fa616f4a41b4e848e6a8e0edb9adfed5 GIT binary patch literal 5243 zcmeHKc{r478z1|YU6w;*d{bkciIOc&vK129FWJTzjEtExGqxf#mEuIHLzo&FOKI_S zq=ir>p(9RFk;+mWC&zLWS(1G3+dDOrgY(b#eSe*MuIGB6xvu+nKhJaTx0|z&u%r+S zpwi$X6Y%?m#DEQs6dgtgU+=aolN^r;8x=;uQ*opfxK);(sOIMTAx3Xb7x*V zj}l2Y`RU`DsJMyN%QLkBb^4T1?A*Ibzh4ops&iG{=+1}ftw+r* zG4PIbbcb$njQEr~?)M4v=??kso*z=e`#%jfuJK*1*D+Xe*yy~SQ%b4lZg!eLFeL}? zVtpsu94401Ga+=h%0Zg#pp$Xcp-2W{Ia3!(h{sSDUomK(H#{iH>a_AV|LzzK;I*o zQswcY1T~I9+~gTl_XVG^Z9y+~TKv$bw#fp+vB0&7FyK>-87L3`p91v`&nwBlU?q#W z939d}UlQKw57(9d-H{$3a&O_)crrDp$*Y*5Xp-44IwKU%zI+c`b@f%XeZR=)pwIA2 z#*tNtQU^)CaG_}NscF0PpGYO|L!dNQXI1idTGwpE}6iekhz{v)u=c zyH6-EF!fbzQ;_s9-8&OuJ0xD%ZGehJ#RV&@z3JN_yZLmXn-bjKeBa>-2Kl`fB0wkn ziUX?W(TR=g#5;2v2eoVN65Sjzp2SysE}nmO3nYhQ)f zXn9Yykp$F?Ixo%Iz8`sRrkH!Gq(#bqzo>@B#pI3ICqtMoj?v%3+2O_4FK7y;MIRl= zuaxR>4}BdLmzcEQBC!UY?HHy0QQog?2+rCvf8#~4Z?(YFe?KYgnuqZcM)RVq0)!f#sd>u-=5TYMC{+z3rN269=fHuDBYz?~Csp32D3i$*!|o+2+)why~KU zw{4cA`Od^9EVbpFXWIMeb*~TFvYZMpX5GZ=KCe>AEIi?q5Qm%{`gv}~bA2*NbMBeG z&)#IV`NKKZo+@9z4L@zwHBZe!mP`HCn5>ZbwlGL$y2a_~qtNNX1bl3+d%IzM&_yXz ztA=*F3sstj_V47BA+wt2AA2FoVvM?AnIZ{!7L2F6ke4zjbUa zx70wU2^@Jx@Z|BL3Nh)m6RJXRZ_BeEX7%Z$#%#4z!3V3R8bn*es8ei#utcs8dm8X z3A&-2@WKHrjTu=#Yp3xXnU(`$ZHKBKf7rC^-OKJgmX3ACF^wz2dMBmssanVc{bsgz zUs`?!nqx{Jx&-};rif{roy3ZHjc$oub4$yQ(aP$A=wtY{bhETB6Zak2lxO#glIDNPX~QhG>2EobYfKF+jRx!(F}k zku1OLf-;!xImZogFLtUIoj9pnObjs0^D;P?N{{jqMK+sf1&v1~RqoN;(wN_m%Zfm` zaH6_<5}6_!DiZ8IVjP@>ZrN9SckF&ipP$GBu8J^3hutn$;*Sl0tyibS_f>oAilYI zc{DhNKm?*afbC-R*ExE5A>bqp5hx@T*e)Xk^eQ09fRdJMwZ`Yyb&=={8roH`p3N1m3$5fJ2QU z@5+l`3f3SV;tdx8HI6*ZE>&G16!=gXK*-`olK+-VH9kD_F+kZM`fD4+4_$m+u)To@ zd|*Ep`nB0v{>EUIg$TUyDxk1}XL5m%OOV4?I{8~g9S1G~3V=#CPrXYOZ{D%j`A|?P zhfZ9&L*u0v@XEt{SZ;|RuXJCq06_$5Y7fwCg7^JWWL7%&TUBK*LUPY`a~1)j0tQnC Nel8*~n5r!J??1>OKsW#Z literal 0 HcmV?d00001