The current incarnation of the mapping in the organisation.hbm.xml is this:
Code:
<one-to-one name="registeredAddress"
class="Address"
cascade="all" constrained="true">
<formula>from TPD_ADDRESSES a where a.ORG_ID = ORG_ID and a.REG_ADDRESS = 'y'</formula>
</one-to-one>
and for the locations:
Code:
<set name="locations">
<key>
<column name="ORG_ID" precision="22" scale="0" />
</key>
<one-to-many
class="Address" />
</set>
The address mapping file have no reference to the organisation, only a set of property mappings for the data values.