dont pick and choice the definition that you think agrees with your own definition paste the whole definition of it..
http://www.answers.com/topic/warrior
http://en.wikipedia.org/wiki/Warrior
also a quick definition of a dictionary does not encompass everything that it is required to be a warrior and a warrior would be insulted to be called a soldier or referred as such major difference in most military societies.. .. tell me what military or warrior training have you gone in your country b/c in each country the requirements are different. which is why in a dictionary you get a short encompassing definition and comparison to a soldier.. try the military definition of a countries army to get what that countries military fighting men consider a warrior..
one think that remains the same is:
code of conduct
indoctrination: test body, mind & spirit
elite group above average military..
these were also specifically stated in the definition to be a warrior in the dictionary that you sited in but left out for just the top two similar noun.
which are only meant to give you an idea and similarity of the word but does not make it a fully accurate term just an idea..
like comparing karate to kung fu or tae kwon do.. martial arts they are used for comparison for certain words but not meant to be interchangeable that is the problem with todays society and what we have hear..
green arrow is a comic book hero a super hero even but he is not a warrior.