ANNOTATIONJAVA-465: XML annotation storage support
ANNOTATIONJAVA-464: JSON annotation storage support
Updated sample according to Annotation changes