import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.argeo.cms.CmsException;
-import org.argeo.cms.util.CmsUtils;
import org.argeo.jcr.ArgeoJcrConstants;
import org.argeo.jcr.JcrUtils;
-import org.eclipse.equinox.http.servlet.ExtendedHttpService;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
+import org.osgi.service.http.HttpService;
/**
* Intercepts and enriches http access, mainly focusing on security and
private BundleContext bc;
- NodeHttp(ExtendedHttpService httpService, BundleContext bc) {
+ NodeHttp(HttpService httpService, BundleContext bc) {
this.bc = bc;
// rootFilter = new RootFilter();
// dosFilter = new CustomDosFilter();
String desc = node.hasProperty(JCR_DESCRIPTION) ? node.getProperty(JCR_DESCRIPTION).getString() : null;
Calendar lastUpdate = node.hasProperty(JCR_LAST_MODIFIED)
? node.getProperty(JCR_LAST_MODIFIED).getDate() : null;
- String url = CmsUtils.getCanonicalUrl(node, request);
+ String url = KernelUtils.getCanonicalUrl(node, request);
String imgUrl = null;
loop: for (NodeIterator it = node.getNodes(); it.hasNext();) {
// Takes the first found cms:image
Node child = it.nextNode();
if (child.isNodeType(CMS_IMAGE)) {
- imgUrl = CmsUtils.getDataUrl(child, request);
+ imgUrl = KernelUtils.getDataUrl(child, request);
break loop;
}
}