1) Currently the property definitions to support applications using JPA1.0 syntax is only supported with annotations.
Retaining property definitions when annotations are used in conjunction with an orm file in necessary.

A test case has been added to test this works as expected.

2) The annotation definitions are currently applied to individual JoinColumn annotations. But the JPA overridden annotation reader does present individual JoinColumn annotation definitions. It groups them together using the JoinColumns annotation descriptor.
A change is necessary in the code to detect the group annotation in addition to an individual annotation.

The same test case tests the new code path.