From 4e548693acc16f97b74eaaa95d6841054a172b85 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Sun, 10 Jul 2022 08:57:09 +0200 Subject: [PATCH] Refactor non-SWT projects. --- Makefile | 9 ++-- eclipse/org.argeo.ext.equinox.jetty/bnd.bnd | 1 - .../.classpath | 0 .../.project | 2 +- .../OSGI-INF/pkgServlet.xml | 0 .../OSGI-INF/pkgServletContext.xml | 0 .../bnd.bnd | 1 - .../build.properties | 0 .../cms/integration/CmsExceptionsChain.java | 0 .../cms/integration/CmsLoginServlet.java | 0 .../cms/integration/CmsLogoutServlet.java | 0 .../integration/CmsPrivateServletContext.java | 0 .../cms/integration/CmsSessionDescriptor.java | 0 .../cms/integration/CmsTokenServlet.java | 0 .../cms/integration/TokenDescriptor.java | 0 .../argeo/cms/integration/package-info.java | 0 .../argeo/cms/servlet/CmsServletContext.java | 0 .../servlet/PrivateWwwAuthServletContext.java | 0 .../argeo/cms/servlet/ServletHttpRequest.java | 0 .../cms/servlet/ServletHttpResponse.java | 0 .../argeo/cms/servlet/ServletHttpSession.java | 0 .../argeo/cms/servlet/internal/HttpUtils.java | 0 .../cms/servlet/internal/PkgServlet.java | 0 .../cms/servlet/internal/RobotServlet.java | 0 .../server/CmsWebSocketConfigurator.java | 6 +-- .../websocket/javax/server/TestEndpoint.java | 0 .../websocket/javax/server/WebSocketTest.java | 0 .../websocket/javax/server/WebSocketView.java | 0 .../websocket/javax/server/package-info.java | 0 .../.classpath | 0 .../.gitignore | 0 .../.project | 2 +- .../META-INF/.gitignore | 0 .../OSGI-INF/jettyServiceFactory.xml | 0 org.argeo.cms.lib.equinox/bnd.bnd | 4 ++ .../build.properties | 0 .../servlet/internal/jetty/JettyConfig.java | 0 .../internal/jetty/JettyHttpConstants.java | 0 .../internal/jetty/JettyServiceFactory.java | 0 .../equinox/jetty/CmsJettyCustomizer.java | 0 .../org/argeo/equinox/jetty/package-info.java | 0 .../.classpath | 0 .../.project | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 9 ++++ .../.settings/org.eclipse.pde.core.prefs | 4 ++ org.argeo.cms.lib.jetty/bnd.bnd | 9 ++++ .../build.properties | 0 .../argeo/cms/lib/jetty/CmsJettyServer.java | 52 +++++++++++++++++++ .../.classpath | 0 org.argeo.cms.lib.pgsql/.project | 28 ++++++++++ .../bnd.bnd | 0 org.argeo.cms.lib.pgsql/build.properties | 4 ++ .../org/argeo/cms/sql/postgres/CheckPg.java | 0 org.argeo.cms.lib.sshd/.classpath | 7 +++ .../.gitignore | 0 .../.project | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 0 .../OSGI-INF/cmsSshServer.xml | 0 .../bnd.bnd | 0 .../build.properties | 0 .../src/org/argeo/cms/ssh/AbstractSsh.java | 0 .../src/org/argeo/cms/ssh/BasicSshServer.java | 0 .../src/org/argeo/cms/ssh/CmsSshServer.java | 0 .../src/org/argeo/cms/ssh/Sftp.java | 0 .../src/org/argeo/cms/ssh/Ssh.java | 0 .../src/org/argeo/cms/ssh/SshKeyPair.java | 0 .../src/org/argeo/cms/ssh/SshSync.java | 0 .../src/org/argeo/cms/ssh/cli/SshCli.java | 0 .../src/org/argeo/cms/ssh/cli/SshShell.java | 0 .../src/org/argeo/cms/ssh/package-info.java | 0 .../src/org/argeo/cms/ux/cli}/FileSync.java | 4 +- .../src/org/argeo/cms/ux/cli}/FsCommands.java | 2 +- .../src/org/argeo/cms/auth/CmsAuthUtils.java | 5 +- .../org/argeo/cms/auth/RemoteAuthRequest.java | 3 ++ .../cms/auth/RemoteSessionLoginModule.java | 6 +-- .../internal/runtime/CmsDeploymentImpl.java | 15 +++--- 76 files changed, 147 insertions(+), 30 deletions(-) delete mode 100644 eclipse/org.argeo.ext.equinox.jetty/bnd.bnd rename {eclipse/org.argeo.cms.servlet => org.argeo.cms.ee4j}/.classpath (100%) rename {org.argeo.cms.ssh => org.argeo.cms.ee4j}/.project (95%) rename {eclipse/org.argeo.cms.servlet => org.argeo.cms.ee4j}/OSGI-INF/pkgServlet.xml (100%) rename {eclipse/org.argeo.cms.servlet => org.argeo.cms.ee4j}/OSGI-INF/pkgServletContext.xml (100%) rename {eclipse/org.argeo.cms.servlet => org.argeo.cms.ee4j}/bnd.bnd (89%) rename {eclipse/org.argeo.cms.servlet => org.argeo.cms.ee4j}/build.properties (100%) rename {eclipse/org.argeo.cms.servlet => org.argeo.cms.ee4j}/src/org/argeo/cms/integration/CmsExceptionsChain.java (100%) rename {eclipse/org.argeo.cms.servlet => org.argeo.cms.ee4j}/src/org/argeo/cms/integration/CmsLoginServlet.java (100%) rename {eclipse/org.argeo.cms.servlet => org.argeo.cms.ee4j}/src/org/argeo/cms/integration/CmsLogoutServlet.java (100%) rename {eclipse/org.argeo.cms.servlet => org.argeo.cms.ee4j}/src/org/argeo/cms/integration/CmsPrivateServletContext.java (100%) rename {eclipse/org.argeo.cms.servlet => org.argeo.cms.ee4j}/src/org/argeo/cms/integration/CmsSessionDescriptor.java (100%) rename {eclipse/org.argeo.cms.servlet => org.argeo.cms.ee4j}/src/org/argeo/cms/integration/CmsTokenServlet.java (100%) rename {eclipse/org.argeo.cms.servlet => org.argeo.cms.ee4j}/src/org/argeo/cms/integration/TokenDescriptor.java (100%) rename {eclipse/org.argeo.cms.servlet => org.argeo.cms.ee4j}/src/org/argeo/cms/integration/package-info.java (100%) rename {eclipse/org.argeo.cms.servlet => org.argeo.cms.ee4j}/src/org/argeo/cms/servlet/CmsServletContext.java (100%) rename {eclipse/org.argeo.cms.servlet => org.argeo.cms.ee4j}/src/org/argeo/cms/servlet/PrivateWwwAuthServletContext.java (100%) rename {eclipse/org.argeo.cms.servlet => org.argeo.cms.ee4j}/src/org/argeo/cms/servlet/ServletHttpRequest.java (100%) rename {eclipse/org.argeo.cms.servlet => org.argeo.cms.ee4j}/src/org/argeo/cms/servlet/ServletHttpResponse.java (100%) rename {eclipse/org.argeo.cms.servlet => org.argeo.cms.ee4j}/src/org/argeo/cms/servlet/ServletHttpSession.java (100%) rename {eclipse/org.argeo.cms.servlet => org.argeo.cms.ee4j}/src/org/argeo/cms/servlet/internal/HttpUtils.java (100%) rename {eclipse/org.argeo.cms.servlet => org.argeo.cms.ee4j}/src/org/argeo/cms/servlet/internal/PkgServlet.java (100%) rename {eclipse/org.argeo.cms.servlet => org.argeo.cms.ee4j}/src/org/argeo/cms/servlet/internal/RobotServlet.java (100%) rename {eclipse/org.argeo.cms.servlet => org.argeo.cms.ee4j}/src/org/argeo/cms/websocket/javax/server/CmsWebSocketConfigurator.java (94%) rename {eclipse/org.argeo.cms.servlet => org.argeo.cms.ee4j}/src/org/argeo/cms/websocket/javax/server/TestEndpoint.java (100%) rename {eclipse/org.argeo.cms.servlet => org.argeo.cms.ee4j}/src/org/argeo/cms/websocket/javax/server/WebSocketTest.java (100%) rename {eclipse/org.argeo.cms.servlet => org.argeo.cms.ee4j}/src/org/argeo/cms/websocket/javax/server/WebSocketView.java (100%) rename {eclipse/org.argeo.cms.servlet => org.argeo.cms.ee4j}/src/org/argeo/cms/websocket/javax/server/package-info.java (100%) rename {eclipse/org.argeo.ext.equinox.jetty => org.argeo.cms.lib.equinox}/.classpath (100%) rename {eclipse/org.argeo.ext.equinox.jetty => org.argeo.cms.lib.equinox}/.gitignore (100%) rename {eclipse/org.argeo.ext.equinox.jetty => org.argeo.cms.lib.equinox}/.project (93%) rename {eclipse/org.argeo.ext.equinox.jetty => org.argeo.cms.lib.equinox}/META-INF/.gitignore (100%) rename {eclipse/org.argeo.cms.servlet => org.argeo.cms.lib.equinox}/OSGI-INF/jettyServiceFactory.xml (100%) create mode 100644 org.argeo.cms.lib.equinox/bnd.bnd rename {eclipse/org.argeo.ext.equinox.jetty => org.argeo.cms.lib.equinox}/build.properties (100%) rename {eclipse/org.argeo.cms.servlet => org.argeo.cms.lib.equinox}/src/org/argeo/cms/servlet/internal/jetty/JettyConfig.java (100%) rename {eclipse/org.argeo.cms.servlet => org.argeo.cms.lib.equinox}/src/org/argeo/cms/servlet/internal/jetty/JettyHttpConstants.java (100%) rename {eclipse/org.argeo.cms.servlet => org.argeo.cms.lib.equinox}/src/org/argeo/cms/servlet/internal/jetty/JettyServiceFactory.java (100%) rename {eclipse/org.argeo.ext.equinox.jetty => org.argeo.cms.lib.equinox}/src/org/argeo/equinox/jetty/CmsJettyCustomizer.java (100%) rename {eclipse/org.argeo.ext.equinox.jetty => org.argeo.cms.lib.equinox}/src/org/argeo/equinox/jetty/package-info.java (100%) rename {org.argeo.cms.ssh => org.argeo.cms.lib.jetty}/.classpath (100%) rename {org.argeo.cms.sql => org.argeo.cms.lib.jetty}/.project (94%) create mode 100644 org.argeo.cms.lib.jetty/.settings/org.eclipse.jdt.core.prefs create mode 100644 org.argeo.cms.lib.jetty/.settings/org.eclipse.pde.core.prefs create mode 100644 org.argeo.cms.lib.jetty/bnd.bnd rename {org.argeo.cms.sql => org.argeo.cms.lib.jetty}/build.properties (100%) create mode 100644 org.argeo.cms.lib.jetty/src/org/argeo/cms/lib/jetty/CmsJettyServer.java rename {org.argeo.cms.sql => org.argeo.cms.lib.pgsql}/.classpath (100%) create mode 100644 org.argeo.cms.lib.pgsql/.project rename {org.argeo.cms.sql => org.argeo.cms.lib.pgsql}/bnd.bnd (100%) create mode 100644 org.argeo.cms.lib.pgsql/build.properties rename {org.argeo.cms.sql => org.argeo.cms.lib.pgsql}/src/org/argeo/cms/sql/postgres/CheckPg.java (100%) create mode 100644 org.argeo.cms.lib.sshd/.classpath rename {org.argeo.cms.ssh => org.argeo.cms.lib.sshd}/.gitignore (100%) rename {eclipse/org.argeo.cms.servlet => org.argeo.cms.lib.sshd}/.project (95%) rename {org.argeo.cms.ssh => org.argeo.cms.lib.sshd}/.settings/org.eclipse.jdt.core.prefs (100%) rename {org.argeo.cms.ssh => org.argeo.cms.lib.sshd}/OSGI-INF/cmsSshServer.xml (100%) rename {org.argeo.cms.ssh => org.argeo.cms.lib.sshd}/bnd.bnd (100%) rename {org.argeo.cms.ssh => org.argeo.cms.lib.sshd}/build.properties (100%) rename {org.argeo.cms.ssh => org.argeo.cms.lib.sshd}/src/org/argeo/cms/ssh/AbstractSsh.java (100%) rename {org.argeo.cms.ssh => org.argeo.cms.lib.sshd}/src/org/argeo/cms/ssh/BasicSshServer.java (100%) rename {org.argeo.cms.ssh => org.argeo.cms.lib.sshd}/src/org/argeo/cms/ssh/CmsSshServer.java (100%) rename {org.argeo.cms.ssh => org.argeo.cms.lib.sshd}/src/org/argeo/cms/ssh/Sftp.java (100%) rename {org.argeo.cms.ssh => org.argeo.cms.lib.sshd}/src/org/argeo/cms/ssh/Ssh.java (100%) rename {org.argeo.cms.ssh => org.argeo.cms.lib.sshd}/src/org/argeo/cms/ssh/SshKeyPair.java (100%) rename {org.argeo.cms.ssh => org.argeo.cms.lib.sshd}/src/org/argeo/cms/ssh/SshSync.java (100%) rename {org.argeo.cms.ssh => org.argeo.cms.lib.sshd}/src/org/argeo/cms/ssh/cli/SshCli.java (100%) rename {org.argeo.cms.ssh => org.argeo.cms.lib.sshd}/src/org/argeo/cms/ssh/cli/SshShell.java (100%) rename {org.argeo.cms.ssh => org.argeo.cms.lib.sshd}/src/org/argeo/cms/ssh/package-info.java (100%) rename {org.argeo.cms/src/org/argeo/cms/acr/fs => org.argeo.cms.ux/src/org/argeo/cms/ux/cli}/FileSync.java (96%) rename {org.argeo.cms/src/org/argeo/cms/acr/fs => org.argeo.cms.ux/src/org/argeo/cms/ux/cli}/FsCommands.java (91%) diff --git a/Makefile b/Makefile index ee0604630..3b432b849 100644 --- a/Makefile +++ b/Makefile @@ -19,11 +19,12 @@ org.argeo.api.acr \ org.argeo.api.cli \ org.argeo.api.cms \ org.argeo.cms \ -org.argeo.cms.sql \ -org.argeo.cms.ssh \ org.argeo.cms.ux \ -eclipse/org.argeo.ext.equinox.jetty \ -eclipse/org.argeo.cms.servlet \ +org.argeo.cms.ee4j \ +org.argeo.cms.lib.jetty \ +org.argeo.cms.lib.equinox \ +org.argeo.cms.lib.sshd \ +org.argeo.cms.lib.pgsql \ swt/org.argeo.cms.swt \ swt/org.argeo.cms.e4 \ swt/rap/org.argeo.swt.specific.rap \ diff --git a/eclipse/org.argeo.ext.equinox.jetty/bnd.bnd b/eclipse/org.argeo.ext.equinox.jetty/bnd.bnd deleted file mode 100644 index 7fca53671..000000000 --- a/eclipse/org.argeo.ext.equinox.jetty/bnd.bnd +++ /dev/null @@ -1 +0,0 @@ -Fragment-Host: org.eclipse.equinox.http.jetty diff --git a/eclipse/org.argeo.cms.servlet/.classpath b/org.argeo.cms.ee4j/.classpath similarity index 100% rename from eclipse/org.argeo.cms.servlet/.classpath rename to org.argeo.cms.ee4j/.classpath diff --git a/org.argeo.cms.ssh/.project b/org.argeo.cms.ee4j/.project similarity index 95% rename from org.argeo.cms.ssh/.project rename to org.argeo.cms.ee4j/.project index d46b3afef..9140addc8 100644 --- a/org.argeo.cms.ssh/.project +++ b/org.argeo.cms.ee4j/.project @@ -1,6 +1,6 @@ - org.argeo.cms.ssh + org.argeo.cms.ee4j diff --git a/eclipse/org.argeo.cms.servlet/OSGI-INF/pkgServlet.xml b/org.argeo.cms.ee4j/OSGI-INF/pkgServlet.xml similarity index 100% rename from eclipse/org.argeo.cms.servlet/OSGI-INF/pkgServlet.xml rename to org.argeo.cms.ee4j/OSGI-INF/pkgServlet.xml diff --git a/eclipse/org.argeo.cms.servlet/OSGI-INF/pkgServletContext.xml b/org.argeo.cms.ee4j/OSGI-INF/pkgServletContext.xml similarity index 100% rename from eclipse/org.argeo.cms.servlet/OSGI-INF/pkgServletContext.xml rename to org.argeo.cms.ee4j/OSGI-INF/pkgServletContext.xml diff --git a/eclipse/org.argeo.cms.servlet/bnd.bnd b/org.argeo.cms.ee4j/bnd.bnd similarity index 89% rename from eclipse/org.argeo.cms.servlet/bnd.bnd rename to org.argeo.cms.ee4j/bnd.bnd index 7c537ba6b..6fae1ea24 100644 --- a/eclipse/org.argeo.cms.servlet/bnd.bnd +++ b/org.argeo.cms.ee4j/bnd.bnd @@ -7,6 +7,5 @@ javax.servlet.*;version="[3,5)",\ * Service-Component:\ -OSGI-INF/jettyServiceFactory.xml,\ OSGI-INF/pkgServletContext.xml,\ OSGI-INF/pkgServlet.xml diff --git a/eclipse/org.argeo.cms.servlet/build.properties b/org.argeo.cms.ee4j/build.properties similarity index 100% rename from eclipse/org.argeo.cms.servlet/build.properties rename to org.argeo.cms.ee4j/build.properties diff --git a/eclipse/org.argeo.cms.servlet/src/org/argeo/cms/integration/CmsExceptionsChain.java b/org.argeo.cms.ee4j/src/org/argeo/cms/integration/CmsExceptionsChain.java similarity index 100% rename from eclipse/org.argeo.cms.servlet/src/org/argeo/cms/integration/CmsExceptionsChain.java rename to org.argeo.cms.ee4j/src/org/argeo/cms/integration/CmsExceptionsChain.java diff --git a/eclipse/org.argeo.cms.servlet/src/org/argeo/cms/integration/CmsLoginServlet.java b/org.argeo.cms.ee4j/src/org/argeo/cms/integration/CmsLoginServlet.java similarity index 100% rename from eclipse/org.argeo.cms.servlet/src/org/argeo/cms/integration/CmsLoginServlet.java rename to org.argeo.cms.ee4j/src/org/argeo/cms/integration/CmsLoginServlet.java diff --git a/eclipse/org.argeo.cms.servlet/src/org/argeo/cms/integration/CmsLogoutServlet.java b/org.argeo.cms.ee4j/src/org/argeo/cms/integration/CmsLogoutServlet.java similarity index 100% rename from eclipse/org.argeo.cms.servlet/src/org/argeo/cms/integration/CmsLogoutServlet.java rename to org.argeo.cms.ee4j/src/org/argeo/cms/integration/CmsLogoutServlet.java diff --git a/eclipse/org.argeo.cms.servlet/src/org/argeo/cms/integration/CmsPrivateServletContext.java b/org.argeo.cms.ee4j/src/org/argeo/cms/integration/CmsPrivateServletContext.java similarity index 100% rename from eclipse/org.argeo.cms.servlet/src/org/argeo/cms/integration/CmsPrivateServletContext.java rename to org.argeo.cms.ee4j/src/org/argeo/cms/integration/CmsPrivateServletContext.java diff --git a/eclipse/org.argeo.cms.servlet/src/org/argeo/cms/integration/CmsSessionDescriptor.java b/org.argeo.cms.ee4j/src/org/argeo/cms/integration/CmsSessionDescriptor.java similarity index 100% rename from eclipse/org.argeo.cms.servlet/src/org/argeo/cms/integration/CmsSessionDescriptor.java rename to org.argeo.cms.ee4j/src/org/argeo/cms/integration/CmsSessionDescriptor.java diff --git a/eclipse/org.argeo.cms.servlet/src/org/argeo/cms/integration/CmsTokenServlet.java b/org.argeo.cms.ee4j/src/org/argeo/cms/integration/CmsTokenServlet.java similarity index 100% rename from eclipse/org.argeo.cms.servlet/src/org/argeo/cms/integration/CmsTokenServlet.java rename to org.argeo.cms.ee4j/src/org/argeo/cms/integration/CmsTokenServlet.java diff --git a/eclipse/org.argeo.cms.servlet/src/org/argeo/cms/integration/TokenDescriptor.java b/org.argeo.cms.ee4j/src/org/argeo/cms/integration/TokenDescriptor.java similarity index 100% rename from eclipse/org.argeo.cms.servlet/src/org/argeo/cms/integration/TokenDescriptor.java rename to org.argeo.cms.ee4j/src/org/argeo/cms/integration/TokenDescriptor.java diff --git a/eclipse/org.argeo.cms.servlet/src/org/argeo/cms/integration/package-info.java b/org.argeo.cms.ee4j/src/org/argeo/cms/integration/package-info.java similarity index 100% rename from eclipse/org.argeo.cms.servlet/src/org/argeo/cms/integration/package-info.java rename to org.argeo.cms.ee4j/src/org/argeo/cms/integration/package-info.java diff --git a/eclipse/org.argeo.cms.servlet/src/org/argeo/cms/servlet/CmsServletContext.java b/org.argeo.cms.ee4j/src/org/argeo/cms/servlet/CmsServletContext.java similarity index 100% rename from eclipse/org.argeo.cms.servlet/src/org/argeo/cms/servlet/CmsServletContext.java rename to org.argeo.cms.ee4j/src/org/argeo/cms/servlet/CmsServletContext.java diff --git a/eclipse/org.argeo.cms.servlet/src/org/argeo/cms/servlet/PrivateWwwAuthServletContext.java b/org.argeo.cms.ee4j/src/org/argeo/cms/servlet/PrivateWwwAuthServletContext.java similarity index 100% rename from eclipse/org.argeo.cms.servlet/src/org/argeo/cms/servlet/PrivateWwwAuthServletContext.java rename to org.argeo.cms.ee4j/src/org/argeo/cms/servlet/PrivateWwwAuthServletContext.java diff --git a/eclipse/org.argeo.cms.servlet/src/org/argeo/cms/servlet/ServletHttpRequest.java b/org.argeo.cms.ee4j/src/org/argeo/cms/servlet/ServletHttpRequest.java similarity index 100% rename from eclipse/org.argeo.cms.servlet/src/org/argeo/cms/servlet/ServletHttpRequest.java rename to org.argeo.cms.ee4j/src/org/argeo/cms/servlet/ServletHttpRequest.java diff --git a/eclipse/org.argeo.cms.servlet/src/org/argeo/cms/servlet/ServletHttpResponse.java b/org.argeo.cms.ee4j/src/org/argeo/cms/servlet/ServletHttpResponse.java similarity index 100% rename from eclipse/org.argeo.cms.servlet/src/org/argeo/cms/servlet/ServletHttpResponse.java rename to org.argeo.cms.ee4j/src/org/argeo/cms/servlet/ServletHttpResponse.java diff --git a/eclipse/org.argeo.cms.servlet/src/org/argeo/cms/servlet/ServletHttpSession.java b/org.argeo.cms.ee4j/src/org/argeo/cms/servlet/ServletHttpSession.java similarity index 100% rename from eclipse/org.argeo.cms.servlet/src/org/argeo/cms/servlet/ServletHttpSession.java rename to org.argeo.cms.ee4j/src/org/argeo/cms/servlet/ServletHttpSession.java diff --git a/eclipse/org.argeo.cms.servlet/src/org/argeo/cms/servlet/internal/HttpUtils.java b/org.argeo.cms.ee4j/src/org/argeo/cms/servlet/internal/HttpUtils.java similarity index 100% rename from eclipse/org.argeo.cms.servlet/src/org/argeo/cms/servlet/internal/HttpUtils.java rename to org.argeo.cms.ee4j/src/org/argeo/cms/servlet/internal/HttpUtils.java diff --git a/eclipse/org.argeo.cms.servlet/src/org/argeo/cms/servlet/internal/PkgServlet.java b/org.argeo.cms.ee4j/src/org/argeo/cms/servlet/internal/PkgServlet.java similarity index 100% rename from eclipse/org.argeo.cms.servlet/src/org/argeo/cms/servlet/internal/PkgServlet.java rename to org.argeo.cms.ee4j/src/org/argeo/cms/servlet/internal/PkgServlet.java diff --git a/eclipse/org.argeo.cms.servlet/src/org/argeo/cms/servlet/internal/RobotServlet.java b/org.argeo.cms.ee4j/src/org/argeo/cms/servlet/internal/RobotServlet.java similarity index 100% rename from eclipse/org.argeo.cms.servlet/src/org/argeo/cms/servlet/internal/RobotServlet.java rename to org.argeo.cms.ee4j/src/org/argeo/cms/servlet/internal/RobotServlet.java diff --git a/eclipse/org.argeo.cms.servlet/src/org/argeo/cms/websocket/javax/server/CmsWebSocketConfigurator.java b/org.argeo.cms.ee4j/src/org/argeo/cms/websocket/javax/server/CmsWebSocketConfigurator.java similarity index 94% rename from eclipse/org.argeo.cms.servlet/src/org/argeo/cms/websocket/javax/server/CmsWebSocketConfigurator.java rename to org.argeo.cms.ee4j/src/org/argeo/cms/websocket/javax/server/CmsWebSocketConfigurator.java index 8cc165591..46dabc28e 100644 --- a/eclipse/org.argeo.cms.servlet/src/org/argeo/cms/websocket/javax/server/CmsWebSocketConfigurator.java +++ b/org.argeo.cms.ee4j/src/org/argeo/cms/websocket/javax/server/CmsWebSocketConfigurator.java @@ -17,7 +17,6 @@ import org.argeo.api.cms.CmsLog; import org.argeo.cms.auth.RemoteAuthCallbackHandler; import org.argeo.cms.auth.RemoteAuthSession; import org.argeo.cms.servlet.ServletHttpSession; -import org.osgi.service.http.context.ServletContextHelper; /** * Disabled until third party issues are solved.. Customises @@ -25,6 +24,7 @@ import org.osgi.service.http.context.ServletContextHelper; */ public class CmsWebSocketConfigurator extends Configurator { public final static String WEBSOCKET_SUBJECT = "org.argeo.cms.websocket.subject"; + public final static String REMOTE_USER = "org.osgi.service.http.authentication.remote.user"; private final static CmsLog log = CmsLog.getLog(CmsWebSocketConfigurator.class); final static String HEADER_WWW_AUTHENTICATE = "WWW-Authenticate"; @@ -65,7 +65,7 @@ public class CmsWebSocketConfigurator extends Configurator { @Override public void modifyHandshake(ServerEndpointConfig sec, HandshakeRequest request, HandshakeResponse response) { - if(true) + if (true) return; RemoteAuthSession httpSession = new ServletHttpSession( @@ -85,7 +85,7 @@ public class CmsWebSocketConfigurator extends Configurator { @Override public Void run() { - sec.getUserProperties().put(ServletContextHelper.REMOTE_USER, AccessController.getContext()); + sec.getUserProperties().put(REMOTE_USER, AccessController.getContext()); return null; } diff --git a/eclipse/org.argeo.cms.servlet/src/org/argeo/cms/websocket/javax/server/TestEndpoint.java b/org.argeo.cms.ee4j/src/org/argeo/cms/websocket/javax/server/TestEndpoint.java similarity index 100% rename from eclipse/org.argeo.cms.servlet/src/org/argeo/cms/websocket/javax/server/TestEndpoint.java rename to org.argeo.cms.ee4j/src/org/argeo/cms/websocket/javax/server/TestEndpoint.java diff --git a/eclipse/org.argeo.cms.servlet/src/org/argeo/cms/websocket/javax/server/WebSocketTest.java b/org.argeo.cms.ee4j/src/org/argeo/cms/websocket/javax/server/WebSocketTest.java similarity index 100% rename from eclipse/org.argeo.cms.servlet/src/org/argeo/cms/websocket/javax/server/WebSocketTest.java rename to org.argeo.cms.ee4j/src/org/argeo/cms/websocket/javax/server/WebSocketTest.java diff --git a/eclipse/org.argeo.cms.servlet/src/org/argeo/cms/websocket/javax/server/WebSocketView.java b/org.argeo.cms.ee4j/src/org/argeo/cms/websocket/javax/server/WebSocketView.java similarity index 100% rename from eclipse/org.argeo.cms.servlet/src/org/argeo/cms/websocket/javax/server/WebSocketView.java rename to org.argeo.cms.ee4j/src/org/argeo/cms/websocket/javax/server/WebSocketView.java diff --git a/eclipse/org.argeo.cms.servlet/src/org/argeo/cms/websocket/javax/server/package-info.java b/org.argeo.cms.ee4j/src/org/argeo/cms/websocket/javax/server/package-info.java similarity index 100% rename from eclipse/org.argeo.cms.servlet/src/org/argeo/cms/websocket/javax/server/package-info.java rename to org.argeo.cms.ee4j/src/org/argeo/cms/websocket/javax/server/package-info.java diff --git a/eclipse/org.argeo.ext.equinox.jetty/.classpath b/org.argeo.cms.lib.equinox/.classpath similarity index 100% rename from eclipse/org.argeo.ext.equinox.jetty/.classpath rename to org.argeo.cms.lib.equinox/.classpath diff --git a/eclipse/org.argeo.ext.equinox.jetty/.gitignore b/org.argeo.cms.lib.equinox/.gitignore similarity index 100% rename from eclipse/org.argeo.ext.equinox.jetty/.gitignore rename to org.argeo.cms.lib.equinox/.gitignore diff --git a/eclipse/org.argeo.ext.equinox.jetty/.project b/org.argeo.cms.lib.equinox/.project similarity index 93% rename from eclipse/org.argeo.ext.equinox.jetty/.project rename to org.argeo.cms.lib.equinox/.project index 0b9700dd6..3be5eb6c2 100644 --- a/eclipse/org.argeo.ext.equinox.jetty/.project +++ b/org.argeo.cms.lib.equinox/.project @@ -1,6 +1,6 @@ - org.argeo.ext.equinox.jetty + org.argeo.cms.lib.equinox diff --git a/eclipse/org.argeo.ext.equinox.jetty/META-INF/.gitignore b/org.argeo.cms.lib.equinox/META-INF/.gitignore similarity index 100% rename from eclipse/org.argeo.ext.equinox.jetty/META-INF/.gitignore rename to org.argeo.cms.lib.equinox/META-INF/.gitignore diff --git a/eclipse/org.argeo.cms.servlet/OSGI-INF/jettyServiceFactory.xml b/org.argeo.cms.lib.equinox/OSGI-INF/jettyServiceFactory.xml similarity index 100% rename from eclipse/org.argeo.cms.servlet/OSGI-INF/jettyServiceFactory.xml rename to org.argeo.cms.lib.equinox/OSGI-INF/jettyServiceFactory.xml diff --git a/org.argeo.cms.lib.equinox/bnd.bnd b/org.argeo.cms.lib.equinox/bnd.bnd new file mode 100644 index 000000000..3d836dfb6 --- /dev/null +++ b/org.argeo.cms.lib.equinox/bnd.bnd @@ -0,0 +1,4 @@ +Fragment-Host: org.eclipse.equinox.http.jetty + +Service-Component: \ +OSGI-INF/jettyServiceFactory.xml,\ diff --git a/eclipse/org.argeo.ext.equinox.jetty/build.properties b/org.argeo.cms.lib.equinox/build.properties similarity index 100% rename from eclipse/org.argeo.ext.equinox.jetty/build.properties rename to org.argeo.cms.lib.equinox/build.properties diff --git a/eclipse/org.argeo.cms.servlet/src/org/argeo/cms/servlet/internal/jetty/JettyConfig.java b/org.argeo.cms.lib.equinox/src/org/argeo/cms/servlet/internal/jetty/JettyConfig.java similarity index 100% rename from eclipse/org.argeo.cms.servlet/src/org/argeo/cms/servlet/internal/jetty/JettyConfig.java rename to org.argeo.cms.lib.equinox/src/org/argeo/cms/servlet/internal/jetty/JettyConfig.java diff --git a/eclipse/org.argeo.cms.servlet/src/org/argeo/cms/servlet/internal/jetty/JettyHttpConstants.java b/org.argeo.cms.lib.equinox/src/org/argeo/cms/servlet/internal/jetty/JettyHttpConstants.java similarity index 100% rename from eclipse/org.argeo.cms.servlet/src/org/argeo/cms/servlet/internal/jetty/JettyHttpConstants.java rename to org.argeo.cms.lib.equinox/src/org/argeo/cms/servlet/internal/jetty/JettyHttpConstants.java diff --git a/eclipse/org.argeo.cms.servlet/src/org/argeo/cms/servlet/internal/jetty/JettyServiceFactory.java b/org.argeo.cms.lib.equinox/src/org/argeo/cms/servlet/internal/jetty/JettyServiceFactory.java similarity index 100% rename from eclipse/org.argeo.cms.servlet/src/org/argeo/cms/servlet/internal/jetty/JettyServiceFactory.java rename to org.argeo.cms.lib.equinox/src/org/argeo/cms/servlet/internal/jetty/JettyServiceFactory.java diff --git a/eclipse/org.argeo.ext.equinox.jetty/src/org/argeo/equinox/jetty/CmsJettyCustomizer.java b/org.argeo.cms.lib.equinox/src/org/argeo/equinox/jetty/CmsJettyCustomizer.java similarity index 100% rename from eclipse/org.argeo.ext.equinox.jetty/src/org/argeo/equinox/jetty/CmsJettyCustomizer.java rename to org.argeo.cms.lib.equinox/src/org/argeo/equinox/jetty/CmsJettyCustomizer.java diff --git a/eclipse/org.argeo.ext.equinox.jetty/src/org/argeo/equinox/jetty/package-info.java b/org.argeo.cms.lib.equinox/src/org/argeo/equinox/jetty/package-info.java similarity index 100% rename from eclipse/org.argeo.ext.equinox.jetty/src/org/argeo/equinox/jetty/package-info.java rename to org.argeo.cms.lib.equinox/src/org/argeo/equinox/jetty/package-info.java diff --git a/org.argeo.cms.ssh/.classpath b/org.argeo.cms.lib.jetty/.classpath similarity index 100% rename from org.argeo.cms.ssh/.classpath rename to org.argeo.cms.lib.jetty/.classpath diff --git a/org.argeo.cms.sql/.project b/org.argeo.cms.lib.jetty/.project similarity index 94% rename from org.argeo.cms.sql/.project rename to org.argeo.cms.lib.jetty/.project index b96a541b2..132df7ff4 100644 --- a/org.argeo.cms.sql/.project +++ b/org.argeo.cms.lib.jetty/.project @@ -1,6 +1,6 @@ - org.argeo.cms.sql + org.argeo.cms.lib.jetty diff --git a/org.argeo.cms.lib.jetty/.settings/org.eclipse.jdt.core.prefs b/org.argeo.cms.lib.jetty/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 000000000..62ef3488c --- /dev/null +++ b/org.argeo.cms.lib.jetty/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,9 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=17 diff --git a/org.argeo.cms.lib.jetty/.settings/org.eclipse.pde.core.prefs b/org.argeo.cms.lib.jetty/.settings/org.eclipse.pde.core.prefs new file mode 100644 index 000000000..e8ff8be0b --- /dev/null +++ b/org.argeo.cms.lib.jetty/.settings/org.eclipse.pde.core.prefs @@ -0,0 +1,4 @@ +eclipse.preferences.version=1 +pluginProject.equinox=false +pluginProject.extensions=false +resolve.requirebundle=false diff --git a/org.argeo.cms.lib.jetty/bnd.bnd b/org.argeo.cms.lib.jetty/bnd.bnd new file mode 100644 index 000000000..d92601739 --- /dev/null +++ b/org.argeo.cms.lib.jetty/bnd.bnd @@ -0,0 +1,9 @@ +Import-Package: \ +javax.servlet.http,\ +org.eclipse.jetty.util.component;version="[9.4,12)";resolution:=optional,\ +org.eclipse.jetty.http;version="[9.4,12)";resolution:=optional,\ +org.eclipse.jetty.io;version="[9.4,12)";resolution:=optional,\ +org.eclipse.jetty.security;version="[9.4,12)";resolution:=optional,\ +org.eclipse.jetty.server.handler;version="[9.4,12)";resolution:=optional,\ +org.eclipse.jetty.*;version="[9.4,12)";resolution:=optional,\ +* \ No newline at end of file diff --git a/org.argeo.cms.sql/build.properties b/org.argeo.cms.lib.jetty/build.properties similarity index 100% rename from org.argeo.cms.sql/build.properties rename to org.argeo.cms.lib.jetty/build.properties diff --git a/org.argeo.cms.lib.jetty/src/org/argeo/cms/lib/jetty/CmsJettyServer.java b/org.argeo.cms.lib.jetty/src/org/argeo/cms/lib/jetty/CmsJettyServer.java new file mode 100644 index 000000000..d197a00f7 --- /dev/null +++ b/org.argeo.cms.lib.jetty/src/org/argeo/cms/lib/jetty/CmsJettyServer.java @@ -0,0 +1,52 @@ +package org.argeo.cms.lib.jetty; + +import java.nio.file.Path; + +import org.eclipse.jetty.server.Connector; +import org.eclipse.jetty.server.Server; +import org.eclipse.jetty.server.ServerConnector; +import org.eclipse.jetty.servlet.DefaultServlet; +import org.eclipse.jetty.servlet.ServletContextHandler; +import org.eclipse.jetty.servlet.ServletHolder; +import org.eclipse.jetty.util.thread.QueuedThreadPool; + +public class CmsJettyServer { + private Server server; + private ServerConnector serverConnector; + private Path tempDir; + + public void start() { + server = new Server(new QueuedThreadPool(10, 1)); + serverConnector = new ServerConnector(server); + serverConnector.setPort(0); + server.setConnectors(new Connector[] { serverConnector }); + + ServletContextHandler context = new ServletContextHandler(ServletContextHandler.SESSIONS); + context.setContextPath("/"); + server.setHandler(context); + + //context.addServlet(new ServletHolder(new RWTServlet()), "/" + entryPoint); + + // Required to serve rwt-resources. It is important that this is last. + ServletHolder holderPwd = new ServletHolder("default", DefaultServlet.class); + context.addServlet(holderPwd, "/"); + + try { + server.start(); + } catch (Exception e) { + throw new IllegalStateException("Cannot start Jetty server", e); + } + Runtime.getRuntime().addShutdownHook(new Thread(() -> stop(), "Jetty shutdown")); + } + + public void stop() { + try { + serverConnector.close(); + server.stop(); + // TODO delete temp dir + } catch (Exception e) { + e.printStackTrace(); + } + + } +} diff --git a/org.argeo.cms.sql/.classpath b/org.argeo.cms.lib.pgsql/.classpath similarity index 100% rename from org.argeo.cms.sql/.classpath rename to org.argeo.cms.lib.pgsql/.classpath diff --git a/org.argeo.cms.lib.pgsql/.project b/org.argeo.cms.lib.pgsql/.project new file mode 100644 index 000000000..3cd5f6fb4 --- /dev/null +++ b/org.argeo.cms.lib.pgsql/.project @@ -0,0 +1,28 @@ + + + org.argeo.cms.lib.pgsql + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + + org.eclipse.pde.PluginNature + org.eclipse.jdt.core.javanature + + diff --git a/org.argeo.cms.sql/bnd.bnd b/org.argeo.cms.lib.pgsql/bnd.bnd similarity index 100% rename from org.argeo.cms.sql/bnd.bnd rename to org.argeo.cms.lib.pgsql/bnd.bnd diff --git a/org.argeo.cms.lib.pgsql/build.properties b/org.argeo.cms.lib.pgsql/build.properties new file mode 100644 index 000000000..34d2e4d2d --- /dev/null +++ b/org.argeo.cms.lib.pgsql/build.properties @@ -0,0 +1,4 @@ +source.. = src/ +output.. = bin/ +bin.includes = META-INF/,\ + . diff --git a/org.argeo.cms.sql/src/org/argeo/cms/sql/postgres/CheckPg.java b/org.argeo.cms.lib.pgsql/src/org/argeo/cms/sql/postgres/CheckPg.java similarity index 100% rename from org.argeo.cms.sql/src/org/argeo/cms/sql/postgres/CheckPg.java rename to org.argeo.cms.lib.pgsql/src/org/argeo/cms/sql/postgres/CheckPg.java diff --git a/org.argeo.cms.lib.sshd/.classpath b/org.argeo.cms.lib.sshd/.classpath new file mode 100644 index 000000000..81fe078c2 --- /dev/null +++ b/org.argeo.cms.lib.sshd/.classpath @@ -0,0 +1,7 @@ + + + + + + + diff --git a/org.argeo.cms.ssh/.gitignore b/org.argeo.cms.lib.sshd/.gitignore similarity index 100% rename from org.argeo.cms.ssh/.gitignore rename to org.argeo.cms.lib.sshd/.gitignore diff --git a/eclipse/org.argeo.cms.servlet/.project b/org.argeo.cms.lib.sshd/.project similarity index 95% rename from eclipse/org.argeo.cms.servlet/.project rename to org.argeo.cms.lib.sshd/.project index d39f97472..588b82996 100644 --- a/eclipse/org.argeo.cms.servlet/.project +++ b/org.argeo.cms.lib.sshd/.project @@ -1,6 +1,6 @@ - org.argeo.cms.servlet + org.argeo.cms.lib.sshd diff --git a/org.argeo.cms.ssh/.settings/org.eclipse.jdt.core.prefs b/org.argeo.cms.lib.sshd/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from org.argeo.cms.ssh/.settings/org.eclipse.jdt.core.prefs rename to org.argeo.cms.lib.sshd/.settings/org.eclipse.jdt.core.prefs diff --git a/org.argeo.cms.ssh/OSGI-INF/cmsSshServer.xml b/org.argeo.cms.lib.sshd/OSGI-INF/cmsSshServer.xml similarity index 100% rename from org.argeo.cms.ssh/OSGI-INF/cmsSshServer.xml rename to org.argeo.cms.lib.sshd/OSGI-INF/cmsSshServer.xml diff --git a/org.argeo.cms.ssh/bnd.bnd b/org.argeo.cms.lib.sshd/bnd.bnd similarity index 100% rename from org.argeo.cms.ssh/bnd.bnd rename to org.argeo.cms.lib.sshd/bnd.bnd diff --git a/org.argeo.cms.ssh/build.properties b/org.argeo.cms.lib.sshd/build.properties similarity index 100% rename from org.argeo.cms.ssh/build.properties rename to org.argeo.cms.lib.sshd/build.properties diff --git a/org.argeo.cms.ssh/src/org/argeo/cms/ssh/AbstractSsh.java b/org.argeo.cms.lib.sshd/src/org/argeo/cms/ssh/AbstractSsh.java similarity index 100% rename from org.argeo.cms.ssh/src/org/argeo/cms/ssh/AbstractSsh.java rename to org.argeo.cms.lib.sshd/src/org/argeo/cms/ssh/AbstractSsh.java diff --git a/org.argeo.cms.ssh/src/org/argeo/cms/ssh/BasicSshServer.java b/org.argeo.cms.lib.sshd/src/org/argeo/cms/ssh/BasicSshServer.java similarity index 100% rename from org.argeo.cms.ssh/src/org/argeo/cms/ssh/BasicSshServer.java rename to org.argeo.cms.lib.sshd/src/org/argeo/cms/ssh/BasicSshServer.java diff --git a/org.argeo.cms.ssh/src/org/argeo/cms/ssh/CmsSshServer.java b/org.argeo.cms.lib.sshd/src/org/argeo/cms/ssh/CmsSshServer.java similarity index 100% rename from org.argeo.cms.ssh/src/org/argeo/cms/ssh/CmsSshServer.java rename to org.argeo.cms.lib.sshd/src/org/argeo/cms/ssh/CmsSshServer.java diff --git a/org.argeo.cms.ssh/src/org/argeo/cms/ssh/Sftp.java b/org.argeo.cms.lib.sshd/src/org/argeo/cms/ssh/Sftp.java similarity index 100% rename from org.argeo.cms.ssh/src/org/argeo/cms/ssh/Sftp.java rename to org.argeo.cms.lib.sshd/src/org/argeo/cms/ssh/Sftp.java diff --git a/org.argeo.cms.ssh/src/org/argeo/cms/ssh/Ssh.java b/org.argeo.cms.lib.sshd/src/org/argeo/cms/ssh/Ssh.java similarity index 100% rename from org.argeo.cms.ssh/src/org/argeo/cms/ssh/Ssh.java rename to org.argeo.cms.lib.sshd/src/org/argeo/cms/ssh/Ssh.java diff --git a/org.argeo.cms.ssh/src/org/argeo/cms/ssh/SshKeyPair.java b/org.argeo.cms.lib.sshd/src/org/argeo/cms/ssh/SshKeyPair.java similarity index 100% rename from org.argeo.cms.ssh/src/org/argeo/cms/ssh/SshKeyPair.java rename to org.argeo.cms.lib.sshd/src/org/argeo/cms/ssh/SshKeyPair.java diff --git a/org.argeo.cms.ssh/src/org/argeo/cms/ssh/SshSync.java b/org.argeo.cms.lib.sshd/src/org/argeo/cms/ssh/SshSync.java similarity index 100% rename from org.argeo.cms.ssh/src/org/argeo/cms/ssh/SshSync.java rename to org.argeo.cms.lib.sshd/src/org/argeo/cms/ssh/SshSync.java diff --git a/org.argeo.cms.ssh/src/org/argeo/cms/ssh/cli/SshCli.java b/org.argeo.cms.lib.sshd/src/org/argeo/cms/ssh/cli/SshCli.java similarity index 100% rename from org.argeo.cms.ssh/src/org/argeo/cms/ssh/cli/SshCli.java rename to org.argeo.cms.lib.sshd/src/org/argeo/cms/ssh/cli/SshCli.java diff --git a/org.argeo.cms.ssh/src/org/argeo/cms/ssh/cli/SshShell.java b/org.argeo.cms.lib.sshd/src/org/argeo/cms/ssh/cli/SshShell.java similarity index 100% rename from org.argeo.cms.ssh/src/org/argeo/cms/ssh/cli/SshShell.java rename to org.argeo.cms.lib.sshd/src/org/argeo/cms/ssh/cli/SshShell.java diff --git a/org.argeo.cms.ssh/src/org/argeo/cms/ssh/package-info.java b/org.argeo.cms.lib.sshd/src/org/argeo/cms/ssh/package-info.java similarity index 100% rename from org.argeo.cms.ssh/src/org/argeo/cms/ssh/package-info.java rename to org.argeo.cms.lib.sshd/src/org/argeo/cms/ssh/package-info.java diff --git a/org.argeo.cms/src/org/argeo/cms/acr/fs/FileSync.java b/org.argeo.cms.ux/src/org/argeo/cms/ux/cli/FileSync.java similarity index 96% rename from org.argeo.cms/src/org/argeo/cms/acr/fs/FileSync.java rename to org.argeo.cms.ux/src/org/argeo/cms/ux/cli/FileSync.java index 397caea34..91279c53d 100644 --- a/org.argeo.cms/src/org/argeo/cms/acr/fs/FileSync.java +++ b/org.argeo.cms.ux/src/org/argeo/cms/ux/cli/FileSync.java @@ -1,4 +1,4 @@ -package org.argeo.cms.acr.fs; +package org.argeo.cms.ux.cli; import java.net.URI; import java.net.URISyntaxException; @@ -11,6 +11,8 @@ import org.apache.commons.cli.Option; import org.apache.commons.cli.Options; import org.argeo.api.cli.CommandArgsException; import org.argeo.api.cli.DescribedCommand; +import org.argeo.cms.acr.fs.PathSync; +import org.argeo.cms.acr.fs.SyncResult; public class FileSync implements DescribedCommand> { final static Option deleteOption = Option.builder().longOpt("delete").desc("delete from target").build(); diff --git a/org.argeo.cms/src/org/argeo/cms/acr/fs/FsCommands.java b/org.argeo.cms.ux/src/org/argeo/cms/ux/cli/FsCommands.java similarity index 91% rename from org.argeo.cms/src/org/argeo/cms/acr/fs/FsCommands.java rename to org.argeo.cms.ux/src/org/argeo/cms/ux/cli/FsCommands.java index 088c1c352..97d8c85f0 100644 --- a/org.argeo.cms/src/org/argeo/cms/acr/fs/FsCommands.java +++ b/org.argeo.cms.ux/src/org/argeo/cms/ux/cli/FsCommands.java @@ -1,4 +1,4 @@ -package org.argeo.cms.acr.fs; +package org.argeo.cms.ux.cli; import org.argeo.api.cli.CommandsCli; diff --git a/org.argeo.cms/src/org/argeo/cms/auth/CmsAuthUtils.java b/org.argeo.cms/src/org/argeo/cms/auth/CmsAuthUtils.java index e8a0dc2b7..9e00ed458 100644 --- a/org.argeo.cms/src/org/argeo/cms/auth/CmsAuthUtils.java +++ b/org.argeo.cms/src/org/argeo/cms/auth/CmsAuthUtils.java @@ -27,7 +27,6 @@ import org.argeo.cms.internal.auth.ImpliedByPrincipal; import org.argeo.cms.internal.http.WebCmsSessionImpl; import org.argeo.cms.internal.runtime.CmsContextImpl; import org.argeo.osgi.useradmin.AuthenticatingUser; -import org.osgi.service.http.HttpContext; import org.osgi.service.useradmin.Authorization; /** Centralises security related registrations. */ @@ -140,8 +139,8 @@ class CmsAuthUtils { String httpSessId = httpSession.getId(); boolean anonymous = authorization.getName() == null; String remoteUser = !anonymous ? authorization.getName() : CmsConstants.ROLE_ANONYMOUS; - request.setAttribute(HttpContext.REMOTE_USER, remoteUser); - request.setAttribute(HttpContext.AUTHORIZATION, authorization); + request.setAttribute(RemoteAuthRequest.REMOTE_USER, remoteUser); + request.setAttribute(RemoteAuthRequest.AUTHORIZATION, authorization); CmsSessionImpl cmsSession; CmsSessionImpl currentLocalSession = CmsContextImpl.getCmsContext().getCmsSessionByLocalId(httpSessId); diff --git a/org.argeo.cms/src/org/argeo/cms/auth/RemoteAuthRequest.java b/org.argeo.cms/src/org/argeo/cms/auth/RemoteAuthRequest.java index 2d1d14b4e..be5d0e15e 100644 --- a/org.argeo.cms/src/org/argeo/cms/auth/RemoteAuthRequest.java +++ b/org.argeo.cms/src/org/argeo/cms/auth/RemoteAuthRequest.java @@ -4,6 +4,9 @@ import java.util.Locale; /** Transitional interface to decouple from the Servlet API. */ public interface RemoteAuthRequest { + final static String REMOTE_USER = "org.osgi.service.http.authentication.remote.user"; + final static String AUTHORIZATION = "org.osgi.service.useradmin.authorization"; + RemoteAuthSession getSession(); RemoteAuthSession createSession(); diff --git a/org.argeo.cms/src/org/argeo/cms/auth/RemoteSessionLoginModule.java b/org.argeo.cms/src/org/argeo/cms/auth/RemoteSessionLoginModule.java index 3abcf8c94..8f0509690 100644 --- a/org.argeo.cms/src/org/argeo/cms/auth/RemoteSessionLoginModule.java +++ b/org.argeo.cms/src/org/argeo/cms/auth/RemoteSessionLoginModule.java @@ -14,13 +14,11 @@ import javax.security.auth.callback.UnsupportedCallbackException; import javax.security.auth.login.LoginException; import javax.security.auth.spi.LoginModule; -import org.argeo.api.cms.CmsConstants; import org.argeo.api.cms.CmsLog; import org.argeo.cms.CmsDeployProperty; import org.argeo.cms.internal.auth.CmsSessionImpl; import org.argeo.cms.internal.runtime.CmsContextImpl; import org.argeo.cms.internal.runtime.CmsStateImpl; -import org.osgi.service.http.HttpContext; import org.osgi.service.useradmin.Authorization; /** Use the HTTP session as the basis for authentication. */ @@ -79,7 +77,7 @@ public class RemoteSessionLoginModule implements LoginModule { log.trace("Retrieved authorization from " + cmsSession); } } else { - authorization = (Authorization) request.getAttribute(HttpContext.AUTHORIZATION); + authorization = (Authorization) request.getAttribute(RemoteAuthRequest.AUTHORIZATION); if (authorization == null) {// search by session ID RemoteAuthSession httpSession = request.getSession(); if (httpSession == null) { @@ -110,7 +108,7 @@ public class RemoteSessionLoginModule implements LoginModule { } else { if (log.isTraceEnabled()) log.trace("HTTP login: " + true); - request.setAttribute(HttpContext.AUTHORIZATION, authorization); + request.setAttribute(RemoteAuthRequest.AUTHORIZATION, authorization); return true; } } diff --git a/org.argeo.cms/src/org/argeo/cms/internal/runtime/CmsDeploymentImpl.java b/org.argeo.cms/src/org/argeo/cms/internal/runtime/CmsDeploymentImpl.java index 2353250c5..1b94bdad1 100644 --- a/org.argeo.cms/src/org/argeo/cms/internal/runtime/CmsDeploymentImpl.java +++ b/org.argeo.cms/src/org/argeo/cms/internal/runtime/CmsDeploymentImpl.java @@ -4,7 +4,6 @@ import org.argeo.api.cms.CmsDeployment; import org.argeo.api.cms.CmsLog; import org.argeo.api.cms.CmsState; import org.argeo.cms.CmsDeployProperty; -import org.osgi.service.http.HttpService; /** Implementation of a CMS deployment. */ public class CmsDeploymentImpl implements CmsDeployment { @@ -12,7 +11,7 @@ public class CmsDeploymentImpl implements CmsDeployment { // Readiness private boolean httpExpected = false; - private HttpService httpService; +// private HttpService httpService; private CmsState cmsState; // private DeployConfig deployConfig; @@ -40,9 +39,9 @@ public class CmsDeploymentImpl implements CmsDeployment { // return deployConfig.getProps(factoryPid, cn); // } - public boolean isHttpAvailableOrNotExpected() { - return (httpExpected ? httpService != null : true); - } +// public boolean isHttpAvailableOrNotExpected() { +// return (httpExpected ? httpService != null : true); +// } // private void loadIpaJaasConfiguration() { // if (System.getProperty(KernelConstants.JAAS_CONFIG_PROP) == null) { @@ -70,8 +69,8 @@ public class CmsDeploymentImpl implements CmsDeployment { httpExpected = httpPort != null || httpsPort != null; } - public void setHttpService(HttpService httpService) { - this.httpService = httpService; - } +// public void setHttpService(HttpService httpService) { +// this.httpService = httpService; +// } } -- 2.30.2