From e823421b0c8303b4689c88c246f42d9c578a5125 Mon Sep 17 00:00:00 2001 From: Doug Hilpipre Date: Tue, 12 Mar 2024 13:09:06 -0500 Subject: [PATCH 1/4] added visibility for events (jobs) and scripting --- apache-sling-event/.classpath | 74 +++++++++++++ apache-sling-event/.project | 17 +++ .../.settings/org.eclipse.jdt.core.prefs | 13 +++ apache-sling-event/bin/.gitignore | 2 + apache-sling-event/build.gradle | 27 +++++ .../event/impl/jobs/queues/JobQueueImpl.class | Bin 0 -> 1515 bytes ...onsumer_instrumentation$AsyncHandler.class | Bin 0 -> 2024 bytes .../JobConsumer_instrumentation.class | Bin 0 -> 1249 bytes .../event/jobs/consumer/JobExecutor.class | Bin 0 -> 2252 bytes .../build/libs/apache-sling-event.jar | Bin 0 -> 5546 bytes apache-sling-event/build/tmp/jar/MANIFEST.MF | 7 ++ apache-sling-event/build/verifier/passes.txt | 38 +++++++ .../event/impl/jobs/queues/JobQueueImpl.java | 24 ++++ .../consumer/JobConsumer_instrumentation.java | 70 ++++++++++++ .../event/jobs/consumer/JobExecutor.java | 35 ++++++ apache-sling-scripting/.classpath | 104 ++++++++++++++++++ apache-sling-scripting/.project | 17 +++ .../.settings/org.eclipse.jdt.core.prefs | 13 +++ apache-sling-scripting/bin/.gitignore | 2 + apache-sling-scripting/build.gradle | 34 ++++++ .../core/impl/DefaultSlingScript.java | 5 + settings.gradle | 2 + 22 files changed, 484 insertions(+) create mode 100644 apache-sling-event/.classpath create mode 100644 apache-sling-event/.project create mode 100644 apache-sling-event/.settings/org.eclipse.jdt.core.prefs create mode 100644 apache-sling-event/bin/.gitignore create mode 100644 apache-sling-event/build.gradle create mode 100644 apache-sling-event/build/classes/java/main/org/apache/sling/event/impl/jobs/queues/JobQueueImpl.class create mode 100644 apache-sling-event/build/classes/java/main/org/apache/sling/event/jobs/consumer/JobConsumer_instrumentation$AsyncHandler.class create mode 100644 apache-sling-event/build/classes/java/main/org/apache/sling/event/jobs/consumer/JobConsumer_instrumentation.class create mode 100644 apache-sling-event/build/classes/java/main/org/apache/sling/event/jobs/consumer/JobExecutor.class create mode 100644 apache-sling-event/build/libs/apache-sling-event.jar create mode 100644 apache-sling-event/build/tmp/jar/MANIFEST.MF create mode 100644 apache-sling-event/build/verifier/passes.txt create mode 100644 apache-sling-event/src/main/java/org/apache/sling/event/impl/jobs/queues/JobQueueImpl.java create mode 100644 apache-sling-event/src/main/java/org/apache/sling/event/jobs/consumer/JobConsumer_instrumentation.java create mode 100644 apache-sling-event/src/main/java/org/apache/sling/event/jobs/consumer/JobExecutor.java create mode 100644 apache-sling-scripting/.classpath create mode 100644 apache-sling-scripting/.project create mode 100644 apache-sling-scripting/.settings/org.eclipse.jdt.core.prefs create mode 100644 apache-sling-scripting/bin/.gitignore create mode 100644 apache-sling-scripting/build.gradle create mode 100644 apache-sling-scripting/src/main/java/org/apache/sling/scripting/core/impl/DefaultSlingScript.java diff --git a/apache-sling-event/.classpath b/apache-sling-event/.classpath new file mode 100644 index 0000000..7c7ef8c --- /dev/null +++ b/apache-sling-event/.classpath @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/apache-sling-event/.project b/apache-sling-event/.project new file mode 100644 index 0000000..cc2b96e --- /dev/null +++ b/apache-sling-event/.project @@ -0,0 +1,17 @@ + + + apache-sling-event + + + + org.eclipse.jdt.core.javanature + + + + org.eclipse.jdt.core.javabuilder + + + + + + diff --git a/apache-sling-event/.settings/org.eclipse.jdt.core.prefs b/apache-sling-event/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 0000000..5d00f7f --- /dev/null +++ b/apache-sling-event/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,13 @@ +# +#Tue Mar 12 11:24:09 CDT 2024 +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error diff --git a/apache-sling-event/bin/.gitignore b/apache-sling-event/bin/.gitignore new file mode 100644 index 0000000..7eed456 --- /dev/null +++ b/apache-sling-event/bin/.gitignore @@ -0,0 +1,2 @@ +/main/ +/test/ diff --git a/apache-sling-event/build.gradle b/apache-sling-event/build.gradle new file mode 100644 index 0000000..fad1d6f --- /dev/null +++ b/apache-sling-event/build.gradle @@ -0,0 +1,27 @@ + +// Build.gradle generated for instrumentation module apache-sling-jobs + +apply plugin: 'java' + +dependencies { + implementation 'org.apache.sling:org.apache.sling.event:4.2.0' + + // New Relic Java Agent dependencies + implementation 'com.newrelic.agent.java:newrelic-agent:6.4.0' + implementation 'com.newrelic.agent.java:newrelic-api:6.4.0' + implementation fileTree(include: ['*.jar'], dir: '../libs') + implementation fileTree(include: ['*.jar'], dir: '../test-lib') +} + +jar { + manifest { + attributes 'Implementation-Title': 'com.newrelic.instrumentation.labs.apache-sling-event' + attributes 'Implementation-Vendor': 'New Relic Labs' + attributes 'Implementation-Vendor-Id': 'com.newrelic.labs' + attributes 'Implementation-Version': 1.0 + } +} + +verifyInstrumentation { + passes 'org.apache.sling:org.apache.sling.event:[4.0.0,)' +} \ No newline at end of file diff --git a/apache-sling-event/build/classes/java/main/org/apache/sling/event/impl/jobs/queues/JobQueueImpl.class b/apache-sling-event/build/classes/java/main/org/apache/sling/event/impl/jobs/queues/JobQueueImpl.class new file mode 100644 index 0000000000000000000000000000000000000000..bdbff465c8e6edb5420297e9bc1ab90db7d1c830 GIT binary patch literal 1515 zcmbVM*-{fh6g^Fr3CXZU6hRP>EhL0NMO;8MqKH-qB~Vc1TW8XhG&PxtlMZ}>-{T8{ z4}O3jWqEr-Nh~TXPSs3z-{sup+@4>*fBXcnh>bW*OvEvXsW_%FlRyfyF{IhqZ}tSYk3u$1@wvc+rMt_Z8{NVjZ>L*Xh*R%?!R;1%oEmxgGFy7kd3e$u-Sq*!K% z)fM*@2^khrSA&q@26s!2@RxP2Mx}XR$ll18YNebQ(%14jOEs!|Zi^DbRNnTgmMe~Y z;YgdRmKHDTVs`_BO`$4YiE10%Zn#QT#h$E7>R8ToJ;jyuTx!_;OEJhfUXt}1SJY2G zMC>w>?05~|7VA=z(bw9?`2&8)FUjjj@I&ES`+8Y6(S>dUPfRS~sexxEp5ui9lCR(; zLubHFfmelrRTHo9+Ca|48>}%zcD~=N!cnM2wO2^ zu0%SgpT@Qpq# z)J4FH5`8Ik`+`AXm~0cTbs&98p8hM&mM_cFbMVO(GO-AO9 z5j}+wLN*zreP^&gL45x_#1I7m1&9!EH~KL|u+zAMGzNmO=_d49SPDYA0ZJu8R(CN- jDRg6myzWsF!-SL|-3Yz+KVy`XVCYBclBfXbTlWn{A~n))q<{i%{oJvi**reOT?h9Z+!yFg!X0GbW3gMSl0tpF(yo8qC*o4Om@3`pya-ayj69us8!Hln7;ek=wx0XJ2|x> z&{GW?O5kiw8@0OEs;g*SGP*#q7Wy*Skdd}>TPYIWNVYT~-Aeqz_)F3>0u@nQHbzC& zK*q76b*&agO(r4zE#<|5Hce0M+ibSOdhGcmz1JeI$6>wN{{M|OaS~B$jj8EPJ zPZR0ytjOJzN?N@+fm?4$eADJ%2?C44=zbDLu`R-LsRPwGsp^sR6+L^UO*6{|3xQ0y z!@IsTz6u2LPs6>)SBs1!Fm^&JqAFLoJm>MiaoGV!<8>B=j)Ws|7r zIVrOfVWgYd$Y52rD9*7F<)cQF(?*ojMwD$M%Eyf;cd-9Q;av>kJr^zp9L&3TfCUE? z7Y|W&@P&&><2R#U#}(4p=Nxd|pK*BAx4Sx`IKZ9UshGy2wmjYiy#0Wrdt}#~Z$hxv z9x#C+=JxM~Fq4JTHXWDviWcnBA!CP+=NU?UJkRp%;mNtAtw`x5&kWB>=_iPi_z{`X z56JwAnODdjqDSBmy#lrA*BF{UM4!NSD3qq@_B{rvbg6U%Hbw0vgJkhOza_#0BLq5+ z97YK?M(Gl!aTznXf?14X9uru=B!=iYOaddceUMTm6>82=f1bZ0GH-Y(&EPeP_Bcd8*`;~CLT>YKlEdhw>oqvI&H!aX-XP%3l#qKA zrh`TnVmQSu&@{^5*fS=?sXGn$ZGzunfLQ|FCHUv>2!7=>;PV83zyJ#be@O7^JAr4} iLa^KuX;F%-#8pb4D0XxTrI@Y$i1s}7d8YLta(@Cjjp?cY literal 0 HcmV?d00001 diff --git a/apache-sling-event/build/classes/java/main/org/apache/sling/event/jobs/consumer/JobConsumer_instrumentation.class b/apache-sling-event/build/classes/java/main/org/apache/sling/event/jobs/consumer/JobConsumer_instrumentation.class new file mode 100644 index 0000000000000000000000000000000000000000..ca83d6fcf383e23e0bb4cefd08f223e1968fe467 GIT binary patch literal 1249 zcmbtTT~8B16g|@xR!S8_MDY`}Xp6e*gHK`%NMghkNRVLS3z;rsnPxlF%xoe2D}B=V zV0`vR8P9HuA`uL6lifS_&i&eR?*0Db%U1wT@TiO-%$9KncLU4?xEJ7lfSN#M$sd^b zl{7nva#UB0QEoYr-YYLK{7f62J{Ks~>RSS(WxJyU#v0nFwO*&G+@@?Mv`jQ?ER!wi zbfyoCrF2&_$BTw_tw?rdysILgXw!<+o-%3FwoMZf}At$OuW0oE13=JT;9>XD^numisVbs^2YXDtX}F2 z-WirS37oJk_oTqwNhS7`+#|eiGr>xw^q|X(^?$gpX3cEUl_4W5CROe|JLP;>r(4>{ zWKDLcJ|?wcpV}~|Hq5CFiJA`&!3~deU%?2<0qPaZ<3WIj0#DC69l!YzSUhX+@zD|( z&+v;9$+28-wpGlrTK(Uw)jyZ2dII}LsmXSaE0nAc@D-S>)f>lqBO4jyXWFLHEJ|Gd z>?we3qRj6owTMzs4$Xgp_?TZ;_#MuT<2cWArSE_X7^6n8Fu^2Q@B+00W$+n=Zzz7? zu|W63@X0)Us_!xgr!y{Ll7W}$H%d9h_sTn5MG@0^f@}HJ1kKkOdPCtRZsE4a49@XB Rt3Ax03HTF5RB>@}`X{FqWC{QP literal 0 HcmV?d00001 diff --git a/apache-sling-event/build/classes/java/main/org/apache/sling/event/jobs/consumer/JobExecutor.class b/apache-sling-event/build/classes/java/main/org/apache/sling/event/jobs/consumer/JobExecutor.class new file mode 100644 index 0000000000000000000000000000000000000000..00258bc190898c92c3744ec817f88c01819533aa GIT binary patch literal 2252 zcmb7GO;;OL7=AAKm`O4b2$VM37U+irDotCfwV_fmmfFgPB|uH<*JN@DLz9^}nEZTUY(c{X6KgmUp&z%HJ%Sn#poXpMp-uLr)pL-{NKmY9y09VnB<2B60 zaRcurFpHZS-qSIs<9!`@we>+9w=l2cYy!9Op^iHV+{H&qSkSSkgrzu^@v(+`38b*1 zqoCGR9cyY`*KuFRCmMjL4tTb2U-3$`PdnzfSjR?SkCn$&`8 znbmdEvz6RdhW$;uA#i2E^(tAjZd#i%+o;-3B`de3<7co@vRl!1)Estz{j#*s zRut;1fx)8mH{CMx#tym=xPJ7^2WTV+~GXD4Wen_Bu;7g)WB!>T*DUzz65g*ygYBBpKmsNwI!ZQB zf~BEsKw^Uc8K_{BdG0l3Q!be`slhg|g$)CbP-To&w{BYoYRcL%;G!;Y?PzC-Ft;XT z;46@%vApS6vRaj_qM;Pgd6U>u@`LR{)3T&2D+0w>ddpYf($TWI4BUava%oFiB=*_= z!AOD8E>=r&XGKw2K(9!DPH|aaEYo$Qfd%JyvP-;ngnkC=JQ4yE-D7qdGPEirUp3V& zHAJWX_z);*(EpN3AW4^kU8`4vi3<$B;CFCuBpcG_5%p|K5kp`k^ROd)+f3caqrE1> z3G$j^#siA+nlj7f7E9-R#xFH}hM&kBj(%99@~M^sUJ9J+0&M5eBM}U~7^=&jU9laL ztbVcK7B$pqv-XJ@yld2}XCq)Hw;KDT43FbgzT(uU51cGc@p+n3maE_znfevtmtcF8 z&uE}bVvN6ymI20bh7!q$a|}XfaT^g@0#BZyZx11XrD^?lgo~k6q)-f}qJ?54r4@?N zsi)ANB33ABsd!-zi9SrHj0<~63hd#P5T$-f18wOU2LD7V7fy%&;w_kqq{Dj{68I7E z)Nn5H6V52bv6f;)DF&6|xKe1T6S>HADxHo5ans?SSzQRKqgnLxIfxiv)t51Zn;6C- zj$sWWc!1-)pib~sNy8yfyM*c+g7ht6`i|a@+51=!BTBm*&f|4<&c552s9zJv1UNmx zB&LW@4Bz7d-eC4M{;inCMT7}9m^u6$j)qGbE^D|lko5?n2=>Mh%AZh`!aS#$Wmm< zk~I`6{xj*{cFVo@%zWR>{C?+o&ikHu&-=aSF#zG>kpKWhL;x2%*Yg030kJoX5o0c0 zH4`NPEj@K1T!6thM+1ywvaV%9AjaVZ=A!%2QCCS%OI^*_L{L{fs8@udS(q&RwVcuF z6e;I*@pE~2WJJDx#tbnuxzV8kLEN}1)DQJDUR_gt9aUD9p6?Y8xZ3bIr`sE;Gf+~e z?)Mtbt;j!0Dv(5@(T^;Ymv2AA@_Z&{LtT%yd+22$Omtyne9}Z;6uwmLdB<|?+7#f7 z#Z;}RWbIvX{qLjI|7BWun9;g>IsP=GUwufw`hY#akjoB7x>En_>h00cL0aK z9H2f&#$ow0%*oBe^++uHKVY5R?Yxg9;QluRp1uyg4u9tXy>%=o!K|sb_yB16W zb!Tk3y%$fuX>9|)iBO^OR_XGnfwB^;sc@_+ZB_o|;LEcO!3R6Uw#3Ip5QrEs$)HG& ztwbE>8>D92?e;(xCVo}$Vy_(;YE;?idxMzdq1w&(k<29HkrLe0a5JhCmHw8A`+xLkbE`2lSa+bEtC zBsgd*I%8`Im$;PdS;TZb$8E64t~-s<#1yoXI@k>DY+`Xdq9@jM@uBI8=n#C!DUW*2 z+cJ?cXY+~qV=K=EQjIZtK>?d#vl>`)j=`~FRRWc9UGvVA7k9|DI=iZhaw`+kLBuuJ z1PGbX+NFl`(ZEd=6KnO3xREWlM}oeuKK9RhW_3~Sh1I%q@Ky2oa02ZoSNRFux^hUgMmQsVa z<NEo3eZvPp*GbuRnEPy3vPn@C8Wb z<|TD+$0eB;6^auY5KchNGyVIcMvA}+;4T01i?5hmQbxJ4~3af@1736XVM%cqZx z-3xdsOov1JZINwI%!~cIH^E*&ugs{ckv@paj>3_2t9VdjfhFUL0C7#4YV~Yi29?%< zP{Yz{4W*ddvU;V4du!L)8Hv%j8niIYj5j#zgn!^x|nbLC)_KK(Qrb8q*?^Dg_ zDjGz=2a<+onEJ1t4Sv!Pbnpqk5hBZPOOOPF&cxj?rSy}V*ffA}Ltm&ItDDU~PO7q+ zW7I4LffkmKJ=RAhbe@fHEqn#;5cf3~?y1P88NaW@t&@5~L`_?Ob)&K+)@NS~0ea8n zDeLYuNV;=d<0D7OBa=GCm~idu^%QPYP7WHl;Opknu6pxVjYeCa>Tt=%TZl8(W<859 zQBBTmwFYZ=HkX*oz*9w!ZyTEz@AE49K2B^mka|R>;_sJDBSppP#N~EPg-32NJ-`O4 z7C^=AX{*YAiX#DMO)7AFU6ZQvY0_UEw8(Q8q=nSuM*{3QHk75g%;TuhYnvjD=RaFU z;WnYmn$Go!O=Pi9L_G>t-h;d3=sv*fbkA2s_&w)&N$F;<&wIjs6Q}ByCc`!4&5Wh# z-0B@YhJ)P7efO6P@fuAkb&=u|AJ#)&cOGO=w(MOfrf<1EC=@9L_G_+>jP!l`@ZpdG zo9Q-NTzj2dfbvG4$;F5^i#p%3igwj^#^T8ZCpB(O1~CceD#Uuv;@dNg-Yvgn%Qi5_ z5&PK5183feUysHEXLHrUs7&<&#l%S=mEn(JJ?8e4Y%rmmb(B^Y-Rh;}%i*s@d*?d@ zpIw_1DB`&3rR^bL&1<+L?SBprYR6Q;Z{{Hw>li7oA?B}a;^|rU3HRs1SmVFF$c0&x zJwyP2#D7?qYF8W}zCP|=U)Q0TrTKAFx_yeOp4&QjKve87uEw!n3@O;H^)tIq=lo75((@WP4|hpPO^#m8 z2-@wF-~G7Jq5!Z`MKrrG>b@p<1%i;7i`N!Itk8tg(avvM=!(F~=qRzGnNzIi1`w@i zXAu;{Lg11SqU{VbG$+0-EiNHt-j_em-w-Xpn&HgtQYmn|)~@C+;nP&dSuE%x8S3)s z77(S@QnbT-0~zP|DB_nB9q;xb7ss9Jh}%OQYIr=rU7IfckHHq*qLV(Z74YPO0rGcz zHmJK5vK36jsEmv)-jQL{F@kgj-c0ep{si6p1Ifx<`5|@6DA^v|+_YC3ZzA{^)FSpqScSMh85C_pu>3mIBFmBtmQyr1U#ETm`_~9RA{T zzqu44)^VhijQen6(ypeh1wpq>63L3CA(7QS+h|83aIjj&O#(UXQmJx1J{4G1^^|bVp#^Tj0r@mOBo;K9uB ztf1E1-bRb`+&t|b@;A>fBH0MyrhUmXn08n$UfvmKG@ly1C-b&>XpBdqh?tL~fD^29BPKui?K8RqoIV;w`7;H(fq&+4+mBsF{$i-(r z<#IcFMQyM=dqy+hnTeuTbJ=}UDz{|i?u62OqUZ9viH!3U0ihKRj!#NC1T3UBfH8Cn z<7&?8MZG+lip8C_R$$=g&>FZ{f-UQ<)$)EDb;vlYWL-@!tDlCHk&n(0s`|l}*fdeL zBAOy{B#f7<=9LFBnsm!`aD3_b-5jzjG47TEk6ty&^xu3CH&LPQ2u_`jvZRBgiWUsf zgV4As55iz3>8(O1w!gbyZ$!(`lgNlS1k)n5L`17snYg7$t<3TKUs1ZsE8uz(Ea9HMbM5j4X zdHhARx->N(0B*-4iF;xeZcz!LOQVdW(skioQ4h^{&)is3Y3S!O8ZLb>KrrCO*vafD zahv)@BcDi-bmh{7m7L;8MhE?L)y~D`>*1<`^)M(bBfjfB9ZkbjC6J;##0KAoXQ~8P zwj8f)$C=vA#R00?Dc%yKR}+h%h_k*tZya>uWo7gUof#_nr#HtXdkB2Pthor2qbwZr z>m3s6Au08_@AYHq6iVZ>t#ESJ2~Igqq)Hh!=s|?L2Ia`Wh+QW%rDW(i|2^P=Shv@&N7{GcwdE>;X}eeq4h0*M+`sJlF?fRPZMf z7%l*?KnMUB|A&p|PY*;+C2xNyL=z0PcXjx>D;1hp8`GLI2I~R&wdheisO|e9B=pxW zmFGQ2YQ`9q;9N?CF$s-Hjk2`BdM{k^gY6mbkp`^j$Rycp4fJiD*+#B-!=D;C0;RV& z=6gSSzMA(}=-c0)7is`jh9}9ARKitGjBIkZ@J$gw>DQ%lNVZ-*L9<@fncu))l}31a z=x53hS0qw1=I?^L&pHbk!QRVN70Qj8oZc`iyrw=iG01vn0d6t)sE9D%P6yGUdgC-b z4Zey8;@|88e@n}W~#W+fNKRYvWxnD_1A&pf(t?o$z>()t6(U^I${+zt-RQYE8y`dLiG1H=^kKgfZy8_GE=jCq|ttddShXRZ74@haIG zB3|k@b3f6&!tR^NjP{jFsJFAPC=)AXDWU2Jv#fm!nki5`dB8sr6)0Zp=BOUWgR156 zLp8pr@woShJh-YihW1RDP-pApc?a&|S$bV0k|DcCD=Z%Bd@9so6d8~a%FRZGOryZQ zT?q~4SyXq4J|2j@Qd5xkc#Z6DdU%r%;cei#L1jvK%SyIg7Ckl1$6tBA3{A@~xih9l z4x)hL!}mwzs1_>fwt$_geA~Kn-t0mrK6v0o$W-p0PPe$D=x)q)%w>iVE%QV!7O_Y+ z(&rJ;St)xOUXK#;DEIC<<*5_6JDZ1Fw9*{+I$)=FVaPL_!OwJWBE#E%$ZuR4IflOA zYN|8iX~`CJ<7HWY+GLn5s?HXOo4x*Ckx0gGENg~l8J&2Gf~h7j(J^n^ARV=goV6J+ z&wd{*s&awnGnpZc0=w}Z_1#I~ZRXJ+AL8ZvmYEW}1h{uTE>Q2B2p`~V3072y6^xB* ztj?>mOW>EEy}%(WteUym0Y=!KdM*g2Nfrs`L$q^W5{ZzCfrP||atf`I9^PiI+POW)0V_cq8aD6<<||f^I0}Ik zBn}OW_=x$6MSPVfjsjxki9^EzPviUqJQORAf@8&s?{M?q!4IX2qe!sb&UccyKa+eB zGLB+m|3A@}f2`{tn7*__N6}$rjYGpGhZNHr{gBne + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/apache-sling-scripting/.project b/apache-sling-scripting/.project new file mode 100644 index 0000000..1fd246d --- /dev/null +++ b/apache-sling-scripting/.project @@ -0,0 +1,17 @@ + + + apache-sling-scripting + + + + org.eclipse.jdt.core.javanature + + + + org.eclipse.jdt.core.javabuilder + + + + + + diff --git a/apache-sling-scripting/.settings/org.eclipse.jdt.core.prefs b/apache-sling-scripting/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 0000000..c54f16c --- /dev/null +++ b/apache-sling-scripting/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,13 @@ +# +#Tue Mar 12 12:53:08 CDT 2024 +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error diff --git a/apache-sling-scripting/bin/.gitignore b/apache-sling-scripting/bin/.gitignore new file mode 100644 index 0000000..7eed456 --- /dev/null +++ b/apache-sling-scripting/bin/.gitignore @@ -0,0 +1,2 @@ +/main/ +/test/ diff --git a/apache-sling-scripting/build.gradle b/apache-sling-scripting/build.gradle new file mode 100644 index 0000000..27311c8 --- /dev/null +++ b/apache-sling-scripting/build.gradle @@ -0,0 +1,34 @@ + +// Build.gradle generated for instrumentation module apache-sling-scripting + +apply plugin: 'java' + +dependencies { + implementation 'org.apache.sling:org.apache.sling.scripting.core:2.2.0' + implementation 'javax.servlet:javax.servlet-api:3.1.0' + // https://mvnrepository.com/artifact/org.apache.sling/org.apache.sling.api + compileOnly group: 'org.apache.sling', name: 'org.apache.sling.api', version: '2.22.0' + + // New Relic Java Agent dependencies + implementation 'com.newrelic.agent.java:newrelic-agent:6.4.0' + implementation 'com.newrelic.agent.java:newrelic-api:6.4.0' + implementation fileTree(include: ['*.jar'], dir: '../libs') + implementation fileTree(include: ['*.jar'], dir: '../test-lib') +} + +jar { + manifest { + attributes 'Implementation-Title': 'com.newrelic.instrumentation.labs.apache-sling-scripting' + attributes 'Implementation-Vendor': 'New Relic Labs' + attributes 'Implementation-Vendor-Id': 'com.newrelic.labs' + attributes 'Implementation-Version': 1.0 + } +} + +verifyInstrumentation { + // Verifier plugin documentation: + // https://github.com/newrelic/newrelic-gradle-verify-instrumentation + // Example: + // passes 'javax.servlet:servlet-api:[2.2,2.5]' + // exclude 'javax.servlet:servlet-api:2.4.public_draft' +} \ No newline at end of file diff --git a/apache-sling-scripting/src/main/java/org/apache/sling/scripting/core/impl/DefaultSlingScript.java b/apache-sling-scripting/src/main/java/org/apache/sling/scripting/core/impl/DefaultSlingScript.java new file mode 100644 index 0000000..4950a27 --- /dev/null +++ b/apache-sling-scripting/src/main/java/org/apache/sling/scripting/core/impl/DefaultSlingScript.java @@ -0,0 +1,5 @@ +package org.apache.sling.scripting.core.impl; + +abstract class DefaultSlingScript { + +} diff --git a/settings.gradle b/settings.gradle index da53300..937a370 100644 --- a/settings.gradle +++ b/settings.gradle @@ -8,3 +8,5 @@ include 'apache-sling-distribution-api' include 'apache-sling-distribution-core' include 'apache-sling-model' include 'apache-sling-provisioning-model' +include 'apache-sling-event' +include 'apache-sling-scripting' From f3e415875d9b87969ae7f146e97c13dd0b6ac461 Mon Sep 17 00:00:00 2001 From: Doug Hilpipre Date: Tue, 12 Mar 2024 13:17:07 -0500 Subject: [PATCH 2/4] cleanup --- .gitignore | 5 ++ .../build/libs/apache-sling-event.jar | Bin 5546 -> 5546 bytes apache-sling-event/build/tmp/jar/MANIFEST.MF | 4 +- apache-sling-event/build/verifier/passes.txt | 60 ++++++++++++++++++ apache-sling-scripting/build.gradle | 10 ++- .../core/impl/DefaultSlingScript.java | 25 ++++++++ 6 files changed, 96 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 8e6c450..e295b33 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,8 @@ .git .github /.metadata/ +.settings +.classpath +.project +build +bin diff --git a/apache-sling-event/build/libs/apache-sling-event.jar b/apache-sling-event/build/libs/apache-sling-event.jar index 649290f57256ee1bdf0088d4c945e9a513850e76..c6bd3cd58a5b97cd1159864e571fef6ce5e42e01 100644 GIT binary patch delta 199 zcmZ3by-J%Wz?+$ci-CcIgTWzlB9A(+LuO7yKZk^J4Fdzi&4~^&^}U9ChYSQ*s=fam zu00^O<)5R<0tbz~g<=*b?cBF1-dFc@6l8h(F5}sY*8CM`zi3R|Y;o)M+^|?FWuYZM z&HA4m(mfP-;w0CyrV|G@T?v~ff6T3Z?X`Y8n}n>CozfYu>wo^g^f&kG1V!=7ytD5; t`p;->mAL40)5XN2TdJ5rZks%bQEcPKU;IoCnUmiNn4-FGv%X+83jo_LQ&|82 delta 196 zcmZ3by-J%Uz?+$6@;hO%iBgih0ZBO#(|w~S)i5wH+?ePfQ-9Ww?~nmc>qFb1cMrH# znoP}Cu<&q{mIsUX2rchwuBz2wb{1UYKmT66%frqsJLjz`n#fSSfAg}_#fy9{ZP@Ep z{&1RxgU(HE-Kj$E=NGNDvpc3PbLDZ*M>jv=(^v1VZ8Umu{r3G3f1_!yb`?&JeqaB9 pK|Sih9wUoAGfn-$?wZ6Xw(;XH{>fj21t$L%P)Bv(W_`hG762KBQ@;QJ diff --git a/apache-sling-event/build/tmp/jar/MANIFEST.MF b/apache-sling-event/build/tmp/jar/MANIFEST.MF index 9cb502a..cb507a0 100644 --- a/apache-sling-event/build/tmp/jar/MANIFEST.MF +++ b/apache-sling-event/build/tmp/jar/MANIFEST.MF @@ -1,6 +1,6 @@ Manifest-Version: 1.0 -Implementation-Title: com.newrelic.instrumentation.labs.apache-sling-j - obs +Implementation-Title: com.newrelic.instrumentation.labs.apache-sling-e + vent Implementation-Version: 1.0 Implementation-Vendor-Id: com.newrelic.labs Implementation-Vendor: New Relic Labs diff --git a/apache-sling-event/build/verifier/passes.txt b/apache-sling-event/build/verifier/passes.txt index ccfd626..6086c7d 100644 --- a/apache-sling-event/build/verifier/passes.txt +++ b/apache-sling-event/build/verifier/passes.txt @@ -36,3 +36,63 @@ apache-sling-event org.apache.sling:org.apache.sling.event:4.2.10 apache-sling-event org.apache.sling:org.apache.sling.event:4.2.12 apache-sling-event org.apache.sling:org.apache.sling.event:4.0.0 apache-sling-event org.apache.sling:org.apache.sling.event:4.2.18 +apache-sling-event org.apache.sling:org.apache.sling.event:4.2.8 +apache-sling-event org.apache.sling:org.apache.sling.event:4.2.6 +apache-sling-event org.apache.sling:org.apache.sling.event:4.2.4 +apache-sling-event org.apache.sling:org.apache.sling.event:4.3.8 +apache-sling-event org.apache.sling:org.apache.sling.event:4.2.24 +apache-sling-event org.apache.sling:org.apache.sling.event:4.3.6 +apache-sling-event org.apache.sling:org.apache.sling.event:4.3.14 +apache-sling-event org.apache.sling:org.apache.sling.event:4.3.2 +apache-sling-event org.apache.sling:org.apache.sling.event:4.3.12 +apache-sling-event org.apache.sling:org.apache.sling.event:4.3.0 +apache-sling-event org.apache.sling:org.apache.sling.event:4.2.22 +apache-sling-event org.apache.sling:org.apache.sling.event:4.2.20 +apache-sling-event org.apache.sling:org.apache.sling.event:4.2.12 +apache-sling-event org.apache.sling:org.apache.sling.event:4.2.2 +apache-sling-event org.apache.sling:org.apache.sling.event:4.2.18 +apache-sling-event org.apache.sling:org.apache.sling.event:4.2.0 +apache-sling-event org.apache.sling:org.apache.sling.event:4.1.0 +apache-sling-event org.apache.sling:org.apache.sling.event:4.0.2 +apache-sling-event org.apache.sling:org.apache.sling.event:4.0.0 +apache-sling-event org.apache.sling:org.apache.sling.event:4.2.10 +apache-sling-event org.apache.sling:org.apache.sling.event:4.2.8 +apache-sling-event org.apache.sling:org.apache.sling.event:4.2.6 +apache-sling-event org.apache.sling:org.apache.sling.event:4.2.4 +apache-sling-event org.apache.sling:org.apache.sling.event:4.3.0 +apache-sling-event org.apache.sling:org.apache.sling.event:4.3.12 +apache-sling-event org.apache.sling:org.apache.sling.event:4.3.2 +apache-sling-event org.apache.sling:org.apache.sling.event:4.3.6 +apache-sling-event org.apache.sling:org.apache.sling.event:4.3.8 +apache-sling-event org.apache.sling:org.apache.sling.event:4.3.14 +apache-sling-event org.apache.sling:org.apache.sling.event:4.2.24 +apache-sling-event org.apache.sling:org.apache.sling.event:4.2.20 +apache-sling-event org.apache.sling:org.apache.sling.event:4.2.2 +apache-sling-event org.apache.sling:org.apache.sling.event:4.2.22 +apache-sling-event org.apache.sling:org.apache.sling.event:4.2.12 +apache-sling-event org.apache.sling:org.apache.sling.event:4.1.0 +apache-sling-event org.apache.sling:org.apache.sling.event:4.0.0 +apache-sling-event org.apache.sling:org.apache.sling.event:4.2.10 +apache-sling-event org.apache.sling:org.apache.sling.event:4.2.0 +apache-sling-event org.apache.sling:org.apache.sling.event:4.0.2 +apache-sling-event org.apache.sling:org.apache.sling.event:4.2.18 +apache-sling-event org.apache.sling:org.apache.sling.event:4.3.8 +apache-sling-event org.apache.sling:org.apache.sling.event:4.3.14 +apache-sling-event org.apache.sling:org.apache.sling.event:4.3.6 +apache-sling-event org.apache.sling:org.apache.sling.event:4.3.2 +apache-sling-event org.apache.sling:org.apache.sling.event:4.3.0 +apache-sling-event org.apache.sling:org.apache.sling.event:4.3.12 +apache-sling-event org.apache.sling:org.apache.sling.event:4.2.8 +apache-sling-event org.apache.sling:org.apache.sling.event:4.2.4 +apache-sling-event org.apache.sling:org.apache.sling.event:4.2.6 +apache-sling-event org.apache.sling:org.apache.sling.event:4.2.24 +apache-sling-event org.apache.sling:org.apache.sling.event:4.2.10 +apache-sling-event org.apache.sling:org.apache.sling.event:4.2.18 +apache-sling-event org.apache.sling:org.apache.sling.event:4.2.20 +apache-sling-event org.apache.sling:org.apache.sling.event:4.2.22 +apache-sling-event org.apache.sling:org.apache.sling.event:4.2.2 +apache-sling-event org.apache.sling:org.apache.sling.event:4.2.12 +apache-sling-event org.apache.sling:org.apache.sling.event:4.2.0 +apache-sling-event org.apache.sling:org.apache.sling.event:4.1.0 +apache-sling-event org.apache.sling:org.apache.sling.event:4.0.2 +apache-sling-event org.apache.sling:org.apache.sling.event:4.0.0 diff --git a/apache-sling-scripting/build.gradle b/apache-sling-scripting/build.gradle index 27311c8..ecc7b75 100644 --- a/apache-sling-scripting/build.gradle +++ b/apache-sling-scripting/build.gradle @@ -7,7 +7,7 @@ dependencies { implementation 'org.apache.sling:org.apache.sling.scripting.core:2.2.0' implementation 'javax.servlet:javax.servlet-api:3.1.0' // https://mvnrepository.com/artifact/org.apache.sling/org.apache.sling.api - compileOnly group: 'org.apache.sling', name: 'org.apache.sling.api', version: '2.22.0' + compileOnly 'org.apache.sling:org.apache.sling.api:2.22.0' // New Relic Java Agent dependencies implementation 'com.newrelic.agent.java:newrelic-agent:6.4.0' @@ -26,9 +26,7 @@ jar { } verifyInstrumentation { - // Verifier plugin documentation: - // https://github.com/newrelic/newrelic-gradle-verify-instrumentation - // Example: - // passes 'javax.servlet:servlet-api:[2.2,2.5]' - // exclude 'javax.servlet:servlet-api:2.4.public_draft' + passes('org.apache.sling:org.apache.sling.scripting.core:[2.2.0,)') { + compile 'org.apache.sling:org.apache.sling.api:2.22.0' + } } \ No newline at end of file diff --git a/apache-sling-scripting/src/main/java/org/apache/sling/scripting/core/impl/DefaultSlingScript.java b/apache-sling-scripting/src/main/java/org/apache/sling/scripting/core/impl/DefaultSlingScript.java index 4950a27..72c984a 100644 --- a/apache-sling-scripting/src/main/java/org/apache/sling/scripting/core/impl/DefaultSlingScript.java +++ b/apache-sling-scripting/src/main/java/org/apache/sling/scripting/core/impl/DefaultSlingScript.java @@ -1,5 +1,30 @@ package org.apache.sling.scripting.core.impl; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; +import org.apache.sling.api.scripting.SlingBindings; + +import com.newrelic.api.agent.NewRelic; +import com.newrelic.api.agent.Trace; +import com.newrelic.api.agent.weaver.Weave; +import com.newrelic.api.agent.weaver.Weaver; + +@Weave abstract class DefaultSlingScript { + public abstract String getServletName(); + + @Trace + public void service(ServletRequest req, ServletResponse res) { + NewRelic.getAgent().getTracedMethod().setMetricName("Custom","Sling","DefaultSlingScript","service",getServletName()); + + Weaver.callOriginal(); + } + + @Trace + public Object call(SlingBindings props, String method, Object... args) { + NewRelic.getAgent().getTracedMethod().addCustomAttribute("Method", method); + NewRelic.getAgent().getTracedMethod().setMetricName("Custom","Sling","DefaultSlingScript","call"); + return Weaver.callOriginal(); + } } From 5a63046d92308900dff92eb92b177b6ae8f5428f Mon Sep 17 00:00:00 2001 From: Doug Hilpipre Date: Tue, 12 Mar 2024 13:19:39 -0500 Subject: [PATCH 3/4] cleanup --- .../event/impl/jobs/queues/JobQueueImpl.class | Bin 1515 -> 0 bytes ...onsumer_instrumentation$AsyncHandler.class | Bin 2024 -> 0 bytes .../JobConsumer_instrumentation.class | Bin 1249 -> 0 bytes .../event/jobs/consumer/JobExecutor.class | Bin 2252 -> 0 bytes .../build/libs/apache-sling-event.jar | Bin 5546 -> 0 bytes apache-sling-event/build/tmp/jar/MANIFEST.MF | 7 -- apache-sling-event/build/verifier/passes.txt | 98 ----------------- apache-sling-scripting/.classpath | 104 ------------------ apache-sling-scripting/.project | 17 --- .../.settings/org.eclipse.jdt.core.prefs | 13 --- apache-sling-scripting/bin/.gitignore | 2 - 11 files changed, 241 deletions(-) delete mode 100644 apache-sling-event/build/classes/java/main/org/apache/sling/event/impl/jobs/queues/JobQueueImpl.class delete mode 100644 apache-sling-event/build/classes/java/main/org/apache/sling/event/jobs/consumer/JobConsumer_instrumentation$AsyncHandler.class delete mode 100644 apache-sling-event/build/classes/java/main/org/apache/sling/event/jobs/consumer/JobConsumer_instrumentation.class delete mode 100644 apache-sling-event/build/classes/java/main/org/apache/sling/event/jobs/consumer/JobExecutor.class delete mode 100644 apache-sling-event/build/libs/apache-sling-event.jar delete mode 100644 apache-sling-event/build/tmp/jar/MANIFEST.MF delete mode 100644 apache-sling-event/build/verifier/passes.txt delete mode 100644 apache-sling-scripting/.classpath delete mode 100644 apache-sling-scripting/.project delete mode 100644 apache-sling-scripting/.settings/org.eclipse.jdt.core.prefs delete mode 100644 apache-sling-scripting/bin/.gitignore diff --git a/apache-sling-event/build/classes/java/main/org/apache/sling/event/impl/jobs/queues/JobQueueImpl.class b/apache-sling-event/build/classes/java/main/org/apache/sling/event/impl/jobs/queues/JobQueueImpl.class deleted file mode 100644 index bdbff465c8e6edb5420297e9bc1ab90db7d1c830..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1515 zcmbVM*-{fh6g^Fr3CXZU6hRP>EhL0NMO;8MqKH-qB~Vc1TW8XhG&PxtlMZ}>-{T8{ z4}O3jWqEr-Nh~TXPSs3z-{sup+@4>*fBXcnh>bW*OvEvXsW_%FlRyfyF{IhqZ}tSYk3u$1@wvc+rMt_Z8{NVjZ>L*Xh*R%?!R;1%oEmxgGFy7kd3e$u-Sq*!K% z)fM*@2^khrSA&q@26s!2@RxP2Mx}XR$ll18YNebQ(%14jOEs!|Zi^DbRNnTgmMe~Y z;YgdRmKHDTVs`_BO`$4YiE10%Zn#QT#h$E7>R8ToJ;jyuTx!_;OEJhfUXt}1SJY2G zMC>w>?05~|7VA=z(bw9?`2&8)FUjjj@I&ES`+8Y6(S>dUPfRS~sexxEp5ui9lCR(; zLubHFfmelrRTHo9+Ca|48>}%zcD~=N!cnM2wO2^ zu0%SgpT@Qpq# z)J4FH5`8Ik`+`AXm~0cTbs&98p8hM&mM_cFbMVO(GO-AO9 z5j}+wLN*zreP^&gL45x_#1I7m1&9!EH~KL|u+zAMGzNmO=_d49SPDYA0ZJu8R(CN- jDRg6myzWsF!-SL|-3Yz+KVy`XVCYBclBfXbTlWn{A~n))q<{i%{oJvi**reOT?h9Z+!yFg!X0GbW3gMSl0tpF(yo8qC*o4Om@3`pya-ayj69us8!Hln7;ek=wx0XJ2|x> z&{GW?O5kiw8@0OEs;g*SGP*#q7Wy*Skdd}>TPYIWNVYT~-Aeqz_)F3>0u@nQHbzC& zK*q76b*&agO(r4zE#<|5Hce0M+ibSOdhGcmz1JeI$6>wN{{M|OaS~B$jj8EPJ zPZR0ytjOJzN?N@+fm?4$eADJ%2?C44=zbDLu`R-LsRPwGsp^sR6+L^UO*6{|3xQ0y z!@IsTz6u2LPs6>)SBs1!Fm^&JqAFLoJm>MiaoGV!<8>B=j)Ws|7r zIVrOfVWgYd$Y52rD9*7F<)cQF(?*ojMwD$M%Eyf;cd-9Q;av>kJr^zp9L&3TfCUE? z7Y|W&@P&&><2R#U#}(4p=Nxd|pK*BAx4Sx`IKZ9UshGy2wmjYiy#0Wrdt}#~Z$hxv z9x#C+=JxM~Fq4JTHXWDviWcnBA!CP+=NU?UJkRp%;mNtAtw`x5&kWB>=_iPi_z{`X z56JwAnODdjqDSBmy#lrA*BF{UM4!NSD3qq@_B{rvbg6U%Hbw0vgJkhOza_#0BLq5+ z97YK?M(Gl!aTznXf?14X9uru=B!=iYOaddceUMTm6>82=f1bZ0GH-Y(&EPeP_Bcd8*`;~CLT>YKlEdhw>oqvI&H!aX-XP%3l#qKA zrh`TnVmQSu&@{^5*fS=?sXGn$ZGzunfLQ|FCHUv>2!7=>;PV83zyJ#be@O7^JAr4} iLa^KuX;F%-#8pb4D0XxTrI@Y$i1s}7d8YLta(@Cjjp?cY diff --git a/apache-sling-event/build/classes/java/main/org/apache/sling/event/jobs/consumer/JobConsumer_instrumentation.class b/apache-sling-event/build/classes/java/main/org/apache/sling/event/jobs/consumer/JobConsumer_instrumentation.class deleted file mode 100644 index ca83d6fcf383e23e0bb4cefd08f223e1968fe467..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1249 zcmbtTT~8B16g|@xR!S8_MDY`}Xp6e*gHK`%NMghkNRVLS3z;rsnPxlF%xoe2D}B=V zV0`vR8P9HuA`uL6lifS_&i&eR?*0Db%U1wT@TiO-%$9KncLU4?xEJ7lfSN#M$sd^b zl{7nva#UB0QEoYr-YYLK{7f62J{Ks~>RSS(WxJyU#v0nFwO*&G+@@?Mv`jQ?ER!wi zbfyoCrF2&_$BTw_tw?rdysILgXw!<+o-%3FwoMZf}At$OuW0oE13=JT;9>XD^numisVbs^2YXDtX}F2 z-WirS37oJk_oTqwNhS7`+#|eiGr>xw^q|X(^?$gpX3cEUl_4W5CROe|JLP;>r(4>{ zWKDLcJ|?wcpV}~|Hq5CFiJA`&!3~deU%?2<0qPaZ<3WIj0#DC69l!YzSUhX+@zD|( z&+v;9$+28-wpGlrTK(Uw)jyZ2dII}LsmXSaE0nAc@D-S>)f>lqBO4jyXWFLHEJ|Gd z>?we3qRj6owTMzs4$Xgp_?TZ;_#MuT<2cWArSE_X7^6n8Fu^2Q@B+00W$+n=Zzz7? zu|W63@X0)Us_!xgr!y{Ll7W}$H%d9h_sTn5MG@0^f@}HJ1kKkOdPCtRZsE4a49@XB Rt3Ax03HTF5RB>@}`X{FqWC{QP diff --git a/apache-sling-event/build/classes/java/main/org/apache/sling/event/jobs/consumer/JobExecutor.class b/apache-sling-event/build/classes/java/main/org/apache/sling/event/jobs/consumer/JobExecutor.class deleted file mode 100644 index 00258bc190898c92c3744ec817f88c01819533aa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2252 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 XsX-5nhmQ$Dfqqq?H;XAC=GXrKRFrKt diff --git a/apache-sling-event/build/tmp/jar/MANIFEST.MF b/apache-sling-event/build/tmp/jar/MANIFEST.MF deleted file mode 100644 index cb507a0..0000000 --- a/apache-sling-event/build/tmp/jar/MANIFEST.MF +++ /dev/null @@ -1,7 +0,0 @@ -Manifest-Version: 1.0 -Implementation-Title: com.newrelic.instrumentation.labs.apache-sling-e - vent -Implementation-Version: 1.0 -Implementation-Vendor-Id: com.newrelic.labs -Implementation-Vendor: New Relic Labs - diff --git a/apache-sling-event/build/verifier/passes.txt b/apache-sling-event/build/verifier/passes.txt deleted file mode 100644 index 6086c7d..0000000 --- a/apache-sling-event/build/verifier/passes.txt +++ /dev/null @@ -1,98 +0,0 @@ -apache-sling-event org.apache.sling:org.apache.sling.event:4.2.0 -apache-sling-event org.apache.sling:org.apache.sling.event:4.2.6 -apache-sling-event org.apache.sling:org.apache.sling.event:4.2.4 -apache-sling-event org.apache.sling:org.apache.sling.event:4.2.8 -apache-sling-event org.apache.sling:org.apache.sling.event:4.3.2 -apache-sling-event org.apache.sling:org.apache.sling.event:4.3.0 -apache-sling-event org.apache.sling:org.apache.sling.event:4.3.12 -apache-sling-event org.apache.sling:org.apache.sling.event:4.2.22 -apache-sling-event org.apache.sling:org.apache.sling.event:4.3.6 -apache-sling-event org.apache.sling:org.apache.sling.event:4.2.24 -apache-sling-event org.apache.sling:org.apache.sling.event:4.2.20 -apache-sling-event org.apache.sling:org.apache.sling.event:4.3.8 -apache-sling-event org.apache.sling:org.apache.sling.event:4.3.14 -apache-sling-event org.apache.sling:org.apache.sling.event:4.2.2 -apache-sling-event org.apache.sling:org.apache.sling.event:4.2.12 -apache-sling-event org.apache.sling:org.apache.sling.event:4.2.18 -apache-sling-event org.apache.sling:org.apache.sling.event:4.2.10 -apache-sling-event org.apache.sling:org.apache.sling.event:4.2.0 -apache-sling-event org.apache.sling:org.apache.sling.event:4.2.4 -apache-sling-event org.apache.sling:org.apache.sling.event:4.2.8 -apache-sling-event org.apache.sling:org.apache.sling.event:4.2.6 -apache-sling-event org.apache.sling:org.apache.sling.event:4.3.8 -apache-sling-event org.apache.sling:org.apache.sling.event:4.2.20 -apache-sling-event org.apache.sling:org.apache.sling.event:4.3.2 -apache-sling-event org.apache.sling:org.apache.sling.event:4.3.12 -apache-sling-event org.apache.sling:org.apache.sling.event:4.3.0 -apache-sling-event org.apache.sling:org.apache.sling.event:4.2.24 -apache-sling-event org.apache.sling:org.apache.sling.event:4.2.22 -apache-sling-event org.apache.sling:org.apache.sling.event:4.3.14 -apache-sling-event org.apache.sling:org.apache.sling.event:4.3.6 -apache-sling-event org.apache.sling:org.apache.sling.event:4.2.2 -apache-sling-event org.apache.sling:org.apache.sling.event:4.1.0 -apache-sling-event org.apache.sling:org.apache.sling.event:4.2.0 -apache-sling-event org.apache.sling:org.apache.sling.event:4.0.2 -apache-sling-event org.apache.sling:org.apache.sling.event:4.2.10 -apache-sling-event org.apache.sling:org.apache.sling.event:4.2.12 -apache-sling-event org.apache.sling:org.apache.sling.event:4.0.0 -apache-sling-event org.apache.sling:org.apache.sling.event:4.2.18 -apache-sling-event org.apache.sling:org.apache.sling.event:4.2.8 -apache-sling-event org.apache.sling:org.apache.sling.event:4.2.6 -apache-sling-event org.apache.sling:org.apache.sling.event:4.2.4 -apache-sling-event org.apache.sling:org.apache.sling.event:4.3.8 -apache-sling-event org.apache.sling:org.apache.sling.event:4.2.24 -apache-sling-event org.apache.sling:org.apache.sling.event:4.3.6 -apache-sling-event org.apache.sling:org.apache.sling.event:4.3.14 -apache-sling-event org.apache.sling:org.apache.sling.event:4.3.2 -apache-sling-event org.apache.sling:org.apache.sling.event:4.3.12 -apache-sling-event org.apache.sling:org.apache.sling.event:4.3.0 -apache-sling-event org.apache.sling:org.apache.sling.event:4.2.22 -apache-sling-event org.apache.sling:org.apache.sling.event:4.2.20 -apache-sling-event org.apache.sling:org.apache.sling.event:4.2.12 -apache-sling-event org.apache.sling:org.apache.sling.event:4.2.2 -apache-sling-event org.apache.sling:org.apache.sling.event:4.2.18 -apache-sling-event org.apache.sling:org.apache.sling.event:4.2.0 -apache-sling-event org.apache.sling:org.apache.sling.event:4.1.0 -apache-sling-event org.apache.sling:org.apache.sling.event:4.0.2 -apache-sling-event org.apache.sling:org.apache.sling.event:4.0.0 -apache-sling-event org.apache.sling:org.apache.sling.event:4.2.10 -apache-sling-event org.apache.sling:org.apache.sling.event:4.2.8 -apache-sling-event org.apache.sling:org.apache.sling.event:4.2.6 -apache-sling-event org.apache.sling:org.apache.sling.event:4.2.4 -apache-sling-event org.apache.sling:org.apache.sling.event:4.3.0 -apache-sling-event org.apache.sling:org.apache.sling.event:4.3.12 -apache-sling-event org.apache.sling:org.apache.sling.event:4.3.2 -apache-sling-event org.apache.sling:org.apache.sling.event:4.3.6 -apache-sling-event org.apache.sling:org.apache.sling.event:4.3.8 -apache-sling-event org.apache.sling:org.apache.sling.event:4.3.14 -apache-sling-event org.apache.sling:org.apache.sling.event:4.2.24 -apache-sling-event org.apache.sling:org.apache.sling.event:4.2.20 -apache-sling-event org.apache.sling:org.apache.sling.event:4.2.2 -apache-sling-event org.apache.sling:org.apache.sling.event:4.2.22 -apache-sling-event org.apache.sling:org.apache.sling.event:4.2.12 -apache-sling-event org.apache.sling:org.apache.sling.event:4.1.0 -apache-sling-event org.apache.sling:org.apache.sling.event:4.0.0 -apache-sling-event org.apache.sling:org.apache.sling.event:4.2.10 -apache-sling-event org.apache.sling:org.apache.sling.event:4.2.0 -apache-sling-event org.apache.sling:org.apache.sling.event:4.0.2 -apache-sling-event org.apache.sling:org.apache.sling.event:4.2.18 -apache-sling-event org.apache.sling:org.apache.sling.event:4.3.8 -apache-sling-event org.apache.sling:org.apache.sling.event:4.3.14 -apache-sling-event org.apache.sling:org.apache.sling.event:4.3.6 -apache-sling-event org.apache.sling:org.apache.sling.event:4.3.2 -apache-sling-event org.apache.sling:org.apache.sling.event:4.3.0 -apache-sling-event org.apache.sling:org.apache.sling.event:4.3.12 -apache-sling-event org.apache.sling:org.apache.sling.event:4.2.8 -apache-sling-event org.apache.sling:org.apache.sling.event:4.2.4 -apache-sling-event org.apache.sling:org.apache.sling.event:4.2.6 -apache-sling-event org.apache.sling:org.apache.sling.event:4.2.24 -apache-sling-event org.apache.sling:org.apache.sling.event:4.2.10 -apache-sling-event org.apache.sling:org.apache.sling.event:4.2.18 -apache-sling-event org.apache.sling:org.apache.sling.event:4.2.20 -apache-sling-event org.apache.sling:org.apache.sling.event:4.2.22 -apache-sling-event org.apache.sling:org.apache.sling.event:4.2.2 -apache-sling-event org.apache.sling:org.apache.sling.event:4.2.12 -apache-sling-event org.apache.sling:org.apache.sling.event:4.2.0 -apache-sling-event org.apache.sling:org.apache.sling.event:4.1.0 -apache-sling-event org.apache.sling:org.apache.sling.event:4.0.2 -apache-sling-event org.apache.sling:org.apache.sling.event:4.0.0 diff --git a/apache-sling-scripting/.classpath b/apache-sling-scripting/.classpath deleted file mode 100644 index 81aa29e..0000000 --- a/apache-sling-scripting/.classpath +++ /dev/null @@ -1,104 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/apache-sling-scripting/.project b/apache-sling-scripting/.project deleted file mode 100644 index 1fd246d..0000000 --- a/apache-sling-scripting/.project +++ /dev/null @@ -1,17 +0,0 @@ - - - apache-sling-scripting - - - - org.eclipse.jdt.core.javanature - - - - org.eclipse.jdt.core.javabuilder - - - - - - diff --git a/apache-sling-scripting/.settings/org.eclipse.jdt.core.prefs b/apache-sling-scripting/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index c54f16c..0000000 --- a/apache-sling-scripting/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,13 +0,0 @@ -# -#Tue Mar 12 12:53:08 CDT 2024 -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.source=1.8 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error diff --git a/apache-sling-scripting/bin/.gitignore b/apache-sling-scripting/bin/.gitignore deleted file mode 100644 index 7eed456..0000000 --- a/apache-sling-scripting/bin/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/main/ -/test/ From 40b5d9ee8b92d7959478f9daacad0f5bb7268926 Mon Sep 17 00:00:00 2001 From: Doug Hilpipre Date: Tue, 12 Mar 2024 13:20:37 -0500 Subject: [PATCH 4/4] cleanup --- apache-sling-event/.classpath | 74 ------------------- apache-sling-event/.project | 17 ----- .../.settings/org.eclipse.jdt.core.prefs | 13 ---- apache-sling-event/bin/.gitignore | 2 - 4 files changed, 106 deletions(-) delete mode 100644 apache-sling-event/.classpath delete mode 100644 apache-sling-event/.project delete mode 100644 apache-sling-event/.settings/org.eclipse.jdt.core.prefs delete mode 100644 apache-sling-event/bin/.gitignore diff --git a/apache-sling-event/.classpath b/apache-sling-event/.classpath deleted file mode 100644 index 7c7ef8c..0000000 --- a/apache-sling-event/.classpath +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/apache-sling-event/.project b/apache-sling-event/.project deleted file mode 100644 index cc2b96e..0000000 --- a/apache-sling-event/.project +++ /dev/null @@ -1,17 +0,0 @@ - - - apache-sling-event - - - - org.eclipse.jdt.core.javanature - - - - org.eclipse.jdt.core.javabuilder - - - - - - diff --git a/apache-sling-event/.settings/org.eclipse.jdt.core.prefs b/apache-sling-event/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 5d00f7f..0000000 --- a/apache-sling-event/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,13 +0,0 @@ -# -#Tue Mar 12 11:24:09 CDT 2024 -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.source=1.8 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error diff --git a/apache-sling-event/bin/.gitignore b/apache-sling-event/bin/.gitignore deleted file mode 100644 index 7eed456..0000000 --- a/apache-sling-event/bin/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/main/ -/test/