Fixing a build issue

added the -r to remove the folders. Also added bits to fix the war file
name when built in a workspace directory