From 6b192f7f767e671fc6afc9c756001505ff8d61b5 Mon Sep 17 00:00:00 2001 From: Eugene Livis Date: Fri, 13 Jan 2017 09:54:48 -0500 Subject: [PATCH] Improvements to Solr4IndexUpgrade.jar and Solr5IndexUpgrade.jar --- .../Solr4IndexUpgrade.jar | Bin 2960 -> 2746 bytes .../Solr5IndexUpgrade.jar | Bin 3241 -> 2990 bytes .../autopsy/keywordsearch/IndexHandling.java | 5 ----- 3 files changed, 5 deletions(-) diff --git a/KeywordSearch/release/Solr4to5IndexUpgrade/Solr4IndexUpgrade.jar b/KeywordSearch/release/Solr4to5IndexUpgrade/Solr4IndexUpgrade.jar index 3447a11a1fb4278294b5f282bd3fe759468c0a11..764fc7df8d95604dd1574b796216ab2761417c05 100644 GIT binary patch delta 969 zcmZ8gNmCO+6#hChVUo@yEMWp_un4n6O6zy6kf-Fq#kP0p1CN#=kJI9v+8b@oc1 zmV!r-eI`>nZ+vF~mk2zS9|LO&u%;L;OXTSjjus5taRVbZL^y6@l%pB96hv(p>-l7X!EJO& zZX+j!I~e%P?q(uaOl30#1u+JDVLSV3y`U!(#)0(H_$d3!ODdMJ!q65g6^dF;FBG(} zmdfNxMUC)E&l8!Vf>jmw;aAa%RtE2m{!$O6^-MA}mrf^=dV1B@eq#~hKzB!-PpIz$&VR&j2Ci`Q?SMbD{1!`s}7%=q3)lDxJ-XLI-$XWHi}j6Ktz7H-0sIfts4-xJFduWKZgjy*#hpa&ql}E1FsvO{D3EF5Dk-AoP$U%fn0iR1(85WJpk*d4H zCny(N_6gfc|G_F8aeoEsF`OrGEml#kjaN{&R7HI}SV2Rq3U|COAXm^hD!0nVXcFKS z6TFSw08zTElXQYpbVAeQY=+#-ntq1PC`=QeDj#_dkT4AmOB5kHJVli3Fb*6-WYtqVXMY41pn`l7P6%+M=}7 z*|4xmH|iR#3Y1v>3f=eI~GE?*D?(>~{yX$s;XnN|ZA0HJZ8L$HGxcaQ# zE4IYd_3#>#R#zVn8=skKr~Z*2EuB6eX?#}0E`;ytGF%ATa2x|xL}U!&gba?89H%%= z%Q%CxGKO%@hA7UPe-}6|%1|(DzD8t>BE}Jy;Xs%pA)^sv9OE*axMaR2I3|rZ!jm>Z zTVZI5&83!8!AveVJQiJ<(H4uDTsC5a#DtBbljAalHC~9{FS6!frPZf$Vv{aC#Vnz?@ zxpbPGf-(APc?KJ?fBp}9|A&A3)!5QDOvbJqjJ0J=XRu60r=k;4TJfr9&A{YM4dEhX z!!Yza><*Iu^NBUrrhj=hpL>v+*0qRl>itKHgHa8*U|yo}h5MQ7xz$}_Xr+#~kRZ}G z;Qu7O#IAP`8pSdszZi-IHc|H$&Uhm)!@3FEJIG8eW7j$u)nYT;un^it@BwpcU>~(T zu%nYkyJ*};ibE8{3qRfMr0|fwmFjsv5hcNliVl*405=X2#0UV@wrKwe83KowlMUnW zJE%?d2ceSn8tUi G1bzV-`|zv) diff --git a/KeywordSearch/release/Solr5to6IndexUpgrade/Solr5IndexUpgrade.jar b/KeywordSearch/release/Solr5to6IndexUpgrade/Solr5IndexUpgrade.jar index 6df6a7a95fe2faf276ec95a70f6c4f4ae7651e38..9a18d23a983b61889e98689b6cc6568700661a7d 100644 GIT binary patch delta 1019 zcmZ8gOHUI~6#ni^+i5Q&kAl1(m6uTZ5acZ)pgam~K@qSD$N;sJ)RweGan*(Hj0-a> zS0=7xV}d3vNu!31G10j2zqoPbxr2al7H7`;`_8@h>{q?3Q0Hc369=roe(Hm=^yT4mz$ zN7KU$`giH69+UmG419cVBfOK2CgLdtw;61yt;FMnloko=NAgGgxv3>ni#i1hDi*QC zP!`xtr5!t3D&^>OXvxU#!*D#U;EswAJStqMV`$vg9%H8Q9M zQZ(V6h{nPy?&6+;Wfdz})mP1HaxL!bN9OM0HE05GUBw1A8Jcv>+*BkyRPz84635*)nk*wE$*vc~voaqVwb3QXT|_6KW>Z`v{G^d%(#d)BGPWOVKr2L%)Emb z(cKC5^{)jZVtu(f{QvqcssYP0N(cS`$j!DB delta 1302 zcmZux-BTM?6#w1bWiQ#>5=uftiiG%4N)dp7s`;5Q+$ zl-3Ok=mgUCXCkW2+q-AKU|QOizp=5dv^_fib^o`2%zA)XkL=RMYoAzn0h1n_$5baS zSeV9)1&&#cIgZyYq;S!~8+g-$OPE(tn!~mrkWpsA!XlP9E^}P5a2S&oy0Of0RrzZc z0$5Seb&j_z^dYOv+sfSFc!$B9luxuzk7>>hL$AG_+s-8lrNpJh)Xti-SuK=`6AVVK zoUbtWWm5OcH9hI!h;qD3{mCEnpR9kN6}fH<&krEXaZ}(H-eU-5wkp-gX0B3+l#1^C zNHRjTwlrw5Mwp?yCFbUe`NZPty0cb&F11`O7m9gVG?xc`&wz6-ZJvSWo$5kv z!(j*vN9AQbQ0r@9wyFg;;g<4wq9$ze4)yFI@P0ft+@4BHwJk9bZKn?4(zJpH)OEHU zmu9`3T1j0=(Nu`PN|S!RfC3R;r*0VLp2{8o`F}tE%3Qr&F5Szmy3Ry&<;S1RKUs~_ z*R6g!7@cRB>>#ZYA#Xgzuz#%@eMVUO&g;}HUx9$rW19z3~lF+z`OCPJKk`X3F^dre8x`zU!oLWCZn+HqP1p!@!U1&w2rV+@R= zmguGged9z^y+5Sh4f3;1h%9aXP#s-+@YzjtXPY>jZJ?(CeZLJOlt9Y;s&=zn%dFklGSmJ5C*+d<9Ll?4HHXgrUmr9p diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/IndexHandling.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/IndexHandling.java index 2b9c3de8c4..511260669e 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/IndexHandling.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/IndexHandling.java @@ -18,10 +18,7 @@ */ package org.sleuthkit.autopsy.keywordsearch; -import java.net.URL; import java.io.File; -import java.io.IOException; -import java.net.URLClassLoader; import java.nio.file.Paths; import java.util.ArrayList; import java.util.Arrays; @@ -32,14 +29,12 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import org.apache.commons.io.FileUtils; import org.openide.modules.InstalledFileLocator; -import org.openide.util.NbBundle; import org.sleuthkit.autopsy.casemodule.Case; import org.sleuthkit.autopsy.corecomponentinterfaces.AutopsyService; import org.sleuthkit.autopsy.coreutils.ExecUtil; import org.sleuthkit.autopsy.coreutils.Logger; import org.sleuthkit.autopsy.coreutils.UNCPathUtilities; import org.sleuthkit.autopsy.coreutils.PlatformUtil; -import org.sleuthkit.autopsy.ingest.DataSourceIngestModuleProcessTerminator; /** * This class handles the task of finding KWS index folders and upgrading old