1. Both "swing" and "shuffle" refer to patterns played by a drummer and/or the rhythm section as a whole. The bassist has a part to play, but it is usually the other players that make swing and shuffle. The guitarist, for example, will likely strum straight quarter notes when swinging but change his pattern for a shuffle, while the bassist may or may not play the same lines either way.
2. Swing involves a subdivision of the beat by threes. The degree or strength of this subdivision can be varied infinitely but it needs to be there.
3. Swing can happen in almost any time signature but is most common in 2/4 or 4/4.
4. Swing does NOT NEED an emphasis on upbeats (2 and 4) to swing.
5. The shuffle is a subset of swing. It is characterized by the emphasis of hits on the "and" of beats. Note that a drummer will probably hit the ands on a cymbal in a plain-old swing but will likely hit them, or some of them, on the snare in a shuffle. Remember that, since we are subdividing by 3, the and will be the third note of the tuple.
6. There are infinite variations in feel and style for swing and shuffle.