-Add Dependency on Token Macro

-Remove the list of property passed to Ant and instead resolve them in the plug in using Token Macro