@@ -0,0 +1,896 @@
+package com.indoqa.daisy.wicket;%0A%0Aimport org.apache.wicket.Session;%0Aimport org.apache.wicket.injection.web.InjectorHolder;%0Aimport org.apache.wicket.model.LoadableDetachableModel;%0Aimport org.apache.wicket.spring.injection.annot.SpringBean;%0A%0Aimport com.indoqa.daisy.entity.ContentDocument;%0Aimport com.indoqa.daisy.service.ContentService;%0A%0Apublic class ContentDocumentModel extends LoadableDetachableModel%3CContentDocument%3E %7B%0A%0A    private static final long serialVersionUID = 1L;%0A%0A    @SpringBean%0A    private ContentService contentService;%0A%0A    private String path;%0A%0A    public ContentDocumentModel(ContentDocument contentDocument) %7B%0A        InjectorHolder.getInjector().inject(this);%0A%0A        this.path = contentDocument.getPath();%0A    %7D%0A%0A    @Override%0A    protected ContentDocument load() %7B%0A        return this.contentService.getContentDocumentByPath(this.path, Session.get().getLocale());%0A    %7D%0A%7D%0A

move the ContentDocumentModel to daisy-wicket; fix potential NPE in the content service