From 1f6d0dd079615a2b11ab9c4baeb7b25f1ae09558 Mon Sep 17 00:00:00 2001
From: Arthur Casals <arthur.casals@freedomsponsors.org>
Date: Tue, 7 Aug 2012 06:10:29 -0300
Subject: [PATCH] Corrected context bugs at atlassian-plugin.xml

---
 .../plugins/jira/SponsorThis.java             |  11 +++++++++--
 src/main/resources/atlassian-plugin.xml       |   5 +++--
 src/main/resources/sponsorthis.vm             |   2 +-
 target/jira-1.0-SNAPSHOT.jar                  | Bin 39138 -> 39291 bytes
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/freedomsponsors/plugins/jira/SponsorThis.java b/src/main/java/org/freedomsponsors/plugins/jira/SponsorThis.java
index e2d3a36..3645e44 100644
--- a/src/main/java/org/freedomsponsors/plugins/jira/SponsorThis.java
+++ b/src/main/java/org/freedomsponsors/plugins/jira/SponsorThis.java
@@ -2,6 +2,7 @@
 
 import com.atlassian.crowd.embedded.api.User;
 import com.atlassian.jira.config.properties.APKeys.JiraIndexConfiguration;
+import com.atlassian.jira.config.properties.ApplicationProperties;
 import com.atlassian.jira.functest.config.JiraConfig;
 import com.atlassian.jira.issue.Issue;
 import com.atlassian.jira.plugin.webfragment.contextproviders.AbstractJiraContextProvider;
