add by hejian for VAADIN