JCR-2226 : REFACTORY CODE SOURCE