There are (
http://en.wikipedia.org/wiki/Japanese_martial_arts) ancient and modern Budo disciplines
Kenjutsu is the traditional form of swordsmanship, from which Kendo is derived, it concentrates more on Kata and single practice and cannot (AFAIK) be fought in a competitive fashion like Kendo. Iaido is another offshoot which is mainly a meditative form.
Traditionally, unarmed combat forms are Sumo and Jujutsu
Judo and Aikido are modern unarmed combat forms.
Judo is a competitive form of Jujutsu without the more nasty stuff while Aikido is the stuff that Steven Seagal did when he was still cool...
Other Budo disciplines are spear fighting and archery, which is divided in competitive shooting and meditative shooting.
I once read somewhere that there even used to be a japanese martial arts dealing with the best way to shoot a matchlock musket or arquebuse.