@@ -15,15 +16,21 @@
 
 public class SponsorThis extends AbstractJiraContextProvider
 {       
+	private final ApplicationProperties applicationProperties;
+
+	public SponsorThis(ApplicationProperties applicationProperties) // magic constructor
+    {
+        this.applicationProperties = applicationProperties;
+    }
 	
 	@Override
     public Map getContextMap(User user, JiraHelper jiraHelper) {
         Map contextMap = new HashMap();        
-        //String baseUrl = (String)jiraHelper.getContextParams().get("baseurl");
+        String baseUrl = applicationProperties.getString("jira.baseurl");
         Issue currentIssue = (Issue) jiraHelper.getContextParams().get("issue");        
         String issueKey = currentIssue.getKey();        
         contextMap.put("issueKey", issueKey);
-        //contextMap.put("baseUrl", baseUrl);
+        contextMap.put("baseUrl", baseUrl);
         
         
         return contextMap;
diff --git a/src/main/resources/atlassian-plugin.xml b/src/main/resources/atlassian-plugin.xml
index 6a9c450..68352e9 100644
--- a/src/main/resources/atlassian-plugin.xml
+++ b/src/main/resources/atlassian-plugin.xml
@@ -9,13 +9,14 @@
   <web-item key="sponsor-issue" name="Sponsor this issue" section="operations-operations" weight="100">
     <label>Sponsor this issue!</label>
     <tooltip>Sponsors the issue at FreedomSponsors.org</tooltip>
-    <link linkId="manage-project-link" absolute="true">http://www.freedomsponsors.org/core/issue/sponsor?trackerURL=${baseurl}/browse/${issue.key}</link>
+	<context-provider class="org.freedomsponsors.plugins.jira.SponsorThis"/>
+    <link linkId="manage-project-link" absolute="true">http://www.freedomsponsors.org/core/issue/sponsor?trackerURL=${baseUrl}/browse/${issue.key}</link>
   </web-item>
   <resource type="i18n" name="i18n" location="org.freedomsponsors.plugins.jira"/>
   <web-panel name="SponsorThis" i18n-name-key="sponsor-this.name" key="sponsor-this" location="atl.jira.view.issue.right.context" weight="1000">
 	<label key="sponsor-this.title"/>
     <description key="sponsor-this.description">The SponsorThis Plugin</description>
-    <!--<context-provider class="org.freedomsponsors.plugins.jira.SponsorThis"/>-->
+    <context-provider class="org.freedomsponsors.plugins.jira.SponsorThis"/>
     <resource name="view" type="velocity" location="sponsorthis.vm"/>	
   </web-panel>
 </atlassian-plugin>
diff --git a/src/main/resources/sponsorthis.vm b/src/main/resources/sponsorthis.vm
index a3e24ee..e0a53b3 100644
--- a/src/main/resources/sponsorthis.vm
+++ b/src/main/resources/sponsorthis.vm
@@ -1,3 +1,3 @@
 <p>
-	<a style="font-weight: bold; color: green;" href="http://www.freedomsponsors.org/core/issue/sponsor?trackerURL=${baseurl}/browse/${issue.key}">Sponsor $issue.key on FreedomSponsors.org $issue.project.url</a>
+	<a style="font-weight: bold; color: green;" href="http://www.freedomsponsors.org/core/issue/sponsor?trackerURL=${baseUrl}/browse/${issueKey}">Sponsor $issueKey on FreedomSponsors.org</a>
 </p>
\ No newline at end of file
diff --git a/target/jira-1.0-SNAPSHOT.jar b/target/jira-1.0-SNAPSHOT.jar
index 40f7b13c61de9340d51e50fda22a1c2c55945461..b9adb77cd9e1e0546dfccf649fcaa4dc57ffeca7 100644
GIT binary patch
delta 2173
zcmZuz2{hFE7oUZhVl0!LBHK{Y3?VgS7+c0tvgCy<F_;+pGBFwx#+LOrmR?WU#?r%|
zOwU%zPP{}S#Z;<?giud|>W$8M{ZHrrzvtX@@ArQ1z2}~LzTf+~vyG6gTM!X@8>oN~
zXonWC@LUnKUGrEtVP;X{_gtI`y;G=5TU>C3v2AwAYe-++IXv)_n&k0Rm)%R&re-WP
z%;v_K%hY1V#SrbznFFL22is*NryBjHHlsWW-D`}Gi^UMP1^iR2P>%(^xMeJpEp5(g
zqXi#s_VV1R!_jHUwxPfN71B}nVPb%y8VBU*g46NAIE>oFo=~xt_L4DC>xDMKpwO+J
zDfmvA03MKT{AvKE^D8C5*R&@OK|mmaAP6MMuiiT{$U7o}>>Z2=4T|z72V<#}pgO0a
z;OE-n$K5<T_p~}h#tI1$nOX!1Ns73kl8H^=wMKIxHA?TUwUxIvH@88w1N(Q4hvTNN
zPC4su1zd;(v0Ei^9jB^f8JeWtUQ~a`(22DKe~Ua{`tZ1I;6nlO;uoecC($R1{j4HT
z(0<Ue*&(1NQvUC#&4*ImRt>Q5ZP{??!*HXmyG2Ci;=R`@1Wn<vu3p!+5QQ3(!t~}o
zKdB+i<N)4JSW%;^<hD})*Cp-x4UajpWj`G1bf>n#X>fL9o3y$<qEjBv8A0Y-w7VKw
z#yQW?se!gziDUJPSb>Hzds`!kSWERqFN+oiYCtAiy#AA7Y~8Fy!Hv0v7(G@WTFuRV
z7;}Wz+*1whn37+75t*)<@@riQ7TeiD(hEw~QzcQTZitCvXX91Q!-~UV#&w=45m9Fk
zBs0X!T-C+yK$5MizAbfFsg|wlSiL>?*ZCCs^kU6}ux^3p3D8T;(`mv!J!f1e;(RQ0
z9z1ZE)-GiURnM9F(EKFPF(q6N`rDWr=*m}iPdp>pzEuov{N|hS*maWgEf<(X+~e&+
z2xjA^fNxeECh3K7Dz~+vo-|l?wz)D<)M!)({D};uQgXW0uqRI%^zp8?X<N#yhVA|(
zIw<iaT=bm${DDa{nX_CG<GyZdI_KV1$-E{HYqkWU)MGdqOFa<zTvIKN#K3Nz=N38i
z;J`b{`=hs^zofO`ve@bOJGRYyPNNce++vl%d7fv3)mKPUia_#ZWHJABo$7Yikc5Ij
zr7#dk2T%sf0Qd40>1-!A$Hyj;U;p4#u=d+yWV8}wDyG}GCTvZW^lB+N!d|831&0D6
zFpNTeaWQyJdL-8mzp;HfOT$jE2fzO$YH)dQYK8Wq^-cfCh$q;+6AInU-0kARV;0<+
zouG|G(OkBso4Rj?(>mCkm%legQ5<=&JjBSM<~|EA;TJCSuC(}BD9x?lD5rX&LLzi1
z3c@q^z}d2PR%1LY{9+=Erkca0XS30n*$CXLi+|iQFL6()y*|#!!*>VO5cMu|?VXpG
zHdlFmRT+r7rU$1xDa_XGZ=lS2T{W5M^x+c0B^06vf#HpQ(%0Urn`??T^C#lMakcqu
z4+)Z+4&B$LUj2PksWT@;767Z~mD+C>_5iG`n+SPwoXT<7N{Nb1`*SJmflF)^v^zE3
zc!Q1Am*7@-9Le)vuRdlohI-XII#xhcr^;$xbL=T&C^DCgp67iyI(VHRx<vk{TZD`(
zJw%hc(7vxKwC_Hdd9_@F+XI5hJ+s=pP?GORC$$u1lc&0B)}DU8ws6T2<{!qrk7F*B
z4;~EzcO%Zlo%KYzj#r1z@Di^QeUg;fG-KA1Y;OzW@XbjjJPM^vG%^c?>mA305YeB_
z%({IObP;-`p4mN0eXBw(L1TKJY(I?;{c9rKX*A$U#o^wZdL{L$)VU~$qoIJ+MP+(!
z+i22wX+R}mhHOrv*HhlDJj#Z}zR8&x%$a&-XV7@;Li3)i+aU%9Vk}MhzIzU)n80LL
z2@j(}gxQ~ED?`zeq$eV`)n%OZhR$tSa>P3wCr{%SHmq06?m_DIaP)I3{S}s^$u~-3
z{N78<yjFU&TEG05IO6jOz^RSebi~u=%g&v8pBda`7B5w*)0Xwx9J+2;tgG@~YvAs7
z68CN6#{9tFOD}yPx`S!ivJX6_33x_`=5WQPqhX7=<CMYGyAv<k5*MWJ6b(Q8sG%^_
z+)jhNtFB7hk~@DS!5iVwEb<CfbLYfs<f>b`>dKm1&!J%Ce*&TuB9d5@8~cVO<ofqw
z%TwDcLW;ztcd1%X<BL?>Di$sot<3@rV1=fov|0$gjsJPXv759){z&fOvnZb<LPLTh
zLc${h$Pw6Rie2WA=w)qji^(-9yY4f7V(jJVdFw8?q^u&+@J~*qauR(q6%{;kSK|b(
zcrOcyKcri5OG6<GS>=sr4G35k8XdF!ErWriDEAILEeuC=z6BlbtEG$WGrFU?n06xG
z^0<l3743`P%s;O=dOhamE<V3)JK0CAy~r)`PFGYuXFMm2y*B<NIQ3({z}YY^`iZ9n
zV>As?<@pm30v?$Mp?sJDGBPc9WYc(NufTW1Z+Ut@AhPLcUJh9FXEXw$Sq|VUz#t0`
zh5@_s4Isfx-~*rtlrt58_<Y3v|CuiQ2K`GF40sCPSrr)0Hv|U)-UUj4NV*u{&O!jD
z1&ZL$e2WWY-xZ*(V4uqWYxIBfXk>ywKth46=XY2q{Clw@#eN*bK}&>pd`CMACjy3e
z(o&1!9Zd?>vbO<4B%wccf}euXKLyKV0f)0NKye}BduwV76(C+aCLLg_@F1jqN5uhN
VMF$~vd3;qL=qi$jp@5wf{{UgZyAuEa

delta 1964
zcmZWq2{hFE7oP=>vCM?YI)=!SB{OJ-${MdsPnJPXBqbpRF)fP882i$g-wb+*1|xeh
zrDd{BmTXVdvn$VtBwmp{-XG_@_fF@3&$;KG`~80JJ@?*ozn{-~HDtUBBI!tg3c*0z
zvcF6?LsCQ3piJ0GwJ5ze!*ma&1I9N**e=I>w~0Q}uEEJ4eEeJ*X3$hY^DAsb?7fvw
z2`Nk*4j&si_}dtXiS^XhTo(0sC1N@wFy_ULqw@~c+DltB4w^ICe0{E7?6K%F2IRY}
zW4LU5p1aC|=eWI|^6bW)_r_O)T}NNNE1Wof(-j@)ARgxoCV_ceh6jx7F$+3Xo`+ut
zRZS4V(pwc;$*+3%YC%AtO(76S76hoVc2nYr!+`=rL=>sc8X3i6&bj;=l<<NXtTWnM
zh`u)f97)qxIF_Vj|92EQyziN1gZwpPGovZxG;W)_O99GXo!R;IFzTF8HIYRxQ>JvH
z+n~9!1x_u&U1_^K88z=JX-AX>rcO>Hy#jCAn-sbBY6ts|;J&%|r)Nw^POM-iDV@$z
zky6)n0Oj_-`OTtiy_O_8;X}PwA;cxH$0N(Nv!AcJJYXV}BNUryUl8zqZ)9|2UT>--
z+^(2d9!hNcOkO*%zHlYC%6w?*RXf}3GpeAXGW<nN%|_SBe)0tf-bvmsM(iM)L4K&p
zx0d-p_&L$gPrTNxgf5V~8jpffIFhiE-NwrVo6Y^0PnP9<eXBSXK@)pYyf`KN;c#km
zMYbQSw8B3n*5q^_J@Kin*2v+<sf#~5qttM(>T^q#ah~%?x?9<ae#}>&)D?bl<VBQ8
z8S3_Uas;Qh!TKk?W-YgcOVBmJ#@_n%)1lDcspy*5rA7^Nbv9UX@+O`_s`O>nWtrUw
zFbpgsSYCer+^%UO_VZ%;j0fw`u^Y1v+*m+A%Mm?18KPyU0<7Ro=LdO~QSt@cm50K(
zAhztN*hl}u`?W705qtSrhcAtsik8_hPvE!>D4y+Zjg3&d@-SsI2dqf94zY?QsFMjt
zGZh#5{yHM8$cmPJP<Bi=;dvF6PP=BPS2`2d(Dnj_=g>ysNWwr&b7hz%F5w{J_&z&@
zgBx+k0tz=(D2^(nxV1+aLb9GQTYDrY44@P6l)J>>6Eaqa=*&7#odhP#-xYBqh8nl%
zWi6S6!4xBtR9kKh^Eg4_wY<-xF`GzATy)00q_13ycKj80wkn!_k#r&C^5iu?zYA+K
z%TLgtxwAc%Xq&D#`gI)6qgsct>!h*io9hm5ok<PD_TqK9fw&siGpZe5TIS6>Y3ZUA
z$lj5+n&dHF^)rrbnffUGRIXAxoc*8{b)Eo;>Xoq8FaIKJdgvE;|MLWi)z)^`Ke0AN
zX1q3f)ThDfM2WRuCg>OB1GU{N?d}%6Rmz_}8h_~}m&Vn3lw8ki4?60E)id7IDl>a|
zh7doReOfH9@xg&~zkq;{{z=A4@TnnB%1Uy*WML)F!97)qBlv<}Ku)hr;D-HEP>ltS
zraAI6BJm3GaI)^60nMmgd%wwHs2FI01iZV&ZyaKPWl8~_G9D4djxYZZ#K?vwsokfl
zGN4bXVo(7wSN(uy<yi(Pc}%{jOy{Qh$ZpDL5JC6*9nS~t4JPqPGW-+SD+?562n=_8
zq{(;@8dJ|iE7+CR`p>Z4NGa5EtgN&<Hd&Bk6eey0Yrmyk+$=*ibIpEh<%C!kbn5(-
z#~v^*Hrkc<7%kfRX}X?$?g{^lM@HYoZ^UGud5!#Bk3Io-^**Vodd_x;(M>$0&&gFg
znV2>WDW)annGf|$^aQ?^qiD4qot#{9Twy571$1e(ON;oMxIh`P8VbMr6wiE5QeDuH
zt1I{x4gc`RkbBO4_oc9Ba0|?1W`*x^*j*nToOf=?#1iICBX70)C%tntSZY4v31*|n
z(MnPvHghR?<b2wdg>TiqtzmZ%u<RDp8n1&sB|rD4c{R;2ai0ppK%|SvU-$?Is=$ie
zxa4vOWgF^jE2!C-TfofQQmHKs4-FxOhg^#A4+uB79DF#XLyEeE&i(U9NgrMAl+$tx
zs|BuYC~Q4Tzs-n8Y<lIld@!AQ7ueTUg0<&=dg!3P8k&w@ve72mRO-4C(w{mWR$s%q
zLJKP1sL`H*5;2oYqNrM5&HYUb8N21z((0*u#QELckUN*Hqu+&)YfS7yeV*97loeJR
zHW%FBlTR!Pt~(8S@4G&R+%S$TY4})3{k0za1D^oPY5SmCtpFP7cH5R4oZc+7b6^4(
z|I0MoFn|u0`Vrg#ILjHF0Gwr+gTVlsWd;d|2P~K>z&c9{{p0rqfv{V%`9}(4Ab?e-
zH{?yy&hv&$Q}7vporwk%vhWshDL)P|;%bB=0Su9aZWEyBHUa+M%>T=KD;1z;Den~j
zAWI4C1axGn?0BEElpxV*Ktr~^-hbJ4=+x?;=xuBGuY&;1TD5KmV1aU`1aL1~1&joI
dvW<ZGYz*X4#@59FAddk9&fi9eq%pR`{s%FSYQ_Kn