WTP 3.3.2 Patches

Bug 371542. JPQL content assist and validation fails if Entity is overridden in XML Mapping File