From 862859c96c5bc85ce204eb118912cb60dd8c20a7 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Mon, 16 Sep 2024 13:02:48 +0200 Subject: [PATCH] Adapt to changes in Argeo Third Party --- .../jcr/internal/servlet/CmsSessionProvider.java | 3 ++- swt/org.argeo.cms.jcr.ui/bnd.bnd | 14 +++++++------- .../src/org/argeo/cms/ui/util/CmsUiUtils.java | 2 +- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/org.argeo.cms.jcr/src/org/argeo/cms/jcr/internal/servlet/CmsSessionProvider.java b/org.argeo.cms.jcr/src/org/argeo/cms/jcr/internal/servlet/CmsSessionProvider.java index 7c8e95f..79c54eb 100644 --- a/org.argeo.cms.jcr/src/org/argeo/cms/jcr/internal/servlet/CmsSessionProvider.java +++ b/org.argeo.cms.jcr/src/org/argeo/cms/jcr/internal/servlet/CmsSessionProvider.java @@ -22,6 +22,7 @@ import org.argeo.api.cms.CmsLog; import org.argeo.api.cms.CmsSession; import org.argeo.cms.auth.RemoteAuthUtils; import org.argeo.cms.servlet.ServletHttpRequest; +import org.argeo.cms.servlet.javax.JavaxServletHttpRequest; import org.argeo.jcr.JcrUtils; /** @@ -48,7 +49,7 @@ public class CmsSessionProvider implements SessionProvider, Serializable { // if (workspace == null) // return null; - CmsSession cmsSession = RemoteAuthUtils.getCmsSession(new ServletHttpRequest(request)); + CmsSession cmsSession = RemoteAuthUtils.getCmsSession(new JavaxServletHttpRequest(request)); // CmsSessionImpl cmsSession = WebCmsSessionImpl.getCmsSession(request); if (log.isTraceEnabled()) { log.trace("Get JCR session from " + cmsSession); diff --git a/swt/org.argeo.cms.jcr.ui/bnd.bnd b/swt/org.argeo.cms.jcr.ui/bnd.bnd index 60d23b1..b27f415 100644 --- a/swt/org.argeo.cms.jcr.ui/bnd.bnd +++ b/swt/org.argeo.cms.jcr.ui/bnd.bnd @@ -4,13 +4,13 @@ Import-Package: org.eclipse.swt,\ org.eclipse.jface.window,\ org.eclipse.core.commands,\ javax.jcr.security,\ -org.eclipse.rap.fileupload;version="[2.1,4)",\ -org.eclipse.rap.rwt;version="[2.1,4)",\ -org.eclipse.rap.rwt.application;version="[2.1,4)",\ -org.eclipse.rap.rwt.client;version="[2.1,4)",\ -org.eclipse.rap.rwt.client.service;version="[2.1,4)",\ -org.eclipse.rap.rwt.service;version="[2.1,4)",\ -org.eclipse.rap.rwt.widgets;version="[2.1,4)",\ +org.eclipse.rap.fileupload;version="[2.1,5)",\ +org.eclipse.rap.rwt;version="[2.1,5)",\ +org.eclipse.rap.rwt.application;version="[2.1,5)",\ +org.eclipse.rap.rwt.client;version="[2.1,5)",\ +org.eclipse.rap.rwt.client.service;version="[2.1,5)",\ +org.eclipse.rap.rwt.service;version="[2.1,5)",\ +org.eclipse.rap.rwt.widgets;version="[2.1,5)",\ org.osgi.*;version=0.0.0,\ javax.servlet.*;version="[3,5)",\ * diff --git a/swt/org.argeo.cms.jcr.ui/src/org/argeo/cms/ui/util/CmsUiUtils.java b/swt/org.argeo.cms.jcr.ui/src/org/argeo/cms/ui/util/CmsUiUtils.java index 94c5808..dc0a135 100644 --- a/swt/org.argeo.cms.jcr.ui/src/org/argeo/cms/ui/util/CmsUiUtils.java +++ b/swt/org.argeo.cms.jcr.ui/src/org/argeo/cms/ui/util/CmsUiUtils.java @@ -5,7 +5,7 @@ import java.net.URL; import javax.jcr.Node; import javax.jcr.RepositoryException; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.argeo.api.cms.CmsConstants; import org.argeo.api.cms.ux.Cms2DSize; -- 2.39.5