Revert "switch to java 6"

This reverts commit bd644fe479604178323fe4e16379e766905b1c01.
fix deployment descriptor file name