merge latest jsvitak sample and introduced one EJB