fixed 'enum' - now keyword in JDK 1.5+.  Added missing generic.xml