86 XJ with TJ drivetrain

I've searched high and low but only came back with minimal info on this. I'm picking up an 86 XJ from a family friend for 500. It has had the old 2.8 swapped with the entire drivetrain from a 2003 TJ Wrangler. 4.0 HO, NV3550 five speed, and NV231 transfer case. He's run it for about 60,000 after the swap but with no four wheel, the front driveshaft is too long. Has anyone done or seen a similar swap? Basically the drivetrain is the same as whats found on 2000-01 Cherokee, but of course my front axle pinion is higher than the late model ones. I'd rather be able to buy a new driveshaft than have the stock one modified or build a custom.
(I don't have it yet so i can't measure length)

Measure and see if any of the XJ's had a driveshaft that will work. Then buy a new one.