as $subject, I think org.hibernate.metadata.source.spi is a better home for this class.
and also remove the old internal org.hibernate.internal.util.xml.Origin