Revision 470536

Due to the Maven bug related to having multiple packaging plugins, I had
to separate our pom into two different ones (one for the old plugin and
one for the new). A new ant file can be used to build the two pom files.