There is a new Apache policy regarding license notices in source files. Please see http://www.apache.org/legal/src-headers.html for details.
What we need to do is to remove the Apache copyright notice header for source files and replace it with the license header described in the reference.
This applies to .java, .orm, .jdo files in the source tree. Everywhere there is currently an Apache copyright notice needs to be updated.
We also need to double check the distribution artifacts to make sure that the LICENSE and NOTICE files conform to the new policy.