refactor for consistency between wtp, eclipse; remove SHORTNAME variable because generic/build.xml doesn't need it >> master