Adapt to changes in Argeo Third Party

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 7c8e95f1e2f8fb786bd990b219e013909ddd2b44..79c54eb1a3b210ba824bb0569d7bd99f87509a56 100644 (file)
--- 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 60d23b176fa2857990726a8040b13c887e4cae37..b27f415f631a838b57b064d709103042bad2f37c 100644 (file)
--- 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 94c5808e4ca9758a13f1f7760c903354a2b64cb9..dc0a135e0989d6833c4fda9e0320d2d024824d28 100644 (file)
--- 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;